Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d35f6a4574)
r14.1.x
Michele Calgaro 9 months ago
parent 3f5b00b2f2
commit a9af628d68
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -141,10 +141,10 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
TQM_EXPORT_WORKSPACE => '', TQM_EXPORT_WORKSPACE => '',
TQT_NO_REMOTE => 'TQT_NO_REMOTE', TQT_NO_REMOTE => 'TQT_NO_REMOTE',
QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
Q_WS_X11 => 'Q_WS_X11', TQ_WS_X11 => 'TQ_WS_X11',
TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
Q_WS_QWS => 'undef', TQ_WS_QWS => 'undef',
Q_WS_MAC => 'undef', TQ_WS_MAC => 'undef',
TQ_OBJECT => <<'CODE', TQ_OBJECT => <<'CODE',
public: public:
virtual TQMetaObject *metaObject() const; virtual TQMetaObject *metaObject() const;
@ -574,13 +574,13 @@ LOOP:
else { else {
# Skip platform-specific stuff, or #if 0 stuff # Skip platform-specific stuff, or #if 0 stuff
# or #else of something we parsed (e.g. for TQKeySequence) # or #else of something we parsed (e.g. for TQKeySequence)
if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or
$p =~ m/^#\s*if\s+defined\(Q_WS_/ or $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or
($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or
($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or ($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(TQ_WS_X11_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(TQ_WS_WIN_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or
$p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or $p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or

Loading…
Cancel
Save