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

1 files changed, 16 insertions, 16 deletions

diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp
index 0150ecfd..65bebe66 100644
--- a/kexi/plugins/macros/tests/actiontests.cpp
+++ b/kexi/plugins/macros/tests/actiontests.cpp
@@ -34,8 +34,8 @@
 
 #include <ostream>
 
-#include <qstringlist.h>
-#include <qdom.h>
+#include <tqstringlist.h>
+#include <tqdom.h>
 
 #include <kdebug.h>
 #include <kunittest/runner.h>
@@ -66,16 +66,16 @@ 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<KoMacro::Macro> macro;
 
-		QValueList< KSharedPtr<KoMacro::MacroItem> > items;
+		TQValueList< KSharedPtr<KoMacro::MacroItem> > items;
 
 		KSharedPtr<KoMacro::Action> actionptr;
 
@@ -90,7 +90,7 @@ namespace KoMacroTest {
 	};
 }
 
-typedef QValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype;
+typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype;
 
 
 ActionTests::ActionTests()
@@ -117,9 +117,9 @@ void ActionTests::setUp()
 	d->testaction = new TestAction();
 	::KoMacro::Manager::self()->publishAction(d->testaction);	
 
-	d->doomdocument = new QDomDocument();
+	d->doomdocument = new TQDomDocument();
 
-	QString const xml = QString("<!DOCTYPE macros>"
+	TQString const xml = TQString("<!DOCTYPE macros>"
 				   "<macro xmlversion=\"1\" >"
 				      "<item action=\"testaction\" >"
 				      "</item>"
@@ -147,7 +147,7 @@ void ActionTests::testMacro()
 	kdDebug()<<"===================== testMacro() ======================" << endl;
 	
 	//fetch Items and ..
-	//QValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
+	//TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
 
 	//... check that there is one
 	KOMACROTEST_XASSERT( d->items.count(), sizetype(0) );
@@ -169,14 +169,14 @@ void ActionTests::testText()
 
 	//KSharedPtr<KoMacro::Action> actionptr = items[0]->action();
 
-	const QString leetSpeech = "']['3 $']['";
+	const TQString leetSpeech = "']['3 $']['";
 	
 	//check i18n text
-	KOMACROTEST_ASSERT(d->actionptr->text(),QString("Test"));
+	KOMACROTEST_ASSERT(d->actionptr->text(),TQString("Test"));
 	//change it
 	d->actionptr->setText(leetSpeech);
 	//retest it
-	KOMACROTEST_ASSERT(d->actionptr->text(),QString(leetSpeech));
+	KOMACROTEST_ASSERT(d->actionptr->text(),TQString(leetSpeech));
 }
 
 
@@ -187,11 +187,11 @@ void ActionTests::testName()
 	//KSharedPtr<KoMacro::Action> actionptr = items[0]->action();
 
 	//check name
-	KOMACROTEST_ASSERT(d->actionptr->name(),QString("testaction"));
+	KOMACROTEST_ASSERT(d->actionptr->name(),TQString("testaction"));
 	//change it
 	d->actionptr->setName("ActionJackson");
 	//retest it
-	KOMACROTEST_ASSERT(d->actionptr->name(),QString("ActionJackson"));
+	KOMACROTEST_ASSERT(d->actionptr->name(),TQString("ActionJackson"));
 }
 
 void ActionTests::testComment()
@@ -201,11 +201,11 @@ void ActionTests::testComment()
 	//KSharedPtr<KoMacro::Action> actionptr = items[0]->action();
 
 	//check comment
-	KOMACROTEST_XASSERT(d->actionptr->comment(),QString("No Comment!"));
+	KOMACROTEST_XASSERT(d->actionptr->comment(),TQString("No Comment!"));
 	//set comment
 	d->actionptr->setComment("Stringtest");
 	//check comment again
-	KOMACROTEST_ASSERT(d->actionptr->comment(),QString("Stringtest"));
+	KOMACROTEST_ASSERT(d->actionptr->comment(),TQString("Stringtest"));
 }
 
 #include "actiontests.moc"