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, 36 insertions, 35 deletions

diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index 977dbf55..be9e7126 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -18,15 +18,15 @@
 #ifndef _KO_PALETTE_MANAGER_
 #define _KO_PALETTE_MANAGER_
 
-#include <qobject.h>
-#include <qdockwindow.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qdict.h>
-#include <qvaluestack.h>
-#include <qwidget.h>
-#include <qsignalmapper.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqdockwindow.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqdict.h>
+#include <tqvaluestack.h>
+#include <tqwidget.h>
+#include <tqsignalmapper.h>
+#include <tqstringlist.h>
 
 #include <koffice_export.h>
 
@@ -45,8 +45,8 @@ enum enumKoDockability {
 };
 
 enum enumKoPaletteStyle {
-    PALETTE_DOCKER, // QDockWindow based docker with tabs
-    PALETTE_TOOLBOX // QDockWindow based docker with a QToolBox
+    PALETTE_DOCKER, // TQDockWindow based docker with tabs
+    PALETTE_TOOLBOX // TQDockWindow based docker with a TQToolBox
 };
 
 
@@ -71,7 +71,7 @@ namespace {
  * <Action name="view_palette_action_menu"/>
  *
  * There are two styles: one that uses tabs and one that uses the vertical
- * QToolBox style to separate and show individual widgets. By implementing
+ * TQToolBox style to separate and show individual widgets. By implementing
  * the kopalette interface and extending the above enum, you can add
  * more types.
  *
@@ -82,9 +82,10 @@ namespace {
  *        - Restoration of the application default state
  *        - Make it impossible to close a floating palette window with alt-f4
  */
-class KOPALETTE_EXPORT KoPaletteManager : public QObject {
+class KOPALETTE_EXPORT KoPaletteManager : public TQObject {
 
     Q_OBJECT
+  TQ_OBJECT
 
 
 public:
@@ -112,24 +113,24 @@ public:
      * @param position the position of the widget in the palettes
      * @param style docker, toolbox or slider
      */
-    virtual void addWidget(QWidget * widget, const QString & name, const QString & paletteName, int position = -1, 
+    virtual void addWidget(TQWidget * widget, const TQString & name, const TQString & paletteName, int position = -1, 
 			   enumKoPaletteStyle style = PALETTE_DOCKER, bool shown = true);
 
 
     /**
      * Get a certain widget by name
      */
-    virtual QWidget * widget(const QString & name);
+    virtual TQWidget * widget(const TQString & name);
 
     /**
      * Show a the specified palette wherever it currently is.
      */
-    virtual void showWidget(const QString & name);
+    virtual void showWidget(const TQString & name);
 
     /**
      * hide the specified widget
      */
-    virtual void hideWidget(const QString & name);
+    virtual void hideWidget(const TQString & name);
     
     /**
      * Remove the widget with the specified name from whichever
@@ -137,27 +138,27 @@ public:
      * the palette, the palette is destroyed. If the name does
      * not occur, nothing is done.
      */
-    virtual void removeWidget(const QString & name);
+    virtual void removeWidget(const TQString & name);
 
 
     /**
      * Create an empty palette in the given style. with the given name and caption. If
      * the palette already exists, nothing is done.
      */
-    virtual KoPalette * createPalette(const QString & name, const QString & caption, enumKoPaletteStyle style = PALETTE_DOCKER);
+    virtual KoPalette * createPalette(const TQString & name, const TQString & caption, enumKoPaletteStyle style = PALETTE_DOCKER);
 
     /**
      * Move the specified palette to the specified location. If there is already
      * a location for the palette in the saved settings, then move it there
      * instead of the specified location.
      */
-    virtual void placePalette(const QString & name, Dock location = DockRight);
+    virtual void placePalette(const TQString & name, Dock location = DockRight);
 
     /**
      * Add a palette; this can be used to add palettes other than those in the two
      * default styles.
      */
-     virtual void addPalette(KoPalette * palette, const QString & name, Dock location = DockRight);
+     virtual void addPalette(KoPalette * palette, const TQString & name, Dock location = DockRight);
 
      /**
       * Sets all palettes to the specified fixed width
@@ -171,7 +172,7 @@ public slots:
     void showAllPalettes(bool shown);
 
     /**
-     * Restores the palette configuration to the default layout, i.e, the layout
+     * Restores the palette configuration to the default tqlayout, i.e, the tqlayout
      * preferred by each docker.
      */
     virtual void slotReset();
@@ -184,7 +185,7 @@ public slots:
 
 protected:
 
-    bool eventFilter( QObject *o, QEvent *e );
+    bool eventFilter( TQObject *o, TQEvent *e );
 
 private:
 
@@ -203,18 +204,18 @@ private:
     KToggleAction           * m_toggleShowHidePalettes;
     enumKoDockability         m_dockability;
     
-    QStringList             * m_widgetNames;
-
-    QDict<QWidget>          * m_widgets;
-    QDict<KoPalette>        * m_palettes;
-    QValueStack<QString>   m_hiddenWidgets; // names of widgets actively hidden by hide all
-    QDict<KToggleAction>    * m_actions;
-    QSignalMapper           * m_mapper;
-
-    QMap<QString, QString>  * m_defaultMapping; // widget to docker
-    QStringList               m_defaultPaletteOrder; // Order of palette creation
-    QStringList               m_defaultWidgetOrder; // Order of widget addition
-    QMap<QString, QString>  * m_currentMapping; // widget to docker
+    TQStringList             * m_widgetNames;
+
+    TQDict<TQWidget>          * m_widgets;
+    TQDict<KoPalette>        * m_palettes;
+    TQValueStack<TQString>   m_hiddenWidgets; // names of widgets actively hidden by hide all
+    TQDict<KToggleAction>    * m_actions;
+    TQSignalMapper           * m_mapper;
+
+    TQMap<TQString, TQString>  * m_defaultMapping; // widget to docker
+    TQStringList               m_defaultPaletteOrder; // Order of palette creation
+    TQStringList               m_defaultWidgetOrder; // Order of widget addition
+    TQMap<TQString, TQString>  * m_currentMapping; // widget to docker
 
     bool m_setFixedWidth;
     int m_fixedWidth;