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

diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h
index 21da93af..ce105574 100644
--- a/kchart/kchartWizardSelectChartTypePage.h
+++ b/kchart/kchartWizardSelectChartTypePage.h
@@ -1,15 +1,15 @@
 #ifndef _kchartWIZARDSELECTCHARTTYPEPAGE_H
 #define _kchartWIZARDSELECTCHARTTYPEPAGE_H
 
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qwidget.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
+#include <tqwidget.h>
 
 #include "kchart_params.h"
 
-class QFrame;
-class QPushButton;
-class QButtonGroup;
+class TQFrame;
+class TQPushButton;
+class TQButtonGroup;
 
 namespace KChart
 {
@@ -19,24 +19,26 @@ class KChartPart;
 // Contains a button with a text label below it
 //
 // FIXME: Move to kchartWizardSelectChartTypePage.cc
-class KChartButton : public QVBox
+class KChartButton : public TQVBox
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KChartButton(QWidget* parent, const QString &, const QPixmap &);
+    KChartButton(TQWidget* tqparent, const TQString &, const TQPixmap &);
     ~KChartButton();
 
-    QPushButton *button() const { return m_button;}
+    TQPushButton *button() const { return m_button;}
   private:
-    QPushButton *m_button;
+    TQPushButton *m_button;
 };
 
-class KChartWizardSelectChartTypePage : public QWidget
+class KChartWizardSelectChartTypePage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KChartWizardSelectChartTypePage( QWidget* parent, KChartPart* chart );
+  KChartWizardSelectChartTypePage( TQWidget* tqparent, KChartPart* chart );
 
 public slots:
   void  apply();
@@ -48,14 +50,14 @@ signals:
   void  chartChange(int);
 
 private:
-  void  addButton(const QString &name, const QString &icon_name, int type);
+  void  addButton(const TQString &name, const TQString &icon_name, int type);
   void  incPos();
 
 private:
   KChartPart    *m_chart;
 
-  QButtonGroup  *m_typeBG;
-  QGridLayout   *m_layout;
+  TQButtonGroup  *m_typeBG;
+  TQGridLayout   *m_layout;
 
   // column and row position (used by addButton() to know where to put
   // the new button)