summaryrefslogtreecommitdiffstats
path: root/kchart
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-01 13:21:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-01 13:21:06 -0600
commit7d18baa666593a494ceea480732a8540ba471fe5 (patch)
tree1c656ba0da61a3bfcf4c4de730e66322865844fe /kchart
parent951839808408bed4165fc025dbf00caf59ea319b (diff)
downloadkoffice-7d18baa666593a494ceea480732a8540ba471fe5.tar.gz
koffice-7d18baa666593a494ceea480732a8540ba471fe5.zip
Rename additional global TQt functions
Diffstat (limited to 'kchart')
-rw-r--r--kchart/kchartComboConfigPage.cc4
-rw-r--r--kchart/kdchart/KDChart.cpp32
-rw-r--r--kchart/kdchart/KDChartAxesPainter.cpp380
-rw-r--r--kchart/kdchart/KDChartAxisParams.cpp10
-rw-r--r--kchart/kdchart/KDChartBWPainter.cpp2
-rw-r--r--kchart/kdchart/KDChartBarPainter.cpp62
-rw-r--r--kchart/kdchart/KDChartCustomBox.cpp50
-rw-r--r--kchart/kdchart/KDChartDataRegion.h2
-rw-r--r--kchart/kdchart/KDChartEnums.cpp2
-rw-r--r--kchart/kdchart/KDChartEnums.h4
-rw-r--r--kchart/kdchart/KDChartGlobal.h4
-rw-r--r--kchart/kdchart/KDChartHiLoPainter.cpp16
-rw-r--r--kchart/kdchart/KDChartLinesPainter.cpp50
-rw-r--r--kchart/kdchart/KDChartPainter.cpp36
-rw-r--r--kchart/kdchart/KDChartParams.cpp20
-rw-r--r--kchart/kdchart/KDChartParams_frame.cpp2
-rw-r--r--kchart/kdchart/KDChartParams_io.cpp72
-rw-r--r--kchart/kdchart/KDChartPolarPainter.cpp4
-rw-r--r--kchart/kdchart/KDChartPropertySet.cpp2
-rw-r--r--kchart/kdchart/KDChartRingPainter.cpp2
-rw-r--r--kchart/kdchart/KDChartTableBase.cpp8
-rw-r--r--kchart/kdchart/KDChartTextPiece.cpp16
-rw-r--r--kchart/kdchart/KDDrawText.cpp22
-rw-r--r--kchart/kdchart/KDFrame.cpp16
-rw-r--r--kchart/kdchart/KDFrameProfileSection.cpp2
-rw-r--r--kchart/kdchart/KDXMLTools.cpp14
26 files changed, 417 insertions, 417 deletions
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 2444998d..a6476530 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -68,7 +68,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
void KChartComboPage::init()
{
- qDebug( "Sorry, not implemented: KChartComboPage::init()" );
+ tqDebug( "Sorry, not implemented: KChartComboPage::init()" );
#ifdef __GNUC__
#warning Put back in
#endif
@@ -106,7 +106,7 @@ void KChartComboPage::init()
void KChartComboPage::apply()
{
- qDebug( "Sorry, not implemented: KChartComboPage::apply()" );
+ tqDebug( "Sorry, not implemented: KChartComboPage::apply()" );
#ifdef __GNUC__
#warning Put back in
#endif
diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp
index 4d8fd0c8..ab83da29 100644
--- a/kchart/kdchart/KDChart.cpp
+++ b/kchart/kdchart/KDChart.cpp
@@ -98,7 +98,7 @@ bool hasCartesianAxes( KDChartParams::ChartType chartType )
case KDChartParams::Polar: return false; // Polar axes are NO cartesian axes!
case KDChartParams::BoxWhisker: return true;
default:
- qDebug("\n\n\n\nKDCHART ERROR: Type missing in KDChart.cpp hasCartesianAxes()\n"
+ tqDebug("\n\n\n\nKDCHART ERROR: Type missing in KDChart.cpp hasCartesianAxes()\n"
"=============================================================\n"
"=============================================================\n\n\n\n");
}
@@ -129,7 +129,7 @@ bool KDChart::painterToDrawRect( TQPainter* painter, TQRect& drawRect )
return true;
}else{
drawRect = TQRect( TQPoint(0,0), TQSize(0,0) );
- qDebug("ERROR: KDChartPainter::painterToDrawRect() was called with *no* painter.");
+ tqDebug("ERROR: KDChartPainter::painterToDrawRect() was called with *no* painter.");
return false;
}
}
@@ -158,13 +158,13 @@ bool KDChart::setupGeometry( TQPainter* painter,
KDChartTableDataBase* data,
const TQRect& drawRect )
{
-//qDebug("INVOKING: KDChart::setupGeometry()");
+//tqDebug("INVOKING: KDChart::setupGeometry()");
if( !params ){
- qDebug("ERROR: setupGeometry::paint() was called with *no* params.");
+ tqDebug("ERROR: setupGeometry::paint() was called with *no* params.");
return false;
}
if( !data ){
- qDebug("ERROR: setupGeometry::paint() was called with *no* data.");
+ tqDebug("ERROR: setupGeometry::paint() was called with *no* data.");
return false;
}
// don't crash due to memory problems when running on windows
@@ -178,7 +178,7 @@ bool KDChart::setupGeometry( TQPainter* painter,
static bool bFirstCleanUpInstall = true;
if( bFirstCleanUpInstall ) {
bFirstCleanUpInstall = false;
- qAddPostRoutine( cleanupPainter );
+ tqAddPostRoutine( cleanupPainter );
}
// Check whether last call of this methode gave us the same params pointer.
@@ -260,7 +260,7 @@ void KDChart::paint( TQPainter* painter,
const TQRect* rect,
bool mustCalculateGeometry )
{
-//qDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"TRUE":"FALSE") );
+//tqDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"TRUE":"FALSE") );
#if defined KDAB_EVAL
EvalDialog::checkEvalLicense( "KD Chart" );
#endif
@@ -272,9 +272,9 @@ void KDChart::paint( TQPainter* painter,
KDChartParams* params = paraParams;
KDChartTableDataBase* data = paraData;
if( !paraParams && !paraData ){
- qDebug("-----");
- qDebug("Note: KDChart::paint() was called without \"params\" and without \"data\".");
- qDebug("----- Showing a default bar chart.");
+ tqDebug("-----");
+ tqDebug("Note: KDChart::paint() was called without \"params\" and without \"data\".");
+ tqDebug("----- Showing a default bar chart.");
params = new KDChartParams();
params->setDatasetGap(3 * params->valueBlockGap());
params->setPrintDataValues( false );
@@ -297,19 +297,19 @@ void KDChart::paint( TQPainter* painter,
if( rect )
drawRect = *rect;
else if( !painterToDrawRect( painter, drawRect ) ){
- qDebug("ERROR: KDChart::paint() could not calculate a drawing area.");
+ tqDebug("ERROR: KDChart::paint() could not calculate a drawing area.");
bOk = false;
}
- //qDebug("xxx" );
+ //tqDebug("xxx" );
if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){
- qDebug("ERROR: KDChart::paint() could not calculate the chart geometry.");
+ tqDebug("ERROR: KDChart::paint() could not calculate the chart geometry.");
bOk = false;
}
}else{
drawRect = cpainter->outermostRect();
}
- //qDebug("yyy" );
+ //tqDebug("yyy" );
if( bOk ){
// Note: the following *must* paint the main-chart first
@@ -320,7 +320,7 @@ void KDChart::paint( TQPainter* painter,
bool paintFirst = true;
bool paintLast = ! ( cpainter && cpainter2 );
if ( cpainter ) { // can be 0 if no exceptions are used
- //qDebug("zzz" );
+ //tqDebug("zzz" );
cpainter->paint( painter, data, paintFirst, paintLast, regions, &drawRect, false );
paintFirst = false;
@@ -478,7 +478,7 @@ TQString KDChart::globals()
globals += TQString::number( it2.data().blue() );
globals += TQString::fromLatin1( " );\n" );
}
- //qDebug( "%s",globals.latin1() );
+ //tqDebug( "%s",globals.latin1() );
return globals;
}
diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp
index ee9dc879..24f5b915 100644
--- a/kchart/kdchart/KDChartAxesPainter.cpp
+++ b/kchart/kdchart/KDChartAxesPainter.cpp
@@ -174,7 +174,7 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues(
{
uint iAxis;
double averageValueP1000 = TQMIN(areaWidthP1000, areaHeightP1000);//( areaWidthP1000 + areaHeightP1000 ) / 2.0;
- //qDebug("KChart::KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues() averageValueP1000: %f", averageValueP1000);
+ //tqDebug("KChart::KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues() averageValueP1000: %f", averageValueP1000);
// length of little delimiter-marks indicating axis scaling
delimLen = 20.0 * averageValueP1000; // per mille of area
@@ -286,8 +286,8 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues(
&& cv2.bSteadyCalc
&& ( fabs(cv2.nDelta) != fabs(nDelta)
|| fabs(cv2.nDeltaPix) != fabs(nDeltaPix) ) ){
- //qDebug("\nrecalculating scale for axis %x", iAxis2);
- //qDebug("cv2.nDelta %f cv2.nDeltaPix %f nDelta %f nDeltaPix %f\n",
+ //tqDebug("\nrecalculating scale for axis %x", iAxis2);
+ //tqDebug("cv2.nDelta %f cv2.nDeltaPix %f nDelta %f nDeltaPix %f\n",
// cv2.nDelta,cv2.nDeltaPix,nDelta,nDeltaPix);
if( (cv2.nDelta >= 0.0) == (nDelta >= 0.0) )
cv2.nDelta = nDelta;
@@ -321,7 +321,7 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues(
|| ( cv2.nDelta == cv.nDelta
&& cv2.nDeltaPix < cv.nDeltaPix ) ){
// adjust this axis
- //qDebug("recalculating scale for this axis %x", iAxis);
+ //tqDebug("recalculating scale for this axis %x", iAxis);
cv.nDelta = cv2.nDelta;
cv.nDeltaPix = cv2.nDeltaPix;
reCalculateLabelTexts(
@@ -335,8 +335,8 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues(
cv.nSubDelimFactor = cv2.nSubDelimFactor;
}else{
// adjust the other axis
- //qDebug("\nrecalculating scale for other axis %x", isoRef);
- //qDebug("cv2.nDelta %f cv2.nDeltaPix %f cv.nDelta %f cv.nDeltaPix %f",
+ //tqDebug("\nrecalculating scale for other axis %x", isoRef);
+ //tqDebug("cv2.nDelta %f cv2.nDeltaPix %f cv.nDelta %f cv.nDeltaPix %f",
// cv2.nDelta,cv2.nDeltaPix,cv.nDelta,cv.nDeltaPix);
cv2.nDelta = cv.nDelta;
cv2.nDeltaPix = cv.nDeltaPix;
@@ -380,7 +380,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
// length of little delimiter-marks indicating axis scaling
double delimLen;
-//qDebug("-------------------------------------------------------------------------------------");
+//tqDebug("-------------------------------------------------------------------------------------");
calculateAllAxesLabelTextsAndCalcValues( painter, data, areaWidthP1000, areaHeightP1000, delimLen );
@@ -539,7 +539,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
// calculate font size
const double minTextHeight = para.axisLabelsFontMinSize();
- //qDebug("KChart::KDChartAxesPainter::paintAxes() cv.nTxtHeight: %f minTextHeight: %f", cv.nTxtHeight, minTextHeight);
+ //tqDebug("KChart::KDChartAxesPainter::paintAxes() cv.nTxtHeight: %f minTextHeight: %f", cv.nTxtHeight, minTextHeight);
if ( minTextHeight > cv.nTxtHeight )
cv.nTxtHeight = minTextHeight;
TQFont actFont( para.axisLabelsFont() );
@@ -557,8 +557,8 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
TQString commonDtHeader;
if( cv.autoDtLabels ){
cv.textAlign = TQt::AlignCenter;
- //qDebug(dtLow.toString("\nd.MM.yyyy - h:mm:ss" ));
- //qDebug(dtHigh.toString( "d.MM.yyyy - h:mm:ss" ));
+ //tqDebug(dtLow.toString("\nd.MM.yyyy - h:mm:ss" ));
+ //tqDebug(dtHigh.toString( "d.MM.yyyy - h:mm:ss" ));
const TQDate& dLow = cv.dtLow.date();
const TQTime& tLow = cv.dtLow.time();
const TQDate& dHigh = cv.dtHigh.date();
@@ -619,7 +619,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
else if( sameYear )
commonDtHeader = TQString::number( dLow.year() );
//if( !commonDtHeader.isEmpty() )
- // qDebug(commonDtHeader);
+ // tqDebug(commonDtHeader);
}else{
// make sure all label texts fit into their space
// by rotating and/or shrinking the texts
@@ -710,15 +710,15 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
< params()->globalLeadingLeft()+1 ){
textsMatching = false;
textsDontFitIntoArea = true;
- //qDebug("too wide");
+ //tqDebug("too wide");
}
- //qDebug("nRotation: %i",nRotation);
+ //tqDebug("nRotation: %i",nRotation);
TQRegion sectReg;
if( nRotation ){
- //qDebug("test 1");
+ //tqDebug("test 1");
sectReg = infosKDD.region.intersect( unitedRegions );
}else{
- //qDebug("test 2");
+ //tqDebug("test 2");
TQRect rect( infosKDD.region.boundingRect() );
rect.addCoords(-2,-2,2,2);
TQRegion biggerRegion( rect );
@@ -729,7 +729,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
else {
textsMatching = false;
textsOverlapping = true;
- //qDebug("label regions are intersecting");
+ //tqDebug("label regions are intersecting");
break;
}
}
@@ -737,9 +737,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
/*
if(!iAxis){
- qDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)+
+ tqDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)+
" matching: "+TQString(textsMatching ? "TRUE":"FALSE"));
- qDebug("nUsableAxisHeight: %f, unitedRegions.boundingRect().height(): %i ",
+ tqDebug("nUsableAxisHeight: %f, unitedRegions.boundingRect().height(): %i ",
nUsableAxisHeight, unitedRegions.boundingRect().height());
}
*/
@@ -750,18 +750,18 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
}
} else {
if( nUsableAxisWidth < unitedRegions.boundingRect().width() ){
- //qDebug("textsMatching: %s",textsMatching ? "TRUE" : "FALSE");
+ //tqDebug("textsMatching: %s",textsMatching ? "TRUE" : "FALSE");
textsMatching = false;
textsDontFitIntoArea = true;
- //qDebug("too wide");
+ //tqDebug("too wide");
}
- //else qDebug("not too wide");
+ //else tqDebug("not too wide");
}
/*
if(textsMatching && !iAxis){
- qDebug("--------------------------");
- qDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation));
- qDebug("matching");
+ tqDebug("--------------------------");
+ tqDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation));
+ tqDebug("matching");
}
*/
if( !textsMatching ) {
@@ -771,7 +771,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
// we try to rotate the texts in 5 steps.
// This is done for Abscissa axes only.
if ( tryRotating ) {
- //qDebug("try rotating");
+ //tqDebug("try rotating");
// The following is designed for horizontal axes
// since we currently don't support label rotating
// on vertical axes. (khz, 2002/08/15)
@@ -781,7 +781,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
nRotation = nInitialRotation;
}
rotatingDoesNotHelp = true;
- //qDebug("rotating does not help (a)");
+ //tqDebug("rotating does not help (a)");
}
else{
if( nRotation ) {
@@ -795,7 +795,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
else
nRotation = 0; // reset rotation to ZERO
rotatingDoesNotHelp = true;
- //qDebug("rotating does not help (b)");
+ //tqDebug("rotating does not help (b)");
}
} else {
if( nInitialRotation )
@@ -811,7 +811,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
// rotating them did not help or is forbidden
// we try to reduce the font size.
if ( tryShrinking && (minTextHeight < cv.nTxtHeight) ) {
- //qDebug("try shrinking");
+ //tqDebug("try shrinking");
cv.nTxtHeight -= 1.0;
if ( minTextHeight > cv.nTxtHeight )
cv.nTxtHeight = minTextHeight;
@@ -823,9 +823,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
if( tryLeavingOut
&& textsOverlapping
&& (nLeaveOut+1 < static_cast < int > ( nLabels ) ) ) {
- //qDebug("try leaving out");
+ //tqDebug("try leaving out");
++iStepsLeaveOut;
- //if(!iAxis)qDebug("iStepsLeaveOut: %i", iStepsLeaveOut);
+ //if(!iAxis)tqDebug("iStepsLeaveOut: %i", iStepsLeaveOut);
nLeaveOut =
iStepsLeaveOut*stepWidthLeaveOut - 1;
if( tryShrinking )
@@ -836,13 +836,13 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
}
if( tryShrinking ) {
actFont.setPixelSize( static_cast < int > ( cv.nTxtHeight ) );
- //qDebug("axis: cv.nTxtHeight: %f", iAxis, cv.nTxtHeight);
+ //tqDebug("axis: cv.nTxtHeight: %f", iAxis, cv.nTxtHeight);
painter->setFont( actFont );
fm = painter->fontMetrics();
}
}
}
-//qDebug("nLeaveOut: %i",nLeaveOut);
+//tqDebug("nLeaveOut: %i",nLeaveOut);
} while( !textsMatching );
if( nRotation ){
@@ -871,9 +871,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
painter->setBrush(oldBrush);
*/
/*if(!iAxis){
- qDebug("==========================");
- qDebug("nTxtHeight: "+TQString::number(nTxtHeight)+" nRotation: "+TQString::number(nRotation));
- qDebug(textsMatching ? "matching":"not matching");
+ tqDebug("==========================");
+ tqDebug("nTxtHeight: "+TQString::number(nTxtHeight)+" nRotation: "+TQString::number(nRotation));
+ tqDebug(textsMatching ? "matching":"not matching");
}*/
}
@@ -986,7 +986,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
double nSubDelim = ( labelTexts->count() - 1 )
/ cv.nSubDelimFactor;
- //qDebug("subDelim: %f",
+ //tqDebug("subDelim: %f",
modf( nSubDelim, &nSubDelim );
int logarithCnt = 1;
@@ -1137,14 +1137,14 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
if( cv.autoDtLabels )
{
/*
- qDebug("\ndtLow: %i %i %i %i:%i:%i",
+ tqDebug("\ndtLow: %i %i %i %i:%i:%i",
dtLow.date().year(),
dtLow.date().month(),
dtLow.date().day(),
dtLow.time().hour(),
dtLow.time().minute(),
dtLow.time().second());
- qDebug("dtHigh: %i %i %i %i:%i:%i",
+ tqDebug("dtHigh: %i %i %i %i:%i:%i",
dtHigh.date().year(),
dtHigh.date().month(),
dtHigh.date().day(),
@@ -1253,10 +1253,10 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
? cv.dtHigh
: newDt );
/*
- qDebug(" dt: %i %i %i %i:%i:%i",
+ tqDebug(" dt: %i %i %i %i:%i:%i",
newDt.date().year(),newDt.date().month(),newDt.date().day(),
newDt.time().hour(),newDt.time().minute(),newDt.time().second());
- qDebug("testDt: %i %i %i %i:%i:%i",
+ tqDebug("testDt: %i %i %i %i:%i:%i",
testDt.date().year(),testDt.date().month(),testDt.date().day(),
testDt.time().hour(),testDt.time().minute(),testDt.time().second());
*/
@@ -1412,18 +1412,18 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
TQPoint( static_cast<int>( p2X + pXD ),
static_cast<int>( p2Y + pYD ) ) );
/*
- qDebug("line");
- qDebug("pXDelta / 2.0 : %f", pXDelta/2.0);
- qDebug("p2X - pHourX : %f", p2X - pHourX);
+ tqDebug("line");
+ tqDebug("pXDelta / 2.0 : %f", pXDelta/2.0);
+ tqDebug("p2X - pHourX : %f", p2X - pHourX);
*/
if( (pXDelta/2.0 < p2X - pHourX) || (pYDelta/2.0 < p2Y - pHourY) ){
/*
- qDebug("pHourX %f", pHourX );
- qDebug(" +pXD %i", pXD );
- qDebug(" -orgXD %i", orgXD);
- qDebug("pHourY %f", pHourY );
- qDebug(" +pYD %i", pYD );
- qDebug(" -orgYD %i", orgYD);
+ tqDebug("pHourX %f", pHourX );
+ tqDebug(" +pXD %i", pXD );
+ tqDebug(" -orgXD %i", orgXD);
+ tqDebug("pHourY %f", pHourY );
+ tqDebug(" +pYD %i", pYD );
+ tqDebug(" -orgYD %i", orgYD);
*/
TQPen oldPen( painter->pen() );
painter->setPen( TQPen( labelsColor ) );
@@ -1852,7 +1852,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
y -= mult * pYDelta;
axisZeroLineStartX = x;
axisZeroLineStartY = y;
- //qDebug( "axisZeroLineStartX %f, axisZeroLineStartY %f",
+ //tqDebug( "axisZeroLineStartX %f, axisZeroLineStartY %f",
// axisZeroLineStartX, axisZeroLineStartY );
}
@@ -1913,7 +1913,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
+ xFactor * _dataRect.width() ),
static_cast<int>( para.axisZeroLineStartY()
+ yFactor * _dataRect.height() ) );
- //qDebug("------");
+ //tqDebug("------");
saveDrawLine( *painter,
pZ0,
pZ,
@@ -1935,7 +1935,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
internal__KDChart__CalcValues& cv2 = calcVal[ KDChartAxisParams::AxisPosBottom ];
const KDChartAxisParams& pa1 = params()->axisParams( KDChartAxisParams::AxisPosLeft );
const KDChartAxisParams& pa2 = params()->axisParams( KDChartAxisParams::AxisPosBottom );
-qDebug("\n\nx1: %i y1: %i w1: %i\nx2: %i y2: %i w2: %i",
+tqDebug("\n\nx1: %i y1: %i w1: %i\nx2: %i y2: %i w2: %i",
cv1.orig.x(), cv1.orig.y(), pa1.axisTrueLineWidth(),
cv2.orig.x(), cv2.orig.y(), pa2.axisTrueLineWidth() );
if( cv1.orig == cv2.orig ){
@@ -1953,7 +1953,7 @@ cv2.orig.x(), cv2.orig.y(), pa2.axisTrueLineWidth() );
TQPointArray a;
a.putPoints( 0, 3, pA.x(),pA.y(), pB.x(),pB.y(), pC.x(),pC.y() );
painter->drawPolyline( a );
-qDebug("done\n" );
+tqDebug("done\n" );
}
*/
// 2. draw the axes using their normal color
@@ -2048,7 +2048,7 @@ void KDChartAxesPainter::calculateLabelTexts(
double trueDelta,
double trueDeltaPix )
{
-//qDebug("\nentering KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
+//tqDebug("\nentering KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
const KDChartAxisParams & para = params.axisParams( axisNumber );
// store whether the labels are to be drawn in reverted order
@@ -2072,9 +2072,9 @@ void KDChartAxesPainter::calculateLabelTexts(
: para.axisTrueAreaRect().topRight();
pYDelimDeltaFaktor = 1.0;
pXDeltaFactor = bDecreasing ? -1.0 : 1.0;
- //qDebug("\nsetting pXDeltaFactor for axis %x", axisNumber);
- //qDebug(bDecreasing ? "bDecreasing = TRUE" : "bDecreasing = FALSE");
- //qDebug("pXDeltaFactor = %f\n",pXDeltaFactor);
+ //tqDebug("\nsetting pXDeltaFactor for axis %x", axisNumber);
+ //tqDebug(bDecreasing ? "bDecreasing = TRUE" : "bDecreasing = FALSE");
+ //tqDebug("pXDeltaFactor = %f\n",pXDeltaFactor);
}
break;
case KDChartAxisParams::AxisPosLeft: {
@@ -2115,7 +2115,7 @@ void KDChartAxesPainter::calculateLabelTexts(
break;
default: {
axisLength = 0;
- qDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::paintAxes() unhandled enum value." );
+ tqDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::paintAxes() unhandled enum value." );
}
break;
}
@@ -2126,7 +2126,7 @@ void KDChartAxesPainter::calculateLabelTexts(
dataset = KDCHART_ALL_DATASETS;
dataset2 = KDCHART_ALL_DATASETS;
chart = 0;
- //qDebug("\nautomatic set values: chart: %u,\ndataset: %u, dataset2: %u",
+ //tqDebug("\nautomatic set values: chart: %u,\ndataset: %u, dataset2: %u",
//chart, dataset, dataset2);
}
// which dataset(s) with mode DataEntry (or mode ExtraLinesAnchor, resp.)
@@ -2166,20 +2166,20 @@ void KDChartAxesPainter::calculateLabelTexts(
}
else {
// Should not happen
- qDebug( "IMPLEMENTATION ERROR: findDatasets( DataEntry, ExtraLinesAnchor ) should *always* return true. (b)" );
+ tqDebug( "IMPLEMENTATION ERROR: findDatasets( DataEntry, ExtraLinesAnchor ) should *always* return true. (b)" );
dataDataset = KDCHART_ALL_DATASETS;
}
- //qDebug("\naxisNumber: %x\nchart: %x\ndataset: %x, dataset2: %x,\ndataDataset: %x, dataDataset2: %x",
+ //tqDebug("\naxisNumber: %x\nchart: %x\ndataset: %x, dataset2: %x,\ndataDataset: %x, dataDataset2: %x",
//axisNumber, chart, dataset, dataset2, dataDataset, dataDataset2);
if ( para.axisLabelsFontUseRelSize() ){
nTxtHeight = para.axisLabelsFontRelSize()
* averageValueP1000;
-//qDebug("using rel. size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
+//tqDebug("using rel. size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
}else {
TQFontInfo info( para.axisLabelsFont() );
nTxtHeight = info.pointSize();
-//qDebug("using FIXED size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
+//tqDebug("using FIXED size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
}
const KDChartEnums::NumberNotation notation = para.axisLabelsNotation();
@@ -2248,7 +2248,7 @@ void KDChartAxesPainter::calculateLabelTexts(
}
default:
// Should not happen
- qDebug( "KDChart: Unknown label texts source" );
+ tqDebug( "KDChart: Unknown label texts source" );
}
// if necessary adjust text params *including* the steady value calc setting
@@ -2280,8 +2280,8 @@ void KDChartAxesPainter::calculateLabelTexts(
(KDChartParams::Line == params_chartType) &&
(KDChartAxisParams::AxisCalcLogarithmic == para.axisCalcMode());
- //qDebug(bSteadyCalc ? "bSteadyCalc":"NOT bSteadyCalc");
- //qDebug(isLogarithmic? "isLogarithmic":"NOT isLogarithmic");
+ //tqDebug(bSteadyCalc ? "bSteadyCalc":"NOT bSteadyCalc");
+ //tqDebug(isLogarithmic? "isLogarithmic":"NOT isLogarithmic");
// store whether this is a vertical axis or a horizontal axis
const bool bVertAxis = (KDChartAxisParams::AxisPosLeft == basicPos) ||
@@ -2346,9 +2346,9 @@ void KDChartAxesPainter::calculateLabelTexts(
double nVal = nLow;
bDone = false;
bool bShowVeryLastLabel = false;
- //qDebug("\n nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
+ //tqDebug("\n nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
while( bShowVeryLastLabel || (upwards ? (nVal <= nHigh) : (nVal >= nHigh)) ){
- //qDebug("nVal : %f", nVal );
+ //tqDebug("nVal : %f", nVal );
labelTexts.append( applyLabelsFormat( nVal,
divPow10,
behindComma,
@@ -2363,7 +2363,7 @@ void KDChartAxesPainter::calculateLabelTexts(
padFill,
blockAlign ) );
nVal += nDelta;
- //qDebug("nVal-neu: %f", nVal );
+ //tqDebug("nVal-neu: %f", nVal );
if( ! (upwards ? (nVal <= nHigh) : (nVal >= nHigh)) ){
// work around a rounding error: show the last label, even if not nVal == nHigh is not matching exactly
if( bShowVeryLastLabel )
@@ -2396,13 +2396,13 @@ void KDChartAxesPainter::calculateLabelTexts(
padFill,
blockAlign ) );
bShowVeryLastLabel = (sValue == sHigh);
- //qDebug("test: sHigh: "+sHigh+" sValue: "+sValue );
+ //tqDebug("test: sHigh: "+sHigh+" sValue: "+sValue );
}
}
bDone = true;
}
( ( KDChartAxisParams& ) para ).setTrueAxisLowHighDelta( nLow, nHigh, nDelta );
- //qDebug("\n[Z-0] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
+ //tqDebug("\n[Z-0] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
} // look if a string list was specified
else if ( para.axisLabelStringCount() ) {
int nLabels = bSteadyCalc
@@ -2542,7 +2542,7 @@ void KDChartAxesPainter::calculateLabelTexts(
// find out if the associated dataset contains only strings
// if yes, we will take these as label texts
uint dset = ( dataset == KDCHART_ALL_DATASETS ) ? 0 : dataset;
- //qDebug("\ndset: %u", dset);
+ //tqDebug("\ndset: %u", dset);
bDone = false;
TQVariant value;
for ( uint col = 0; col < data.usedCols(); ++col ) {
@@ -2638,7 +2638,7 @@ void KDChartAxesPainter::calculateLabelTexts(
break;
default: {
// Should not happen
- qDebug( "IMPLEMENTATION ERROR: Unknown params_chartType in calculateLabelTexts()" );
+ tqDebug( "IMPLEMENTATION ERROR: Unknown params_chartType in calculateLabelTexts()" );
mode = Normal;
}
}
@@ -2654,7 +2654,7 @@ void KDChartAxesPainter::calculateLabelTexts(
nDelta = fabs( trueDelta );
pDelimDelta = trueDeltaPix;
nLow = TQMIN( para.trueAxisLow(), para.trueAxisHigh() );
- //qDebug("\nsearching: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh());
+ //tqDebug("\nsearching: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh());
double orgLow( nLow );
modf( nLow / nDelta, &nLow );
nLow *= nDelta;
@@ -2709,7 +2709,7 @@ void KDChartAxesPainter::calculateLabelTexts(
nSubDelimFactor = 0.25;
bOrdFactorsOk = true;
}else{
- //qDebug("\ngo: nLow: %f nHigh: %f", nLow, nHigh );
+ //tqDebug("\ngo: nLow: %f nHigh: %f", nLow, nHigh );
// get the raw start value
const bool bStackedMode = (mode == Stacked);
if( bAutoCalcStart ){
@@ -2719,7 +2719,7 @@ void KDChartAxesPainter::calculateLabelTexts(
? TQMIN( data.minColSum(), 0.0 )
: data.minValue( coordinate,
isLogarithmic );
- //qDebug("\n1: nLow: %f", nLow );
+ //tqDebug("\n1: nLow: %f", nLow );
}else{
dtLow = data.minDtValue( coordinate );
@@ -2768,7 +2768,7 @@ void KDChartAxesPainter::calculateLabelTexts(
dtHigh = data.maxDtInRows( dataDataset,dataDataset2,
coordinate );
}
- //qDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh );
+ //tqDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh );
}else{
if( bIsDouble ){
if( TQVariant::Double == para.axisValueEnd().type() )
@@ -2781,20 +2781,20 @@ void KDChartAxesPainter::calculateLabelTexts(
}
- //qDebug("\nnew: nLow: %f nHigh: %f", nLow, nHigh );
+ //tqDebug("\nnew: nLow: %f nHigh: %f", nLow, nHigh );
if( bIsDouble ) {
if( DBL_MAX == nLow
|| ( ( 0.0 == nHigh || 0 == nHigh )
&& ( 0.0 == nLow || 0 == nLow ) ) ) {
- // qDebug("NO values or all values have ZERO value, showing 0.0 - 10.0 span");
+ // tqDebug("NO values or all values have ZERO value, showing 0.0 - 10.0 span");
nLow = 0.0;
nHigh = 10.0;
nDist = 10.0;
nDelta = 1.0;
nSubDelimFactor = 0.5;
bOrdFactorsOk = true;
- //qDebug("nLow: %f, nHigh: %f", nLow, nHigh);
+ //tqDebug("nLow: %f, nHigh: %f", nLow, nHigh);
}else if( nLow == nHigh ){
// if both values are equal, but NOT Zero
// -> move the appropriate one to Zero
@@ -2802,7 +2802,7 @@ void KDChartAxesPainter::calculateLabelTexts(
nHigh = 0.0;
else
nLow = 0.0;
- //qDebug("nLow: %f, nHigh: %f", nLow, nHigh);
+ //tqDebug("nLow: %f, nHigh: %f", nLow, nHigh);
}else if( nHigh < nLow ){
// make sure nLow is <= nHigh
double nTmp = nLow;
@@ -2881,7 +2881,7 @@ void KDChartAxesPainter::calculateLabelTexts(
bool gotoEndOfMonth = false;
switch( dtDeltaScale ) {
case KDChartAxisParams::ValueScaleSecond:
- //qDebug("\nKDChartAxisParams::ValueScaleSecond");
+ //tqDebug("\nKDChartAxisParams::ValueScaleSecond");
if( 5.0 < aDist ){
secondLowD = secondLow % 5;
if( secondHigh % 5 )
@@ -2889,19 +2889,19 @@ void KDChartAxesPainter::calculateLabelTexts(
}
break;
case KDChartAxisParams::ValueScaleMinute:
- //qDebug("\nKDChartAxisParams::ValueScaleMinute");
+ //tqDebug("\nKDChartAxisParams::ValueScaleMinute");
secondLowD = secondLow;
secondHighD = 59-secondHigh;
break;
case KDChartAxisParams::ValueScaleHour:
- //qDebug("\nKDChartAxisParams::ValueScaleHour");
+ //tqDebug("\nKDChartAxisParams::ValueScaleHour");
minuteLowD = minuteLow;
secondLowD = secondLow;
minuteHighD = 59-minuteHigh;
secondHighD = 59-secondHigh;
break;
case KDChartAxisParams::ValueScaleDay:
- //qDebug("\nKDChartAxisParams::ValueScaleDay");
+ //tqDebug("\nKDChartAxisParams::ValueScaleDay");
hourLowD = hourLow;
minuteLowD = minuteLow;
secondLowD = secondLow;
@@ -2910,7 +2910,7 @@ void KDChartAxesPainter::calculateLabelTexts(
secondHighD = 59-secondHigh;
break;
case KDChartAxisParams::ValueScaleWeek:
- //qDebug("\nKDChartAxisParams::ValueScaleWeek");
+ //tqDebug("\nKDChartAxisParams::ValueScaleWeek");
// khz: week scaling is disabled at the moment
/*
dayLowD = dowLow - 1;
@@ -2922,7 +2922,7 @@ void KDChartAxesPainter::calculateLabelTexts(
*/
break;
case KDChartAxisParams::ValueScaleMonth:
- //qDebug("\nKDChartAxisParams::ValueScaleMonth");
+ //tqDebug("\nKDChartAxisParams::ValueScaleMonth");
if( 1 < dayLow )
dayLowD = dayLow - 1;
hourLowD = hourLow;
@@ -2931,7 +2931,7 @@ void KDChartAxesPainter::calculateLabelTexts(
gotoEndOfMonth = true;
break;
case KDChartAxisParams::ValueScaleQuarter:
- //qDebug("\nKDChartAxisParams::ValueScaleQuarter");
+ //tqDebug("\nKDChartAxisParams::ValueScaleQuarter");
monthLowD = ( monthLow - 1 ) % 3;
dayLowD = dayLow;
hourLowD = hourLow;
@@ -2942,7 +2942,7 @@ void KDChartAxesPainter::calculateLabelTexts(
gotoEndOfMonth = true;
break;
case KDChartAxisParams::ValueScaleYear:
- //qDebug("\nKDChartAxisParams::ValueScaleYear");
+ //tqDebug("\nKDChartAxisParams::ValueScaleYear");
monthLowD = monthLow;
dayLowD = dayLow;
hourLowD = hourLow;
@@ -2995,7 +2995,7 @@ void KDChartAxesPainter::calculateLabelTexts(
// that may to contain NO data entries)
int maxEmpty = para.axisMaxEmptyInnerSpan();
if( bAutoCalcStart ) {
- //qDebug("\nbAutoCalcStart:\n nLow: %f\n nHigh: %f", nLow, nHigh );
+ //tqDebug("\nbAutoCalcStart:\n nLow: %f\n nHigh: %f", nLow, nHigh );
if( 0.0 < nLow ) {
if( maxEmpty == KDCHART_AXIS_IGNORE_EMPTY_INNER_SPAN
|| maxEmpty > ( nLow / nHigh * 100.0 ) )
@@ -3006,10 +3006,10 @@ void KDChartAxesPainter::calculateLabelTexts(
else if( nDist / 100.0 < fabs( nLow ) )
nLow -= nDist / 100.0; // shift lowest value
nDist = nHigh - nLow;
- //qDebug("* nLow: %f\n nHigh: %f", nLow, nHigh );
+ //tqDebug("* nLow: %f\n nHigh: %f", nLow, nHigh );
}
if( bAutoCalcEnd ) {
- //qDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh );
+ //tqDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh );
if( 0.0 > nHigh ) {
if( maxEmpty == KDCHART_AXIS_IGNORE_EMPTY_INNER_SPAN
|| maxEmpty > ( nHigh / nLow * 100.0 ) )
@@ -3020,7 +3020,7 @@ void KDChartAxesPainter::calculateLabelTexts(
else if( nDist / 100.0 < fabs( nHigh ) )
nHigh += nDist / 100.0; // shift highest value
nDist = nHigh - nLow;
- //qDebug("* nLow: %f\n nHigh: %f\n\n", nLow, nHigh );
+ //tqDebug("* nLow: %f\n nHigh: %f\n\n", nLow, nHigh );
}
}
}
@@ -3028,7 +3028,7 @@ void KDChartAxesPainter::calculateLabelTexts(
if( isLogarithmic ){
if( bIsDouble ) {
- //qDebug("\n[L--] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
+ //tqDebug("\n[L--] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
if( 0.0 == TQABS( nLow ) )
nLow = -5;
else{
@@ -3040,10 +3040,10 @@ void KDChartAxesPainter::calculateLabelTexts(
}
nHigh = log10( TQABS( nHigh ) );
- //qDebug("[L-0] nLow: %f, nHigh: %f", nLow, nHigh );
+ //tqDebug("[L-0] nLow: %f, nHigh: %f", nLow, nHigh );
double intPart=0.0; // initialization necessary for Borland C++
double fractPart = modf( nLow, &intPart );
- //qDebug(" intPart: %f\nfractPart: %f", intPart, fractPart );
+ //tqDebug(" intPart: %f\nfractPart: %f", intPart, fractPart );
if( 0.0 > nLow && 0.0 != fractPart )
nLow = intPart - 1.0;
else
@@ -3055,7 +3055,7 @@ void KDChartAxesPainter::calculateLabelTexts(
nDist = nHigh - nLow;
nDelta = 1.0;
nSubDelimFactor = 0.1;
- //qDebug("\n[L-1] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
+ //tqDebug("\n[L-1] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
bOrdFactorsOk = true;
}
}
@@ -3067,7 +3067,7 @@ void KDChartAxesPainter::calculateLabelTexts(
double nDivisor;
double nRound;
nDist = nHigh - nLow;
- //qDebug("* nLow: %f\n nHigh: %f nDist: %f\n\n", nLow, nHigh, nDist );
+ //tqDebug("* nLow: %f\n nHigh: %f nDist: %f\n\n", nLow, nHigh, nDist );
// find out factors and adjust nLow and nHigh
orgLow = nLow;
orgHigh = nHigh;
@@ -3077,17 +3077,17 @@ void KDChartAxesPainter::calculateLabelTexts(
nLow, nHigh );
nLabels = params.roundVal( nDist / nDelta );
- //qDebug("\n0. nOrgHigh: %f\n nOrgLow: %f",
+ //tqDebug("\n0. nOrgHigh: %f\n nOrgLow: %f",
// orgHigh, orgLow);
- //qDebug("\n nDist: %f\n nHigh: %f\n nLow: %f",
+ //tqDebug("\n nDist: %f\n nHigh: %f\n nLow: %f",
// nDist, nHigh, nLow);
- //qDebug(" nDelta: %f", nDelta);
- //qDebug(" nRound: %f", nRound);
- //qDebug(" nLabels: %u", nLabels);
+ //tqDebug(" nDelta: %f", nDelta);
+ //tqDebug(" nRound: %f", nRound);
+ //tqDebug(" nLabels: %u", nLabels);
if( para.axisSteadyValueCalc() ) {
++nLabels;
- //qDebug("* nLabels: %u", nLabels );
+ //tqDebug("* nLabels: %u", nLabels );
}
}
@@ -3100,13 +3100,13 @@ void KDChartAxesPainter::calculateLabelTexts(
nDelta = para.axisValueDelta();
nLabels = params.roundVal( nDist / nDelta );
- //qDebug("\nI nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
+ //tqDebug("\nI nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
// nLow, nHigh, nDelta, nLabels );
if( para.axisSteadyValueCalc() ) {
++nLabels;
- //qDebug("* nLabels: %u", nLabels );
+ //tqDebug("* nLabels: %u", nLabels );
}
}
@@ -3120,10 +3120,10 @@ void KDChartAxesPainter::calculateLabelTexts(
//make sure to avoid inf
double areaHeight = para.axisTrueAreaRect().height()>0?para.axisTrueAreaRect().height():1.0;
double widthHeight = areaWidth / areaHeight;
- //qDebug( "widthHeight %f, nDelta %f", widthHeight, nDelta);
- //qDebug( "maxValue %f", data.maxValue());
- //qDebug( "maxColSum %f", data.maxColSum());
- //qDebug( "axisValueEnd() %f", para.axisValueEnd().toDouble());
+ //tqDebug( "widthHeight %f, nDelta %f", widthHeight, nDelta);
+ //tqDebug( "maxValue %f", data.maxValue());
+ //tqDebug( "maxColSum %f", data.maxColSum());
+ //tqDebug( "axisValueEnd() %f", para.axisValueEnd().toDouble());
double nDivisor;
double nRound;
orgLow = nLow;
@@ -3145,7 +3145,7 @@ void KDChartAxesPainter::calculateLabelTexts(
} else {
orgHigh = nHigh = para.axisValueEnd().toDouble();
}
- //qDebug("\ncalc ordinate 0. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", nDist, nLow, nHigh, nDelta, nLabels );
+ //tqDebug("\ncalc ordinate 0. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", nDist, nLow, nHigh, nDelta, nLabels );
bool bTryNext = false;
uint minLabels = para.axisSteadyValueCalc() ? 3 : 2;
// the following must be processed at least twice - to avoid rounding errors
@@ -3155,7 +3155,7 @@ void KDChartAxesPainter::calculateLabelTexts(
nLow = orgLow;
nHigh = orgHigh;
/*
- qDebug("\n=============================================================================\ncalc ordinate 1. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
+ tqDebug("\n=============================================================================\ncalc ordinate 1. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
nDist, nLow, nHigh, nDelta, nLabels );
*/
calculateOrdinateFactors( para, isLogarithmic,
@@ -3165,23 +3165,23 @@ void KDChartAxesPainter::calculateLabelTexts(
bTryNext );
nLabels = params.roundVal( nDist / nDelta );
- //qDebug("\ncalc ordinate 2. nDist: %f\n+ nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
+ //tqDebug("\ncalc ordinate 2. nDist: %f\n+ nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u",
//nDist, nLow, nHigh, nDelta, nLabels );
//TQString sDelta;sDelta.setNum( nDelta, 'f', 24 );
//TQString sLow; sLow.setNum( nLow, 'f', 24 );
- //qDebug("nLow: %f, sLow: %s, sDelta: %s", nLow, sLow.latin1(), sDelta.latin1());
+ //tqDebug("nLow: %f, sLow: %s, sDelta: %s", nLow, sLow.latin1(), sDelta.latin1());
// special case: End values was set by the user, but no Detla values was set.
if( !bAutoCalcEnd && orgHigh > nLow + nLabels * nDelta ) {
++nLabels;
- //qDebug("\nnLabels: %u\n", nLabels );
+ //tqDebug("\nnLabels: %u\n", nLabels );
}
if( para.axisSteadyValueCalc() ) {
++nLabels;
- //qDebug("\nnLabels: %u\n", nLabels );
+ //tqDebug("\nnLabels: %u\n", nLabels );
}
- //qDebug("calc ordinate n. nDist = nHigh - nLow: %f = %f - %f",nDist, nHigh, nLow);
- //qDebug(" nRound: %f\n", nRound);
+ //tqDebug("calc ordinate n. nDist = nHigh - nLow: %f = %f - %f",nDist, nHigh, nLow);
+ //tqDebug(" nRound: %f\n", nRound);
bTryNext = true;
++pass;
}while ( ( pass < 2 )
@@ -3229,13 +3229,13 @@ void KDChartAxesPainter::calculateLabelTexts(
}
// save our true Low and High value
- //qDebug(para.axisSteadyValueCalc()?"\ntrue " : "\nfalse");
- //qDebug("nVal: %f, nDelta: %f", nVal, nDelta );
+ //tqDebug(para.axisSteadyValueCalc()?"\ntrue " : "\nfalse");
+ //tqDebug("nVal: %f, nDelta: %f", nVal, nDelta );
if ( para.axisSteadyValueCalc() ) {
nHigh = nVal - nDelta;
}
( ( KDChartAxisParams& ) para ).setTrueAxisLowHighDelta( nLow, nHigh, nDelta );
- //qDebug("[Z] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
+ //tqDebug("[Z] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta );
} else {
bool goDown = dtLow > dtHigh;
@@ -3243,29 +3243,29 @@ void KDChartAxesPainter::calculateLabelTexts(
TQDateTime dt( dtLow );
nLabels = 0;
/*
- qDebug("dtLow: ");
- qDebug(dtLow.toString( Qt::ISODate ));
- qDebug("dtHigh: ");
- qDebug(dtHigh.toString( Qt::ISODate ));
+ tqDebug("dtLow: ");
+ tqDebug(dtLow.toString( Qt::ISODate ));
+ tqDebug("dtHigh: ");
+ tqDebug(dtHigh.toString( Qt::ISODate ));
*/
bool bDone=false;
while( !bDone ) {
/*
- qDebug("dtLow: %i %i %i %i:%i:%i",
+ tqDebug("dtLow: %i %i %i %i:%i:%i",
dtLow.date().year(),
dtLow.date().month(),
dtLow.date().day(),
dtLow.time().hour(),
dtLow.time().minute(),
dtLow.time().second());
- qDebug("dtHigh: %i %i %i %i:%i:%i",
+ tqDebug("dtHigh: %i %i %i %i:%i:%i",
dtHigh.date().year(),
dtHigh.date().month(),
dtHigh.date().day(),
dtHigh.time().hour(),
dtHigh.time().minute(),
dtHigh.time().second());
- qDebug("dt: %i %i %i %i:%i:%i",
+ tqDebug("dt: %i %i %i %i:%i:%i",
dt.date().year(),
dt.date().month(),
dt.date().day(),
@@ -3336,15 +3336,15 @@ void KDChartAxesPainter::calculateLabelTexts(
: (data.usedCols() ? data.usedCols() : 1);
//double start( 1.0 );
double start( 1.0 + (bSteadyCalc ? 0.0 : static_cast < double >(data.colsScrolledBy())) );
-//qDebug("colsScrolledBy: %i", data.colsScrolledBy());
+//tqDebug("colsScrolledBy: %i", data.colsScrolledBy());
//if(bVertAxis)
-//qDebug("vert nVal starting: %f",start);
+//tqDebug("vert nVal starting: %f",start);
//else
-//qDebug("horz nVal starting: %f",start);
+//tqDebug("horz nVal starting: %f",start);
//if(bSteadyCalc)
-//qDebug("bSteadyCalc");
+//tqDebug("bSteadyCalc");
//else
-//qDebug("not bSteadyCalc");
+//tqDebug("not bSteadyCalc");
double delta( 1.0 );
double finis( start + delta * ( count - 1 ) );
const bool startIsDouble = TQVariant::Double == para.axisValueStart().type();
@@ -3362,7 +3362,7 @@ void KDChartAxesPainter::calculateLabelTexts(
if( endIsDouble ){
finis = para.axisValueEnd().toDouble();
start = finis - delta * ( count - 1 );
-//qDebug("1 changing: start: %f",start);
+//tqDebug("1 changing: start: %f",start);
} else {
//
//
@@ -3374,7 +3374,7 @@ void KDChartAxesPainter::calculateLabelTexts(
}else{
if ( startIsDouble ) {
start = para.axisValueStart().toDouble() + (bSteadyCalc ? 0.0 : static_cast < double >(data.colsScrolledBy()));
-//qDebug("2 changing: start: %f",start);
+//tqDebug("2 changing: start: %f",start);
} else {
//
//
@@ -3416,7 +3416,7 @@ void KDChartAxesPainter::calculateLabelTexts(
: para.axisDigitsBehindComma();
double s = start;
double f = finis;
-//qDebug("label loop: s: %f f: %f",s,f);
+//tqDebug("label loop: s: %f f: %f",s,f);
bool up = ( 0.0 < delta );
// check the text widths of one large(?) entry
// and hope all the entries will
@@ -3506,17 +3506,17 @@ void KDChartAxesPainter::calculateLabelTexts(
( ( KDChartAxisParams& ) para ).setTrueAxisDeltaPixels( pDelimDelta );
- //qDebug("\nsetting: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh());
- //qDebug("\npDelimDelta: %f", pDelimDelta );
+ //tqDebug("\nsetting: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh());
+ //tqDebug("\npDelimDelta: %f", pDelimDelta );
/*
- qDebug( "Found label texts:" );
+ tqDebug( "Found label texts:" );
for ( TQStringList::Iterator it = labelTexts.begin();
it != labelTexts.end(); ++it )
- qDebug( ">>> %s", (*it).latin1() );
- qDebug( "\n" );
+ tqDebug( ">>> %s", (*it).latin1() );
+ tqDebug( "\n" );
*/
-//qDebug("\nleaving KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
+//tqDebug("\nleaving KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight));
}
@@ -3575,7 +3575,7 @@ void KDChartAxesPainter::calculateBasicTextFactors( double nTxtHeight,
+ delimLen * 1.33;
textAlign = TQt::AlignHCenter | TQt::AlignTop;
/*
- qDebug("pTextsW %f wid %f nLabels %u", pTextsW, wid, nLabels );
+ tqDebug("pTextsW %f wid %f nLabels %u", pTextsW, wid, nLabels );
*/
}
break;
@@ -3626,7 +3626,7 @@ void KDChartAxesPainter::calculateBasicTextFactors( double nTxtHeight,
}
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::calculateBasicTextFactors() unhandled enum value." );
+ tqDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::calculateBasicTextFactors() unhandled enum value." );
// NOOP since the 'basicPos' does not support more that these four values.
}
break;
@@ -3660,8 +3660,8 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
TQString sVal;
sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision
: TQMIN(behindComma, nTrustedPrecision) );
- //qDebug("nVal: %f sVal: "+sVal, nVal );
- //qDebug( TQString(" %1").arg(sVal));
+ //tqDebug("nVal: %f sVal: "+sVal, nVal );
+ //tqDebug( TQString(" %1").arg(sVal));
if ( bUseAutoDigits ) {
int comma = sVal.find( '.' );
if ( -1 < comma ) {
@@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
}
}
}
- //qDebug( TQString(" - %1").arg(trueBehindComma));
+ //tqDebug( TQString(" - %1").arg(trueBehindComma));
return sVal;
}
@@ -3742,16 +3742,16 @@ TQString KDChartAxesPainter::applyLabelsFormat( const double nVal_,
if( notation == KDChartEnums::NumberNotationScientific ||
notation == KDChartEnums::NumberNotationScientificBig ){
valLog10 = (nVal != 0.0) ? trunc( log10(TQABS(nVal)) ) : 0.0;
- //qDebug("nVal old: %f valLog10: %f",nVal,valLog10);
+ //tqDebug("nVal old: %f valLog10: %f",nVal,valLog10);
nVal /= fastPow10( valLog10 );
nDelta /= fastPow10( valLog10 );
- //qDebug("nVal new: %f",nVal);
+ //tqDebug("nVal new: %f",nVal);
}
TQString sVal = truncateBehindComma( nVal,
behindComma,
nDelta,
trueBehindComma );
- //qDebug("sVal : "+sVal+" behindComma: %i",behindComma);
+ //tqDebug("sVal : "+sVal+" behindComma: %i",behindComma);
int posComma = sVal.find( '.' );
if( 0 <= posComma ){
@@ -3890,12 +3890,12 @@ void KDChartAxesPainter::calculateOrdinateFactors(
nDelta *= -1.0;
/*
- qDebug(" n D i s t : %f", nDist );
- qDebug(" n D i v i s o r : %f", nDivisor);
- qDebug(" n R o u n d : %f", nRound );
- qDebug(" n D e l t a : %f", nDelta );
- qDebug(" nHigh : %f", nHigh );
- qDebug(" nLow : %f", nLow );
+ tqDebug(" n D i s t : %f", nDist );
+ tqDebug(" n D i v i s o r : %f", nDivisor);
+ tqDebug(" n R o u n d : %f", nRound );
+ tqDebug(" n D e l t a : %f", nDelta );
+ tqDebug(" nHigh : %f", nHigh );
+ tqDebug(" nLow : %f", nLow );
*/
if( KDCHART_AXIS_LABELS_AUTO_LIMIT == para.axisValueStart()
|| !para.axisValueStartIsExact() ) {
@@ -3931,8 +3931,8 @@ void KDChartAxesPainter::calculateOrdinateFactors(
}
}
- //qDebug(" n H i g h : %f", nHigh );
- //qDebug(" n L o w : %f\n\n", nLow );
+ //tqDebug(" n H i g h : %f", nHigh );
+ //tqDebug(" n L o w : %f\n\n", nLow );
if ( 1.0 == nRound )
nSubDelimFactor = 0.5;
@@ -3947,7 +3947,7 @@ void KDChartAxesPainter::calculateOrdinateFactors(
nSubDelimFactor = 0.2;
else {
// Should not happen
- qDebug( "IMPLEMENTATION ERROR: Unknown nRound in calculateOrdinateFactors()" );
+ tqDebug( "IMPLEMENTATION ERROR: Unknown nRound in calculateOrdinateFactors()" );
nSubDelimFactor = 1.0;
}
@@ -3974,7 +3974,7 @@ void KDChartAxesPainter::saveDrawLine( TQPainter& painter,
/**** static ****/
void KDChartAxesPainter::dtAddSecs( const TQDateTime& org, const int secs, TQDateTime& dest )
{
- //qDebug("entering KDChartAxesPainter::dtAddSecs() ..");
+ //tqDebug("entering KDChartAxesPainter::dtAddSecs() ..");
int s = org.time().second();
int m = org.time().minute();
int h = org.time().hour();
@@ -4003,13 +4003,13 @@ void KDChartAxesPainter::dtAddSecs( const TQDateTime& org, const int secs, TQDat
dest.setDate( org.date() );
if( days )
dtAddDays( dest, days, dest );
- //qDebug(".. KDChartAxesPainter::dtAddSecs() done.");
+ //tqDebug(".. KDChartAxesPainter::dtAddSecs() done.");
}
/**** static ****/
void KDChartAxesPainter::dtAddDays( const TQDateTime& org, const int days, TQDateTime& dest )
{
- //qDebug("entering KDChartAxesPainter::dtAddDays() ..");
+ //tqDebug("entering KDChartAxesPainter::dtAddDays() ..");
int d = org.date().day();
int m = org.date().month();
int y = org.date().year();
@@ -4041,13 +4041,13 @@ void KDChartAxesPainter::dtAddDays( const TQDateTime& org, const int days, TQDat
di += dd;
}
dest = TQDateTime( TQDate( y,m,d ), org.time() );
- //qDebug(".. KDChartAxesPainter::dtAddDays() done.");
+ //tqDebug(".. KDChartAxesPainter::dtAddDays() done.");
}
/**** static ****/
void KDChartAxesPainter::dtAddMonths( const TQDateTime& org, const int months, TQDateTime& dest )
{
- //qDebug("entering KDChartAxesPainter::dtAddMonths() ..");
+ //tqDebug("entering KDChartAxesPainter::dtAddMonths() ..");
int d = org.date().day();
int m = org.date().month();
int y = org.date().year();
@@ -4067,13 +4067,13 @@ void KDChartAxesPainter::dtAddMonths( const TQDateTime& org, const int months, T
// TQMIN takes care for intercalary day
dest = TQDateTime( TQDate( y,m,TQMIN( d, TQDate( y,m,1 ).daysInMonth() ) ),
org.time() );
- //qDebug(".. KDChartAxesPainter::dtAddMonths() done.");
+ //tqDebug(".. KDChartAxesPainter::dtAddMonths() done.");
}
/**** static ****/
void KDChartAxesPainter::dtAddYears( const TQDateTime& org, const int years, TQDateTime& dest )
{
- //qDebug("entering KDChartAxesPainter::dtAddYears() ..");
+ //tqDebug("entering KDChartAxesPainter::dtAddYears() ..");
int d = org.date().day();
int m = org.date().month();
int y = org.date().year() + years;
@@ -4081,7 +4081,7 @@ void KDChartAxesPainter::dtAddYears( const TQDateTime& org, const int years, TQD
// TQMIN takes care for intercalary day
dest = TQDateTime( TQDate( y,m,TQMIN( d, TQDate( y,m,d ).daysInMonth() ) ),
org.time() );
- //qDebug(".. KDChartAxesPainter::dtAddYears() done.");
+ //tqDebug(".. KDChartAxesPainter::dtAddYears() done.");
}
@@ -4160,9 +4160,9 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params,
? ( infos.abscissaSpan / infos.numLabels )
: infos.abscissaSpan );
- //qDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = TRUE" : "bAbscissaDecreasing = FALSE");
- //qDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = TRUE" : "abscissaHasTrueAxisValues = FALSE");
- //qDebug( "abscissaDelta = %f", abscissaDelta);
+ //tqDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = TRUE" : "bAbscissaDecreasing = FALSE");
+ //tqDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = TRUE" : "abscissaHasTrueAxisValues = FALSE");
+ //tqDebug( "abscissaDelta = %f", abscissaDelta);
infos.bAbscissaHasTrueAxisDtValues =
(TQVariant::DateTime == type2Ref) &&
@@ -4205,10 +4205,10 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params,
infos.abscissaDtEnd.time().minute(),
infos.abscissaDtEnd.time().second(),
999 ) );
- //qDebug( infos.abscissaPara->trueAxisDtLow().toString("yyyy-MM-dd-hh:mm:ss.zzz"));
- //qDebug( infos.abscissaPara->trueAxisDtHigh().toString("yyyy-MM-dd-hh:mm:ss.zzz"));
- //qDebug(infos.abscissaDtStart.toString("yyyy-MM-dd-hh:mm:ss.zzz"));
- //qDebug(infos.abscissaDtEnd.toString("yyyy-MM-dd-hh:mm:ss.zzz"));
+ //tqDebug( infos.abscissaPara->trueAxisDtLow().toString("yyyy-MM-dd-hh:mm:ss.zzz"));
+ //tqDebug( infos.abscissaPara->trueAxisDtHigh().toString("yyyy-MM-dd-hh:mm:ss.zzz"));
+ //tqDebug(infos.abscissaDtStart.toString("yyyy-MM-dd-hh:mm:ss.zzz"));
+ //tqDebug(infos.abscissaDtEnd.toString("yyyy-MM-dd-hh:mm:ss.zzz"));
/*
infos.bScaleLessThanDay = ( infos.bAbscissaHasTrueAxisDtValues
? infos.abscissaPara->trueAxisDtDeltaScale()
@@ -4265,19 +4265,19 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params,
//const double infos.abscissaZeroPos2 = -1.0 * infos.abscissaPixelsPerUnit * infos.abscissaStart;
infos.abscissaZeroPos = infos.abscissaPara->axisZeroLineStartX() - dataRect.x();
- //qDebug("abscissaZeroPos %f abscissaZeroPos2 %f",abscissaZeroPos,abscissaZeroPos2);
+ //tqDebug("abscissaZeroPos %f abscissaZeroPos2 %f",abscissaZeroPos,abscissaZeroPos2);
/*
- qDebug(abscissaPara ?
+ tqDebug(abscissaPara ?
"\nabscissaPara: OK" :
"\nabscissaPara: leer");
- qDebug(abscissaHasTrueAxisValues ?
+ tqDebug(abscissaHasTrueAxisValues ?
"abscissaHasTrueAxisValues: TRUE" :
"abscissaHasTrueAxisValues: FALSE");
- qDebug("abscissaStart: %f", abscissaStart);
- qDebug("abscissaEnd : %f", abscissaEnd);
- qDebug("abscissaPara->trueAxisDelta(): %f", abscissaPara->trueAxisDelta());
- qDebug("numValues : %u, numLabels : %u", numValues, numLabels);
+ tqDebug("abscissaStart: %f", abscissaStart);
+ tqDebug("abscissaEnd : %f", abscissaEnd);
+ tqDebug("abscissaPara->trueAxisDelta(): %f", abscissaPara->trueAxisDelta());
+ tqDebug("numValues : %u, numLabels : %u", numValues, numLabels);
*/
}
@@ -4309,7 +4309,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value,
? ai.abscissaDtStart.secsTo( dtVal )
: ai.abscissaDtStart.daysTo( dtVal );
/*
- qDebug("abscissaDtStart: %i %i %i %i:%i:%i.%i",
+ tqDebug("abscissaDtStart: %i %i %i %i:%i:%i.%i",
ai.abscissaDtStart.date().year(),
ai.abscissaDtStart.date().month(),
ai.abscissaDtStart.date().day(),
@@ -4318,10 +4318,10 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value,
ai.abscissaDtStart.time().second(),
ai.abscissaDtStart.time().msec());
*/
- //qDebug("days to = %f",dT);
+ //tqDebug("days to = %f",dT);
/*
- qDebug(" dtVal: %i %i %i %i:%i:%i.%i",
+ tqDebug(" dtVal: %i %i %i %i:%i:%i.%i",
dtVal.date().year(),
dtVal.date().month(),
dtVal.date().day(),
@@ -4336,7 +4336,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value,
/ ( ai.bScaleLessThanDay
? 1000.0
: (1000.0 * 86400.0) );
- //qDebug("xValue: %f",xValue);
+ //tqDebug("xValue: %f",xValue);
if( !ai.bScaleLessThanDay ){
if( dtVal.time().second() )
xValue += (ai.abscissaDtPixelsPerScaleUnit * dtVal.time().second())
@@ -4350,7 +4350,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value,
}
xValue *= ai.bAbscissaDecreasing ? -1.0 : 1.0;
xValue += ai.dtLowPos;
- // qDebug("xValue = dtLowPos + abscissaDtPixelsPerScaleUnit * dT\n%f = %f + %f * %f",
+ // tqDebug("xValue = dtLowPos + abscissaDtPixelsPerScaleUnit * dT\n%f = %f + %f * %f",
// xValue, dtLowPos, abscissaDtPixelsPerScaleUnit, dT);
}
else
@@ -4482,19 +4482,19 @@ void KDChartAxesPainter::paintData( TQPainter* painter,
datasetEnd = chartDatasetEnd;
}
- //qDebug("\n=========================================================="
+ //tqDebug("\n=========================================================="
// "\naxis %u axisDatasetStart %u axisDatasetEnd %u / chartDatasetStart %u chartDatasetEnd %u",
//axis, axisDatasetStart, axisDatasetEnd, chartDatasetStart, chartDatasetEnd );
double logHeight = axisPara->axisTrueAreaRect().height();
double axisYOffset = axisPara->axisTrueAreaRect().y() - _dataRect.y();
- //qDebug("\n==========================================================\naxis %u logHeight %f axisDatasetStart %u chartDatasetStart %u axisDatasetEnd %u chartDatasetEnd %u",
+ //tqDebug("\n==========================================================\naxis %u logHeight %f axisDatasetStart %u chartDatasetStart %u axisDatasetEnd %u chartDatasetEnd %u",
//axis, logHeight, axisDatasetStart, chartDatasetStart, axisDatasetEnd, chartDatasetEnd );
//if( KDCHART_ALL_DATASETS == axisDatasetStart )
- // qDebug(" ALL DATASETS");
+ // tqDebug(" ALL DATASETS");
//if( KDCHART_NO_DATASET == axisDatasetStart )
- // qDebug(" N O DATESETS");
+ // tqDebug(" N O DATESETS");
double maxColumnValue = axisPara->trueAxisHigh();
double minColumnValue = axisPara->trueAxisLow();
diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp
index b24892b1..66dbc45c 100644
--- a/kchart/kdchart/KDChartAxisParams.cpp
+++ b/kchart/kdchart/KDChartAxisParams.cpp
@@ -389,7 +389,7 @@ KDChartAxisParams::AxisPos KDChartAxisParams::basicAxisPos( uint pos )
ret = AxisPosLeft;
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: type missing in KDChartAxisParams::basicAxisPos()" );
+ tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartAxisParams::basicAxisPos()" );
Q_ASSERT( ret != AxisPos( pos ) );
}
}
@@ -485,7 +485,7 @@ TQString KDChartAxisParams::axisAreaModeToString( AxisAreaMode mode ) {
case AxisAreaModeMinMaxSize:
return "MinMaxSize";
default: // should not happen
- qDebug( "Unknown axis area mode" );
+ tqDebug( "Unknown axis area mode" );
return "AxisAreaMode";
}
}
@@ -730,7 +730,7 @@ TQString KDChartAxisParams::axisCalcModeToString( AxisCalcMode mode ) {
case AxisCalcLogarithmic:
return "Logarithmic";
default: // should not happen
- qDebug( "Unknown axis calc mode" );
+ tqDebug( "Unknown axis calc mode" );
return "Linear";
}
}
@@ -1583,7 +1583,7 @@ TQString KDChartAxisParams::labelsFromDataRowToString( LabelsFromDataRow mode )
case LabelsFromDataRowGuess:
return "Guess";
default: // should not happen
- qDebug( "Unknown labels from data row mode" );
+ tqDebug( "Unknown labels from data row mode" );
return "Guess";
}
}
@@ -2885,7 +2885,7 @@ TQString KDChartAxisParams::axisTypeToString( AxisType type ) {
case AxisUP:
return "Up";
default: // should not happen
- qDebug( "Unknown axis type" );
+ tqDebug( "Unknown axis type" );
return "Unknown";
}
}
diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp
index 7fed7520..b7b57894 100644
--- a/kchart/kdchart/KDChartBWPainter.cpp
+++ b/kchart/kdchart/KDChartBWPainter.cpp
@@ -172,7 +172,7 @@ int KDChartBWPainter::calculateStats( KDChartTableDataBase& data,
stats[ KDChartParams::Quartile3 ] = values[ nLastQ3 ];
}
else{
- //qDebug(" "+TQString::number(nLastQ3)+" "+TQString::number(KDChartParams::Quartile3)
+ //tqDebug(" "+TQString::number(nLastQ3)+" "+TQString::number(KDChartParams::Quartile3)
// +" "+TQString::number(nUsed)+" "+TQString::number(TQMIN(nLastQ3+1, nUsed-1)));
stats[ KDChartParams::Quartile3 ] =
(values[ nLastQ3 ] + values[ TQMIN(nLastQ3+1, nUsed-1) ]) /2;
diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp
index 8bfe1a76..dbf6394a 100644
--- a/kchart/kdchart/KDChartBarPainter.cpp
+++ b/kchart/kdchart/KDChartBarPainter.cpp
@@ -165,7 +165,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
if( !data ) return;
- // qDebug("datasetStart: %i datasetEnd: %i", datasetStart, datasetEnd);
+ // tqDebug("datasetStart: %i datasetEnd: %i", datasetStart, datasetEnd);
const TQPen defaultOutlinePen( params()->outlineDataColor(),
params()->outlineDataLineWidth(),
params()->outlineDataLineStyle() );
@@ -243,7 +243,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
spaceBetweenDatasets = 0; // always 0 when stacked/percent/multi-rows
break;
default:
- qFatal( "Unsupported bar chart type" );
+ tqFatal( "Unsupported bar chart type" );
};
double barWidth = 0.0;
@@ -270,8 +270,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
;
/* Debug space available
- qDebug ( " logWidth %f" , logWidth );
- qDebug ( "compare value %f", barWidth*totalNumberOfBars + spaceBetweenValueBlocks + datasetGap * ( totalNumberOfBars - numValues ) );
+ tqDebug ( " logWidth %f" , logWidth );
+ tqDebug ( "compare value %f", barWidth*totalNumberOfBars + spaceBetweenValueBlocks + datasetGap * ( totalNumberOfBars - numValues ) );
*/
} else if( 0 > params()->barWidth() )
barWidth = params()->barWidth() * -areaWidthP1000;
@@ -297,8 +297,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
if ( logWidth < totalSpaceOccupied) {
sideBarWidth -= (totalSpaceOccupied /*+ spaceBetweenDatasets + spaceBetweenValueBlocks*/ - logWidth)/totalNumberOfBars;
- //qDebug ( "logWidth %f", logWidth );
- //qDebug ( "totalSpaceOccupied %f", totalSpaceOccupied );
+ //tqDebug ( "logWidth %f", logWidth );
+ //tqDebug ( "totalSpaceOccupied %f", totalSpaceOccupied );
}
const double sideBarHeight = sideBarWidth;
@@ -309,10 +309,10 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
if ( params()->barChartSubType() != KDChartParams::BarPercent ) // not used for percent
pixelsPerUnit = logHeight / ( columnValueDistance ? columnValueDistance : 10 );
- //qDebug("\nordinatePara->trueAxisLow() = %f", ordinatePara->trueAxisLow());
- //qDebug( "ordinatePara->trueAxisHigh() = %f", ordinatePara->trueAxisHigh());
- //qDebug( "sideBarHeight = %f", sideBarHeight);
- //qDebug( "pixelsPerUnit = %f", pixelsPerUnit);
+ //tqDebug("\nordinatePara->trueAxisLow() = %f", ordinatePara->trueAxisLow());
+ //tqDebug( "ordinatePara->trueAxisHigh() = %f", ordinatePara->trueAxisHigh());
+ //tqDebug( "sideBarHeight = %f", sideBarHeight);
+ //tqDebug( "pixelsPerUnit = %f", pixelsPerUnit);
double zeroXAxisI;
if ( params()->barChartSubType() == KDChartParams::BarPercent ) {
@@ -400,7 +400,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
= ordinateIsLogarithmic
? log10( vVal.toDouble() )
: vVal.toDouble();
- //qDebug("value %u dataset %u logHeight %f", value,dataset,logHeight);
+ //tqDebug("value %u dataset %u logHeight %f", value,dataset,logHeight);
if( bFirstValidValueUnknown ){
firstValidValue = dataset;
@@ -418,7 +418,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
}
}
- //qDebug("shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY );");
+ //tqDebug("shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY );");
shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY );
// iterate over all datasets of this chart:
@@ -431,7 +431,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
bMultiRows
? --dataset
: ++dataset ) {
- //qDebug("value %u dataset %u logHeight %f", value,dataset,logHeight);
+ //tqDebug("value %u dataset %u logHeight %f", value,dataset,logHeight);
const bool bDataEntrySourceMode
= (params()->chartSourceMode( dataset ) == KDChartParams::DataEntry);
@@ -447,7 +447,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
= ordinateIsLogarithmic
? log10( coord1.toDouble() )
: coord1.toDouble();
- //qDebug("b");
+ //tqDebug("b");
// there is a numeric value
double barHeight;
@@ -474,7 +474,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
// draw only the bars belonging to the axis
// which we are processing currently
if( dataset >= datasetStart && dataset <= datasetEnd ) {
- //qDebug("b2");
+ //tqDebug("b2");
// calculate Abscissa axis value, if there are X coordinates
// ---------------------------------------------------------
@@ -919,8 +919,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
/*
if ( cellValue != 0 ) {
pt1Y = static_cast <int> (cellValue * pixelsPerUnit * -2);
- qDebug( "value %s",TQString::number(static_cast <int> (cellValue)).latin1());
- qDebug( "pt1Y %s", TQString::number(static_cast <int> (cellValue * pixelsPerUnit * -2)).latin1());
+ tqDebug( "value %s",TQString::number(static_cast <int> (cellValue)).latin1());
+ tqDebug( "pt1Y %s", TQString::number(static_cast <int> (cellValue * pixelsPerUnit * -2)).latin1());
}
else
pt1Y = static_cast < int > ( yZero - barHeight);
@@ -1041,10 +1041,10 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
double minValueYPos = minColumnValue * pixelsPerUnit;
double minDataValueYPos = maxValueYPos - minValueYPos;
double yZero = yposPositives - zeroXAxisI;
- //qDebug( "yposPositives %f - zeroXAxisI %f = %f" , yposPositives, zeroXAxisI, yZero );
- //qDebug( "yZero %s", TQString::number( yZero ).latin1());
- //qDebug( "minDataValueYPos = %s", TQString::number( minDataValueYPos).latin1());
- //qDebug( "positive value %s", TQString::number( cellValue).latin1());
+ //tqDebug( "yposPositives %f - zeroXAxisI %f = %f" , yposPositives, zeroXAxisI, yZero );
+ //tqDebug( "yZero %s", TQString::number( yZero ).latin1());
+ //tqDebug( "minDataValueYPos = %s", TQString::number( minDataValueYPos).latin1());
+ //tqDebug( "positive value %s", TQString::number( cellValue).latin1());
//Pending Michel: draw the default split excess arrows
//when the front top of the 3d chart reach the max Y value
@@ -1366,7 +1366,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
}
if( 1.5 > frontBarWidth ){
- //qDebug("1.5 > frontBarWidth ");
+ //tqDebug("1.5 > frontBarWidth ");
TQPen oldPen( painter->pen() );
painter->setPen( TQPen(painter->brush().color(), 0) );
painter->drawLine(pt1, TQPoint(pt1.x(),pt2.y()));
@@ -1504,11 +1504,11 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
// the value labels closer to the corner of the front bar.
if ( pointArrayList && !tooHigh && !tooLow && params()->barChartSubType() != KDChartParams::BarPercent ) {
TQPointArray points2cpy( points.copy() );
- //qDebug("g2");
+ //tqDebug("g2");
points2cpy.translate( _dataRect.x(), _dataRect.y());
- //qDebug("g3");
+ //tqDebug("g3");
pointArrayList->append( points2cpy );
- //qDebug("g4");
+ //tqDebug("g4");
}
// drawing the top, but only for the topmost piece for stacked and percent
@@ -1616,7 +1616,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
TQT_TQRECT_OBJECT(pointArrayList->first().boundingRect()) );
delete pointArrayList;
}
- /*qDebug("KDChartDataRegion stored! x: %i y: %i w: %i h: %i",
+ /*tqDebug("KDChartDataRegion stored! x: %i y: %i w: %i h: %i",
region->rect().x(),region->rect().y(),
region->rect().width(),region->rect().height());*/
regions->append( region );
@@ -1673,7 +1673,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
xpos += datasetGap;
}
if( bAdvanceToNextValue || bMultiRows ){
- //qDebug("shiftMyPainter( -nShiftX, nShiftY );");
+ //tqDebug("shiftMyPainter( -nShiftX, nShiftY );");
shiftMyPainter( -nShiftX, nShiftY );
}
bIsVeryFirstBar = false;
@@ -1685,17 +1685,17 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
if ( bNormalMode ){
// skip gap between value blocks, don't worry about last one here
xpos += valueBlockGap;
- //qDebug("**************************** xpos: %f + valueBlockGap: %f = %f", xpos, valueBlockGap, xpos+valueBlockGap);
+ //tqDebug("**************************** xpos: %f + valueBlockGap: %f = %f", xpos, valueBlockGap, xpos+valueBlockGap);
}else{
// skip gap between value blocks
xpos += valueBlockGap + barWidth;
- //qDebug ( "2/ barWidth %f", barWidth );
- //qDebug ( " valueBlockGap %f", valueBlockGap );
+ //tqDebug ( "2/ barWidth %f", barWidth );
+ //tqDebug ( " valueBlockGap %f", valueBlockGap );
// start at bottom with next value group
yposPositives = yposPositivesStart;
yposNegatives = yposNegativesStart;
}
- //qDebug("shiftMyPainterBack");
+ //tqDebug("shiftMyPainterBack");
shiftMyPainterBack();
}
diff --git a/kchart/kdchart/KDChartCustomBox.cpp b/kchart/kdchart/KDChartCustomBox.cpp
index 9b4d7855..c8c51c60 100644
--- a/kchart/kdchart/KDChartCustomBox.cpp
+++ b/kchart/kdchart/KDChartCustomBox.cpp
@@ -98,22 +98,22 @@ float KDChartCustomBox::trueFontSize( double areaWidthP1000,
TQFont font( content().font() );
font.setPointSizeFloat( size );
TQFontMetrics fm( font );
- //qDebug(TQString("\nsize : ")+TQString::number(size));
- //qDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight));
- //qDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing()));
+ //tqDebug(TQString("\nsize : ")+TQString::number(size));
+ //tqDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight));
+ //tqDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing()));
size *= targetLineSpacing / fm.lineSpacing();
- //qDebug(TQString("size : ")+TQString::number(size));
+ //tqDebug(TQString("size : ")+TQString::number(size));
// step #2 - make sure the font size is not too big:
font.setPointSizeFloat( size );
TQFontMetrics fm2( font );
size *= targetLineSpacing / fm2.lineSpacing();
- //qDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight));
- //qDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing()));
- //qDebug(TQString("size : ")+TQString::number(size));
+ //tqDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight));
+ //tqDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing()));
+ //tqDebug(TQString("size : ")+TQString::number(size));
}
}
else {
-//qDebug(TQString("\n_fontsize: ")+TQString::number(_fontSize));
+//tqDebug(TQString("\n_fontsize: ")+TQString::number(_fontSize));
if( _fontSize )
size = _fontSize;
else{
@@ -151,10 +151,10 @@ void KDChartCustomBox::getTrueShift( double areaWidthP1000,
y = (0 > _deltaY) ? static_cast < int > ( -areaHeightP1000 * _deltaY ) : _deltaY;
}else{
int fontHeight = trueFontLineSpacing( areaWidthP1000, areaHeightP1000, rectHeight );
- //qDebug("\nfontHeight %i",fontHeight);
+ //tqDebug("\nfontHeight %i",fontHeight);
x = (0 > _deltaX) ? static_cast < int > ( fontHeight * _deltaX / -100.0 ) : _deltaX;
y = (0 > _deltaY) ? static_cast < int > ( fontHeight * _deltaY / -100.0 ) : _deltaY;
- //qDebug("y %i",y);
+ //tqDebug("y %i",y);
}
uint deltaAlign = (KDCHART_AlignAuto == _deltaAlign) ? _anchorAlign : _deltaAlign;
if ( TQt::AlignLeft == (TQt::AlignLeft & deltaAlign) )
@@ -175,7 +175,7 @@ void KDChartCustomBox::getTrueShift( double areaWidthP1000,
TQRect KDChartCustomBox::trueRect( TQPainter * /*painter*/, TQPoint /*anchor*/, double /*areaWidthP1000*/, double /*areaHeightP1000*/ ) const
{
//temporary allow KDC_Presentation to compile
- qDebug( "Sorry, not implemented yet: KDChartCustomBox::trueRect()" );
+ tqDebug( "Sorry, not implemented yet: KDChartCustomBox::trueRect()" );
return TQRect( 1, 1, 2, 2 );
}
@@ -188,7 +188,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double
int w = (0 > _width ) ? static_cast < int > ( -areaWidthP1000 * _width ) : _width;
int h = (0 > _height) ? static_cast < int > ( -areaHeightP1000 * _height ) : _height;
- //qDebug("w: %i h: %i", w,h );
+ //tqDebug("w: %i h: %i", w,h );
if( _fontScaleGlobal && 0 == w && 0 == h ){
//Now calculate the size of the box based upon the content!
@@ -198,7 +198,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double
(0 > _fontSize)
? (_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) * -1.0)//(areaWidthP1000 + areaHeightP1000) / -2.0
: _fontSize );
- //qDebug("\n_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) %i * TQMIN(%f, %f) text: %s", _fontSize , areaWidthP1000, areaHeightP1000, content().text().latin1());
+ //tqDebug("\n_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) %i * TQMIN(%f, %f) text: %s", _fontSize , areaWidthP1000, areaHeightP1000, content().text().latin1());
}
TQString txt( content().text() );
TQString txtTest( txt.stripWhiteSpace().lower() );
@@ -207,7 +207,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double
if( !txtTest.endsWith( "</qt>") )
txt.append( "</qt>");
- //qDebug("\nw: %i h: %i", w,h );
+ //tqDebug("\nw: %i h: %i", w,h );
TQSimpleRichText tmpContent( txt, font );
// tmpContent.setWidth(pdWidth);
// tmpContent.setHeight(pdHeight);
@@ -218,11 +218,11 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double
// }
w = tmpContent.widthUsed();
h = tmpContent.height();
- //qDebug("pdWidth: %i w: %i h %i",pdWidth,w,h);
- //qDebug("w: %i h: %i", w,h );
+ //tqDebug("pdWidth: %i w: %i h %i",pdWidth,w,h);
+ //tqDebug("w: %i h: %i", w,h );
}
- //qDebug("\nw: %i h: %i", w,h );
+ //tqDebug("\nw: %i h: %i", w,h );
int x,y;
if ( TQt::AlignLeft == (TQt::AlignLeft & _anchorAlign) )
x = 0;
@@ -240,7 +240,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double
int dX,dY;
getTrueShift( areaWidthP1000, areaHeightP1000, h,
dX, dY );
- //qDebug("trueRect: x %i y %i w %i h %i text: %s", anchor.x()+x+dX, anchor.y()+y+dY, w,h, content().text().latin1());
+ //tqDebug("trueRect: x %i y %i w %i h %i text: %s", anchor.x()+x+dX, anchor.y()+y+dY, w,h, content().text().latin1());
return TQRect( anchor.x()+x+dX, anchor.y()+y+dY, w, h );
}
@@ -294,29 +294,29 @@ TQPaintDeviceMetrics metrics(painter->device());
int pdWidth = metrics.width();
int dpiY = metrics.logicalDpiY();
int dpiX = metrics.logicalDpiX();
-qDebug("dpiY: %i dpiX: %i",dpiY,dpiX);
-qDebug("pdWidth: %i box myRect w: %i h %i",pdWidth,myRect.width(),myRect.height());
+tqDebug("dpiY: %i dpiX: %i",dpiY,dpiX);
+tqDebug("pdWidth: %i box myRect w: %i h %i",pdWidth,myRect.width(),myRect.height());
*/
//myRect.setSize(myRect.size()*6);
TQRect myFrameRect( frameRect );
if ( myRect.isValid() ) {
-//qDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
+//tqDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
if( _rotation ){
getTrueShift( areaWidthP1000, areaHeightP1000, myRect.height(),
rotDX, rotDY );
myRect.moveBy( -rotDX, -rotDY );
if( frame )
myFrameRect.moveBy( -rotDX, -rotDY );
-//qDebug("\nrotDelta: x %i y %i",rotDX,rotDY);
-//qDebug("\nbox myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
+//tqDebug("\nrotDelta: x %i y %i",rotDX,rotDY);
+//tqDebug("\nbox myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
myRect.moveCenter( TQPoint( anchor.x() - trueRectAlignX(myRect),
anchor.y() - trueRectAlignY(myRect) ) );
if( frame )
myFrameRect.moveCenter( TQPoint( anchor.x() - trueRectAlignX(myFrameRect),
anchor.y() - trueRectAlignY(myFrameRect) ) );
-//qDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
+//tqDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y());
painter->translate( anchor.x(), anchor.y() );
painter->rotate( _rotation );
painter->translate( rotDX, rotDY );
@@ -452,7 +452,7 @@ bool KDChartCustomBox::readCustomBoxNode( const TQDomElement& element,
} else if ( tagName == "ParentAxisArea" ) {
ok = ok & KDXML::readIntNode( element, tempParentAxisArea );
} else {
- qDebug( "Unknown tag in custom box" );
+ tqDebug( "Unknown tag in custom box" );
}
}
node = node.nextSibling();
diff --git a/kchart/kdchart/KDChartDataRegion.h b/kchart/kdchart/KDChartDataRegion.h
index c86d0bdc..0854a86b 100644
--- a/kchart/kdchart/KDChartDataRegion.h
+++ b/kchart/kdchart/KDChartDataRegion.h
@@ -86,7 +86,7 @@ struct KDCHART_EXPORT KDChartDataRegion
~KDChartDataRegion()
{
- //qDebug ("~KDChartDataRegion");
+ //tqDebug ("~KDChartDataRegion");
if( pPointArrayList )
delete pPointArrayList;
if( pRegion )
diff --git a/kchart/kdchart/KDChartEnums.cpp b/kchart/kdchart/KDChartEnums.cpp
index 917136f0..e361ace5 100644
--- a/kchart/kdchart/KDChartEnums.cpp
+++ b/kchart/kdchart/KDChartEnums.cpp
@@ -22,7 +22,7 @@ TQString KDChartEnums::positionFlagToString( PositionFlag type )
case PosBottomRight:
return "BottomRight";
default: // should not happen
- qDebug( "Unknown content position" );
+ tqDebug( "Unknown content position" );
return "TopLeft";
}
}
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index 8876fb8b..712aedbe 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -90,7 +90,7 @@ public:
case LayoutPolicyShrinkFontSize:
return "ShrinkFontSize";
default: // should not happen
- qDebug( "Unknown text layout policy" );
+ tqDebug( "Unknown text layout policy" );
return "JustOverwrite";
}
}
@@ -125,7 +125,7 @@ public:
case NumberNotationScientificBig:
return "NumberNotationScientificBig";
default: // should not happen
- qDebug( "Unknown text number notation" );
+ tqDebug( "Unknown text number notation" );
return "NumberNotationDecimal";
}
}
diff --git a/kchart/kdchart/KDChartGlobal.h b/kchart/kdchart/KDChartGlobal.h
index 868dfa3a..ab7750ed 100644
--- a/kchart/kdchart/KDChartGlobal.h
+++ b/kchart/kdchart/KDChartGlobal.h
@@ -83,9 +83,9 @@
#if !defined(Q_ASSERT)
#if defined(TQT_CHECK_STATE)
#if defined(TQT_FATAL_ASSERT)
-#define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
+#define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
#else
-#define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
+#define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__))
#endif
#else
#define Q_ASSERT(x)
diff --git a/kchart/kdchart/KDChartHiLoPainter.cpp b/kchart/kdchart/KDChartHiLoPainter.cpp
index d8f766c2..6073994a 100644
--- a/kchart/kdchart/KDChartHiLoPainter.cpp
+++ b/kchart/kdchart/KDChartHiLoPainter.cpp
@@ -144,12 +144,12 @@ void KDChartHiLoPainter::specificPaintData( TQPainter* painter,
if( (numValues < 2) ||
((params()->hiLoChartSubType() == KDChartParams::HiLoClose) && (numValues < 3)) ||
((params()->hiLoChartSubType() == KDChartParams::HiLoOpenClose) && (numValues < 4)) ){
- qDebug( "\nNot enough data to display a High/Low Chart!\n" );
- qDebug( "type requiring" );
- qDebug( "---- ---------" );
- qDebug( "High/Low 2 data cells per series" );
- qDebug( "High/Low/Close 3 data cells per series" );
- qDebug( "High/Low/open/Close 4 data cells per series\n" );
+ tqDebug( "\nNot enough data to display a High/Low Chart!\n" );
+ tqDebug( "type requiring" );
+ tqDebug( "---- ---------" );
+ tqDebug( "High/Low 2 data cells per series" );
+ tqDebug( "High/Low/Close 3 data cells per series" );
+ tqDebug( "High/Low/open/Close 4 data cells per series\n" );
return; // PENDING(kalle) Throw exception?
}
@@ -261,8 +261,8 @@ void KDChartHiLoPainter::specificPaintData( TQPainter* painter,
// Check whether there is enough space below the data display
int valX = 0, valY = 0;
- //qDebug("\nzeroXAxisI %f lowDrawValue %f height %i logHeight %f _dataRect.y() %i axisYOffset %f",zeroXAxisI,highDrawValue,height,logHeight,_dataRect.y(),axisYOffset);
- //qDebug("zeroXAxisI - lowDrawValue + height %f < axisYOffset + logHeight %f",
+ //tqDebug("\nzeroXAxisI %f lowDrawValue %f height %i logHeight %f _dataRect.y() %i axisYOffset %f",zeroXAxisI,highDrawValue,height,logHeight,_dataRect.y(),axisYOffset);
+ //tqDebug("zeroXAxisI - lowDrawValue + height %f < axisYOffset + logHeight %f",
//zeroXAxisI - lowDrawValue + height, axisYOffset+logHeight);
if( zeroXAxisI - lowDrawValue + height < axisYOffset+logHeight ) {
// enough space
diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp
index 9f0995e8..c25abd85 100644
--- a/kchart/kdchart/KDChartLinesPainter.cpp
+++ b/kchart/kdchart/KDChartLinesPainter.cpp
@@ -223,7 +223,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
&& (0.0 != ordinatePara->trueAxisDelta()))
? ordinatePara->trueAxisDeltaPixels() / ordinatePara->trueAxisDelta()
: logHeight / columnValueDistance;;
- //qDebug("ordinatePixelsPerUnit: %f",ordinatePixelsPerUnit);
+ //tqDebug("ordinatePixelsPerUnit: %f",ordinatePixelsPerUnit);
const bool showThreeDLines = !mIsArea && params()->threeDLines();
@@ -245,7 +245,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
&& ( params()->areaChartSubType() == KDChartParams::AreaPercent ) ) )
mode = Percent;
else
- qDebug( "Internal error in KDChartLinesPainter::paintDataInternal(): Unknown subtype" );
+ tqDebug( "Internal error in KDChartLinesPainter::paintDataInternal(): Unknown subtype" );
TQMap < int, double > currentValueSums;
@@ -334,7 +334,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
if( data->cellContent( dataset, value, vValY, vValX, cellPropID ) &&
TQVariant::Double == vValY.type() &&
( !ai.bCellsHaveSeveralCoordinates || TQVariant::Invalid != vValX.type() ) ){
- //qDebug("a. cellPropID: %i",cellPropID);
+ //tqDebug("a. cellPropID: %i",cellPropID);
// calculate Ordinate axis value
// -----------------------------
@@ -352,11 +352,11 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
drawValue = log10( cellValue ) * ordinatePixelsPerUnit;
else
drawValue = -10250.0;
- //qDebug("\nlogarithmic calc - cellValue: %f drawValue: %f",
+ //tqDebug("\nlogarithmic calc - cellValue: %f drawValue: %f",
// cellValue, drawValue );
}else{
drawValue = cellValue * ordinatePixelsPerUnit * (bOrdinateDecreasing ? -1.0 : 1.0);
- //qDebug("\nlinear calc - cellValue: %f\n - drawValue: %f",
+ //tqDebug("\nlinear calc - cellValue: %f\n - drawValue: %f",
// cellValue, drawValue );
}
}
@@ -388,12 +388,12 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
allPoints[ static_cast < int > ( datasetEnd-dataset )
* arrayNumValues + value ].setSkipThis( true );
skipMe = true;
- //qDebug("skipped");
+ //tqDebug("skipped");
}else{
// use typecast to make it compile on windows using qt232
allPoints[ static_cast < int > ( datasetEnd-dataset )
* arrayNumValues + value ].set( myPointX, myPointY, cellValue );
- //qDebug("ok");
+ //tqDebug("ok");
}
if( !skipMe ){
// --------------------------------------------------------
@@ -401,15 +401,15 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
// by traversing the property set chain (if necessary)
// --------------------------------------------------------
if( cellPropID != curPropSetId ){
- //qDebug("b. ( curPropSetId: %i )",curPropSetId);
- //qDebug("b. cellPropID: %i",cellPropID);
- //qDebug(curPropSet.name().latin1());
+ //tqDebug("b. ( curPropSetId: %i )",curPropSetId);
+ //tqDebug("b. cellPropID: %i",cellPropID);
+ //tqDebug(curPropSet.name().latin1());
if( cellPropID != KDChartPropertySet::UndefinedID &&
params()->calculateProperties( cellPropID,
curPropSet ) ){
curPropSetId = cellPropID;
- //qDebug("c. curPropSetId: %i",curPropSetId);
- //qDebug(curPropSet.name().latin1());
+ //tqDebug("c. curPropSetId: %i",curPropSetId);
+ //tqDebug(curPropSet.name().latin1());
}else{
curPropSetId = KDChartPropertySet::UndefinedID;
}
@@ -520,7 +520,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
const MyPoint& mp = allPoints[iVec];
- //qDebug("\np.x() %i p.y() %i", p.x(), p.y() );
+ //tqDebug("\np.x() %i p.y() %i", p.x(), p.y() );
// For 3D lines, we need two points (that lie
// behind each other on the Z axis). For 2D lines and
// areas, we need only one point.
@@ -678,13 +678,13 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
// remove the last two points added
point -= 2;
*/
- //qDebug("\n111");
+ //tqDebug("\n111");
} // if ( mode == Normal || dataset == (int)datasetEnd )
else {
// don't mess around with the original array; we'll need
// that for the next time through.
- //qDebug("222");
+ //tqDebug("222");
// no 3d handling for areas yet
TQPointArray thisSection = points[0]->copy();
@@ -695,8 +695,8 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
for ( unsigned int i = 0; i < previousPoints.size(); ++i ) {
thisSection.setPoint( point + i,
previousPoints.point( previousPoints.size() - i - 1 ) );
- //qDebug("\nx: %i",previousPoints.point( previousPoints.size() - i - 1 ).x());
- //qDebug("y: %i",previousPoints.point( previousPoints.size() - i - 1 ).y());
+ //tqDebug("\nx: %i",previousPoints.point( previousPoints.size() - i - 1 ).x());
+ //tqDebug("y: %i",previousPoints.point( previousPoints.size() - i - 1 ).y());
}
painter->drawPolygon( thisSection );
}
@@ -733,7 +733,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
for ( int value = 0; value < point-1; ++value ) {
// if( data->cell( dataset, value ).hasValue() &&
// data->cell( dataset, value+1 ).hasValue() ) {
- // qDebug( "Draw a segment in dataset %d from %d to %d", dataset, value, value+1 );
+ // tqDebug( "Draw a segment in dataset %d from %d to %d", dataset, value, value+1 );
//store the rotated points ( see project() )
TQPointArray rotatedSegment( 4 );
@@ -772,7 +772,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
// } else
- // qDebug( "Can't draw a segment in dataset %d from %d to %d", dataset, value, value+1 );
+ // tqDebug( "Can't draw a segment in dataset %d from %d to %d", dataset, value, value+1 );
}
} else {
TQPoint p1, p2;
@@ -903,7 +903,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
int iVec = static_cast < int > ( datasetEnd-dataset ) * arrayNumValues + value;
if( allPoints[ iVec ].bValid ){
const MyPoint& mp = allPoints[iVec];
- //qDebug("\np.x() %i p.y() %i", p.x(), p.y() );
+ //tqDebug("\np.x() %i p.y() %i", p.x(), p.y() );
// --------------------------------------------------------
// determine any 'extra' properties assigned to this cell
@@ -936,9 +936,9 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
}
}
}
- //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_NORMAL_DATA )->name().latin1());
- //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_TRANSPARENT_DATA )->name().latin1());
- //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_HORI_LINE )->name().latin1());
- //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_VERT_LINE )->name().latin1());
- //qDebug("--");
+ //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_NORMAL_DATA )->name().latin1());
+ //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_TRANSPARENT_DATA )->name().latin1());
+ //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_HORI_LINE )->name().latin1());
+ //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_VERT_LINE )->name().latin1());
+ //tqDebug("--");
}
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index 849d2b29..03df77a6 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -192,7 +192,7 @@ void KDChartPainter::registerPainter( const TQString& /*painterName*/,
KDChartPainter* /*painter*/ )
{
// PENDING(kalle) Implement this
- qDebug( "Sorry, not implemented: KDChartPainter::registerPainter()" );
+ tqDebug( "Sorry, not implemented: KDChartPainter::registerPainter()" );
}
@@ -208,7 +208,7 @@ void KDChartPainter::registerPainter( const TQString& /*painterName*/,
void KDChartPainter::unregisterPainter( const TQString& /*painterName*/ )
{
// PENDING(kalle) Implement this
- qDebug( "Sorry, not implemented: KDChartPainter::unregisterPainter()" );
+ tqDebug( "Sorry, not implemented: KDChartPainter::unregisterPainter()" );
}
@@ -247,7 +247,7 @@ void KDChartPainter::paint( TQPainter* painter,
if( rect )
drawRect = *rect;
else if( !KDChart::painterToDrawRect( painter, drawRect ) ){
- qDebug("ERROR: KDChartPainter::paint() could not calculate the drawing area.");
+ tqDebug("ERROR: KDChartPainter::paint() could not calculate the drawing area.");
return;
}
setupGeometry( painter, data, drawRect );
@@ -255,7 +255,7 @@ void KDChartPainter::paint( TQPainter* painter,
else
drawRect = _outermostRect;
- //qDebug("A2: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
+ //tqDebug("A2: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
// Note: In addition to the below paintArea calls there might be several
@@ -628,11 +628,11 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
if(anchor.x() < -250){
anchor.setX(-250);
- //qDebug("!! bad negative x position in KDChartPainter::paintDataValues() !!");
+ //tqDebug("!! bad negative x position in KDChartPainter::paintDataValues() !!");
}
if(anchor.y() < -2500){
anchor.setY(-2500);
- //qDebug("!! bad negative y position in KDChartPainter::paintDataValues() !!");
+ //tqDebug("!! bad negative y position in KDChartPainter::paintDataValues() !!");
}
int rotation( params()->dataValuesRotation( region->chart,
@@ -1358,7 +1358,7 @@ TQFont KDChartPainter::trueLegendTitleFont() const
static_cast < int > ( params()->legendTitleFontRelSize()
* averageValueP1000 );
font.setPixelSize( nTxtHeight );
- // qDebug("l-t-height %i",nTxtHeight);
+ // tqDebug("l-t-height %i",nTxtHeight);
}
return font;
}
@@ -1394,8 +1394,8 @@ void KDChartPainter::paintLegend( TQPainter* painter,
painter->drawRect( _legendRect );
}
*/
- //qDebug("B: _legendRect:\n %i,%i\n %i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
- //qDebug("B: legendArea():\n %i,%i\n %i,%i\n", _params->legendArea().left(),_params->legendArea().top(),_params->legendArea().right(),_params->legendArea().bottom() );
+ //tqDebug("B: _legendRect:\n %i,%i\n %i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
+ //tqDebug("B: legendArea():\n %i,%i\n %i,%i\n", _params->legendArea().left(),_params->legendArea().top(),_params->legendArea().right(),_params->legendArea().bottom() );
const int em2 = 2 * _legendEMSpace;
const int em4 = 4 * _legendEMSpace;
@@ -1879,7 +1879,7 @@ void KDChartPainter::calculateAllAxesRects(
// iterate over all axes
uint iAxis;
for ( iAxis = 0; iAxis < KDCHART_MAX_AXES; ++iAxis ) {
- //qDebug( "iAxis %i", iAxis );
+ //tqDebug( "iAxis %i", iAxis );
const KDChartAxisParams& para = params()->axisParams( iAxis );
int areaSize = 0;
@@ -1917,7 +1917,7 @@ void KDChartPainter::calculateAllAxesRects(
dataDataset,
dataDataset2,
KDCHART_ALL_CHARTS ) ) {
- qDebug( "IMPLEMENTATION ERROR: findDataset( DataEntry, ... ) should *always* return true. (a)" );
+ tqDebug( "IMPLEMENTATION ERROR: findDataset( DataEntry, ... ) should *always* return true. (a)" );
dataDataset = KDCHART_ALL_DATASETS;
}
TQVariant::Type valType = TQVariant::Invalid;
@@ -1987,7 +1987,7 @@ void KDChartPainter::calculateAllAxesRects(
break;
case KDChartAxisParams::AxisAreaModeMinMaxSize:
{
- qDebug( "Sorry, not implemented: AxisAreaModeMinMaxSize" );
+ tqDebug( "Sorry, not implemented: AxisAreaModeMinMaxSize" );
}
//
@@ -2157,7 +2157,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
KDChartTableDataBase* data,
const TQRect& drawRect )
{
- //qDebug("INVOKING: KDChartPainter::setupGeometry()");
+ //tqDebug("INVOKING: KDChartPainter::setupGeometry()");
// avoid recursion from repaint() being called due to params() changed signals...
const bool oldBlockSignalsState = params()->signalsBlocked();
const_cast < KDChartParams* > ( params() )->blockSignals( true );
@@ -2248,7 +2248,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
font );
_legendTitleWidth = _legendTitle->width();
_legendTitleHeight = _legendTitle->height();
- // qDebug("1. _legendTitleHeight %i",_legendTitleHeight);
+ // tqDebug("1. _legendTitleHeight %i",_legendTitleHeight);
}
painter->setFont( trueLegendFont() );
@@ -2284,7 +2284,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
// have some space before the boundary line comes).
sizeX = TQMAX( sizeX, _legendTitleWidth + _legendEMSpace*2 );
- //qDebug("setupGeometry mustDrawVerticalLegend: %s", mustDrawVerticalLegend() ? "YES":"NO ");
+ //tqDebug("setupGeometry mustDrawVerticalLegend: %s", mustDrawVerticalLegend() ? "YES":"NO ");
// PENDING Michel: do that after having calculated the position
if( !mustDrawVerticalLegend() ){
@@ -2303,7 +2303,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
_legendRect = TQRect( xposLeft + ( (xposRight-xposLeft) - sizeX ) / 2,
yposTop, sizeX, sizeY );
yposTop = _legendRect.bottom() + params()->legendSpacing();
- //qDebug("A: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
+ //tqDebug("A: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() );
break;
case KDChartParams::LegendBottom:
if ( params()->showGrid() )
@@ -2413,7 +2413,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
break;
default:
// Should not be able to happen
- qDebug( "KDChart: Unknown legend position" );
+ tqDebug( "KDChart: Unknown legend position" );
}
_params->setLegendArea( _legendRect );
@@ -2517,7 +2517,7 @@ void KDChartPainter::findLegendTexts( KDChartTableDataBase* data )
}
default:
// Should not happen
- qDebug( "KDChart: Unknown legend source" );
+ tqDebug( "KDChart: Unknown legend source" );
}
}
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index e59443fb..efc2362c 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -628,9 +628,9 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
rSet.deepCopy( &startSet ); // reset all properties of rSet to the default !!
-//qDebug("in KDChartParams::calculateProperties():");
-//qDebug(" startId: %i",startId);
-//qDebug(" startSet: %s",startSet.name().latin1());
+//tqDebug("in KDChartParams::calculateProperties():");
+//tqDebug(" startId: %i",startId);
+//tqDebug(" startSet: %s",startSet.name().latin1());
bool bOk = properties(startId, startSet);
if( bOk ){
@@ -1273,7 +1273,7 @@ void KDChartParams::setPrintDataValues( bool active,
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: Unknown chartType in setPrintDataValues()" );
+ tqDebug( "IMPLEMENTATION ERROR: Unknown chartType in setPrintDataValues()" );
finished = false; // use build-in default params, see KDChartParams.h::setPrintDataValues()
}
}
@@ -1661,7 +1661,7 @@ bool KDChartParams::findDatasets( SourceMode modeA,
dataset2 = TQMAX(dsA2, dsB2);
res = true;
}else{
- qDebug("ERROR in KDChartParams::findDatasets(): Datasets found are *not* a contiguous series.");
+ tqDebug("ERROR in KDChartParams::findDatasets(): Datasets found are *not* a contiguous series.");
}
}else{
dataset = foundA ? dsA1 : dsB1;
@@ -2005,7 +2005,7 @@ void KDChartParams::setDefaultAxesTypes()
setAxisLabelsTouchEdges( i, false );
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: axis type missing in KDChartParams::setDefaultAxesTypes()" );
+ tqDebug( "IMPLEMENTATION ERROR: axis type missing in KDChartParams::setDefaultAxesTypes()" );
Q_ASSERT( !this );
}
}
@@ -2170,7 +2170,7 @@ void KDChartParams::setDefaultAxesTypes()
setPolarRotateCircularLabels( false );
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::setDefaultAxesTypes()" );
+ tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::setDefaultAxesTypes()" );
Q_ASSERT( !this );
}
}
@@ -2241,7 +2241,7 @@ void KDChartParams::activateDefaultAxes()
// by default there are no axes defined for pie, ring, and polar charts
break;
default: {
- qDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::activateDefaultAxes()" );
+ tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::activateDefaultAxes()" );
Q_ASSERT( !this );
}
}
@@ -9291,7 +9291,7 @@ void KDChartParams::setAxisTitle( uint n, const TQString& axisTitle )
box->content().font() );
box->setContent( textPiece );
- //qDebug ("old Axis Title updated");
+ //tqDebug ("old Axis Title updated");
bDone = true;
}
}
@@ -9302,7 +9302,7 @@ void KDChartParams::setAxisTitle( uint n, const TQString& axisTitle )
false, TQFont(),
false, false,
false, 0 );
- //qDebug("new Axis Title Box inserted");
+ //tqDebug("new Axis Title Box inserted");
}
emit changed();
}
diff --git a/kchart/kdchart/KDChartParams_frame.cpp b/kchart/kdchart/KDChartParams_frame.cpp
index 2c8d92e9..60dc529b 100644
--- a/kchart/kdchart/KDChartParams_frame.cpp
+++ b/kchart/kdchart/KDChartParams_frame.cpp
@@ -160,7 +160,7 @@ bool KDChartParams::KDChartFrameSettings::readFrameSettingsNode( const TQDomElem
} else if( tagName == "AddFrameHeightToLayout" ) {
ok = ok & KDXML::readBoolNode( element, tempAddFrameHeightToLayout );
} else {
- qDebug( "Unknown tag in frame settings" );
+ tqDebug( "Unknown tag in frame settings" );
}
}
node = node.nextSibling();
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 86f37d68..19b5c390 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -1339,7 +1339,7 @@ void KDChartParams::loadAxesFormXML(int& curAxisSettings, TQDomElement& element)
if( KDXML::readBoolNode( element, blockAlign ) )
axisSettings->_axisLabelsBlockAlign = blockAlign;
} else {
- qDebug( "Unknown subelement of AxisSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of AxisSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1395,7 +1395,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
_dataSourceModeAndChart[dataset] = KDChartParams::ModeAndChart( sourceMode, chart );
}
} else {
- qDebug( "Unknown subelement of ModeAndChartMap found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of ModeAndChartMap found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1462,7 +1462,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( element.hasAttribute( "Style" ) )
_outlineDataLineStyle = KDXML::stringToPenStyle( element.attribute( "Style" ) );
} else {
- qDebug( "!!!Unknown subelement of ColorSettings found: %s", tagName.latin1() );
+ tqDebug( "!!!Unknown subelement of ColorSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1510,7 +1510,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readBoolNode( element, solidExcessArrows ) )
_solidExcessArrows = solidExcessArrows;
} else {
- qDebug( "Unknown subelement of BarSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of BarSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1599,7 +1599,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readIntNode( element, rotation ) )
_threeDLineYRotation = rotation;
} else {
- qDebug( "Unknown subelement of LineSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of LineSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1619,7 +1619,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readStringNode( element, string ) )
_areaLocation = KDChartParams::stringToAreaLocation( string );
} else {
- qDebug( "Unknown subelement of AreaSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of AreaSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1666,7 +1666,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readBoolNode( element, relativeRingThickness ) )
_relativeRingThickness = relativeRingThickness;
} else {
- qDebug( "Unknown subelement of PieRingSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of PieRingSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1734,7 +1734,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readColorNode( element, color ) )
_hiLoChartCloseValuesColor = color;
} else {
- qDebug( "Unknown subelement of HiLoSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of HiLoSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1803,15 +1803,15 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readBrushNode( element, brush ) )
_BWChartStatistics[ i ].brush = brush;
} else {
- qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
}
}
}
} else {
- qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
}
} else {
- qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1864,7 +1864,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readIntNode( element, polarLineWidth ) )
_polarLineWidth = polarLineWidth;
} else {
- qDebug( "Unknown subelement of PolarSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of PolarSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1931,7 +1931,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readIntNode( element, spacing ) )
_legendSpacing = spacing;
} else {
- qDebug( "Unknown subelement of LegendSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of LegendSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1962,7 +1962,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readColorNode( element, color ) )
hfSettings->_color = color;
} else {
- qDebug( "Unknown subelement of HeaderFooterSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of HeaderFooterSettings found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -1994,7 +1994,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readIntNode( element, value ) )
_globalLeadingBottom = value;
} else {
- qDebug( "Unknown subelement of GlobalLeading found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of GlobalLeading found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -2076,7 +2076,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
} else if( tagName == "ShowInfinite" ) {
KDXML::readBoolNode( element, _printDataValuesSettings._dataValuesShowInfinite );
} else {
- qDebug( "Unknown subelement of DataValuesSettings1 found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of DataValuesSettings1 found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -2158,7 +2158,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
} else if( tagName == "ShowInfinite" ) {
KDXML::readBoolNode( element, _printDataValuesSettings2._dataValuesShowInfinite );
} else {
- qDebug( "Unknown subelement of DataValuesSettings2 found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of DataValuesSettings2 found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
@@ -2175,7 +2175,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
_allowOverlappingDataValueTexts = value;
}
else
- qDebug( "Unknown subelement of DataValuesGlobalSettings found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of DataValuesGlobalSettings found: %s", tagName.latin1() );
// do _not_ return false here (to enable future extentions)
}
node = node.nextSibling();
@@ -2204,7 +2204,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
}
}
else
- qDebug( "Unknown tag in AreaMap found: %s", tagName.latin1() );
+ tqDebug( "Unknown tag in AreaMap found: %s", tagName.latin1() );
// do _not_ return false here (to enable future extentions)
}
node = node.nextSibling();
@@ -2226,12 +2226,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
_customBoxDict.insert( curNumber, customBox.clone() );
}
else
- qDebug( "Unknown tag in CustomBoxMap found: %s", tagName.latin1() );
+ tqDebug( "Unknown tag in CustomBoxMap found: %s", tagName.latin1() );
}
node = node.nextSibling();
}
} else {
- qDebug( "Unknown second-level element found: %s", tagName.latin1() );
+ tqDebug( "Unknown second-level element found: %s", tagName.latin1() );
// NOTE: We do *not* 'return false' here but continue normal operation
// since additional elements might have been added in future versions
}
@@ -2400,7 +2400,7 @@ bool KDChartParams::readColorMapNode( const TQDomElement& element,
KDXML::readColorNode( element, color );
value->insert( curDataset, color );
} else {
- qDebug( "Unknown tag in color map" );
+ tqDebug( "Unknown tag in color map" );
}
}
node = node.nextSibling();
@@ -2434,7 +2434,7 @@ bool KDChartParams::readDoubleMapNode( const TQDomElement& element,
KDXML::readDoubleNode( element, doubleValue );
value->insert( curValue, doubleValue );
} else {
- qDebug( "Unknown tag in double map" );
+ tqDebug( "Unknown tag in double map" );
}
}
node = node.nextSibling();
@@ -2480,7 +2480,7 @@ bool KDChartParams::readChartFontNode( const TQDomElement& element,
} else if( tagName == "MinFontSize" ) {
ok = ok & KDXML::readIntNode( element, tempMinFontSize );
} else {
- qDebug( "Unknown tag in color map" );
+ tqDebug( "Unknown tag in color map" );
}
}
node = node.nextSibling();
@@ -2632,7 +2632,7 @@ TQString KDChartParams::markerStyleToString( int style )
case LineMarkerFastCross:
return "fast Cross";
default: // should not happen
- qDebug( "Unknown marker style" );
+ tqDebug( "Unknown marker style" );
return "Circle";
}
}
@@ -2656,7 +2656,7 @@ TQString KDChartParams::markerStyleToStringTr( int style )
case LineMarkerFastCross:
return tr( "fast Cross" );
default: // should not happen
- qDebug( "Unknown line marker style!" );
+ tqDebug( "Unknown line marker style!" );
return tr( "Circle" );
}
}
@@ -2722,7 +2722,7 @@ TQString KDChartParams::barChartSubTypeToString( BarChartSubType type ) {
case BarMultiRows:
return "BarMultiRows";
default: // should not happen
- qDebug( "Unknown bar type" );
+ tqDebug( "Unknown bar type" );
return "BarNormal";
}
}
@@ -2783,7 +2783,7 @@ TQString KDChartParams::lineChartSubTypeToString( LineChartSubType type ) {
case LinePercent:
return "LinePercent";
default: // should not happen
- qDebug( "Unknown bar type" );
+ tqDebug( "Unknown bar type" );
return "LineNormal";
}
}
@@ -2854,7 +2854,7 @@ TQString KDChartParams::areaChartSubTypeToString( AreaChartSubType type ) {
case AreaPercent:
return "AreaPercent";
default: // should not happen
- qDebug( "Unknown area chart subtype" );
+ tqDebug( "Unknown area chart subtype" );
return "AreaNormal";
}
}
@@ -2891,7 +2891,7 @@ TQString KDChartParams::areaLocationToString( AreaLocation type ) {
case AreaBelow:
return "Below";
default: // should not happen
- qDebug( "Unknown area location" );
+ tqDebug( "Unknown area location" );
return "Below";
}
}
@@ -2946,7 +2946,7 @@ TQString KDChartParams::polarChartSubTypeToString( PolarChartSubType type ) {
case LinePercent:
return "PolarPercent";
default: // should not happen
- qDebug( "Unknown polar type" );
+ tqDebug( "Unknown polar type" );
return "PolarNormal";
}
}
@@ -3018,7 +3018,7 @@ TQString KDChartParams::hiLoChartSubTypeToString( HiLoChartSubType type ) {
case HiLoOpenClose:
return "HiLoOpenClose";
default: // should not happen
- qDebug( "Unknown HiLo chart subtype" );
+ tqDebug( "Unknown HiLo chart subtype" );
return "HiLoNormal";
}
}
@@ -3084,7 +3084,7 @@ TQString KDChartParams::bWChartStatValToString( BWStatVal type ) {
case MinValue:
return "MinValue";
default: // should not happen
- qDebug( "Unknown BoxWhisker statistical value type" );
+ tqDebug( "Unknown BoxWhisker statistical value type" );
return "unknown";
}
}
@@ -3164,7 +3164,7 @@ TQString KDChartParams::legendPositionToString( LegendPosition pos ) {
case LegendBottomRightRight:
return "LegendBottomRightRight";
default: // should not happen
- qDebug( "Unknown legend position" );
+ tqDebug( "Unknown legend position" );
return "LegendLeft";
}
}
@@ -3230,7 +3230,7 @@ TQString KDChartParams::legendSourceToString( LegendSource source ) {
case LegendAutomatic:
return "Automatic";
default: // should not happen
- qDebug( "Unknown legend source" );
+ tqDebug( "Unknown legend source" );
return "Automatic";
}
}
@@ -3326,7 +3326,7 @@ TQString KDChartParams::bWChartSubTypeToString( BWChartSubType type ) {
case BWSimple:
return "BWSimple";
default: // should not happen
- qDebug( "Unknown BoxWhisker chart subtype" );
+ tqDebug( "Unknown BoxWhisker chart subtype" );
return "BWNormal";
}
}
diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp
index 99cee953..4bf6ca0a 100644
--- a/kchart/kdchart/KDChartPolarPainter.cpp
+++ b/kchart/kdchart/KDChartPolarPainter.cpp
@@ -256,11 +256,11 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
dtDeltaScale );
labelTexts = ( TQStringList* ) paraCircular.axisLabelTexts();
if( paraCircular.axisLabelsVisible() ) {
-//qDebug("\nnTxtHeight: "+TQString::number(nTxtHeight));
+//tqDebug("\nnTxtHeight: "+TQString::number(nTxtHeight));
// calculate font size
actFont = paraCircular.axisLabelsFont();
if ( paraCircular.axisLabelsFontUseRelSize() ) {
-//qDebug("paraCircular.axisLabelsFontUseRelSize() is TRUE");
+//tqDebug("paraCircular.axisLabelsFontUseRelSize() is TRUE");
actFont.setPointSizeFloat( nTxtHeight );
}
TQFontMetrics fm( actFont );
diff --git a/kchart/kdchart/KDChartPropertySet.cpp b/kchart/kdchart/KDChartPropertySet.cpp
index 247a9182..f2b65acf 100644
--- a/kchart/kdchart/KDChartPropertySet.cpp
+++ b/kchart/kdchart/KDChartPropertySet.cpp
@@ -371,7 +371,7 @@ bool KDChartPropertySet::loadXML( const TQDomElement& element, KDChartPropertySe
set.mExtraMarkersStyle
= KDChartParams::stringToLineMarkerStyle( element.attribute( "Style" ) );
} else {
- qDebug( "Unknown subelement of KDChartPropertySet found: %s", tagName.latin1() );
+ tqDebug( "Unknown subelement of KDChartPropertySet found: %s", tagName.latin1() );
}
}
node = node.nextSibling();
diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp
index ba1e6fed..68462b89 100644
--- a/kchart/kdchart/KDChartRingPainter.cpp
+++ b/kchart/kdchart/KDChartRingPainter.cpp
@@ -342,7 +342,7 @@ void KDChartRingPainter::drawOneSegment( TQPainter* painter,
painter->drawEllipse( datReg->points[ KDChartEnums::PosBottomLeft ].x() - 2,
datReg->points[ KDChartEnums::PosBottomLeft ].y() - 2, 5, 5);
- qDebug( "\ncenter: (%i, %i)",
+ tqDebug( "\ncenter: (%i, %i)",
datReg->points[ KDChartEnums::PosCenter ].x(),
datReg->points[ KDChartEnums::PosCenter ].y() );
painter->drawEllipse( datReg->points[ KDChartEnums::PosTopCenter ].x() - 2,
diff --git a/kchart/kdchart/KDChartTableBase.cpp b/kchart/kdchart/KDChartTableBase.cpp
index fcec2c53..fddb6c94 100644
--- a/kchart/kdchart/KDChartTableBase.cpp
+++ b/kchart/kdchart/KDChartTableBase.cpp
@@ -593,12 +593,12 @@ double KDChartTableDataBase::maxInRows( uint row, uint row2, int coordinate ) co
if ( 0 < usedRows() ) {
uint a = row;
uint z = row2;
- // qDebug("KDChartTableDataBase::maxInRows() (1) a: %u z: %u", a, z);
+ // tqDebug("KDChartTableDataBase::maxInRows() (1) a: %u z: %u", a, z);
if ( usedRows() <= a )
a = usedRows() - 1;
if ( usedRows() <= z )
z = usedRows() - 1;
- // qDebug("KDChartTableDataBase::maxInRows() (2) a: %u z: %u", a, z);
+ // tqDebug("KDChartTableDataBase::maxInRows() (2) a: %u z: %u", a, z);
for ( uint row = a; row <= z; ++row ) {
TQVariant value;
double dVal;
@@ -628,12 +628,12 @@ double KDChartTableDataBase::minInRows( uint row, uint row2, int coordinate, boo
if ( 0 < usedRows() ) {
uint a = row;
uint z = row2;
- // qDebug("KDChartTableDataBase::minInRows() (1) a: %u z: %u", a, z);
+ // tqDebug("KDChartTableDataBase::minInRows() (1) a: %u z: %u", a, z);
if ( usedRows() <= a )
a = usedRows() - 1;
if ( usedRows() <= z )
z = usedRows() - 1;
- //qDebug("KDChartTableDataBase::minInRows() (2) a: %u z: %u", a, z);
+ //tqDebug("KDChartTableDataBase::minInRows() (2) a: %u z: %u", a, z);
for ( uint row = a; row <= z; ++row ) {
TQVariant value;
double dVal;
diff --git a/kchart/kdchart/KDChartTextPiece.cpp b/kchart/kdchart/KDChartTextPiece.cpp
index b95165f7..ddb9c0ff 100644
--- a/kchart/kdchart/KDChartTextPiece.cpp
+++ b/kchart/kdchart/KDChartTextPiece.cpp
@@ -76,11 +76,11 @@ KDChartTextPiece::KDChartTextPiece( TQPainter *p, const TQString& text, const TQ
if( TQStyleSheet::mightBeRichText( text ) ) {
_isRichText = true;
_richText = new TQSimpleRichText( text, font );
- //qDebug( "richtext width %s", TQString::number(_richText->width()).latin1());
- //qDebug( "richtext height %s", TQString::number(_richText->height()).latin1());
+ //tqDebug( "richtext width %s", TQString::number(_richText->width()).latin1());
+ //tqDebug( "richtext height %s", TQString::number(_richText->height()).latin1());
_richText->adjustSize();
- //qDebug( "richtext width %s", TQString::number(_richText->width()).latin1());
- //qDebug( "richtext height %s", TQString::number(_richText->height()).latin1());
+ //tqDebug( "richtext width %s", TQString::number(_richText->width()).latin1());
+ //tqDebug( "richtext height %s", TQString::number(_richText->height()).latin1());
} else {
_isRichText = false;
@@ -91,13 +91,13 @@ KDChartTextPiece::KDChartTextPiece( TQPainter *p, const TQString& text, const TQ
_dirtyMetrics = (p == 0);
if( _dirtyMetrics ) {
_metrics = new TQFontMetrics( font );
- //qDebug("dirty metrics text: %s", text.latin1());
+ //tqDebug("dirty metrics text: %s", text.latin1());
}
else{
p->save();
p->setFont( font );
_metrics = new TQFontMetrics( p->fontMetrics() );
- //qDebug ( "drawing metrics text: %s", text.latin1() );
+ //tqDebug ( "drawing metrics text: %s", text.latin1() );
//p->drawRect( _metrics->boundingRect( text) );
//p->drawText( _metrics->boundingRect(text).bottomRight(), text);
p->restore();
@@ -160,12 +160,12 @@ int KDChartTextPiece::height() const
{
if( _isRichText ) {
- //qDebug ("_richText height %s", TQString::number(_richText->height()).latin1());
+ //tqDebug ("_richText height %s", TQString::number(_richText->height()).latin1());
return _richText->height();
}
else {
- //qDebug ("_metrics height %s", TQString::number(_metrics->height()).latin1());
+ //tqDebug ("_metrics height %s", TQString::number(_metrics->height()).latin1());
return _metrics->height();
}
}
diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp
index c0985134..09c0bb78 100644
--- a/kchart/kdchart/KDDrawText.cpp
+++ b/kchart/kdchart/KDDrawText.cpp
@@ -124,7 +124,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
{
// showAnchor=true;
- //qDebug("\nanchor: "+ text + " / "+TQString::number(anchor.x())
+ //tqDebug("\nanchor: "+ text + " / "+TQString::number(anchor.x())
// +" / "+TQString::number(anchor.y()));
bool useInfos = doNotCalculate && infos;
bool fontChanged = ( 0 != font );
@@ -219,11 +219,11 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
}
int x = useInfos ? infos->x : pos.x();
int y = useInfos ? infos->y : pos.y();
- //qDebug("1.: (x / y) :" + text + " / "+TQString::number(x)
+ //tqDebug("1.: (x / y) :" + text + " / "+TQString::number(x)
// +" / "+TQString::number(y));
- //qDebug("2.: (posx / posy) :" + text );
- // qDebug ( "%d", pos.x() ); qDebug ( "%d", pos.y() );
- //qDebug("3.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x)
+ //tqDebug("2.: (posx / posy) :" + text );
+ // tqDebug ( "%d", pos.x() ); tqDebug ( "%d", pos.y() );
+ //tqDebug("3.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x)
// +" / "+TQString::number(infos->y));
if( !useInfos && !optimizeOutputForScreen ) {
@@ -231,7 +231,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
case TQt::AlignLeft:
break;
case TQt::AlignRight:
-//qDebug( TQPaintDeviceMetrics::logicalDpiX() );
+//tqDebug( TQPaintDeviceMetrics::logicalDpiX() );
x -= txtWidth;
break;
case TQt::AlignHCenter:
@@ -254,11 +254,11 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
infos->x = x - 4;
infos->y = y - 4;
//PENDING Michel updating info using x , y from pos
- //qDebug("4.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x)
+ //tqDebug("4.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x)
//+" / "+TQString::number(infos->y));
- //qDebug("5.: (x / y) :" + text + " / "+TQString::number(x)
+ //tqDebug("5.: (x / y) :" + text + " / "+TQString::number(x)
// +" / "+TQString::number(y));
- //qDebug("6.: (anchorx /anchory) :" + text + " / "+TQString::number(x)
+ //tqDebug("6.: (anchorx /anchory) :" + text + " / "+TQString::number(x)
// +" / "+TQString::number(y));
TQRect rect( painter->boundingRect( x, y,
txtWidth, txtHeight,
@@ -312,7 +312,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
}
if( !calculateOnly ){
- //qDebug("txtWidth: %i txtHeight: %i", txtWidth, txtHeight);
+ //tqDebug("txtWidth: %i txtHeight: %i", txtWidth, txtHeight);
if( !optimizeOutputForScreen ){
/*
painter->drawText( x, y,
@@ -464,7 +464,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
}
break;
}
- //qDebug("2.: (x / y) : "+TQString::number(x)
+ //tqDebug("2.: (x / y) : "+TQString::number(x)
// +" / "+TQString::number(y));
painter->drawPixmap( TQPoint( x - pixPoint.x(),
y - pixPoint.y() ),
diff --git a/kchart/kdchart/KDFrame.cpp b/kchart/kdchart/KDFrame.cpp
index 3904bf16..7a21930c 100644
--- a/kchart/kdchart/KDFrame.cpp
+++ b/kchart/kdchart/KDFrame.cpp
@@ -127,9 +127,9 @@ void KDFrame::paintEdges( TQPainter& painter, const TQRect& innerRect ) const
TQPen thePen;
thePen = section->pen();
int penWidth = TQMAX(thePen.width(), 1) * TQMAX(section->width(), 1);
-//qDebug("paintEdges: thePen.width() = %i", thePen.width());
-//qDebug("paintEdges: section->width() = %i", section->width());
-//qDebug("paintEdges: penWidth = %i", penWidth);
+//tqDebug("paintEdges: thePen.width() = %i", thePen.width());
+//tqDebug("paintEdges: section->width() = %i", section->width());
+//tqDebug("paintEdges: penWidth = %i", penWidth);
thePen.setWidth( penWidth );
painter.setPen( thePen );
painter.setBrush( TQt::NoBrush );
@@ -262,13 +262,13 @@ void KDFrame::setSimpleFrame( SimpleFrame frame,
_backPixmap = backPixmap ? *backPixmap : TQPixmap();
_backPixmapMode = backPixmapMode;
if( FrameFlat == frame ) {
- //qDebug("_profileSections.count() before = %i", _profileSections.count());
+ //tqDebug("_profileSections.count() before = %i", _profileSections.count());
KDFrameProfileSection* newsection =
new KDFrameProfileSection( KDFrameProfileSection::DirPlain,
KDFrameProfileSection::CvtPlain,
lineWidth, pen );
_profileSections.append( newsection );
- //qDebug( "_profileSections.count() after = %i, lineWidth = %i",
+ //tqDebug( "_profileSections.count() after = %i, lineWidth = %i",
// _profileSections.count(),
// lineWidth );
_topProfile.append( newsection );
@@ -526,7 +526,7 @@ bool KDFrame::readFrameNode( const TQDomElement& element, KDFrame& frame )
ok = ok & KDFrameCorner::readFrameCornerNode( element,
tempCornerBR );
} else {
- qDebug( "Unknown tag in frame" );
+ tqDebug( "Unknown tag in frame" );
}
}
node = node.nextSibling();
@@ -567,7 +567,7 @@ bool KDFrame::readFrameProfileNode( const TQDomElement& element,
section );
profile.append( section );
} else {
- qDebug( "Unknown tag in double map" );
+ tqDebug( "Unknown tag in double map" );
return false;
}
}
@@ -600,7 +600,7 @@ bool KDFrame::KDFrameCorner::readFrameCornerNode( const TQDomElement& element,
KDFrameProfile profile;
ok = ok & readFrameProfileNode( element, profile );
} else {
- qDebug( "Unknown tag in frame" );
+ tqDebug( "Unknown tag in frame" );
}
}
node = node.nextSibling();
diff --git a/kchart/kdchart/KDFrameProfileSection.cpp b/kchart/kdchart/KDFrameProfileSection.cpp
index 38c6fa45..a8b69e85 100644
--- a/kchart/kdchart/KDFrameProfileSection.cpp
+++ b/kchart/kdchart/KDFrameProfileSection.cpp
@@ -78,7 +78,7 @@ bool KDFrameProfileSection::readFrameProfileSectionNode( const TQDomElement& ele
} else if( tagName == "Style" || tagName == "Pen" ) {
ok = ok & KDXML::readPenNode( element, tempPen );
} else {
- qDebug( "Unknown tag in frame" );
+ tqDebug( "Unknown tag in frame" );
}
}
node = node.nextSibling();
diff --git a/kchart/kdchart/KDXMLTools.cpp b/kchart/kdchart/KDXMLTools.cpp
index bf03b362..21c41592 100644
--- a/kchart/kdchart/KDXMLTools.cpp
+++ b/kchart/kdchart/KDXMLTools.cpp
@@ -458,7 +458,7 @@ namespace KDXML {
} else if( tagName == "Pixmap" ) {
ok = ok & readPixmapNode( element, tempPixmap );
} else {
- qDebug( "Unknown tag in brush" );
+ tqDebug( "Unknown tag in brush" );
}
}
node = node.nextSibling();
@@ -490,7 +490,7 @@ namespace KDXML {
ok = ok & readStringNode( element, formatName );
#ifndef NDEBUG
if( formatName != "XPM.GZ" )
- qDebug( "Unsupported pixmap format in XML file" );
+ tqDebug( "Unsupported pixmap format in XML file" );
#endif
} else if( tagName == "Length" ) {
int itempLength;
@@ -499,7 +499,7 @@ namespace KDXML {
} else if( tagName == "Data" ) {
ok = ok & readStringNode( element, tempData );
} else {
- qDebug( "Unknown tag in Pixmap" );
+ tqDebug( "Unknown tag in Pixmap" );
}
}
node = node.nextSibling();
@@ -565,7 +565,7 @@ namespace KDXML {
ok = ok & readStringNode( element, value );
tempStyle = stringToPenStyle( value );
} else {
- qDebug( "Unknown tag in brush" );
+ tqDebug( "Unknown tag in brush" );
}
}
node = node.nextSibling();
@@ -603,7 +603,7 @@ namespace KDXML {
} else if( tagName == "CharSet" ) {
ok = ok & readIntNode( element, charSet );
} else {
- qDebug( "Unknown tag in color map" );
+ tqDebug( "Unknown tag in color map" );
}
}
node = node.nextSibling();
@@ -641,7 +641,7 @@ namespace KDXML {
} else if( tagName == "Y" ) {
ok = ok & readIntNode( element, y );
} else {
- qDebug( "Unknown tag in rect" );
+ tqDebug( "Unknown tag in rect" );
}
}
node = node.nextSibling();
@@ -674,7 +674,7 @@ namespace KDXML {
} else if( tagName == "Time" ) {
ok = ok & readTimeNode( element, tempTime );
} else {
- qDebug( "Unknown tag in datetime" );
+ tqDebug( "Unknown tag in datetime" );
}
}
node = node.nextSibling();