From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kchart/kdchart/KDChartSeriesCollection.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kchart/kdchart/KDChartSeriesCollection.h') diff --git a/kchart/kdchart/KDChartSeriesCollection.h b/kchart/kdchart/KDChartSeriesCollection.h index ac0a1c9b..8cb2b65f 100644 --- a/kchart/kdchart/KDChartSeriesCollection.h +++ b/kchart/kdchart/KDChartSeriesCollection.h @@ -30,14 +30,14 @@ #define __KDCHARTSERIESCOLLECTION_H__ // to avoid problems in TableBase - it doesn't include this - bug! -#include +#include #include "KDChartTableBase.h" #include "KDChartBaseSeries.h" -#if COMPAT_QT_VERSION >= 0x030000 -#include +#if COMPAT_TQT_VERSION >= 0x030000 +#include #else -#include +#include #endif class KDChartParams; #include "KDChartAxisParams.h" @@ -45,10 +45,10 @@ class KDChartParams; // takes ownership of any series passed to it, and will delete // them when it is deleted. class KDCHART_EXPORT KDChartSeriesCollection : public KDChartTableDataBase, -#if COMPAT_QT_VERSION >= 0x030000 - public QValueVector +#if COMPAT_TQT_VERSION >= 0x030000 + public TQValueVector #else - public QArray + public TQArray #endif { // Standard KDChartTableDataBase interface @@ -75,8 +75,8 @@ class KDCHART_EXPORT KDChartSeriesCollection : public KDChartTableDataBase, // extra functions for our use - virtual void setLegendText( KDChartBaseSeries *series, QString text ); - virtual QString legendText( KDChartBaseSeries *series ); + virtual void setLegendText( KDChartBaseSeries *series, TQString text ); + virtual TQString legendText( KDChartBaseSeries *series ); virtual void setYaxis( KDChartBaseSeries *series, KDChartAxisParams::AxisPos axis );// PENDING(blackie) possible enum problem -- cgit v1.2.1