diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
| commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
| tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kexi/plugins/macros/tests/komacrotestbase.h | |
| parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
| download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip | |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi/plugins/macros/tests/komacrotestbase.h')
| -rw-r--r-- | kexi/plugins/macros/tests/komacrotestbase.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kexi/plugins/macros/tests/komacrotestbase.h b/kexi/plugins/macros/tests/komacrotestbase.h index d423e086..e301730d 100644 --- a/kexi/plugins/macros/tests/komacrotestbase.h +++ b/kexi/plugins/macros/tests/komacrotestbase.h @@ -27,11 +27,11 @@ */ #define KOMACROTEST_ASSERT(actual, expected) \ { \ - std::cout << QString("Testing: %1 == %2").arg(#actual).arg(#expected).latin1() << std::endl; \ + std::cout << TQString("Testing: %1 == %2").tqarg(#actual).tqarg(#expected).latin1() << std::endl; \ check( __FILE__, __LINE__, #actual, actual, expected, false ); \ if(actual != expected) \ { \ - kdWarning() << QString("==============> FAILED") << endl; \ + kdWarning() << TQString("==============> FAILED") << endl; \ return; \ } \ } @@ -44,11 +44,11 @@ */ #define KOMACROTEST_XASSERT(actual, notexpected) \ { \ - std::cout << QString("Testing: %1 != %2").arg(#actual).arg(#notexpected).latin1() << std::endl; \ + std::cout << TQString("Testing: %1 != %2").tqarg(#actual).tqarg(#notexpected).latin1() << std::endl; \ check( __FILE__, __LINE__, #actual, actual, notexpected, true ); \ if(actual == notexpected) \ { \ - kdWarning() << QString("==============> FAILED") << endl; \ + kdWarning() << TQString("==============> FAILED") << endl; \ return; \ } \ } @@ -70,11 +70,11 @@ setExceptionRaised(true); \ } \ if(exceptionRaised()) { \ - success(QString(__FILE__) + "[" + QString::number(__LINE__) + "]: passed " + #expression); \ + success(TQString(__FILE__) + "[" + TQString::number(__LINE__) + "]: passed " + #expression); \ setExceptionRaised(false); \ } \ else { \ - failure(QString(__FILE__) + "[" + QString::number(__LINE__) + QString("]: failed to throw an exception on: ") + #expression); \ + failure(TQString(__FILE__) + "[" + TQString::number(__LINE__) + TQString("]: failed to throw an exception on: ") + #expression); \ return; \ } \ } @@ -84,7 +84,7 @@ //Used more tha once at various places //names of variables from testaction namespace KoMacroTest { - static const QString TESTSTRING = "teststring"; - static const QString TESTINT = "testint"; - static const QString TESTBOOL = "testbool"; + static const TQString TESTSTRING = "teststring"; + static const TQString TESTINT = "testint"; + static const TQString TESTBOOL = "testbool"; } |