TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop use of COMPAT_TQT_VERSION define

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/36/head
Michele Calgaro 1 year ago
parent 72e96ecd25
commit fded561239
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
9 changed files with 4 additions and 129 deletions
Show Stats Download Patch File Download Diff File

62
kchart/kdchart/KDChartAxesPainter.cpp
Unescape View File

@ -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() );

16
kchart/kdchart/KDChartGlobal.h
Unescape View File

@ -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 <climits>
#endif
#endif
#include <tqmemarray.h>
#include <tqptrlist.h>

6
kchart/kdchart/KDChartParams.cpp
Unescape View File

@ -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 );

8
kchart/kdchart/KDChartPiePainter.cpp
Unescape View File

@ -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

8
kchart/kdchart/KDChartPolarPainter.cpp
Unescape View File

@ -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 );

8
kchart/kdchart/KDChartRingPainter.cpp
Unescape View File

@ -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);

7
kchart/kdchart/KDChartTable.h
Unescape View File

@ -33,15 +33,8 @@
#include <KDChartGlobal.h>
#include <KDChartListTable.h>
#if COMPAT_TQT_VERSION >= 0x030000
#include <KDChartVectorTable.h>
#endif
#if COMPAT_TQT_VERSION >= 0x030000
typedef KDChartVectorTableData KDChartTableData;
#else
typedef KDChartListTableData KDChartTableData;
#endif
#endif

10
kchart/kdchart/KDChartVectorSeries.cpp
Unescape View File

@ -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;

8
kchart/kdchart/KDXMLTools.cpp
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save