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

diff --git a/lib/kross/python/pythonmodule.cpp b/lib/kross/python/pythonmodule.cpp
index b54eb73f..9c3353ea 100644
--- a/lib/kross/python/pythonmodule.cpp
+++ b/lib/kross/python/pythonmodule.cpp
@@ -20,7 +20,7 @@
 #include "pythonmodule.h"
 #include "pythoninterpreter.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 using namespace Kross::Python;
 
@@ -41,7 +41,7 @@ namespace Kross { namespace Python {
              * List of \a PythonExtension instances accessible
              * via this \a PythonModule instance.
              */
-            QMap<QString, PythonExtension*> m_modules;
+            TQMap<TQString, PythonExtension*> m_modules;
 
     };
 
@@ -52,7 +52,7 @@ PythonModule::PythonModule(PythonInterpreter* interpreter)
     , d(new PythonModulePrivate())
 {
 #ifdef KROSS_PYTHON_MODULE_DEBUG
-    krossdebug( QString("Kross::Python::PythonModule::Constructor") );
+    krossdebug( TQString("Kross::Python::PythonModule::Constructor") );
 #endif
 
     d->m_interpreter = interpreter;
@@ -65,7 +65,7 @@ PythonModule::PythonModule(PythonInterpreter* interpreter)
 PythonModule::~PythonModule()
 {
 #ifdef KROSS_PYTHON_MODULE_DEBUG
-    krossdebug( QString("Kross::Python::PythonModule::Destructor name='%1'").arg(name().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").tqarg(name().c_str()) );
 #endif
 
     delete d;
@@ -79,19 +79,19 @@ Py::Dict PythonModule::getDict()
 Py::Object PythonModule::import(const Py::Tuple& args)
 {
     if(args.size() > 0) {
-        QString modname = args[0].as_string().c_str();
+        TQString modname = args[0].as_string().c_str();
         if(modname.startsWith("kross")) {
 #ifdef KROSS_PYTHON_MODULE_DEBUG
-            krossdebug( QString("Kross::Python::PythonModule::import() module=%1").arg(modname) );
+            krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").tqarg(modname) );
 #endif
-            if( modname.find( QRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
-                krosswarning( QString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) );
+            if( modname.tqfind( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
+                krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) );
             }
             else {
                 Kross::Api::Module::Ptr module = Kross::Api::Manager::scriptManager()->loadModule(modname);
                 if(module)
                     return PythonExtension::toPyObject( Kross::Api::Object::Ptr(module) );
-                krosswarning( QString("Loading of Kross module '%1' failed.").arg(modname) );
+                krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) );
             }
 
         }