summaryrefslogtreecommitdiffstats
path: root/libkdchart
diff options
context:
space:
mode:
Diffstat (limited to 'libkdchart')
-rw-r--r--libkdchart/KDChart.cpp20
-rw-r--r--libkdchart/KDChartAxesPainter.cpp6
-rw-r--r--libkdchart/KDChartObjectFactory.cpp58
-rw-r--r--libkdchart/KDChartPainter.cpp4
-rw-r--r--libkdchart/KDChartPiePainter.cpp2
-rw-r--r--libkdchart/KDChartPolarPainter.cpp8
-rw-r--r--libkdchart/KDChartRingPainter.cpp2
-rw-r--r--libkdchart/KDChartTableBase.cpp2
-rw-r--r--libkdchart/KDChartWrapperFactory.cpp8
9 files changed, 55 insertions, 55 deletions
diff --git a/libkdchart/KDChart.cpp b/libkdchart/KDChart.cpp
index 415f013..5d0c6bf 100644
--- a/libkdchart/KDChart.cpp
+++ b/libkdchart/KDChart.cpp
@@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter )
void KDChart::initProject( TQSProject* project )
{
- project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() );
+ project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() );
privateInitInterpreter( project->interpreter() );
}
@@ -431,19 +431,19 @@ TQString KDChart::globals()
for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) {
// This is written this way to be efficient
- globals += TQString::tqfromLatin1( "const " );
+ globals += TQString::fromLatin1( "const " );
globals += it.key();
globals += " = ";
globals += TQString::number( it.data() );
globals += ";\n";
}
- globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
- .tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
- globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
- globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
+ globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
+ .tqarg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
+ globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
+ globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
.tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
- globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
+ globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
.tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
@@ -469,14 +469,14 @@ TQString KDChart::globals()
colorMap.insert( "TQt.darkYellow", TQt::darkYellow );
for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) {
// This is written this way to be efficient
- globals += TQString::tqfromLatin1( it2.key() );
- globals += TQString::tqfromLatin1( " = new Color( " );
+ globals += TQString::fromLatin1( it2.key() );
+ globals += TQString::fromLatin1( " = new Color( " );
globals += TQString::number( it2.data().red() );
globals += ',';
globals += TQString::number( it2.data().green() );
globals += ',';
globals += TQString::number( it2.data().blue() );
- globals += TQString::tqfromLatin1( " );\n" );
+ globals += TQString::fromLatin1( " );\n" );
}
//qDebug( "%s",globals.latin1() );
return globals;
diff --git a/libkdchart/KDChartAxesPainter.cpp b/libkdchart/KDChartAxesPainter.cpp
index 6124abe..3f3b312 100644
--- a/libkdchart/KDChartAxesPainter.cpp
+++ b/libkdchart/KDChartAxesPainter.cpp
@@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) );
// allow for shearing and/or scaling of the painter
- anchor = painter->tqworldMatrix().map( anchor );
+ anchor = painter->worldMatrix().map( anchor );
TQString text;
if( cv.isDateTime ){
@@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
KDDrawText::drawRotatedText(
painter,
nRotation,
- painter->tqworldMatrix().map(
+ painter->worldMatrix().map(
TQPoint( static_cast<int>( cv.pTextsX ),
static_cast<int>( cv.pTextsY ) ) ),
label,
@@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter,
//ourClipRect.setLeft( ourClipRect.left() + 1 );
//ourClipRect.setRight( ourClipRect.right() - 1 );
- const TQWMatrix & world = painter->tqworldMatrix();
+ const TQWMatrix & world = painter->worldMatrix();
ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect );
diff --git a/libkdchart/KDChartObjectFactory.cpp b/libkdchart/KDChartObjectFactory.cpp
index b1dac73..6e2a128 100644
--- a/libkdchart/KDChartObjectFactory.cpp
+++ b/libkdchart/KDChartObjectFactory.cpp
@@ -15,42 +15,42 @@
// PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool.
KDChartObjectFactory::KDChartObjectFactory()
{
- registerClass( TQString::tqfromLatin1( "KDChartWidget" ) );
- registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams );
- registerClass( TQString::tqfromLatin1( "KDChartTableData" ) );
- registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
- registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
- registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) );
- registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
- registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
- registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame );
-
- registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() );
- registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory );
+ registerClass( TQString::fromLatin1( "KDChartWidget" ) );
+ registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams );
+ registerClass( TQString::fromLatin1( "KDChartTableData" ) );
+ registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
+ registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
+ registerClass( TQString::fromLatin1( "KDChartTextPiece" ) );
+ registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
+ registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
+ registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame );
+
+ registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() );
+ registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory );
}
TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ )
{
- if ( className == TQString::tqfromLatin1( "KDChartWidget" ) )
+ if ( className == TQString::fromLatin1( "KDChartWidget" ) )
return createKDChartWidget( args );
- if ( className == TQString::tqfromLatin1("KDChartParams") )
+ if ( className == TQString::fromLatin1("KDChartParams") )
return new KDChartParams();
- else if ( className == TQString::tqfromLatin1("KDChartTableData") )
+ else if ( className == TQString::fromLatin1("KDChartTableData") )
return createKDChartTableData( args );
- else if ( className == TQString::tqfromLatin1("KDChartAxisParams") )
+ else if ( className == TQString::fromLatin1("KDChartAxisParams") )
return new KDChartAxisParams();
- else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) )
+ else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) )
return createKDChartTextPiece( args );
- else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
+ else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
return createKDChartCustomBox( args );
- else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) )
+ else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) )
return createKDChartPropertySet( args );
else
@@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a
TQString str;
if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0;
- if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
TQFont font = args[1].variant().toFont();
return new KDChartTextPiece( str, font );
@@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
TQColor color = TQt::black;
if ( args.count() >= 9 ) {
- if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
color = args[8].variant().toColor();
}
TQBrush paper = TQt::NoBrush;
if ( args.count() >= 10 ) {
- if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
paper = args[9].variant().toBrush();
}
@@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
TQColor color = TQt::black;
if ( args.count() >= 8 ) {
- if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
color = args[7].variant().toColor();
}
TQBrush paper = TQt::NoBrush;
if ( args.count() >= 9 ) {
- if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
paper = args[8].variant().toBrush();
}
@@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0;
- if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor lineColor = args[4].variant().toColor();
int idLineStyle;
@@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idExtraLinesColor;
if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0;
- if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor extraLinesColor = args[18].variant().toColor();
int idExtraLinesStyle;
@@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idExtraMarkersSize;
if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0;
- if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
TQSize extraMarkersSize = args[24].variant().toSize();
int idExtraMarkersColor;
if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0;
- if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor extraMarkersColor = args[26].variant().toColor();
int idExtraMarkersStyle;
@@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
int idBarColor;
if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0;
- if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+ if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
TQColor barColor = args[32].variant().toColor();
KDChartPropertySet* set = new KDChartPropertySet;
diff --git a/libkdchart/KDChartPainter.cpp b/libkdchart/KDChartPainter.cpp
index 156d5d8..df60857 100644
--- a/libkdchart/KDChartPainter.cpp
+++ b/libkdchart/KDChartPainter.cpp
@@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
}
if ( rotation ) {
- anchor = painter->tqworldMatrix().map( anchor );
+ anchor = painter->worldMatrix().map( anchor );
// Temporary solution for fixing the data labels size
// bug when in TQPrinter::HighResolution mode:
@@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
true,
true,
5 );
- //anchor = painter->tqworldMatrix().map( anchor );
+ //anchor = painter->worldMatrix().map( anchor );
if( allowOverlapping ) {
drawThisOne = true;
diff --git a/libkdchart/KDChartPiePainter.cpp b/libkdchart/KDChartPiePainter.cpp
index ada03b4..44f4c60 100644
--- a/libkdchart/KDChartPiePainter.cpp
+++ b/libkdchart/KDChartPiePainter.cpp
@@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter,
TQRect ourClipRect( _dataRect );
ourClipRect.addCoords( -1,-1,1,1 );
- const TQWMatrix & world = painter->tqworldMatrix();
+ const TQWMatrix & world = painter->worldMatrix();
ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect );
diff --git a/libkdchart/KDChartPolarPainter.cpp b/libkdchart/KDChartPolarPainter.cpp
index 23430db..9ebed86 100644
--- a/libkdchart/KDChartPolarPainter.cpp
+++ b/libkdchart/KDChartPolarPainter.cpp
@@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
// PENDING(khz) adjust the clip rect if neccessary...
//
- const TQWMatrix & world = painter->tqworldMatrix();
+ const TQWMatrix & world = painter->worldMatrix();
ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect );
@@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
pt2 = center + polarToXY( r2, currentAngle );
pt3 = center + polarToXY( r3, currentAngle );
- //pt3 = painter->tqworldMatrix().map( pt3 );
+ //pt3 = painter->worldMatrix().map( pt3 );
if( paraSagittal.axisShowGrid() ) {
painter->setPen( TQPen( paraSagittal.axisGridColor(),
@@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
KDDrawText::drawRotatedText( painter,
currentAngle+90,
- painter->tqworldMatrix().map(pt3),
+ painter->worldMatrix().map(pt3),
label,
0,
TQt::AlignCenter );
@@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter,
KDDrawText::drawRotatedText(
painter,
rotate ? txtAngle - 90 : 0,
- painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
+ painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
txt,
0,
step
diff --git a/libkdchart/KDChartRingPainter.cpp b/libkdchart/KDChartRingPainter.cpp
index 9740fa5..8797da5 100644
--- a/libkdchart/KDChartRingPainter.cpp
+++ b/libkdchart/KDChartRingPainter.cpp
@@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter,
TQRect ourClipRect( _dataRect );
- const TQWMatrix & world = painter->tqworldMatrix();
+ const TQWMatrix & world = painter->worldMatrix();
ourClipRect =
#if COMPAT_TQT_VERSION >= 0x030000
world.mapRect( ourClipRect );
diff --git a/libkdchart/KDChartTableBase.cpp b/libkdchart/KDChartTableBase.cpp
index 1ebfa9f..fcec2c5 100644
--- a/libkdchart/KDChartTableBase.cpp
+++ b/libkdchart/KDChartTableBase.cpp
@@ -74,7 +74,7 @@
future absicssa axis value:
\verbatim
- const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() );
+ const TQDateTime currentTime( TQDateTime::currentDateTime() );
for( int iCell = 0; iCell < usedValues; ++iCell ){
KDChartData& cell = myData.cell( 0, iCell );
// assign special property set ID if X value is in the future
diff --git a/libkdchart/KDChartWrapperFactory.cpp b/libkdchart/KDChartWrapperFactory.cpp
index 2ff08f1..b42c037 100644
--- a/libkdchart/KDChartWrapperFactory.cpp
+++ b/libkdchart/KDChartWrapperFactory.cpp
@@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory()
TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr )
{
- if ( className == TQString::tqfromLatin1( "KDChartParams" ) )
+ if ( className == TQString::fromLatin1( "KDChartParams" ) )
return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) );
- if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) )
+ if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) )
return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) );
- if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
+ if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) );
- if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) )
+ if ( className == TQString::fromLatin1( "KDChartAxisParams" ) )
return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) );
return 0;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 17:33:54 +0000