From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kexi/plugins/macros/tests/macroitemtests.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kexi/plugins/macros/tests/macroitemtests.cpp') diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp index 366318e1..47b93b0f 100644 --- a/kexi/plugins/macros/tests/macroitemtests.cpp +++ b/kexi/plugins/macros/tests/macroitemtests.cpp @@ -32,8 +32,8 @@ #include -#include -#include +#include +#include #include #include @@ -64,12 +64,12 @@ namespace KoMacroTest { /** * An @a TestObject instance used internaly to test - * handling and communication with from QObject + * handling and communication with from TQObject * inheritated instances. */ TestAction* testaction; - QDomDocument* doomdocument; + TQDomDocument* doomdocument; KSharedPtr macro; @@ -83,7 +83,7 @@ namespace KoMacroTest { }; } -typedef QValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< KSharedPtr >::size_type sizetype; MacroitemTests::MacroitemTests() : KUnitTest::SlotTester() @@ -108,9 +108,9 @@ void MacroitemTests::setUp() d->testaction = new TestAction(); ::KoMacro::Manager::self()->publishAction(d->testaction); - d->doomdocument = new QDomDocument(); + d->doomdocument = new TQDomDocument(); - QString const xml = QString("" + TQString const xml = TQString("" "" "" "" @@ -136,7 +136,7 @@ void MacroitemTests::testMacro() kdDebug()<<"===================== testMacro() ======================" << endl; //fetch Items and .. - QValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< KSharedPtr >& items = d->macro->items(); //... check that there is one KOMACROTEST_XASSERT( items.count(), sizetype(0) ); @@ -148,7 +148,7 @@ void MacroitemTests::testMacroItemString() kdDebug()<<"===================== testMacroItemString() ======================" << endl; - QValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< KSharedPtr >& items = d->macro->items(); KSharedPtr actionptr = items[0]->action(); KSharedPtr variableptr = actionptr->variable(TESTSTRING); @@ -167,7 +167,7 @@ void MacroitemTests::testMacroItemString() macroitem->setVariable(TESTSTRING, "TeStString"); variableptr = macroitem->variable(TESTSTRING); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); - KOMACROTEST_ASSERT(variableptr->variant().toString(),QString("TeStString")); + KOMACROTEST_ASSERT(variableptr->variant().toString(),TQString("TeStString")); //secondway for appending an macroitem @@ -185,7 +185,7 @@ void MacroitemTests::testMacroItemInt() kdDebug()<<"===================== testMacroItemInt() ======================" << endl; - QValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< KSharedPtr >& items = d->macro->items(); KSharedPtr actionptr = items[0]->action(); //create new macroitem for testing @@ -204,7 +204,7 @@ void MacroitemTests::testMacroItemInt() KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_ASSERT(sizetype(variableptr->variant().toInt()),sizetype(-1)); - macroitem->setVariable(TESTINT,QVariant(0)); + macroitem->setVariable(TESTINT,TQVariant(0)); variableptr = macroitem->variable(TESTINT); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_ASSERT(sizetype(variableptr->variant().toInt()),sizetype(0)); @@ -226,7 +226,7 @@ void MacroitemTests::testMacroItemBool() kdDebug()<<"===================== testMacroItemBool() ======================" << endl; - QValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< KSharedPtr >& items = d->macro->items(); KSharedPtr actionptr = items[0]->action(); //create new macroitem for testing -- cgit v1.2.1