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, 18 insertions, 17 deletions

diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h
index 1fbb209f..c1516748 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.h
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.h
@@ -26,21 +26,21 @@
 #include <klistview.h>
 
 class KivioView;
-class QComboBox;
-class QCheckBox;
-class QLabel;
-class QRadioButton;
+class TQComboBox;
+class TQCheckBox;
+class TQLabel;
+class TQRadioButton;
 class KColorButton;
 class KURLRequester;
 class KoUnitDoubleSpinBox;
 class KivioGuideLineData;
-class QGroupBox;
-class QFont;
+class TQGroupBox;
+class TQFont;
 
 // class GuidesListViewItem : public KListViewItem
 // {
 //   public:
-//     GuidesListViewItem(QListView* parent, KivioGuideLineData *gd, KoUnit::Unit u);
+//     GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u);
 //     ~GuidesListViewItem();
 // 
 //     void setUnit(KoUnit::Unit u);
@@ -57,8 +57,9 @@ class QFont;
 class KivioOptionsDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioOptionsDialog(KivioView* parent, const char* name = 0);
+    KivioOptionsDialog(KivioView* tqparent, const char* name = 0);
 
   protected:
     void initPage();
@@ -71,7 +72,7 @@ class KivioOptionsDialog : public KDialogBase
     void defaultGrid();
 
     void setLayoutText(const KoPageLayout& l);
-    void setFontText(const QFont& f);
+    void setFontText(const TQFont& f);
 
   protected slots:
     void pageLayoutDlg();
@@ -88,19 +89,19 @@ class KivioOptionsDialog : public KDialogBase
     int m_pageIndex;
     int m_gridIndex;
 
-    QComboBox* m_unitCombo;
-    QCheckBox* m_marginsChBox;
-    QCheckBox* m_rulersChBox;
-    QLabel* m_layoutTxtLbl;
+    TQComboBox* m_unitCombo;
+    TQCheckBox* m_marginsChBox;
+    TQCheckBox* m_rulersChBox;
+    TQLabel* m_layoutTxtLbl;
     KoPageLayout m_layout;
-    QLabel* m_fontTxtLbl;
-    QFont m_font;
+    TQLabel* m_fontTxtLbl;
+    TQFont m_font;
     KoUnitDoubleSpinBox* m_spaceHorizUSpin;
     KoUnitDoubleSpinBox* m_spaceVertUSpin;
     KoUnitDoubleSpinBox* m_snapHorizUSpin;
     KoUnitDoubleSpinBox* m_snapVertUSpin;
-    QCheckBox* m_gridChBox;
-    QCheckBox* m_snapChBox;
+    TQCheckBox* m_gridChBox;
+    TQCheckBox* m_snapChBox;
     KColorButton* m_gridColorBtn;
 };