summaryrefslogtreecommitdiffstats
path: root/libkdchart
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-06-03 13:33:59 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-06-05 11:24:56 +0900
commit1a2f76163a8ce08c850f1f632d0a295be57d6807 (patch)
tree206561d838f27d560e568638f52700620aa12209 /libkdchart
parentd09e55dfbb793fc01c18d82eacbc59d6056a9390 (diff)
downloadkmymoney-1a2f76163a8ce08c850f1f632d0a295be57d6807.tar.gz
kmymoney-1a2f76163a8ce08c850f1f632d0a295be57d6807.zip
Drop Qt2 obsolete classes
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit a3a44b5daea0e8674401be3b8b9f15bccd64520d)
Diffstat (limited to 'libkdchart')
-rw-r--r--libkdchart/KDChartBWPainter.cpp5
-rw-r--r--libkdchart/KDChartGlobal.h34
-rw-r--r--libkdchart/KDChartLinesPainter.cpp9
-rw-r--r--libkdchart/KDChartParams.h11
-rw-r--r--libkdchart/KDChartSeriesCollection.cpp12
-rw-r--r--libkdchart/KDChartSeriesCollection.h10
-rw-r--r--libkdchart/KDChartVectorSeries.h8
7 files changed, 2 insertions, 87 deletions
diff --git a/libkdchart/KDChartBWPainter.cpp b/libkdchart/KDChartBWPainter.cpp
index f935b03..363b8e3 100644
--- a/libkdchart/KDChartBWPainter.cpp
+++ b/libkdchart/KDChartBWPainter.cpp
@@ -36,12 +36,7 @@
#include "KDChartTextPiece.h"
#include <tqpainter.h>
-#if COMPAT_TQT_VERSION >= 0x030000
#include <tqmemarray.h>
-#else
-#include <tqarray.h>
-#define TQMemArray TQArray
-#endif
#include <stdlib.h>
diff --git a/libkdchart/KDChartGlobal.h b/libkdchart/KDChartGlobal.h
index 2dc4fdb..fc96072 100644
--- a/libkdchart/KDChartGlobal.h
+++ b/libkdchart/KDChartGlobal.h
@@ -77,41 +77,7 @@
#endif
#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 <tqarray.h>
-
-#else
-
#include <tqmemarray.h>
-
-#endif
-// end of #if COMPAT_TQT_VERSION < 0x030000
-
#include <tqptrlist.h>
#include <tqptrvector.h>
diff --git a/libkdchart/KDChartLinesPainter.cpp b/libkdchart/KDChartLinesPainter.cpp
index 8e4fa4e..fbf5f0f 100644
--- a/libkdchart/KDChartLinesPainter.cpp
+++ b/libkdchart/KDChartLinesPainter.cpp
@@ -36,12 +36,7 @@
#include <KDChartPropertySet.h>
#include <tqpainter.h>
-
-#if COMPAT_TQT_VERSION >= 0x030000
#include <tqvaluevector.h>
-#else
-#include <tqarray.h>
-#endif
#include <stdlib.h>
@@ -291,11 +286,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
( dataset >= static_cast < int > ( datasetStart ) && dataset >= 0 );
--dataset )
++arrayNumDatasets;
-#if COMPAT_TQT_VERSION >= 0x030000
TQValueVector<MyPoint> allPoints(
-#else
- TQArray<MyPoint> allPoints(
-#endif
arrayNumDatasets * arrayNumValues );
KDChartPropertySet curPropSet;
diff --git a/libkdchart/KDChartParams.h b/libkdchart/KDChartParams.h
index 0cbde9c..327071a 100644
--- a/libkdchart/KDChartParams.h
+++ b/libkdchart/KDChartParams.h
@@ -40,6 +40,7 @@
#include <tqtextstream.h>
#include <tqsimplerichtext.h>
#include <tqdom.h>
+#include <tqvaluevector.h>
#include <limits.h>
#include <math.h>
@@ -54,12 +55,6 @@
#include "KDChartAxisParams.h"
#include "KDChartPropertySet.h"
-#if COMPAT_TQT_VERSION >= 0x030000
-#include <tqvaluevector.h>
-#else
-#include <tqarray.h>
-#endif
-
/** \file KDChartParams.h
\brief Header for all common chart parameters.
@@ -2097,11 +2092,7 @@ public slots:
uint& chart ) const;
public:
-#if COMPAT_TQT_VERSION >= 0x030000
typedef TQValueVector<uint> AxesArray;
-#else
- typedef TQArray<uint> AxesArray;
-#endif
public slots:
bool chartAxes( uint chart, uint& cnt, AxesArray& axes ) const;
diff --git a/libkdchart/KDChartSeriesCollection.cpp b/libkdchart/KDChartSeriesCollection.cpp
index 212504e..333917b 100644
--- a/libkdchart/KDChartSeriesCollection.cpp
+++ b/libkdchart/KDChartSeriesCollection.cpp
@@ -135,11 +135,7 @@ double KDChartSeriesCollection::maxValue( int coordinate ) const
bool first_max = true;
// find the first max
-#if COMPAT_TQT_VERSION >= 0x030000
TQValueVector<KDChartBaseSeries *>::const_iterator i;
-#else
- TQArray<KDChartBaseSeries *>::ConstIterator i;
-#endif
for ( i = (*this).begin(); i != (*this).end(); i ++ )
{
double temp = (*i)->maxValue(coordinate, ok);
@@ -166,11 +162,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<KDChartBaseSeries *>::const_iterator i;
-#else
- TQArray<KDChartBaseSeries *>::ConstIterator i;
-#endif
for ( i = (*this).begin(); !ok && i != (*this).end(); i ++ )
result = (*i)->minValue(coordinate, ok);
@@ -189,11 +181,7 @@ double KDChartSeriesCollection::minValue( int coordinate ) const
unsigned int KDChartSeriesCollection::indexOf( KDChartBaseSeries *series )
{
unsigned int index = 0;
-#if COMPAT_TQT_VERSION >= 0x030000
TQValueVector<KDChartBaseSeries *>::const_iterator i;
-#else
- TQArray<KDChartBaseSeries *>::ConstIterator i;
-#endif
for ( i = (*this).begin(); i != (*this).end(); i ++, index ++ )
if ( *i == series )
break;
diff --git a/libkdchart/KDChartSeriesCollection.h b/libkdchart/KDChartSeriesCollection.h
index bacda72..9818aff 100644
--- a/libkdchart/KDChartSeriesCollection.h
+++ b/libkdchart/KDChartSeriesCollection.h
@@ -31,25 +31,17 @@
// to avoid problems in TableBase - it doesn't include this - bug!
#include <tqtable.h>
+#include <tqvaluevector.h>
#include "KDChartTableBase.h"
#include "KDChartBaseSeries.h"
-#if COMPAT_TQT_VERSION >= 0x030000
-#include <tqvaluevector.h>
-#else
-#include <tqarray.h>
-#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<KDChartBaseSeries *>
-#else
- public TQArray<KDChartBaseSeries *>
-#endif
{
// Standard KDChartTableDataBase interface
public:
diff --git a/libkdchart/KDChartVectorSeries.h b/libkdchart/KDChartVectorSeries.h
index 6bb3351..5747089 100644
--- a/libkdchart/KDChartVectorSeries.h
+++ b/libkdchart/KDChartVectorSeries.h
@@ -38,21 +38,13 @@
// - Implement a TQValueVector interface
#include "KDChartBaseSeries.h"
-#if COMPAT_TQT_VERSION >= 0x030000
#include <tqvaluevector.h>
-#else
-#include <tqarray.h>
-#endif
class KDChartSeriesCollection;
class KDCHART_EXPORT KDChartVectorSeries : public KDChartBaseSeries,
-#if COMPAT_TQT_VERSION >= 0x030000
public TQValueVector<KDChartData>
-#else
- public TQArray<KDChartData>
-#endif
{
public:
virtual ~KDChartVectorSeries();