Replace Q_OBJECT with TQ_OBJECT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 11 months ago
parent 2bf1cd4db0
commit a60dd4770b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -119,7 +119,7 @@
2004-05-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk> 2004-05-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* Added the correct macro expansion for Q_OBJECT with Qt/E 2.3.x * Added the correct macro expansion for TQ_OBJECT with Qt/E 2.3.x
* kalyptus can now generate the SMOKE library for Qt Embedded * kalyptus can now generate the SMOKE library for Qt Embedded
2004-05-22 Richard Dale <Richard_Dale@tipitina.demon.co.uk> 2004-05-22 Richard Dale <Richard_Dale@tipitina.demon.co.uk>

@ -145,7 +145,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
Q_WS_QWS => 'undef', Q_WS_QWS => 'undef',
Q_WS_MAC => 'undef', Q_WS_MAC => 'undef',
Q_OBJECT => <<'CODE', TQ_OBJECT => <<'CODE',
public: public:
virtual TQMetaObject *metaObject() const; virtual TQMetaObject *metaObject() const;
virtual const char *className() const; virtual const char *className() const;
@ -454,7 +454,7 @@ sub readSourceLine
=head2 readCxxLine =head2 readCxxLine
Reads a C++ source line, skipping comments, blank lines, Reads a C++ source line, skipping comments, blank lines,
preprocessor tokens and the Q_OBJECT macro preprocessor tokens and the TQ_OBJECT macro
=cut =cut
@ -482,7 +482,7 @@ LOOP:
} }
} }
if ( $p =~ /^\s*Q_OBJECT/ ) { if ( $p =~ /^\s*TQ_OBJECT/ ) {
if ($qt_embedded) { if ($qt_embedded) {
push @inputqueue, @qte_codeqobject; push @inputqueue, @qte_codeqobject;
} elsif ($qt4) { } elsif ($qt4) {
@ -531,7 +531,7 @@ LOOP:
next if ( $p =~ /^\s*$/s ); # blank lines next if ( $p =~ /^\s*$/s ); # blank lines
# || $p =~ /^\s*Q_OBJECT/ # TQObject macro # || $p =~ /^\s*TQ_OBJECT/ # TQObject macro
# ); # );
# #

@ -2625,7 +2625,7 @@ sub preParseClass
|| ($name eq 'qt_cast') || ($name eq 'qt_cast')
|| ($name eq 'qt_property') || ($name eq 'qt_property')
|| ($name eq 'staticMetaObject') || ($name eq 'staticMetaObject')
# Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
|| $name eq 'trUtf8' || $name eq 'trUtf8'
@ -5475,7 +5475,7 @@ sub printJavadocComment($$$$)
$line =~ s/bool/boolean/g; $line =~ s/bool/boolean/g;
$line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g;
$line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g;
$line =~ s/Q_OBJECT\n//g; $line =~ s/TQ_OBJECT\n//g;
$line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g;
$line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/public\s*(slots)?:\n/public /g;
$line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g;

@ -903,7 +903,7 @@ sub preParseClass
|| ($name eq 'qt_property') || ($name eq 'qt_property')
|| ($name eq 'staticMetaObject') || ($name eq 'staticMetaObject')
|| ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
# Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
|| $m->{Deprecated} ) { || $m->{Deprecated} ) {
@ -3317,7 +3317,7 @@ sub printJavadocComment($$$$)
$line =~ s/bool/boolean/g; $line =~ s/bool/boolean/g;
$line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g;
$line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g;
$line =~ s/Q_OBJECT\n//g; $line =~ s/TQ_OBJECT\n//g;
$line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g;
$line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/public\s*(slots)?:\n/public /g;
$line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g;

@ -952,7 +952,7 @@ sub preParseClass
|| ($name eq 'type') || ($name eq 'type')
|| ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
|| ($classNode->{astNodeName} eq 'TQApplication' and $name eq 'TQApplication') || ($classNode->{astNodeName} eq 'TQApplication' and $name eq 'TQApplication')
# Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
@ -3510,7 +3510,7 @@ sub printCSharpdocComment($$$$)
$line =~ s/bool/bool/g; $line =~ s/bool/bool/g;
$line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g;
$line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g;
$line =~ s/Q_OBJECT\n//g; $line =~ s/TQ_OBJECT\n//g;
$line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/public\s*(slots)?:\n/public /g;
$line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g;
$line =~ s/^(\s*)\*/$1/g; $line =~ s/^(\s*)\*/$1/g;

@ -637,7 +637,7 @@ sub preParseClass
|| ($name eq 'hack_strchr') || ($name eq 'hack_strchr')
|| ($name eq 'hack_strstr') ) ) || ($name eq 'hack_strstr') ) )
# Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')

Loading…
Cancel
Save