diff --git a/kchart/kchart_part.cpp b/kchart/kchart_part.cpp index fb6a64143..1956904bd 100644 --- a/kchart/kchart_part.cpp +++ b/kchart/kchart_part.cpp @@ -1621,8 +1621,6 @@ bool KChartPart::loadData( const TQDomDocument& doc, m_currentData.setUsedRows( rows ); kdDebug(35001) << "Expanded!" << endl; TQDomNode n = data.firstChild(); - //TQArray tmpExp(rows*cols); - //TQArray tmpMissing(rows*cols); for (int i=0; i!=rows; i++) { for (int j=0; j!=cols; j++) { if (n.isNull()) { @@ -1717,8 +1715,8 @@ bool KChartPart::loadOldXML( const TQDomDocument& doc ) m_currentData.expand(rows, cols); kdDebug(35001) << "Expanded!" << endl; TQDomNode n = data.firstChild(); - TQArray tmpExp(rows*cols); - TQArray tmpMissing(rows*cols); + TQMemArray tmpExp(rows*cols); + TQMemArray tmpMissing(rows*cols); for (int i=0; i!=rows; i++) { for (int j=0; j!=cols; j++) { diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp index 19d4fa6bf..a8d95d3fa 100644 --- a/kchart/kdchart/KDChartBWPainter.cpp +++ b/kchart/kdchart/KDChartBWPainter.cpp @@ -31,12 +31,7 @@ #include "KDChartTextPiece.h" #include -#if COMPAT_TQT_VERSION >= 0x030000 #include -#else -#include -#define TQMemArray TQArray -#endif #include diff --git a/kchart/kdchart/KDChartGlobal.h b/kchart/kdchart/KDChartGlobal.h index 2dc4fdb3d..91772b015 100644 --- a/kchart/kdchart/KDChartGlobal.h +++ b/kchart/kdchart/KDChartGlobal.h @@ -78,40 +78,7 @@ #endif -#if COMPAT_TQT_VERSION < 0x030000 - -#if !defined(Q_ASSERT) -#if defined(TQT_CHECK_STATE) -#if defined(TQT_FATAL_ASSERT) -#define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) -#else -#define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) -#endif -#else -#define Q_ASSERT(x) -#endif -#endif - -#if !defined(TQT_NO_COMPAT) -// source compatibility with TQt 2.x -#ifndef Q_OS_TEMP -# if !defined(ASSERT) -# define ASSERT(x) Q_ASSERT(x) -# endif -#endif // Q_OS_TEMP -#endif // TQT_NO_COMPAT - -#define TQMemArray TQArray - -#include - -#else - #include - -#endif -// end of #if COMPAT_TQT_VERSION < 0x030000 - #include #include diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp index 24a9b906a..705abb986 100644 --- a/kchart/kdchart/KDChartLinesPainter.cpp +++ b/kchart/kdchart/KDChartLinesPainter.cpp @@ -31,12 +31,7 @@ #include #include - -#if COMPAT_TQT_VERSION >= 0x030000 #include -#else -#include -#endif #include @@ -286,11 +281,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, ( dataset >= static_cast < int > ( datasetStart ) && dataset >= 0 ); --dataset ) ++arrayNumDatasets; -#if COMPAT_TQT_VERSION >= 0x030000 TQValueVector allPoints( -#else - TQArray allPoints( -#endif arrayNumDatasets * arrayNumValues ); KDChartPropertySet curPropSet; diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index 0cbde9c9c..089c725be 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -54,11 +55,6 @@ #include "KDChartAxisParams.h" #include "KDChartPropertySet.h" -#if COMPAT_TQT_VERSION >= 0x030000 -#include -#else -#include -#endif /** \file KDChartParams.h \brief Header for all common chart parameters. @@ -2097,11 +2093,7 @@ public slots: uint& chart ) const; public: -#if COMPAT_TQT_VERSION >= 0x030000 typedef TQValueVector AxesArray; -#else - typedef TQArray AxesArray; -#endif public slots: bool chartAxes( uint chart, uint& cnt, AxesArray& axes ) const; diff --git a/kchart/kdchart/KDChartSeriesCollection.cpp b/kchart/kdchart/KDChartSeriesCollection.cpp index 812db8fdb..217f5102b 100644 --- a/kchart/kdchart/KDChartSeriesCollection.cpp +++ b/kchart/kdchart/KDChartSeriesCollection.cpp @@ -132,11 +132,7 @@ double KDChartSeriesCollection::maxValue( int coordinate ) const bool first_max = true; // find the first max -#if COMPAT_TQT_VERSION >= 0x030000 TQValueVector::const_iterator i; -#else - TQArray::ConstIterator i; -#endif for ( i = (*this).begin(); i != (*this).end(); i ++ ) { double temp = (*i)->maxValue(coordinate, ok); @@ -163,11 +159,7 @@ double KDChartSeriesCollection::minValue( int coordinate ) const double result = 0; // if no valid min/max, then this is the default // find the first min -#if COMPAT_TQT_VERSION >= 0x030000 TQValueVector::const_iterator i; -#else - TQArray::ConstIterator i; -#endif for ( i = (*this).begin(); !ok && i != (*this).end(); i ++ ) result = (*i)->minValue(coordinate, ok); @@ -186,11 +178,7 @@ double KDChartSeriesCollection::minValue( int coordinate ) const unsigned int KDChartSeriesCollection::indexOf( KDChartBaseSeries *series ) { unsigned int index = 0; -#if COMPAT_TQT_VERSION >= 0x030000 TQValueVector::const_iterator i; -#else - TQArray::ConstIterator i; -#endif for ( i = (*this).begin(); i != (*this).end(); i ++, index ++ ) if ( *i == series ) break; diff --git a/kchart/kdchart/KDChartSeriesCollection.h b/kchart/kdchart/KDChartSeriesCollection.h index bacda7260..8ce3044cc 100644 --- a/kchart/kdchart/KDChartSeriesCollection.h +++ b/kchart/kdchart/KDChartSeriesCollection.h @@ -34,22 +34,14 @@ #include "KDChartTableBase.h" #include "KDChartBaseSeries.h" -#if COMPAT_TQT_VERSION >= 0x030000 #include -#else -#include -#endif class KDChartParams; #include "KDChartAxisParams.h" // takes ownership of any series passed to it, and will delete // them when it is deleted. class KDCHART_EXPORT KDChartSeriesCollection : public KDChartTableDataBase, -#if COMPAT_TQT_VERSION >= 0x030000 public TQValueVector -#else - public TQArray -#endif { // Standard KDChartTableDataBase interface public: diff --git a/kchart/kdchart/KDChartVectorSeries.h b/kchart/kdchart/KDChartVectorSeries.h index 6bb335109..574708994 100644 --- a/kchart/kdchart/KDChartVectorSeries.h +++ b/kchart/kdchart/KDChartVectorSeries.h @@ -38,21 +38,13 @@ // - Implement a TQValueVector interface #include "KDChartBaseSeries.h" -#if COMPAT_TQT_VERSION >= 0x030000 #include -#else -#include -#endif class KDChartSeriesCollection; class KDCHART_EXPORT KDChartVectorSeries : public KDChartBaseSeries, -#if COMPAT_TQT_VERSION >= 0x030000 public TQValueVector -#else - public TQArray -#endif { public: virtual ~KDChartVectorSeries(); diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index 9363f8073..221c6b5cc 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -269,7 +269,7 @@ TQIODevice* KoStore::device() const TQByteArray KoStore::read( unsigned long int max ) { - TQByteArray data; // Data is a TQArray + TQByteArray data; if ( !m_bIsOpen ) {