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

diff --git a/kchart/kdchart/KDChartAxisParamsWrapper.h b/kchart/kdchart/KDChartAxisParamsWrapper.h
index de8dbcc3..a0f14a3d 100644
--- a/kchart/kdchart/KDChartAxisParamsWrapper.h
+++ b/kchart/kdchart/KDChartAxisParamsWrapper.h
@@ -1,15 +1,16 @@
 #ifndef KDCHARTAXISPARAMSWRAPPER_H
 #define KDCHARTAXISPARAMSWRAPPER_H
-#include <qobject.h>
+#include <tqobject.h>
 #include <KDChartEnums.h>
 #include <KDChartAxisParams.h>
-#include <qstringlist.h>
-#include <qvariant.h>
+#include <tqstringlist.h>
+#include <tqvariant.h>
 class KDChartAxisParams;
 
-class KDChartAxisParamsWrapper :public QObject
+class KDChartAxisParamsWrapper :public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KDChartAxisParamsWrapper( KDChartAxisParams* );
@@ -18,29 +19,29 @@ public slots:
     // These overload are only for convenience.
     void setAxisValueStart( double axisValueStart );
     void setAxisValueEnd( double axisValueEnd );
-    void setAxisValueStart( const QVariant axisValueStart );
-    void setAxisValueEnd( const QVariant axisValueEnd );
+    void setAxisValueStart( const TQVariant axisValueStart );
+    void setAxisValueEnd( const TQVariant axisValueEnd );
 
 public slots:
     void setAxisValues( bool axisSteadyValueCalc = true,
-                        QVariant axisValueStart = KDCHART_AXIS_LABELS_AUTO_LIMIT,
-                        QVariant axisValueEnd = KDCHART_AXIS_LABELS_AUTO_LIMIT,
+                        TQVariant axisValueStart = KDCHART_AXIS_LABELS_AUTO_LIMIT,
+                        TQVariant axisValueEnd = KDCHART_AXIS_LABELS_AUTO_LIMIT,
                         double axisValueDelta = KDCHART_AXIS_LABELS_AUTO_DELTA,
                         int axisDigitsBehindComma = KDCHART_AXIS_LABELS_AUTO_DIGITS,
                         int axisMaxEmptyInnerSpan = KDCHART_DONT_CHANGE_EMPTY_INNER_SPAN_NOW,
                         int takeLabelsFromDataRow = KDChartAxisParams::LabelsFromDataRowNo,
                         int labelTextsDataRow = 0,
-                        const QVariant& axisLabelStringList = QVariant( QStringList() ),
-                        const QVariant& axisShortLabelsStringList = QVariant( QStringList() ),
+                        const TQVariant& axisLabelStringList = TQVariant( TQStringList() ),
+                        const TQVariant& axisShortLabelsStringList = TQVariant( TQStringList() ),
                         int axisValueLeaveOut = KDCHART_AXIS_LABELS_AUTO_LEAVEOUT,
                         int axisValueDeltaScale = KDChartAxisParams::ValueScaleNumerical );
 
-    void setAxisLabelStringLists( const QVariant& axisLabelStringList,
-                                  const QVariant& axisShortLabelStringList,
-                                  const QString& valueStart = QString::null,
-                                  const QString& valueEnd   = QString::null );
+    void setAxisLabelStringLists( const TQVariant& axisLabelStringList,
+                                  const TQVariant& axisShortLabelStringList,
+                                  const TQString& valueStart = TQString(),
+                                  const TQString& valueEnd   = TQString() );
 
-    void setAxisLabelTexts( const QVariant& axisLabelTexts );
+    void setAxisLabelTexts( const TQVariant& axisLabelTexts );
 private:
     KDChartAxisParams* _data;
 };