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

diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index c6eb082a..2aa8f408 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -26,35 +26,35 @@
 #include "eventslot.h"
 #include "eventsignal.h"
 
-#include <qobject.h>
-#include <qsignal.h>
-//#include <qglobal.h>
-//#include <qobjectdefs.h>
-#include <qmetaobject.h>
-#include <private/qucom_p.h> // for the Qt QUObject API.
+#include <tqobject.h>
+#include <tqsignal.h>
+//#include <tqglobal.h>
+//#include <tqobjectdefs.h>
+#include <tqmetaobject.h>
+#include <tqucom_p.h> // for the TQt TQUObject API.
 
 using namespace Kross::Api;
 
-QtObject::QtObject(QObject* object, const QString& name)
-    : Kross::Api::Class<QtObject>(name.isEmpty() ? object->name() : name)
+QtObject::QtObject(TQObject* object, const TQString& name)
+    : Kross::Api::Class<QtObject>(name.isEmpty() ? TQString(object->name()) : name)
     , m_object(object)
 {
-    // Walk through the signals and slots the QObject has
+    // Walk through the signals and slots the TQObject has
     // and attach them as events to this QtObject.
 
-    QStrList slotnames = m_object->metaObject()->slotNames(false);
+    TQStrList slotnames = m_object->tqmetaObject()->slotNames(false);
     for(char* c = slotnames.first(); c; c = slotnames.next()) {
-        QCString s = c;
+        TQCString s = c;
         addChild(s, new EventSlot(s, object, s) );
     }
 
-    QStrList signalnames = m_object->metaObject()->signalNames(false);
+    TQStrList signalnames = m_object->tqmetaObject()->signalNames(false);
     for(char* c = signalnames.first(); c; c = signalnames.next()) {
-        QCString s = c;
+        TQCString s = c;
         addChild(s, new EventSignal(s, object, s) );
     }
 
-    // Add functions to wrap QObject methods into callable
+    // Add functions to wrap TQObject methods into callable
     // Kross objects.
 
     addFunction("propertyNames", &QtObject::propertyNames);
@@ -78,48 +78,48 @@ QtObject::~QtObject()
 {
 }
 
-const QString QtObject::getClassName() const
+const TQString QtObject::getClassName() const
 {
     return "Kross::Api::QtObject";
 }
 
-QObject* QtObject::getObject()
+TQObject* QtObject::getObject()
 {
     return m_object;
 }
 
-QUObject* QtObject::toQUObject(const QString& signature, List::Ptr arguments)
+TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
 {
-    int startpos = signature.find("(");
-    int endpos = signature.findRev(")");
+    int startpos = signature.tqfind("(");
+    int endpos = signature.tqfindRev(")");
     if(startpos < 0 || startpos > endpos)
-        throw Exception::Ptr( new Exception(QString("Invalid Qt signal or slot signature '%1'").arg(signature)) );
+        throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").tqarg(signature)) );
 
-    //QString sig = signature.left(startpos);
-    QString params = signature.mid(startpos + 1, endpos - startpos - 1);
-    QStringList paramlist = QStringList::split(",", params); // this will fail on something like myslot(QMap<QString,QString> arg), but we don't care jet.
+    //TQString sig = signature.left(startpos);
+    TQString params = signature.mid(startpos + 1, endpos - startpos - 1);
+    TQStringList paramlist = TQStringList::split(",", params); // this will fail on something like myslot(TQMap<TQString,TQString> arg), but we don't care jet.
     uint paramcount = paramlist.size();
 
-    // The first item in the QUObject-array is for the returnvalue
+    // The first item in the TQUObject-array is for the returnvalue
     // while everything >=1 are the passed parameters.
-    QUObject* uo = new QUObject[ paramcount + 1 ];
-    uo[0] = QUObject(); // empty placeholder for the returnvalue.
+    TQUObject* uo = new TQUObject[ paramcount + 1 ];
+    uo[0] = TQUObject(); // empty placeholder for the returnvalue.
 
-//QString t;
+//TQString t;
 //for(int j=0; j<argcount; j++) t += "'" + Variant::toString(arguments->item(j)) + "' ";
-//krossdebug( QString("1 ---------------------: (%1) %2").arg(argcount).arg(t) );
+//krossdebug( TQString("1 ---------------------: (%1) %2").tqarg(argcount).tqarg(t) );
 
     // Fill parameters.
     uint argcount = arguments ? arguments->count() : 0;
     for(uint i = 0; i < paramcount; i++) {
-        if(paramlist[i].find("QString") >= 0) {
-            const QString s = (argcount > i) ? Variant::toString(arguments->item(i)) : QString::null;
-            //krossdebug(QString("EventSlot::toQUObject s=%1").arg(s));
-            static_QUType_QString.set( &(uo[i + 1]), s );
+        if(paramlist[i].tqfind(TQSTRING_OBJECT_NAME_STRING) >= 0) {
+            const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString();
+            //krossdebug(TQString("EventSlot::toTQUObject s=%1").tqarg(s));
+            static_TQUType_TQString.set( &(uo[i + 1]), s );
         }
-        //TODO handle int, long, char*, QStringList, etc.
+        //TODO handle int, long, char*, TQStringList, etc.
         else {
-            throw Exception::Ptr( new Exception(QString("Unknown Qt signal or slot argument '%1' in signature '%2'.").arg(paramlist[i]).arg(signature)) );
+            throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").tqarg(paramlist[i]).tqarg(signature)) );
         }
     }
 
@@ -129,19 +129,19 @@ QUObject* QtObject::toQUObject(const QString& signature, List::Ptr arguments)
 Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-        QStringList::fromStrList(m_object->metaObject()->propertyNames(false)));
+        TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-        m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
+        m_object->tqmetaObject()->tqfindProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
 }
 
 Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args)
 {
-    QVariant variant = m_object->property(Kross::Api::Variant::toString(args->item(0)).latin1());
-    if(variant.type() == QVariant::Invalid)
+    TQVariant variant = m_object->property(Kross::Api::Variant::toString(args->item(0)).latin1());
+    if(variant.type() == TQVariant::Invalid)
         return 0;
     return new Kross::Api::Variant(variant);
 }
