From 252fce5a2a5384702fbcc1c9987284d7bd2e6943 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:31:01 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- libkdchart/KDChart.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libkdchart/KDChart.cpp') diff --git a/libkdchart/KDChart.cpp b/libkdchart/KDChart.cpp index 415f013..4d8fd0c 100644 --- a/libkdchart/KDChart.cpp +++ b/libkdchart/KDChart.cpp @@ -302,7 +302,7 @@ void KDChart::paint( TQPainter* painter, } //qDebug("xxx" ); if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){ - qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry."); + qDebug("ERROR: KDChart::paint() could not calculate the chart geometry."); bOk = false; } }else{ @@ -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,20 +431,20 @@ TQString KDChart::globals() for( TQMapIterator 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" ) - .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); - globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) - .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) + .arg( 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" ) + .arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); + globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) + .arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); TQMap colorMap; @@ -469,14 +469,14 @@ TQString KDChart::globals() colorMap.insert( "TQt.darkYellow", TQt::darkYellow ); for( TQMapIterator 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; -- cgit v1.2.1