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, 26 insertions, 25 deletions

diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 81e1c751..9a04986e 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -19,17 +19,17 @@
 #ifndef _KO_TOOLBOX_H_
 #define _KO_TOOLBOX_H_
 
-#include <qtoolbutton.h>
-#include <qptrvector.h>
-#include <qtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqptrvector.h>
+#include <tqtoolbar.h>
 #include <koffice_export.h>
 #include <ktoolbar.h>
 
-class QWidget;
+class TQWidget;
 class KAction;
 class KMainWindow;
 class KDualColorButton;
-class QGridLayout;
+class TQGridLayout;
 class ToolArea;
 
 
@@ -45,6 +45,7 @@ class ToolArea;
 class KOFFICEUI_EXPORT KoToolBox : public KToolBar {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -55,62 +56,62 @@ public:
     // there is a separate list, and the tool is categorized correctly.
     // The tool is not yet added to the widgets; call setupTools()
     // to do that. We don't store the tool.
-    void registerTool(KAction * tool, int toolType, Q_UINT32 priority);
+    void registerTool(KAction * tool, int toolType, TQ_UINT32 priority);
 
     // Called when all tools have been added by the tool controller
     void setupTools();
 
 public slots:
 
-    virtual void setOrientation ( Orientation o );
+    virtual void setOrientation ( Qt::Orientation o );
     void slotButtonPressed( int id );
     void slotPressButton( int id );
 
     // Enables or disables all buttons and the corresponding actions.
     void enableTools(bool enable);
 
-    void slotSetTool(const QString & toolname);
+    void slotSetTool(const TQString & toolname);
 
 private:
 
-    QToolButton * createButton(QWidget * parent, const char* iconName, QString tooltip);
+    TQToolButton * createButton(TQWidget * tqparent, const char* iconName, TQString tooltip);
 
 
 private:
-    Q_UINT32 m_numberOfButtons;
+    TQ_UINT32 m_numberOfButtons;
 
-    QButtonGroup * m_buttonGroup; // The invisible group of all toolbuttons, so only one can be active at a given time
+    TQButtonGroup * m_buttonGroup; // The invisible group of all toolbuttons, so only one can be active at a given time
 
-    QPtrList<ToolArea> m_toolBoxes; // For every ToolArea
+    TQPtrList<ToolArea> m_toolBoxes; // For every ToolArea
 
-    typedef QMap< int, KAction*> ToolList; // The priority ordered list of tools for a certain tooltype
+    typedef TQMap< int, KAction*> ToolList; // The priority ordered list of tools for a certain tooltype
 
-    QPtrList<ToolList> m_tools;
-    QPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating.
+    TQPtrList<ToolList> m_tools;
+    TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating.
     KInstance* m_instance;
 };
 
 
-class ToolArea : public QWidget {
+class ToolArea : public TQWidget {
 
 public:
-    ToolArea(QWidget *parent);
+    ToolArea(TQWidget *tqparent);
     ~ToolArea();
 
     void  setOrientation ( Qt::Orientation o );
-    void  add(QWidget *button);
+    void  add(TQWidget *button);
 
-    QWidget* getNextParent();
+    TQWidget* getNextParent();
 
 private:
-    QPtrList<QWidget>  m_children;
-    QBoxLayout        *m_layout;
+    TQPtrList<TQWidget>  m_tqchildren;
+    TQBoxLayout        *m_layout;
 
-    QWidget           *m_leftRow;
-    QBoxLayout        *m_leftLayout;
+    TQWidget           *m_leftRow;
+    TQBoxLayout        *m_leftLayout;
 
-    QWidget           *m_rightRow;
-    QBoxLayout        *m_rightLayout;
+    TQWidget           *m_rightRow;
+    TQBoxLayout        *m_rightLayout;
 
     bool               m_left;
 };