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, 23 insertions, 23 deletions

diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp
index 893cccca6..1c7e8e39b 100644
--- a/lib/kross/test/testobject.cpp
+++ b/lib/kross/test/testobject.cpp
@@ -22,24 +22,24 @@
 #include <iostream> // for std::out
 
 TestObject::TestObject()
-    : QObject(0, "TestObject")
+    : TQObject(0, "TestObject")
 {
 }
 
-TestObject::TestObject(QObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
-    : QObject(parent, "TestObject")
+TestObject::TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
+    : TQObject(tqparent, "TestObject")
 {
-    connect(this, SIGNAL(testSignal()), this, SLOT(testSignalSlot()));
-    connect(this, SIGNAL(stdoutSignal(const QString&)), this, SLOT(stdoutSlot(const QString&)));
-    connect(this, SIGNAL(stderrSignal(const QString&)), this, SLOT(stderrSlot(const QString&)));
+    connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot()));
+    connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&)));
+    connect(this, TQT_SIGNAL(stderrSignal(const TQString&)), this, TQT_SLOT(stderrSlot(const TQString&)));
 
-    scriptcontainer->addQObject(this);
+    scriptcontainer->addTQObject(this);
 
-//scriptcontainer->addSignal("stdout", this, SIGNAL(stdoutSignal(const QString&)));
-//scriptcontainer->addSlot("stderr", this, SLOT(stderrSlot(const QString&)));
+//scriptcontainer->addSignal("stdout", this, TQT_SIGNAL(stdoutSignal(const TQString&)));
+//scriptcontainer->addSlot("stderr", this, TQT_SLOT(stderrSlot(const TQString&)));
 
-    //scriptcontainer->addSignal("myTestSignal", this, SIGNAL(testSignal()));
-    //scriptcontainer->addSlot("myTestSlot", this, SLOT(testSlot()));
+    //scriptcontainer->addSignal("myTestSignal", this, TQT_SIGNAL(testSignal()));
+    //scriptcontainer->addSlot("myTestSlot", this, TQT_SLOT(testSlot()));
 }
 
 TestObject::~TestObject()
@@ -48,24 +48,24 @@ TestObject::~TestObject()
 
 uint TestObject::func1(uint i)
 {
-    Kross::krossdebug(QString("CALLED => TestObject::func1 i=%1").arg(i) );
+    Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").tqarg(i) );
     return i;
 }
 
-void TestObject::func2(QString s, int i)
+void TestObject::func2(TQString s, int i)
 {
-    Kross::krossdebug(QString("CALLED => TestObject::func2 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").tqarg(s).tqarg(i));
 }
 
-QString TestObject::func3(QString s, int i)
+TQString TestObject::func3(TQString s, int i)
 {
-    Kross::krossdebug(QString("CALLED => TestObject::func3 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").tqarg(s).tqarg(i));
     return s;
 }
 
-const QString& TestObject::func4(const QString& s, int i) const
+const TQString& TestObject::func4(const TQString& s, int i) const
 {
-    Kross::krossdebug(QString("CALLED => TestObject::func4 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").tqarg(s).tqarg(i));
     return s;
 }
 
@@ -73,7 +73,7 @@ void TestObject::testSlot()
 {
     Kross::krossdebug("TestObject::testSlot called");
     emit testSignal();
-    emit testSignalString("This is the emitted TestObject::testSignalString(const QString&)");
+    emit testSignalString("This is the emitted TestObject::testSignalString(const TQString&)");
 }
 
 void TestObject::testSlot2()
@@ -81,15 +81,15 @@ void TestObject::testSlot2()
     Kross::krossdebug("TestObject::testSlot2 called");
 }
 
-void TestObject::stdoutSlot(const QString& s)
+void TestObject::stdoutSlot(const TQString& s)
 {
-    Kross::krossdebug(QString("stdout: %1").arg(s));
+    Kross::krossdebug(TQString("stdout: %1").tqarg(s));
     //std::cout << "<stdout> " << s.latin1() << std::endl;
 }
 
-void TestObject::stderrSlot(const QString& s)
+void TestObject::stderrSlot(const TQString& s)
 {
-    Kross::krossdebug(QString("stderr: %1").arg(s));
+    Kross::krossdebug(TQString("stderr: %1").tqarg(s));
     //std::cout << "<stderr> " << s.latin1() << std::endl;
 }