diff options
| author | Automated System <[email protected]> | 2012-02-14 22:40:43 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2012-02-14 22:40:43 -0600 |
| commit | 1053cdc43c88b429df96a57c9b0f14be51a71540 (patch) | |
| tree | 62f68bb172a62aeafaf56f2ee86d46f19fff9a3f /tdeui | |
| 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 'tdeui')
| -rw-r--r-- | tdeui/kcursor.cpp | 4 | ||||
| -rw-r--r-- | tdeui/kxmlguifactory.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 094e581be..1458f88dc 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -78,7 +78,7 @@ TQCursor KCursor::handCursor() hand_cursor = new TQCursor(PointingHandCursor); } - Q_CHECK_PTR(hand_cursor); + TQ_CHECK_PTR(hand_cursor); return *hand_cursor; } @@ -135,7 +135,7 @@ TQCursor KCursor::workingCursor() working_cursor->handle(); } - Q_CHECK_PTR(working_cursor); + TQ_CHECK_PTR(working_cursor); return *working_cursor; } diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index a8c437571..7aa427937 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -125,7 +125,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu return TQString::null; } -#if QT_VERSION <= 0x030302 +#if TQT_VERSION <= 0x030302 // Work around bug in TQString::fromUtf8 (which calls strlen). TQByteArray buffer(file.size() + 1); buffer = file.readAll(); |