@@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           QStringList::fromStrList(m_object->metaObject()->slotNames(false)));
+           TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->metaObject()->slotNames(false).find(
+           bool(m_object->tqmetaObject()->slotNames(false).tqfind(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
@@ -172,59 +172,59 @@ Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
 {
 //TODO just call the child event ?!
-    QString name = Kross::Api::Variant::toString(args->item(0));
-    int slotid = m_object->metaObject()->findSlot(name.latin1(), false);
+    TQString name = Kross::Api::Variant::toString(args->item(0));
+    int slotid = m_object->tqmetaObject()->tqfindSlot(name.latin1(), false);
     if(slotid < 0)
-        throw Exception::Ptr( new Exception(QString("No such slot '%1'.").arg(name)) );
+        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) );
 
-    QUObject* uo = QtObject::toQUObject(name, args);
+    TQUObject* uo = QtObject::toTQUObject(name, args);
     m_object->qt_invoke(slotid, uo);
     delete [] uo;
 
-    return new Variant( QVariant(true,0) );
+    return new Variant( TQVariant(true,0) );
 }
 
 Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           QStringList::fromStrList(m_object->metaObject()->signalNames(false)));
+           TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->metaObject()->signalNames(false).find(
+           bool(m_object->tqmetaObject()->signalNames(false).tqfind(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
 
 Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args)
 {
-    QString name = Kross::Api::Variant::toString(args->item(0));
-    int signalid = m_object->metaObject()->findSignal(name.latin1(), false);
+    TQString name = Kross::Api::Variant::toString(args->item(0));
+    int signalid = m_object->tqmetaObject()->tqfindSignal(name.latin1(), false);
     if(signalid < 0)
-        throw Exception::Ptr( new Exception(QString("No such signal '%1'.").arg(name)) );
-    m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => QUObject*
+        throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) );
+    m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject*
     return 0;
 }
 
 Kross::Api::Object::Ptr QtObject::connectSignal(Kross::Api::List::Ptr args)
 {
-    QString signalname = Kross::Api::Variant::toString(args->item(0));
-    QString signalsignatur = QString("2%1").arg(signalname);
+    TQString signalname = Kross::Api::Variant::toString(args->item(0));
+    TQString signalsignatur = TQString("2%1").tqarg(signalname);
     const char* signalsig = signalsignatur.latin1();
 
     QtObject* obj = Kross::Api::Object::fromObject<Kross::Api::QtObject>(args->item(1));
-    QObject* o = obj->getObject();
+    TQObject* o = obj->getObject();
     if(! o)
-        throw Exception::Ptr( new Exception(QString("No such QObject receiver in '%1'.").arg(obj->getName())) );
+        throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").tqarg(obj->getName())) );
 
-    QString slotname = Kross::Api::Variant::toString(args->item(2));
-    QString slotsignatur = QString("1%1").arg(slotname);
+    TQString slotname = Kross::Api::Variant::toString(args->item(2));
+    TQString slotsignatur = TQString("1%1").tqarg(slotname);
     const char* slotsig = slotsignatur.latin1();
 
     return new Kross::Api::Variant(
-           QObject::connect(m_object, signalsig, o, slotsig));
+           TQObject::connect(m_object, signalsig, o, slotsig));
 }
 
 Kross::Api::Object::Ptr QtObject::disconnectSignal(Kross::Api::List::Ptr)