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, 22 insertions, 20 deletions

diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h
index b20be747..22910672 100644
--- a/lib/kofficeui/kcoloractions.h
+++ b/lib/kofficeui/kcoloractions.h
@@ -29,6 +29,7 @@
 class KColorAction : public KAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type {
@@ -38,19 +39,19 @@ public:
     };
 
     // Create default (text) color action
-    KColorAction( const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0 );
-    KColorAction( const QString& text, int accel,
-		  QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
-    KColorAction( QObject* parent = 0, const char* name = 0 );
+    KColorAction( const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+    KColorAction( const TQString& text, int accel,
+		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+    KColorAction( TQObject* tqparent = 0, const char* name = 0 );
 
     // Create a color action of a given type
-    KColorAction( const QString& text, Type type, int accel = 0,
-		  QObject* parent = 0, const char* name = 0 );
-    KColorAction( const QString& text, Type type, int accel,
-		  QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
+    KColorAction( const TQString& text, Type type, int accel = 0,
+		  TQObject* tqparent = 0, const char* name = 0 );
+    KColorAction( const TQString& text, Type type, int accel,
+		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
 
-    virtual void setColor( const QColor &c );
-    QColor color() const;
+    virtual void setColor( const TQColor &c );
+    TQColor color() const;
 
     virtual void setType( Type type );
     Type type() const;
@@ -59,7 +60,7 @@ private:
     void init();
     void createPixmap();
 
-    QColor col;
+    TQColor col;
     Type typ;
 };
 
@@ -67,6 +68,7 @@ private:
 class KSelectColorAction : public KAction
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum Type {
         TextColor,
@@ -74,28 +76,28 @@ public:
         FillColor
     };
 
-    KSelectColorAction( const QString& text, Type type,
-                        const QObject* receiver, const char* slot,
-                        KActionCollection* parent, const char* name );
+    KSelectColorAction( const TQString& text, Type type,
+                        const TQObject* receiver, const char* slot,
+                        KActionCollection* tqparent, const char* name );
     virtual ~KSelectColorAction();
 
-    virtual int plug( QWidget* w, int index = -1 );
+    virtual int plug( TQWidget* w, int index = -1 );
 
-    QColor color() const;
+    TQColor color() const;
     Type type() const;
 
 public slots:
-    virtual void setColor( const QColor &c );
+    virtual void setColor( const TQColor &c );
     virtual void setType( Type t );
 
 signals:
-    void colorSelected( const QColor& color );
+    void colorSelected( const TQColor& color );
 
 private:
-    QString whatsThisWithIcon() const; // duplicated, as it's private in kaction
+    TQString whatsThisWithIcon() const; // duplicated, as it's private in kaction
 
     Type m_type;
-    QColor m_color;
+    TQColor m_color;
 };
 
 #endif