diff options
| author | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
|---|---|---|
| committer | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
| commit | 1053cdc43c88b429df96a57c9b0f14be51a71540 (patch) | |
| tree | 62f68bb172a62aeafaf56f2ee86d46f19fff9a3f /dcop | |
| parent | de1db784f3df1568565b2d1b1a57585b54d2d462 (diff) | |
| parent | fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335 (diff) | |
| download | tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.tar.gz tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'dcop')
| -rw-r--r-- | dcop/dcopidlng/kalyptus | 4 | ||||
| -rw-r--r-- | dcop/kdatastream.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index ccf2cad97..8c53af8b9 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -111,7 +111,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); QT_NO_REMOTE => 'QT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', Q_WS_X11 => 'Q_WS_X11', - Q_DISABLE_COPY => 'Q_DISABLE_COPY', + TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', Q_WS_QWS => 'undef', Q_WS_MAC => 'undef', Q_OBJECT => <<'CODE', @@ -713,7 +713,7 @@ sub identifyDecl elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type \s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export - (?:\s*Q_PACKED)? + (?:\s*TQ_PACKED)? (?:\s*Q_REFCOUNT)? \s+([\w_]+ # 4 name (?:<[\w_ :,]+?>)? # maybe explicit template diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index 6551295f6..4a135b9d9 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -19,7 +19,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) } #endif // USE_QT3 -#if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) +#if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) { TQ_UINT32 l1,l2; |