Replace various Q_* and QT_* defines with TQ_* and TQT_*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/27/head
Michele Calgaro 1 year ago
parent b7ae97b872
commit 93673b22d2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -134,7 +134,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
QT_STATIC_CONST => 'static const', QT_STATIC_CONST => 'static const',
Q_EXPORT => '', Q_EXPORT => '',
Q_EXPORT_CODECS_BIG5 => '', Q_EXPORT_CODECS_BIG5 => '',
Q_REFCOUNT => '', TQ_REFCOUNT => '',
TQM_EXPORT_CANVAS => '', TQM_EXPORT_CANVAS => '',
TQM_EXPORT_DNS => '', TQM_EXPORT_DNS => '',
TQM_EXPORT_ICONVIEW => '', TQM_EXPORT_ICONVIEW => '',
@ -558,7 +558,7 @@ LOOP:
|| $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*Q_GADGET/
|| $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE
|| $p =~ /^\s*TQ_SETS/ || $p =~ /^\s*TQ_SETS/
|| $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/
|| $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff
|| $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*K_SYCOCAFACTORY/ #
|| $p =~ /^\s*KSVG_/ # and KSVG stuff ;) || $p =~ /^\s*KSVG_/ # and KSVG stuff ;)
@ -877,7 +877,7 @@ sub identifyDecl
(?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)?
(?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)?
(?:\s*TQ_PACKED)? (?:\s*TQ_PACKED)?
(?:\s*Q_REFCOUNT)? (?:\s*TQ_REFCOUNT)?
\s+([\w_]+ # 3 name \s+([\w_]+ # 3 name
(?:<[\w_ :,]+?>)? # maybe explicit template (?:<[\w_ :,]+?>)? # maybe explicit template
# (eat chars between <> non-hungry) # (eat chars between <> non-hungry)

@ -117,7 +117,7 @@ sub cplusplusToCSharp
return "IntPtr"; return "IntPtr";
} elsif ( $cplusplusType =~ /^TQUuid/ ) { } elsif ( $cplusplusType =~ /^TQUuid/ ) {
return "IntPtr"; return "IntPtr";
} elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) {
return "IntPtr"; return "IntPtr";
} elsif ( $cplusplusType =~ /^EventRef/ ) { } elsif ( $cplusplusType =~ /^EventRef/ ) {
return "IntPtr"; return "IntPtr";
@ -223,7 +223,7 @@ sub cplusplusToPInvoke
return "RawObject"; return "RawObject";
} elsif ( $cplusplusType =~ /^TQUuid/ ) { } elsif ( $cplusplusType =~ /^TQUuid/ ) {
return "RawObject"; return "RawObject";
} elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) {
return "RawObject"; return "RawObject";
} elsif ( $cplusplusType =~ /^EventRef/ ) { } elsif ( $cplusplusType =~ /^EventRef/ ) {
return "RawObject"; return "RawObject";

@ -305,7 +305,7 @@
<qparam type="TQUuidamp" name="arg1"/> <qparam type="TQUuidamp" name="arg1"/>
<qparam type="TQUnknownInterface**" name="arg2"/> <qparam type="TQUnknownInterface**" name="arg2"/>
</qmethod> </qmethod>
<qmethod name="isValid" access="public" return="Q_REFCOUNT bool" id="0"/> <qmethod name="isValid" access="public" return="TQ_REFCOUNT bool" id="0"/>
<qmethod name="protected_object" access="protected" return="TQObject*" id="0"/> <qmethod name="protected_object" access="protected" return="TQObject*" id="0"/>
</qtype> <qtype name="TQAction" access="public"> </qtype> <qtype name="TQAction" access="public">
<qancestor name="TQObject"/> <qancestor name="TQObject"/>

@ -59,7 +59,7 @@ namespace QtCSharp {
mastermap.Add ("HPALETTE", "uint"); mastermap.Add ("HPALETTE", "uint");
mastermap.Add ("HRGN", "uint"); mastermap.Add ("HRGN", "uint");
mastermap.Add ("Display", "IntPtr"); mastermap.Add ("Display", "IntPtr");
mastermap.Add ("Q_REFCOUNT bool", "bool"); mastermap.Add ("TQ_REFCOUNT bool", "bool");
mastermap.Add ("EventRef", "IntPtr"); mastermap.Add ("EventRef", "IntPtr");
mastermap.Add ("MSG", "IntPtr"); mastermap.Add ("MSG", "IntPtr");
mastermap.Add ("XEvent", "IntPtr"); mastermap.Add ("XEvent", "IntPtr");

Loading…
Cancel
Save