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, 17 insertions, 16 deletions

diff --git a/kspread/dialogs/kspread_dlg_format.h b/kspread/dialogs/kspread_dlg_format.h
index f7c0d23b..a482c13e 100644
--- a/kspread/dialogs/kspread_dlg_format.h
+++ b/kspread/dialogs/kspread_dlg_format.h
@@ -27,15 +27,15 @@
 #define KSPREAD_DLG_FORMAT
 
 #include <kdialogbase.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qcolor.h>
-#include <qpen.h>
-#include <qfont.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqcolor.h>
+#include <tqpen.h>
+#include <tqfont.h>
 
-class QComboBox;
-class QLabel;
-class QDomDocument;
+class TQComboBox;
+class TQLabel;
+class TQDomDocument;
 
 namespace KSpread
 {
@@ -49,6 +49,7 @@ class View;
 class FormatDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
   FormatDialog( View* view, const char* name = 0 );
   ~FormatDialog();
@@ -58,20 +59,20 @@ private slots:
     void slotOk();
 
 private:
-    bool parseXML( const QDomDocument& doc );
+    bool parseXML( const TQDomDocument& doc );
 
-    QComboBox* m_combo;
-    QLabel* m_label;
+    TQComboBox* m_combo;
+    TQLabel* m_label;
     View* m_view;
 
     struct Entry
     {
-	QString xml;
-	QString image;
-	QString config;
-	QString name;
+	TQString xml;
+	TQString image;
+	TQString config;
+	TQString name;
     };
-    QValueList<Entry> m_entries;
+    TQValueList<Entry> m_entries;
 
     Format* m_cells[ 16 ];
 };