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, 13 insertions, 12 deletions

diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h
index 58ce2ad4..6792f3f3 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.h
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.h
@@ -25,27 +25,28 @@
 class KivioView;
 class KFontChooser;
 class KColorButton;
-class QButtonGroup;
-class QLabel;
-class QFont;
-class QColor;
+class TQButtonGroup;
+class TQLabel;
+class TQFont;
+class TQColor;
 
 class KivioTextFormatDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioTextFormatDlg(KivioView* parent, const char* name = 0);
+    KivioTextFormatDlg(KivioView* tqparent, const char* name = 0);
 
     int valign();
     int halign();
-    QFont font();
-    QColor textColor();
+    TQFont font();
+    TQColor textColor();
 
   public slots:
     void setVAlign(int i);
     void setHAlign(int i);
-    void setFont(QFont f);
-    void setTextColor(QColor c);
+    void setFont(TQFont f);
+    void setTextColor(TQColor c);
 
   protected:
     void initFontTab();
@@ -59,9 +60,9 @@ class KivioTextFormatDlg : public KDialogBase
   protected:
     KFontChooser* m_fontChooser;
     KColorButton* m_textCBtn;
-    QButtonGroup* m_halignBGrp;
-    QButtonGroup* m_valignBGrp;
-    QLabel* m_preview;
+    TQButtonGroup* m_halignBGrp;
+    TQButtonGroup* m_valignBGrp;
+    TQLabel* m_preview;
     int m_valign;
     int m_halign;
 };