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, 12 insertions, 10 deletions

diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index 08e9b5c9..dc5eb3a5 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -20,16 +20,16 @@
 #ifndef __my_app_h__
 #define __my_app_h__
 
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqobject.h>
 
 #include <klibloader.h>
 #include <kparts/plugin.h>
 
 #include <koffice_export.h>
 
-class QtCalculator;
+class TQtCalculator;
 class KInstance;
 
 namespace KSpread
@@ -40,12 +40,13 @@ class View;
 class CalcFactory : public KLibFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CalcFactory( QObject* parent = 0, const char* name = 0 );
+    CalcFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~CalcFactory();
 
-    virtual QObject* createObject( QObject* parent = 0, const char* name = 0,
-			     const char* classname = "QObject", const QStringList &args = QStringList() );
+    virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+			     const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
@@ -56,8 +57,9 @@ private:
 class KSPREAD_EXPORT Calculator : public KParts::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    Calculator( View* parent, const char* name = 0 );
+    Calculator( View* tqparent, const char* name = 0 );
     ~Calculator();
 
     View* view() { return m_view; }
@@ -66,10 +68,10 @@ protected slots:
     void showCalculator();
 
 protected:
-    bool eventFilter( QObject*, QEvent* );
+    bool eventFilter( TQObject*, TQEvent* );
 
 private:
-    QtCalculator* m_calc;
+    TQtCalculator* m_calc;
     View* m_view;
 };