From 75cc9de8f47db776021b5e8153c930d9af2108b6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 5 Jun 2023 13:21:40 +0900 Subject: [PATCH] Drop use of COMPAT_TQT_VERSION define Signed-off-by: Michele Calgaro (cherry picked from commit fded56123903e0a8d9e076b1a6a9a52374c3649d) --- kchart/kdchart/KDChartAxesPainter.cpp | 62 +------------------------- kchart/kdchart/KDChartGlobal.h | 16 ------- kchart/kdchart/KDChartParams.cpp | 6 --- kchart/kdchart/KDChartPiePainter.cpp | 8 +--- kchart/kdchart/KDChartPolarPainter.cpp | 8 +--- kchart/kdchart/KDChartRingPainter.cpp | 8 +--- kchart/kdchart/KDChartTable.h | 7 --- kchart/kdchart/KDChartVectorSeries.cpp | 10 ----- kchart/kdchart/KDXMLTools.cpp | 8 ---- 9 files changed, 4 insertions(+), 129 deletions(-) diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 7fda89a22..43b3bd521 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -78,39 +78,6 @@ KDChartAxesPainter::~KDChartAxesPainter() } -#if COMPAT_TQT_VERSION < 0x030000 -TQDateTime dateTimeFromString( const TQString& s ) // only ISODate is allowed -{ - int year( s.mid( 0, 4 ).toInt() ); - int month( s.mid( 5, 2 ).toInt() ); - int day( s.mid( 8, 2 ).toInt() ); - TQString t( s.mid( 11 ) ); - int hour( t.mid( 0, 2 ).toInt() ); - int minute( t.mid( 3, 2 ).toInt() ); - int second( t.mid( 6, 2 ).toInt() ); - int msec( t.mid( 9, 3 ).toInt() ); - if ( year && month && day ) - return TQDateTime( TQDate( year, month, day ), - TQTime( hour, minute, second, msec ) ); - else - return TQDateTime(); -} -TQString dateTimeToString( const TQDateTime& dt ) // ISODate is returned -{ - TQString date; - TQString month( - TQString::number( dt.date().month() ).rightJustify( 2, '0' ) ); - TQString day( - TQString::number( dt.date().day() ).rightJustify( 2, '0' ) ); - date = TQString::number( dt.date().year() ) + "-" + month + "-" + day; - TQString time; - time.sprintf( "%.2d:%.2d:%.2d", - dt.time().hour(), dt.time().minute(), dt.time().second() ); - return date + "T" + time; -} -#endif - - /** ReCalculate the labels based upon given nDelta and nDeltaPix. @@ -572,11 +539,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, if( sameDay ){ commonDtHeader = TQString::number( dLow.day() ) + ". " -#if COMPAT_TQT_VERSION >= 0x030000 + TQDate::longMonthName( dLow.month() ) -#else - + dLow.monthName( dLow.month() ) -#endif + ' ' + TQString::number( dLow.year() ); if( sameHour ){ @@ -609,11 +572,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, commonDtHeader += "00"; } }else if( sameMonth ) -#if COMPAT_TQT_VERSION >= 0x030000 commonDtHeader = TQDate::longMonthName( dLow.month() ) -#else - commonDtHeader = dLow.monthName( dLow.month() ) -#endif + ' ' + TQString::number( dLow.year() ); else if( sameYear ) @@ -684,14 +643,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, TQString text; if( cv.isDateTime ){ -#if COMPAT_TQT_VERSION >= 0x030000 TQDateTime dt( TQDateTime::fromString( *it, Qt::ISODate ) ); text = dt.toString( formatDT ); -#else - TQDateTime dt( dateTimeFromString( *it ) ); - text = dt.toString(); -#endif }else{ text = *it; } @@ -1685,14 +1639,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, ++labelIter ) { TQDateTime dt; if( cv.isDateTime ){ -#if COMPAT_TQT_VERSION >= 0x030000 dt = TQDateTime::fromString( *labelIter, Qt::ISODate ); label = dt.toString( formatDT ); -#else - dt = dateTimeFromString( *labelIter ); - label = dt.toString(); -#endif }else{ label = *labelIter; } @@ -3277,11 +3226,7 @@ void KDChartAxesPainter::calculateLabelTexts( if( autoDtLabels ) labelTexts.append( "x" ); else -#if COMPAT_TQT_VERSION >= 0x030000 labelTexts.append( dt.toString( Qt::ISODate ) ); -#else - labelTexts.append( dateTimeToString( dt ) ); -#endif bDone = (goDown ? (dt < dtLow ) : (dt > dtHigh)); /*if( bDone ){ dtHigh = dt; @@ -4425,12 +4370,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter, //ourClipRect.setRight( ourClipRect.right() - 1 ); const TQWMatrix & world = painter->worldMatrix(); - ourClipRect = -#if COMPAT_TQT_VERSION >= 0x030000 - world.mapRect( ourClipRect ); -#else - world.map( ourClipRect ); -#endif + ourClipRect = world.mapRect( ourClipRect ); painter->setClipRect( ourClipRect ); painter->translate( _dataRect.x(), _dataRect.y() ); diff --git a/kchart/kdchart/KDChartGlobal.h b/kchart/kdchart/KDChartGlobal.h index 91772b015..d47c36120 100644 --- a/kchart/kdchart/KDChartGlobal.h +++ b/kchart/kdchart/KDChartGlobal.h @@ -58,25 +58,9 @@ #endif #endif - - -// --- new format since TQt 3.0.0 or since 3.0.4 ??? -#ifndef COMPAT_TQT_VERSION -#if defined(_MSC_VER) -#pragma message( "using TQt > 2.3.2" ) -#endif -//#define COMPAT_TQT_VERSION [[[TQT_VERSION IS DEPRECATED]]] -#define COMPAT_TQT_VERSION 0x039999 -#endif - -// since TQt 3.1 they do /not/ include limits.h or climits on windows anymore -// so we must include that manually -#if COMPAT_TQT_VERSION > 0x030099 #if defined(_MSC_VER) #include #endif -#endif - #include #include diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index 8df4954c8..fd9f0e2e7 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -113,13 +113,7 @@ KDChartParams::KDChartParams() _printDataValuesSettings2._dataValuesShowInfinite = true; setAllowOverlappingDataValueTexts( false ); - -#if COMPAT_TQT_VERSION >= 0x030100 setOptimizeOutputForScreen( false ); -#else - setOptimizeOutputForScreen( true ); -#endif - setGlobalLeading( 0,0,0,0 ); diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp index 9a1b3fb48..77cff44c5 100644 --- a/kchart/kdchart/KDChartPiePainter.cpp +++ b/kchart/kdchart/KDChartPiePainter.cpp @@ -90,13 +90,7 @@ void KDChartPiePainter::paintData( TQPainter* painter, ourClipRect.addCoords( -1,-1,1,1 ); const TQWMatrix & world = painter->worldMatrix(); - ourClipRect = -#if COMPAT_TQT_VERSION >= 0x030000 - world.mapRect( ourClipRect ); -#else - world.map( ourClipRect ); -#endif - + ourClipRect = world.mapRect( ourClipRect ); painter->setClipRect( ourClipRect ); // find which dataset to paint diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp index 55249abfa..5bcd621f3 100644 --- a/kchart/kdchart/KDChartPolarPainter.cpp +++ b/kchart/kdchart/KDChartPolarPainter.cpp @@ -90,13 +90,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, // const TQWMatrix & world = painter->worldMatrix(); - ourClipRect = -#if COMPAT_TQT_VERSION >= 0x030000 - world.mapRect( ourClipRect ); -#else - world.map( ourClipRect ); -#endif - + ourClipRect = world.mapRect( ourClipRect ); painter->setClipRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp index 43d7f1abe..d2fb3b1b1 100644 --- a/kchart/kdchart/KDChartRingPainter.cpp +++ b/kchart/kdchart/KDChartRingPainter.cpp @@ -85,13 +85,7 @@ void KDChartRingPainter::paintData( TQPainter* painter, TQRect ourClipRect( _dataRect ); const TQWMatrix & world = painter->worldMatrix(); - ourClipRect = -#if COMPAT_TQT_VERSION >= 0x030000 - world.mapRect( ourClipRect ); -#else - world.map( ourClipRect ); -#endif - + ourClipRect = world.mapRect( ourClipRect ); ourClipRect.setTop(ourClipRect.top()-1); ourClipRect.setLeft(ourClipRect.left()-1); ourClipRect.setBottom(ourClipRect.bottom()+1); diff --git a/kchart/kdchart/KDChartTable.h b/kchart/kdchart/KDChartTable.h index d915db9f1..259ee46f5 100644 --- a/kchart/kdchart/KDChartTable.h +++ b/kchart/kdchart/KDChartTable.h @@ -33,15 +33,8 @@ #include #include -#if COMPAT_TQT_VERSION >= 0x030000 #include -#endif -#if COMPAT_TQT_VERSION >= 0x030000 typedef KDChartVectorTableData KDChartTableData; -#else -typedef KDChartListTableData KDChartTableData; -#endif - #endif diff --git a/kchart/kdchart/KDChartVectorSeries.cpp b/kchart/kdchart/KDChartVectorSeries.cpp index 07570afa8..87cd0dfb8 100644 --- a/kchart/kdchart/KDChartVectorSeries.cpp +++ b/kchart/kdchart/KDChartVectorSeries.cpp @@ -68,12 +68,7 @@ double KDChartVectorSeries::maxValue( int coordinate, bool &ok ) const double maxValue = 0.0; bool bStart = true; -#if COMPAT_TQT_VERSION >= 0x030000 KDChartVectorSeries::const_iterator i; -#else - KDChartVectorSeries::ConstIterator i; -#endif - for ( i = begin(); i != end(); i ++ ) { const KDChartData& d = *i; @@ -100,12 +95,7 @@ double KDChartVectorSeries::minValue( int coordinate, bool &ok ) const double minValue = 0.0; bool bStart = true; -#if COMPAT_TQT_VERSION >= 0x030000 KDChartVectorSeries::const_iterator i; -#else - KDChartVectorSeries::ConstIterator i; -#endif - for ( i = begin(); i != end(); i ++ ) { const KDChartData& d = *i; diff --git a/kchart/kdchart/KDXMLTools.cpp b/kchart/kdchart/KDXMLTools.cpp index d0060ef39..0d3e199f4 100644 --- a/kchart/kdchart/KDXMLTools.cpp +++ b/kchart/kdchart/KDXMLTools.cpp @@ -222,10 +222,6 @@ namespace KDXML { createIntNode( doc, fontElement, "PointSize", font.pointSize() ); createIntNode( doc, fontElement, "Weight", font.weight() ); createBoolNode( doc, fontElement, "Italic", font.italic() ); -#if COMPAT_TQT_VERSION < 0x030000 - // TQt 3 handles the charset internally. - createIntNode( doc, fontElement, "CharSet", font.charSet() ); -#endif } @@ -614,10 +610,6 @@ namespace KDXML { font.setPointSize( pointSize ); font.setWeight( weight ); font.setItalic( italic ); -#if COMPAT_TQT_VERSION < 0x030000 - // TQt 3 handles charsets internally. - font.setCharSet( (TQFont::CharSet)charSet ); -#endif } return ok;