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

diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index 648ffc90..119fbc85 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -21,7 +21,7 @@
 #define TKACTION_H
 
 #include <kaction.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <koffice_export.h>
 namespace TK {
   enum IconMode { IconOnly, IconAndText, TextOnly };
@@ -32,25 +32,26 @@ class TKComboBox;
 
 class KOFFICEUI_EXPORT TKAction : public KAction
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  TKAction(QObject* parent, const char* name);
+  TKAction(TQObject* tqparent, const char* name);
   ~TKAction();
 
-  virtual int plug(QWidget* widget, int index = -1);
+  virtual int plug(TQWidget* widget, int index = -1);
 
   TK::IconMode iconMode();
 
 protected:
   virtual void initToolBarButton(TKToolBarButton*);
 
-  QWidget* createLayout(QWidget* parent, QWidget* children);
+  TQWidget* createLayout(TQWidget* tqparent, TQWidget* tqchildren);
   void updateLayout();
-  virtual void updateLayout(QWidget*);
+  virtual void updateLayout(TQWidget*);
 
 public slots:
   virtual void setIconMode(TK::IconMode);
-  void setText(const QString&);
-  void setIcon(const QString&);
+  void setText(const TQString&);
+  void setIcon(const TQString&);
 
 private:
   TK::IconMode m_imode;
@@ -60,12 +61,13 @@ private:
 /******************************************************************************/
 class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction
 { Q_OBJECT
+  TQ_OBJECT
 friend class TKSelectAction;
 public:
-  TKBaseSelectAction(QObject* parent, const char* name);
+  TKBaseSelectAction(TQObject* tqparent, const char* name);
   ~TKBaseSelectAction();
 
-  virtual int plug(QWidget* widget, int index = -1);
+  virtual int plug(TQWidget* widget, int index = -1);
 
   int currentItem();
   bool isEditable();
@@ -94,28 +96,29 @@ private:
 /******************************************************************************/
 class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  TKSelectAction(QObject* parent, const char* name);
+  TKSelectAction(TQObject* tqparent, const char* name);
   ~TKSelectAction();
 
-  QStringList items() const;
+  TQStringList items() const;
 
 public slots:
-  virtual void setItems(const QStringList& );
-  virtual void setEditText(const QString&);
+  virtual void setItems(const TQStringList& );
+  virtual void setEditText(const TQString&);
   virtual void clear();
 
 protected:
   virtual void initComboBox(TKComboBox*);
 
 protected slots:
-  void slotActivated(const QString&);
+  void slotActivated(const TQString&);
 
 signals:
-  void activated(const QString&);
+  void activated(const TQString&);
 
 private:
-  QStringList m_list;
+  TQStringList m_list;
   class TKSelectActionPrivate;
   TKSelectActionPrivate *d;
 };