diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:21:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:21:06 -0600 |
| commit | 7d18baa666593a494ceea480732a8540ba471fe5 (patch) | |
| tree | 1c656ba0da61a3bfcf4c4de730e66322865844fe | |
| parent | 951839808408bed4165fc025dbf00caf59ea319b (diff) | |
| download | koffice-7d18baa666593a494ceea480732a8540ba471fe5.tar.gz koffice-7d18baa666593a494ceea480732a8540ba471fe5.zip | |
Rename additional global TQt functions
86 files changed, 907 insertions, 907 deletions
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 2b014388d..22982cc5d 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -391,7 +391,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB images = BlobToImage(ii, &m_data[0], m_data.size(), &ei); } else { - qstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); + tqstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); if (ii -> filename[MaxTextExtent - 1]) { emit notifyProgressError(); @@ -721,7 +721,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB ii = CloneImageInfo(0); - qstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); + tqstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); if (ii -> filename[MaxTextExtent - 1]) { emit notifyProgressError(); @@ -767,10 +767,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB TQString ext = TQFileInfo(TQFile::encodeName(uri.path())).extension(false).upper(); if (ext == "BMP") { alpha = false; - qstrncpy(ii->magick, "BMP2", MaxTextExtent - 1); + tqstrncpy(ii->magick, "BMP2", MaxTextExtent - 1); } else if (ext == "RGB") { - qstrncpy(ii->magick, "SGI", MaxTextExtent - 1); + tqstrncpy(ii->magick, "SGI", MaxTextExtent - 1); } for (y = 0; y < height; y++) { diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index 225177c47..ec70f1794 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -339,7 +339,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB images = BlobToImage(ii, &m_data[0], m_data.size(), &ei); } else { - qstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); + tqstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); if (ii -> filename[MaxTextExtent - 1]) { emit notifyProgressError(); @@ -663,7 +663,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB ii = CloneImageInfo(0); - qstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); + tqstrncpy(ii -> filename, TQFile::encodeName(uri.path()), MaxTextExtent - 1); if (ii -> filename[MaxTextExtent - 1]) { emit notifyProgressError(); @@ -709,10 +709,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB TQString ext = TQFileInfo(TQFile::encodeName(uri.path())).extension(false).upper(); if (ext == "BMP") { alpha = false; - qstrncpy(ii->magick, "BMP2", MaxTextExtent - 1); + tqstrncpy(ii->magick, "BMP2", MaxTextExtent - 1); } else if (ext == "RGB") { - qstrncpy(ii->magick, "SGI", MaxTextExtent - 1); + tqstrncpy(ii->magick, "SGI", MaxTextExtent - 1); } for (y = 0; y < height; y++) { diff --git a/filters/karbon/ai/ai3handler.cc b/filters/karbon/ai/ai3handler.cc index ae0252a3a..c014d9306 100644 --- a/filters/karbon/ai/ai3handler.cc +++ b/filters/karbon/ai/ai3handler.cc @@ -41,9 +41,9 @@ bool AI3Handler::handleAIOperation (AIOperation op) { return true; break; case AIO_EndGroupNoClip : - if (m_delegate->m_debug) qDebug ("got end group noclip"); + if (m_delegate->m_debug) tqDebug ("got end group noclip"); if (m_delegate->m_structureHandler) m_delegate->m_structureHandler->gotEndGroup (false); - if (m_delegate->m_debug) qDebug ("/got end group noclip"); + if (m_delegate->m_debug) tqDebug ("/got end group noclip"); return true; break; case AIO_BeginCombination : diff --git a/filters/karbon/ai/ai88handler.cc b/filters/karbon/ai/ai88handler.cc index a271f33f9..7b5019be6 100644 --- a/filters/karbon/ai/ai88handler.cc +++ b/filters/karbon/ai/ai88handler.cc @@ -110,9 +110,9 @@ bool AI88Handler::handleAIOperation (AIOperation op) { return true; break; case AIO_EndGroupClip : - if (m_delegate->m_debug) qDebug ("got end group clip"); + if (m_delegate->m_debug) tqDebug ("got end group clip"); if (m_delegate->m_structureHandler) m_delegate->m_structureHandler->gotEndGroup (true); - if (m_delegate->m_debug) qDebug ("/got end group clip"); + if (m_delegate->m_debug) tqDebug ("/got end group clip"); return true; break; @@ -315,7 +315,7 @@ void AI88Handler::_handleSetFillColorCMYK() double m = m_delegate->getDoubleValue(); double c = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 1 are %f %f %f %f",c,m,y,k); + if (m_delegate->m_debug) tqDebug ("values 1 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k); if (m_delegate->m_gstateHandler) m_delegate->m_gstateHandler->gotFillColor (color); @@ -376,7 +376,7 @@ void AI88Handler::_handleSetStrokeColorCMYK() double y = m_delegate->getDoubleValue(); double m = m_delegate->getDoubleValue(); double c = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 2 are %f %f %f %f",c,m,y,k); + if (m_delegate->m_debug) tqDebug ("values 2 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k); @@ -386,7 +386,7 @@ void AI88Handler::_handleSetStrokeColorCMYK() void AI88Handler::_handleSetFillColorGray() { double g = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 3 are %f",g); + if (m_delegate->m_debug) tqDebug ("values 3 are %f",g); AIColor color (g); @@ -396,7 +396,7 @@ void AI88Handler::_handleSetFillColorGray() void AI88Handler::_handleSetStrokeColorGray() { double g = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 4 are %f",g); + if (m_delegate->m_debug) tqDebug ("values 4 are %f",g); AIColor color (g); @@ -411,7 +411,7 @@ void AI88Handler::_handleSetFillColorCustom() double y = m_delegate->getDoubleValue(); double m = m_delegate->getDoubleValue(); double c = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 5 are %f %f %f %f",c,m,y,k); + if (m_delegate->m_debug) tqDebug ("values 5 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k,name.latin1(),g); @@ -420,7 +420,7 @@ void AI88Handler::_handleSetFillColorCustom() void AI88Handler::_handleSetDash() { -// qDebug ("found dash operation"); +// tqDebug ("found dash operation"); double fval = m_delegate->getDoubleValue(); AIElement elem (m_delegate->m_stack.top()); @@ -428,7 +428,7 @@ void AI88Handler::_handleSetDash() const TQValueVector<AIElement> aval = elem.toElementArray(); if (m_delegate->m_gstateHandler) m_delegate->m_gstateHandler->gotDash (aval, fval); -// qDebug ("dash operation finished"); +// tqDebug ("dash operation finished"); } void AI88Handler::_handlePatternDefinition() @@ -499,7 +499,7 @@ void AI88Handler::_handleSetCurrentText() { void AI88Handler::_handleTextBlock (TextOperation to) { AIElement elem (m_delegate->m_stack.top()); - qDebug ("to element is (%s)",elem.typeName()); + tqDebug ("to element is (%s)",elem.typeName()); m_delegate->m_stack.pop(); const TQValueVector<AIElement> aval = elem.toElementArray(); @@ -556,7 +556,7 @@ void AI88Handler::_handleSetStrokeColorCustom() double y = m_delegate->getDoubleValue(); double m = m_delegate->getDoubleValue(); double c = m_delegate->getDoubleValue(); - if (m_delegate->m_debug) qDebug ("values 6 are %f %f %f %f",c,m,y,k); + if (m_delegate->m_debug) tqDebug ("values 6 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k,name.latin1(),g); diff --git a/filters/karbon/ai/aicolor.cc b/filters/karbon/ai/aicolor.cc index 673841676..cabc932fb 100644 --- a/filters/karbon/ai/aicolor.cc +++ b/filters/karbon/ai/aicolor.cc @@ -71,7 +71,7 @@ void AIColor::toRGB (double &r, double &g, double &b) b = cdata.graydata; break; default : - qDebug ("unknown colortype %d", ctype); + tqDebug ("unknown colortype %d", ctype); } } @@ -93,7 +93,7 @@ void AIColor::toCMYK (double &c, double &m, double &y, double &k) k = cdata.graydata; break; default : - qDebug ("unknown colortype %d", ctype); + tqDebug ("unknown colortype %d", ctype); } } diff --git a/filters/karbon/ai/ailexer.cc b/filters/karbon/ai/ailexer.cc index a1ab4bda3..935403d9e 100644 --- a/filters/karbon/ai/ailexer.cc +++ b/filters/karbon/ai/ailexer.cc @@ -185,7 +185,7 @@ bool AILexer::parse (TQIODevice& fin){ { c = fin.getch (); -// qDebug ("got %c", c); +// tqDebug ("got %c", c); State newState; Action action; @@ -212,7 +212,7 @@ bool AILexer::parse (TQIODevice& fin){ /* ignore */ break; case Action_Abort : - qWarning ( "state %s / %s char %c (%d)" , statetoa(m_curState), statetoa(newState), c, c ); + tqWarning ( "state %s / %s char %c (%d)" , statetoa(m_curState), statetoa(newState), c, c ); parsingAborted(); return false; break; @@ -233,7 +233,7 @@ bool AILexer::parse (TQIODevice& fin){ fin.ungetch(c); break; default : - qWarning ( "unknown action: %d ", action); + tqWarning ( "unknown action: %d ", action); } m_curState = newState; @@ -288,76 +288,76 @@ void AILexer::doOutput () doHandleByteArray (); break; default: - qWarning ( "unknown state: %d", m_curState ); + tqWarning ( "unknown state: %d", m_curState ); } m_buffer.clear(); } void AILexer::gotComment (const char *value) { - qDebug ( "gotComment: %s ", value ); + tqDebug ( "gotComment: %s ", value ); } void AILexer::gotIntValue (int value) { - qDebug ( "gotInt: %d ", value ); + tqDebug ( "gotInt: %d ", value ); } void AILexer::gotDoubleValue (double value) { - qDebug ( "gotDouble: %f ", value ); + tqDebug ( "gotDouble: %f ", value ); } void AILexer::gotStringValue (const char *value) { - qDebug ( "gotString: %s ", value ); + tqDebug ( "gotString: %s ", value ); } void AILexer::gotToken (const char *value) { - qDebug ( "gotToken: %s ", value ); + tqDebug ( "gotToken: %s ", value ); } void AILexer::gotReference (const char *value) { - qDebug ( "gotReference: %s ", value ); + tqDebug ( "gotReference: %s ", value ); } void AILexer::gotBlockStart (){ - qDebug ( "gotBlockStart" ); + tqDebug ( "gotBlockStart" ); } void AILexer::gotBlockEnd (){ - qDebug ( "gotBlockEnd" ); + tqDebug ( "gotBlockEnd" ); } void AILexer::gotArrayStart (){ - qDebug ( "gotArrayStart" ); + tqDebug ( "gotArrayStart" ); } void AILexer::gotArrayEnd (){ - qDebug ( "gotArrayEnd" ); + tqDebug ( "gotArrayEnd" ); } void AILexer::parsingStarted() { - qDebug ( "parsing started" ); + tqDebug ( "parsing started" ); } void AILexer::parsingFinished() { - qDebug ( "parsing finished" ); + tqDebug ( "parsing finished" ); } void AILexer::parsingAborted() { - qDebug ( "parsing aborted" ); + tqDebug ( "parsing aborted" ); } void AILexer::gotByte (uchar value) { - qDebug ( "got byte %d" , value ); + tqDebug ( "got byte %d" , value ); } void AILexer::gotByteArray (const TQByteArray &data) { - qDebug ( "got byte array" ); + tqDebug ( "got byte array" ); /* for ( uint i = 0; i < data.size(); i++ ) { uchar value = data[i]; - qDebug( "%d: %x", i, value ); + tqDebug( "%d: %x", i, value ); } - qDebug ( "/byte array" ); */ + tqDebug ( "/byte array" ); */ } @@ -429,7 +429,7 @@ void AILexer::doHandleByteArray () uchar AILexer::getByte() { -// qDebug ("convert string to byte (%s)", m_buffer.latin1()); +// tqDebug ("convert string to byte (%s)", m_buffer.latin1()); TQStringList list = TQStringList::split ("#", m_buffer.toString()); int radix = list[0].toShort(); @@ -441,7 +441,7 @@ uchar AILexer::getByte() uchar AILexer::decode() { uchar value = m_temp.toString().toShort(NULL, 8); -// qDebug ("got encoded char %c",value); +// tqDebug ("got encoded char %c",value); return value; } diff --git a/filters/karbon/ai/aiparserbase.cc b/filters/karbon/ai/aiparserbase.cc index 817c3d7ec..24f9920e7 100644 --- a/filters/karbon/ai/aiparserbase.cc +++ b/filters/karbon/ai/aiparserbase.cc @@ -230,12 +230,12 @@ void AIParserBase::gotComment (const char *value) { break; case CO_BeginProcSet : if (m_moduleHandler) m_moduleHandler->gotBeginSection (ST_ProcSet, value); - if (m_debug) qDebug ("start ignoring"); + if (m_debug) tqDebug ("start ignoring"); m_ignoring = true; break; case CO_BeginResource : if (m_moduleHandler) m_moduleHandler->gotBeginSection (ST_Resource, value); - if (m_debug) qDebug ("start ignoring"); + if (m_debug) tqDebug ("start ignoring"); m_ignoring = true; break; case CO_BeginEncoding : @@ -243,7 +243,7 @@ void AIParserBase::gotComment (const char *value) { m_ignoring = false; break; case CO_IncludeFont : - if (m_debug) qDebug ("start ignoring"); + if (m_debug) tqDebug ("start ignoring"); m_ignoring = true; break; case CO_BeginBrushPattern : @@ -253,7 +253,7 @@ void AIParserBase::gotComment (const char *value) { if (m_moduleHandler) m_moduleHandler->gotBeginSection (ST_Gradient, value); break; case CO_Trailer : - if (m_debug) qDebug ("start ignoring"); + if (m_debug) tqDebug ("start ignoring"); m_ignoring = true; break; case CO_BeginPalette : @@ -271,12 +271,12 @@ void AIParserBase::gotComment (const char *value) { break; case CO_EndProcSet : if (m_moduleHandler) m_moduleHandler->gotEndSection (ST_ProcSet, value); - if (m_debug) qDebug ("stop ignoring"); + if (m_debug) tqDebug ("stop ignoring"); m_ignoring = false; break; case CO_EndResource : if (m_moduleHandler) m_moduleHandler->gotEndSection (ST_Resource, value); - if (m_debug) qDebug ("stop ignoring"); + if (m_debug) tqDebug ("stop ignoring"); m_ignoring = false; break; case CO_EndEncoding : @@ -360,12 +360,12 @@ void AIParserBase::gotComment (const char *value) { case CM_CMYKCustomColor : _handleCMYKCustomColor (value); break; case CM_DocumentNeededResources : _handleDocumentNeededResources (value); break; - default : qWarning ("unknown continuation mode %d",m_continuationMode); + default : tqWarning ("unknown continuation mode %d",m_continuationMode); } break; default : - qWarning( "unhandled comment: %s", value ); + tqWarning( "unhandled comment: %s", value ); } } @@ -375,70 +375,70 @@ void AIParserBase::handleElement (AIElement &element) if (m_sink == DS_Array) { - if (m_debug) qDebug ("in mode array"); + if (m_debug) tqDebug ("in mode array"); TQValueVector<AIElement> &elementArray = m_arrayStack.top(); elementArray.push_back(element); } if (m_sink == DS_Block) { - if (m_debug) qDebug ("in mode block"); + if (m_debug) tqDebug ("in mode block"); TQValueVector<AIElement> &elementArray = m_blockStack.top(); elementArray.push_back(element); } else { - if (m_debug) qDebug ("in mode stack"); + if (m_debug) tqDebug ("in mode stack"); m_stack.push (element); } } void AIParserBase::gotIntValue (int value) { - if (m_debug) qDebug ("got int value"); + if (m_debug) tqDebug ("got int value"); if (m_ignoring) return; AIElement element (value); handleElement (element); - if (m_debug) qDebug ("/got int value"); + if (m_debug) tqDebug ("/got int value"); } void AIParserBase::gotDoubleValue (double value) { - if (m_debug) qDebug ("got double value"); + if (m_debug) tqDebug ("got double value"); if (m_ignoring) return; AIElement element (value); handleElement (element); - if (m_debug) qDebug ("/got double value"); + if (m_debug) tqDebug ("/got double value"); } void AIParserBase::gotStringValue (const char *value) { - if (m_debug) qDebug ("got string value"); + if (m_debug) tqDebug ("got string value"); if (m_ignoring) return; if (value == NULL) value = ""; - if (m_debug) qDebug ("string: %s", value); + if (m_debug) tqDebug ("string: %s", value); AIElement element (value); handleElement (element); - if (m_debug) qDebug ("/got string value"); + if (m_debug) tqDebug ("/got string value"); } void AIParserBase::gotReference (const char *value) { - if (m_debug) qDebug ("got reference value"); + if (m_debug) tqDebug ("got reference value"); if (m_ignoring) return; if (value == NULL) value = ""; - if (m_debug) qDebug ("reference: %s", value); + if (m_debug) tqDebug ("reference: %s", value); TQString string(value); AIElement element (string, AIElement::Reference); handleElement (element); - if (m_debug) qDebug ("/got reference value"); + if (m_debug) tqDebug ("/got reference value"); } void AIParserBase::gotByte (uchar value) { - if (m_debug) qDebug ("got byte value"); + if (m_debug) tqDebug ("got byte value"); if (m_ignoring) return; AIElement element (value); handleElement (element); - if (m_debug) qDebug ("/got byte value"); + if (m_debug) tqDebug ("/got byte value"); } void AIParserBase::gotByteArray (const TQByteArray &data) { @@ -450,7 +450,7 @@ void AIParserBase::gotByteArray (const TQByteArray &data) { void AIParserBase::gotArrayStart () { if (m_ignoring) return; - if (m_debug) qDebug ("got array start"); + if (m_debug) tqDebug ("got array start"); TQValueVector<AIElement> array; m_arrayStack.push (array); @@ -460,7 +460,7 @@ void AIParserBase::gotArrayStart () { void AIParserBase::gotBlockStart () { if (m_ignoring) return; - if (m_debug) qDebug ("got block start"); + if (m_debug) tqDebug ("got block start"); TQValueVector<AIElement> array; m_blockStack.push (array); @@ -470,19 +470,19 @@ void AIParserBase::gotBlockStart () { void AIParserBase::gotArrayEnd () { if (m_ignoring) return; - if (m_debug) qDebug ("got array end"); + if (m_debug) tqDebug ("got array end"); TQValueVector<AIElement> stackArray = m_arrayStack.pop(); if (m_arrayStack.empty()) { - if (m_debug) qDebug ("put elements to stack"); + if (m_debug) tqDebug ("put elements to stack"); AIElement realElement (stackArray); if (m_debug) { - qDebug ("going to stack"); + tqDebug ("going to stack"); elementtoa (realElement); - qDebug ("done"); + tqDebug ("done"); } m_stack.push (realElement); @@ -490,7 +490,7 @@ void AIParserBase::gotArrayEnd () { } else { - if (m_debug) qDebug ("put elements to nest stack level"); + if (m_debug) tqDebug ("put elements to nest stack level"); TQValueVector<AIElement> currentTOS = m_arrayStack.top(); currentTOS.push_back (stackArray); } @@ -498,19 +498,19 @@ void AIParserBase::gotArrayEnd () { void AIParserBase::gotBlockEnd () { if (m_ignoring) return; - if (m_debug) qDebug ("got block end"); + if (m_debug) tqDebug ("got block end"); TQValueVector<AIElement> stackArray = m_blockStack.pop(); if (m_blockStack.empty()) { - if (m_debug) qDebug ("put elements to stack"); + if (m_debug) tqDebug ("put elements to stack"); AIElement realElement (stackArray, AIElement::Block); if (m_debug) { - qDebug ("going to stack"); + tqDebug ("going to stack"); elementtoa (realElement); - qDebug ("done"); + tqDebug ("done"); } m_stack.push (realElement); @@ -518,7 +518,7 @@ void AIParserBase::gotBlockEnd () { } else { - if (m_debug) qDebug ("put elements to nest stack level"); + if (m_debug) tqDebug ("put elements to nest stack level"); TQValueVector<AIElement> currentTOS = m_blockStack.top(); currentTOS.push_back (stackArray); } @@ -542,7 +542,7 @@ void AIParserBase::gotBlockEnd () { double m = getDoubleValue(); double c = getDoubleValue(); - if (m_debug) qDebug ("values 1 are %f %f %f %f",c,m,y,k); + if (m_debug) tqDebug ("values 1 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k); if (m_gstateHandler) m_gstateHandler->gotFillColor (color); @@ -602,7 +602,7 @@ void AIParserBase::gotBlockEnd () { double y = getDoubleValue(); double m = getDoubleValue(); double c = getDoubleValue(); - if (m_debug) qDebug ("values 2 are %f %f %f %f",c,m,y,k); + if (m_debug) tqDebug ("values 2 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k); @@ -612,7 +612,7 @@ void AIParserBase::gotBlockEnd () { /*Ai88*/ /* void AIParserBase::_handleSetFillColorGray() { double g = getDoubleValue(); - if (m_debug) qDebug ("values 3 are %f",g); + if (m_debug) tqDebug ("values 3 are %f",g); AIColor color (g); @@ -622,7 +622,7 @@ void AIParserBase::gotBlockEnd () { /*Ai88*/ /* void AIParserBase::_handleSetStrokeColorGray() { double g = getDoubleValue(); - if (m_debug) qDebug ("values 4 are %f",g); + if (m_debug) tqDebug ("values 4 are %f",g); AIColor color (g); @@ -637,7 +637,7 @@ void AIParserBase::gotBlockEnd () { double y = getDoubleValue(); double m = getDoubleValue(); double c = getDoubleValue(); - if (m_debug) qDebug ("values 5 are %f %f %f %f",c,m,y,k); + if (m_debug) tqDebug ("values 5 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k,name.latin1(),g); @@ -745,7 +745,7 @@ void AIParserBase::_handlePSDef() { double y = getDoubleValue(); double m = getDoubleValue(); double c = getDoubleValue(); - if (m_debug) qDebug ("values 6 are %f %f %f %f",c,m,y,k); + if (m_debug) tqDebug ("values 6 are %f %f %f %f",c,m,y,k); AIColor color (c,m,y,k,name.latin1(),g); @@ -856,7 +856,7 @@ void AIParserBase::_handleCMYKCustomColor(const char *) { /*Ai88*/ /* void AIParserBase::_handleTextBlock (TextOperation to) { AIElement elem (m_stack.top()); - qDebug ("to element is (%s)",elem.typeName()); + tqDebug ("to element is (%s)",elem.typeName()); m_stack.pop(); const TQValueVector<AIElement> aval = elem.toElementArray(); @@ -899,14 +899,14 @@ void AIParserBase::_handleCreationDate (const char *data) } void AIParserBase::gotToken (const char *value) { - if (m_debug) qDebug ("got token"); + if (m_debug) tqDebug ("got token"); if (m_ignoring) return; - if (m_debug) qDebug ("token: %s", value); + if (m_debug) tqDebug ("token: %s", value); if (m_sink == DS_Array) { - if (m_debug) qDebug ("token in array"); + if (m_debug) tqDebug ("token in array"); TQString op (value); AIElement realElement (op, AIElement::Operator); handleElement (realElement); @@ -915,7 +915,7 @@ void AIParserBase::gotToken (const char *value) { } if (m_sink == DS_Block) { - if (m_debug) qDebug ("token in block"); + if (m_debug) tqDebug ("token in block"); TQString op (value); AIElement realElement (op, AIElement::Operator); handleElement (realElement); @@ -923,7 +923,7 @@ void AIParserBase::gotToken (const char *value) { return; } - if (m_debug) qDebug ("get ai operation"); + if (m_debug) tqDebug ("get ai operation"); AIOperation op = getAIOperation (value); // PathElement pathElement; @@ -941,7 +941,7 @@ void AIParserBase::gotToken (const char *value) { { if (handlePS (value)) return; } - qWarning ( "unknown operator: %s", value ); + tqWarning ( "unknown operator: %s", value ); TQString string(value); @@ -953,12 +953,12 @@ void AIParserBase::gotToken (const char *value) { } if (m_debug) stacktoa (m_stack); - qWarning ( "pushing %s to stack", value ); + tqWarning ( "pushing %s to stack", value ); AIElement element (string, AIElement::Operator); handleElement (element); } - if (m_debug) qDebug ("/got token value"); + if (m_debug) tqDebug ("/got token value"); } bool AIParserBase::handlePS (const char *operand){ @@ -1074,15 +1074,15 @@ CommentOperation AIParserBase::getCommentOperation (const char *command) { } void GStateHandlerBase::gotFillPattern (const char *pname, double px, double py, double sx, double sy, double angle, double rf, double r, double k, double ka, const TQValueVector<AIElement>& transformData) { - qDebug ( "got fill pattern %s %f %f %f %f %f %f %f %f %f", pname, px, py, sx, sy, angle, rf, r, k, ka); + tqDebug ( "got fill pattern %s %f %f %f %f %f %f %f %f %f", pname, px, py, sx, sy, angle, rf, r, k, ka); arraytoa (transformData); - qDebug ("/got fill pattern"); + tqDebug ("/got fill pattern"); } void GStateHandlerBase::gotStrokePattern (const char *pname, double px, double py, double sx, double sy, double angle, double rf, double r, double k, double ka, const TQValueVector<AIElement>& transformData) { - qDebug ( "got stroke pattern %s %f %f %f %f %f %f %f %f %f", pname, px, py, sx, sy, angle, rf, r, k, ka); + tqDebug ( "got stroke pattern %s %f %f %f %f %f %f %f %f %f", pname, px, py, sx, sy, angle, rf, r, k, ka); arraytoa (transformData); - qDebug ("/got stroke pattern"); + tqDebug ("/got stroke pattern"); } const char *AIParserBase::getValue (const char *input) { @@ -1126,7 +1126,7 @@ bool AIParserBase::getPoint (const char* input, int &x, int &y) { void AIParserBase::cleanupArrays() { - if (m_sink == DS_Array) qDebug ("unclosed array(s)."); + if (m_sink == DS_Array) tqDebug ("unclosed array(s)."); while (m_sink == DS_Array) gotArrayEnd (); stacktoa (m_stack); } @@ -1154,37 +1154,37 @@ void AIParserBase::cleanupArrays() void TextHandlerBase::gotFontEncoding (const TQValueVector<AIElement>& encodingData, const char*oldFontName, const char*newFontName) { - qDebug ("font encoding %s to %s",oldFontName, newFontName); + tqDebug ("font encoding %s to %s",oldFontName, newFontName); arraytoa (encodingData); - qDebug ("/font encoding"); + tqDebug ("/font encoding"); } void TextHandlerBase::gotFontDefinition (const char*fontName, double size, double leading, double kerning, TextAlign align) { - qDebug ("font definition: name %s size %f leading %f kerning %f align %d", fontName, size, leading, kerning, align); + tqDebug ("font definition: name %s size %f leading %f kerning %f align %d", fontName, size, leading, kerning, align); } void TextHandlerBase::gotTextBlockBegin (const TQValueVector<AIElement>& transData, TextOperation mode) { - qDebug ("text block begin %d",mode); + tqDebug ("text block begin %d",mode); arraytoa (transData); - qDebug ("/text block begin"); + tqDebug ("/text block begin"); } void TextHandlerBase::gotTextOutput (const char*text, int length) { - qDebug ("text output (%s) %d",text,length); + tqDebug ("text output (%s) %d",text,length); } void TextHandlerBase::gotTextBlockEnd () { - qDebug ("text block end"); + tqDebug ("text block end"); } const void elementtoa (const AIElement &/*data*/) { /* AIElement::Type type = data.type(); - qDebug ("type: %s", AIElement::typeToName (type)); + tqDebug ("type: %s", AIElement::typeToName (type)); switch (type) { @@ -1193,13 +1193,13 @@ const void elementtoa (const AIElement &/*data*/) case AIElement::Int : case AIElement::UInt : case AIElement::Double : - qDebug ("string value : %s",data.toString().latin1()); + tqDebug ("string value : %s",data.toString().latin1()); break; case AIElement::Reference : - qDebug ("string value : %s",data.toReference().latin1()); + tqDebug ("string value : %s",data.toReference().latin1()); break; case AIElement::Operator : - qDebug ("string value : %s",data.toOperator().latin1()); + tqDebug ("string value : %s",data.toOperator().latin1()); break; case AIElement::ElementArray : arraytoa (data.toElementArray()); @@ -1209,50 +1209,50 @@ const void elementtoa (const AIElement &/*data*/) break; default : - qDebug ("could not fetch data"); + tqDebug ("could not fetch data"); } */ } const void arraytoa (const TQValueVector<AIElement> &/*data*/) { -/* qDebug ("array size is %d ",data.size()); +/* tqDebug ("array size is %d ",data.size()); if (data.size() > 0) { - qDebug ("[[[[[[[[[[[[[[[[[[[["); + tqDebug ("[[[[[[[[[[[[[[[[[[[["); for (uint i=0; i< data.size(); i++) { elementtoa (data[i]); } - qDebug ("]]]]]]]]]]]]]]]]]]]]"); + tqDebug ("]]]]]]]]]]]]]]]]]]]]"); } */ } const void stacktoa (const TQValueStack<AIElement> &/*data*/) { -/* qDebug ("stack size is %d",data.size()); +/* tqDebug ("stack size is %d",data.size()); if (data.size() > 0) { - qDebug ("<<<<<<<<<<<<<<<<<<"); + tqDebug ("<<<<<<<<<<<<<<<<<<"); for (uint i=0; i< data.size(); i++) { elementtoa (data[i]); } } - qDebug (">>>>>>>>>>>>>>>>>>"); */ + tqDebug (">>>>>>>>>>>>>>>>>>"); */ } const void stacktoa2 (const TQValueStack<TQValueVector<AIElement> >&/*data*/) { -/* qDebug ("stack size is %d",data.size()); +/* tqDebug ("stack size is %d",data.size()); if (data.size() > 0) { - qDebug ("((((((((((((((((((((((("); + tqDebug ("((((((((((((((((((((((("); for (uint i=0; i< data.size(); i++) { arraytoa (data[i]); } - qDebug (")))))))))))))))))))))))"); + tqDebug (")))))))))))))))))))))))"); } */ } @@ -1260,59 +1260,59 @@ const void aiotoa (AIOperation &data) { switch (data) { - case AIO_SetFillColorCMYK : qDebug ("AIO_SetFillColorCMYK"); break; - case AIO_SetStrokeColorCMYK : qDebug ("AIO_SetStrokeColorCMYK"); break; - case AIO_SetFillColorGray : qDebug ("AIO_SetFillColorGray"); break; - case AIO_SetStrokeColorGray : qDebug ("AIO_SetStrokeColorGray"); break; - case AIO_SetFillColorCustom : qDebug ("AIO_SetFillColorCustom"); break; - case AIO_SetStrokeColorCustom : qDebug ("AIO_SetStrokeColorCustom"); break; - case AIO_SetFillPattern : qDebug ("AIO_SetFillPattern"); break; - case AIO_SetStrokePattern : qDebug ("AIO_SetStrokePattern"); break; - case AIO_SetFillOverprinting : qDebug ("AIO_SetFillOverprinting"); break; - case AIO_SetStrokeOverprinting : qDebug ("AIO_SetStrokeOverprinting"); break; - case AIO_SetFlatness : qDebug ("AIO_SetFlatness"); break; - case AIO_SetLineCap : qDebug ("AIO_SetLineCap"); break; - case AIO_SetLineJoin : qDebug ("AIO_SetLineJoin"); break; - case AIO_SetLineWidth : qDebug ("AIO_SetLineWidth"); break; - case AIO_SetMiterLimit : qDebug ("AIO_SetMiterLimit"); break; - case AIO_SetDash : qDebug ("AIO_SetDash"); break; - case AIO_BeginGroupClip : qDebug ("AIO_BeginGroupClip"); break; - case AIO_EndGroupClip : qDebug ("AIO_EndGroupClip"); break; - case AIO_MoveTo : qDebug ("AIO_MoveTo"); break; - case AIO_LineToCorner : qDebug ("AIO_LineToCorner"); break; - case AIO_LineToSmooth : qDebug ("AIO_LineToSmooth"); break; - case AIO_CurveToSmooth : qDebug ("AIO_CurveToSmooth"); break; - case AIO_CurveToCorner : qDebug ("AIO_CurveToCorner"); break; - case AIO_CurveToOmitC1Smooth : qDebug ("AIO_CurveToOmitC1Smooth"); break; - case AIO_CurveToOmitC1Corner : qDebug ("AIO_CurveToOmitC1Corner"); break; - case AIO_CurveToOmitC2Smooth : qDebug ("AIO_CurveToOmitC2Smooth"); break; - case AIO_CurveToOmitC2Corner : qDebug ("AIO_CurveToOmitC2Corner"); break; - case AIO_PathIgnoreNoReset : qDebug ("AIO_PathIgnoreNoReset"); break; - case AIO_PathIgnoreNoResetClose : qDebug ("AIO_PathIgnoreNoResetClose"); break; - case AIO_PathClipPath : qDebug ("AIO_PathClipPath"); break; - case AIO_PathIgnoreReset : qDebug ("AIO_PathIgnoreReset"); break; - case AIO_PathIgnoreResetClose : qDebug ("AIO_PathIgnoreResetClose"); break; - case AIO_PathFillNonZero : qDebug ("AIO_PathFillNonZero"); break; - case AIO_PathFillNonZeroClose : qDebug ("AIO_PathFillNonZeroClose"); break; - case AIO_PathStroke : qDebug ("AIO_PathStroke"); break; - case AIO_PathStrokeClose : qDebug ("AIO_PathStrokeClose"); break; - case AIO_PathFillNoReset : qDebug ("AIO_PathFillNoReset"); break; - case AIO_PathFillNoResetClose : qDebug ("AIO_PathFillNoResetClose"); break; - case AIO_FontEncoding : qDebug ("AIO_FontEncoding"); break; - case AIO_PatternDefinition : qDebug ("AIO_PatternDefinition"); break; - case AIO_SetCurrentText : qDebug ("AIO_SetCurrentText"); break; - case AIO_TextBlockFillStroke : qDebug ("AIO_TextBlockFillStroke"); break; - case AIO_TextBlockFill : qDebug ("AIO_TextBlockFill"); break; - case AIO_TextBlockAppend : qDebug ("AIO_TextBlockAppend"); break; - case AIO_TextBlockIgnore : qDebug ("AIO_TextBlockIgnore"); break; - case AIO_TextBlockStroke : qDebug ("AIO_TextBlockStroke"); break; - case AIO_TextOutput : qDebug ("AIO_TextOutput"); break; - case AIO_TextBlockEnd : qDebug ("AIO_TextBlockEnd"); break; - case AIO_GsaveIncludeDocument : qDebug ("AIO_GsaveIncludeDocument"); break; - case AIO_Grestore : qDebug ("AIO_Grestore"); break; - case AIO_LockElement : qDebug ("AIO_LockElement"); break; - case AIO_SetWindingOrder : qDebug ("AIO_SetWindingOrder"); break; - default : qDebug ("unknown"); + case AIO_SetFillColorCMYK : tqDebug ("AIO_SetFillColorCMYK"); break; + case AIO_SetStrokeColorCMYK : tqDebug ("AIO_SetStrokeColorCMYK"); break; + case AIO_SetFillColorGray : tqDebug ("AIO_SetFillColorGray"); break; + case AIO_SetStrokeColorGray : tqDebug ("AIO_SetStrokeColorGray"); break; + case AIO_SetFillColorCustom : tqDebug ("AIO_SetFillColorCustom"); break; + case AIO_SetStrokeColorCustom : tqDebug ("AIO_SetStrokeColorCustom"); break; + case AIO_SetFillPattern : tqDebug ("AIO_SetFillPattern"); break; + case AIO_SetStrokePattern : tqDebug ("AIO_SetStrokePattern"); break; + case AIO_SetFillOverprinting : tqDebug ("AIO_SetFillOverprinting"); break; + case AIO_SetStrokeOverprinting : tqDebug ("AIO_SetStrokeOverprinting"); break; + case AIO_SetFlatness : tqDebug ("AIO_SetFlatness"); break; + case AIO_SetLineCap : tqDebug ("AIO_SetLineCap"); break; + case AIO_SetLineJoin : tqDebug ("AIO_SetLineJoin"); break; + case AIO_SetLineWidth : tqDebug ("AIO_SetLineWidth"); break; + case AIO_SetMiterLimit : tqDebug ("AIO_SetMiterLimit"); break; + case AIO_SetDash : tqDebug ("AIO_SetDash"); break; + case AIO_BeginGroupClip : tqDebug ("AIO_BeginGroupClip"); break; + case AIO_EndGroupClip : tqDebug ("AIO_EndGroupClip"); break; + case AIO_MoveTo : tqDebug ("AIO_MoveTo"); break; + case AIO_LineToCorner : tqDebug ("AIO_LineToCorner"); break; + case AIO_LineToSmooth : tqDebug ("AIO_LineToSmooth"); break; + case AIO_CurveToSmooth : tqDebug ("AIO_CurveToSmooth"); break; + case AIO_CurveToCorner : tqDebug ("AIO_CurveToCorner"); break; + case AIO_CurveToOmitC1Smooth : tqDebug ("AIO_CurveToOmitC1Smooth"); break; + case AIO_CurveToOmitC1Corner : tqDebug ("AIO_CurveToOmitC1Corner"); break; + case AIO_CurveToOmitC2Smooth : tqDebug ("AIO_CurveToOmitC2Smooth"); break; + case AIO_CurveToOmitC2Corner : tqDebug ("AIO_CurveToOmitC2Corner"); break; + case AIO_PathIgnoreNoReset : tqDebug ("AIO_PathIgnoreNoReset"); break; + case AIO_PathIgnoreNoResetClose : tqDebug ("AIO_PathIgnoreNoResetClose"); break; + case AIO_PathClipPath : tqDebug ("AIO_PathClipPath"); break; + case AIO_PathIgnoreReset : tqDebug ("AIO_PathIgnoreReset"); break; + case AIO_PathIgnoreResetClose : tqDebug ("AIO_PathIgnoreResetClose"); break; + case AIO_PathFillNonZero : tqDebug ("AIO_PathFillNonZero"); break; + case AIO_PathFillNonZeroClose : tqDebug ("AIO_PathFillNonZeroClose"); break; + case AIO_PathStroke : tqDebug ("AIO_PathStroke"); break; + case AIO_PathStrokeClose : tqDebug ("AIO_PathStrokeClose"); break; + case AIO_PathFillNoReset : tqDebug ("AIO_PathFillNoReset"); break; + case AIO_PathFillNoResetClose : tqDebug ("AIO_PathFillNoResetClose"); break; + case AIO_FontEncoding : tqDebug ("AIO_FontEncoding"); break; + case AIO_PatternDefinition : tqDebug ("AIO_PatternDefinition"); break; + case AIO_SetCurrentText : tqDebug ("AIO_SetCurrentText"); break; + case AIO_TextBlockFillStroke : tqDebug ("AIO_TextBlockFillStroke"); break; + case AIO_TextBlockFill : tqDebug ("AIO_TextBlockFill"); break; + case AIO_TextBlockAppend : tqDebug ("AIO_TextBlockAppend"); break; + case AIO_TextBlockIgnore : tqDebug ("AIO_TextBlockIgnore"); break; + case AIO_TextBlockStroke : tqDebug ("AIO_TextBlockStroke"); break; + case AIO_TextOutput : tqDebug ("AIO_TextOutput"); break; + case AIO_TextBlockEnd : tqDebug ("AIO_TextBlockEnd"); break; + case AIO_GsaveIncludeDocument : tqDebug ("AIO_GsaveIncludeDocument"); break; + case AIO_Grestore : tqDebug ("AIO_Grestore"); break; + case AIO_LockElement : tqDebug ("AIO_LockElement"); break; + case AIO_SetWindingOrder : tqDebug ("AIO_SetWindingOrder"); break; + default : tqDebug ("unknown"); } } @@ -1320,18 +1320,18 @@ const void sttoa (SectionType &data, bool begin) { switch (data) { - case ST_Setup : begin ? qDebug ("start setup") : qDebug ("end setup"); break; - case ST_Prolog : begin ? qDebug ("start prolog") : qDebug ("end prolog"); break; - case ST_ProcSet : begin ? qDebug ("start procset") : qDebug ("end procset"); break; - case ST_Encoding : begin ? qDebug ("start encoding") : qDebug ("end encoding"); break; - case ST_Pattern : begin ? qDebug ("start pattern") : qDebug ("end pattern"); break; - case ST_Document : begin ? qDebug ("start document") : qDebug ("end document"); break; - case ST_BrushPattern : begin ? qDebug ("start brush pattern") : qDebug ("end brush pattern"); break; - case ST_Gradient : begin ? qDebug ("start gradient") : qDebug ("end gradient"); break; - case ST_Palette : begin ? qDebug ("start palette") : qDebug ("end palette"); break; - case ST_Resource : begin ? qDebug ("start resource") : qDebug ("end resouce"); break; - - default : begin ? qDebug ("unknown") : qDebug ("end unknown"); + case ST_Setup : begin ? tqDebug ("start setup") : tqDebug ("end setup"); break; + case ST_Prolog : begin ? tqDebug ("start prolog") : tqDebug ("end prolog"); break; + case ST_ProcSet : begin ? tqDebug ("start procset") : tqDebug ("end procset"); break; + case ST_Encoding : begin ? tqDebug ("start encoding") : tqDebug ("end encoding"); break; + case ST_Pattern : begin ? tqDebug ("start pattern") : tqDebug ("end pattern"); break; + case ST_Document : begin ? tqDebug ("start document") : tqDebug ("end document"); break; + case ST_BrushPattern : begin ? tqDebug ("start brush pattern") : tqDebug ("end brush pattern"); break; + case ST_Gradient : begin ? tqDebug ("start gradient") : tqDebug ("end gradient"); break; + case ST_Palette : begin ? tqDebug ("start palette") : tqDebug ("end palette"); break; + case ST_Resource : begin ? tqDebug ("start resource") : tqDebug ("end resouce"); break; + + default : begin ? tqDebug ("unknown") : tqDebug ("end unknown"); } } diff --git a/filters/karbon/ai/karbonaiparserbase.cc b/filters/karbon/ai/karbonaiparserbase.cc index 77945723f..c4321252d 100644 --- a/filters/karbon/ai/karbonaiparserbase.cc +++ b/filters/karbon/ai/karbonaiparserbase.cc @@ -73,12 +73,12 @@ KarbonAIParserBase::~KarbonAIParserBase(){ // generic void KarbonAIParserBase::parsingStarted(){ -// qDebug ( getHeader().latin1() ); +// tqDebug ( getHeader().latin1() ); } // generic void KarbonAIParserBase::parsingFinished(){ -// qDebug ( getFooter().latin1() ); +// tqDebug ( getFooter().latin1() ); // handle bounding box if (m_document) @@ -119,17 +119,17 @@ TQString KarbonAIParserBase::getParamList(Parameters& params){ // generic void KarbonAIParserBase::gotStartTag (const char *tagName, Parameters& params){ - qDebug ("<%s%s>", tagName, getParamList (params).latin1() ); + tqDebug ("<%s%s>", tagName, getParamList (params).latin1() ); } // generic void KarbonAIParserBase::gotEndTag (const char *tagName){ - qDebug ("</%s>", tagName ); + tqDebug ("</%s>", tagName ); } // generic void KarbonAIParserBase::gotSimpleTag (const char *tagName, Parameters& params){ - qDebug ("<%s%s/>", tagName, getParamList (params).latin1() ); + tqDebug ("<%s%s/>", tagName, getParamList (params).latin1() ); } // generic @@ -160,8 +160,8 @@ void KarbonAIParserBase::gotPathElement (PathElement &element){ // generic void KarbonAIParserBase::gotFillPath (bool closed, bool reset, FillMode /*fm*/){ -// qDebug ("found fill path"); -// if (!reset) qDebug ("retain filled path"); +// tqDebug ("found fill path"); +// if (!reset) tqDebug ("retain filled path"); if (closed) m_curKarbonPath->close(); @@ -176,7 +176,7 @@ void KarbonAIParserBase::gotFillPath (bool closed, bool reset, FillMode /*fm*/){ // generic void KarbonAIParserBase::gotIgnorePath (bool closed, bool reset){ -// qDebug ("found ignore path"); +// tqDebug ("found ignore path"); if (closed) m_curKarbonPath->close(); @@ -191,7 +191,7 @@ void KarbonAIParserBase::gotIgnorePath (bool closed, bool reset){ // generic void KarbonAIParserBase::gotStrokePath (bool closed) { -// qDebug ("found stroke path"); +// tqDebug ("found stroke path"); if (closed) m_curKarbonPath->close(); @@ -216,7 +216,7 @@ void KarbonAIParserBase::gotClipPath (bool /*closed*/){ void KarbonAIParserBase::gotFillColor (AIColor &color){ // double r, g, b; // color.toRGB (r,g,b); -// qDebug ("set fillcolor to %f %f %f",r,g,b); +// tqDebug ("set fillcolor to %f %f %f",r,g,b); // m_fillColor = color; VColor karbonColor = toKarbonColor (color); @@ -227,7 +227,7 @@ void KarbonAIParserBase::gotFillColor (AIColor &color){ void KarbonAIParserBase::gotStrokeColor (AIColor &color){ // double r, g, b; // color.toRGB (r,g,b); -// qDebug ("set strokecolor to %f %f %f",r,g,b); +// tqDebug ("set strokecolor to %f %f %f",r,g,b); // m_strokeColor = color; VColor karbonColor = toKarbonColor (color); @@ -299,7 +299,7 @@ void KarbonAIParserBase::gotWindingOrder (int val) void KarbonAIParserBase::gotBeginGroup (bool clipping) { -// qDebug ("start begin group"); +// tqDebug ("start begin group"); if (clipping) { VClipGroup *group = new VClipGroup( 0L ); @@ -311,47 +311,47 @@ void KarbonAIParserBase::gotBeginGroup (bool clipping) m_groupStack.push (group); } -// qDebug ("end begin group"); +// tqDebug ("end begin group"); } void KarbonAIParserBase::gotEndGroup (bool /*clipping*/) { -// qDebug ("start end group"); +// tqDebug ("start end group"); - if (m_debug) qDebug ("got end group"); + if (m_debug) tqDebug ("got end group"); if (m_groupStack.isEmpty()) return; - if (m_debug) qDebug ("got end group 2"); + if (m_debug) tqDebug ("got end group 2"); VGroup *group = m_groupStack.pop(); - if (m_debug) qDebug ("got end group 3"); + if (m_debug) tqDebug ("got end group 3"); if (m_debug) { - if (!group) qDebug ("group is NULL"); + if (!group) tqDebug ("group is NULL"); } if (m_groupStack.isEmpty()) { - if (m_debug) qDebug ("insert object"); + if (m_debug) tqDebug ("insert object"); ensureLayer(); m_layer->append (group); - if (m_debug) qDebug ("/insert object"); + if (m_debug) tqDebug ("/insert object"); } else { - if (m_debug) qDebug ("insert object to group"); + if (m_debug) tqDebug ("insert object to group"); m_groupStack.top()->append (group); - if (m_debug) qDebug ("/insert object to group"); + if (m_debug) tqDebug ("/insert object to group"); } - if (m_debug) qDebug ("/got end group"); + if (m_debug) tqDebug ("/got end group"); -// qDebug ("end end group"); +// tqDebug ("end end group"); } void KarbonAIParserBase::gotBeginCombination () { @@ -359,7 +359,7 @@ void KarbonAIParserBase::gotBeginCombination () { } void KarbonAIParserBase::gotEndCombination () { -// qDebug ( "got end combination" ); +// tqDebug ( "got end combination" ); m_ptt = PTT_Output; @@ -409,7 +409,7 @@ void KarbonAIParserBase::doOutputCurrentPath2(PathOutputType type) /* VFill fill; fill.setColor (toKarbonColor (m_fillColor)); m_curKarbonPath->setFill(fill); */ -// qDebug ("set filled"); +// tqDebug ("set filled"); m_curKarbonPath->setFill(m_fill); } @@ -418,7 +418,7 @@ void KarbonAIParserBase::doOutputCurrentPath2(PathOutputType type) /* VStroke stroke; stroke.setColor (toKarbonColor (m_strokeColor)); m_curKarbonPath->setStroke (stroke); */ -// qDebug ("set stroked"); +// tqDebug ("set stroked"); m_curKarbonPath->setStroke (m_stroke); } } @@ -455,10 +455,10 @@ bool KarbonAIParserBase::parse (TQIODevice& fin, TQDomDocument &doc) bool res = AIParserBase::parse (fin); -// qDebug ("document is %s",doc.toString().latin1()); +// tqDebug ("document is %s",doc.toString().latin1()); if (res) { - qDebug ("before save document"); + tqDebug ("before save document"); doc = m_document->saveXML(); // add paper info, we always need custom for svg (Rob) TQDomElement paper = doc.createElement( "PAPER" ); @@ -467,7 +467,7 @@ bool KarbonAIParserBase::parse (TQIODevice& fin, TQDomDocument &doc) paper.setAttribute( "width", m_document->width() ); paper.setAttribute( "height", m_document->height() ); - qDebug ("after save document"); + tqDebug ("after save document"); } else { @@ -490,7 +490,7 @@ void KarbonAIParserBase::ensureLayer () void KarbonAIParserBase::setupHandlers() { -// qDebug("setupHandler called"); +// tqDebug("setupHandler called"); m_gstateHandler = new KarbonGStateHandler(this); m_structureHandler = new KarbonStructureHandler(this); m_pathHandler = new KarbonPathHandler(this); @@ -502,7 +502,7 @@ void KarbonAIParserBase::setupHandlers() void KarbonAIParserBase::teardownHandlers() { -// qDebug("teardownHandler called"); +// tqDebug("teardownHandler called"); delete m_textHandler; delete m_gstateHandler; @@ -519,15 +519,15 @@ void KarbonDocumentHandler::gotBoundingBox (int llx, int lly, int urx, int ury) void KarbonDocumentHandler::gotCreationDate (const char */*val1*/,const char */*val2*/) { -// qDebug ("got creation date [%s], [%s]",val1,val2); +// tqDebug ("got creation date [%s], [%s]",val1,val2); } void KarbonDocumentHandler::gotProcessColors (int /*colors*/) { -/* if (colors && PC_Cyan) qDebug ("contains cyan"); - if (colors && PC_Magenta) qDebug ("contains magenta"); - if (colors && PC_Yellow) qDebug ("contains yellow"); - if (colors && PC_Black) qDebug ("contains black"); */ +/* if (colors && PC_Cyan) tqDebug ("contains cyan"); + if (colors && PC_Magenta) tqDebug ("contains magenta"); + if (colors && PC_Yellow) tqDebug ("contains yellow"); + if (colors && PC_Black) tqDebug ("contains black"); */ } @@ -625,13 +625,13 @@ const void pottoa (PathOutputType &data) { switch (data) { - case POT_Filled : qDebug ("filled"); break; - case POT_Stroked : qDebug ("stroked"); break; - case POT_FilledStroked : qDebug ("filled/stroked"); break; - case POT_Clip : qDebug ("clip"); break; - case POT_Ignore : qDebug ("ignore"); break; - case POT_Leave : qDebug ("leave"); break; - default : qDebug ("unknown"); + case POT_Filled : tqDebug ("filled"); break; + case POT_Stroked : tqDebug ("stroked"); break; + case POT_FilledStroked : tqDebug ("filled/stroked"); break; + case POT_Clip : tqDebug ("clip"); break; + case POT_Ignore : tqDebug ("ignore"); break; + case POT_Leave : tqDebug ("leave"); break; + default : tqDebug ("unknown"); } } diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc index 77a650bb4..19742a4d4 100644 --- a/filters/karbon/eps/epsimport.cc +++ b/filters/karbon/eps/epsimport.cc @@ -89,7 +89,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to ) file.close(); } else - qDebug ("file could not be opened"); + tqDebug ("file could not be opened"); // sed filter TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\""). @@ -104,7 +104,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to ) command += " > "; command += KProcess::quote(m_chain->outputFile()); - qDebug ("command to execute is (%s)", TQFile::encodeName(command).data()); + tqDebug ("command to execute is (%s)", TQFile::encodeName(command).data()); // Execute it: if( !system( TQFile::encodeName(command)) ) diff --git a/filters/karbon/eps/pscommentlexer.cc b/filters/karbon/eps/pscommentlexer.cc index 04aa9aaa7..a321cc0dc 100644 --- a/filters/karbon/eps/pscommentlexer.cc +++ b/filters/karbon/eps/pscommentlexer.cc @@ -94,7 +94,7 @@ bool PSCommentLexer::parse (TQIODevice& fin){ { c = fin.getch (); -// qDebug ("got %c", c); +// tqDebug ("got %c", c); State newState; Action action; @@ -121,7 +121,7 @@ bool PSCommentLexer::parse (TQIODevice& fin){ /* ignore */ break; case Action_Abort : - qWarning ( "state %s / %s char %c (%d)" , statetoa(m_curState), statetoa(newState), c, c ); + tqWarning ( "state %s / %s char %c (%d)" , statetoa(m_curState), statetoa(newState), c, c ); parsingAborted(); return false; break; @@ -136,7 +136,7 @@ bool PSCommentLexer::parse (TQIODevice& fin){ fin.ungetch(c); break; default : - qWarning ( "unknown action: %d ", action); + tqWarning ( "unknown action: %d ", action); } m_curState = newState; @@ -155,26 +155,26 @@ void PSCommentLexer::doOutput () gotComment (m_buffer.latin1()); break; default: - qWarning ( "unknown state: %d", m_curState ); + tqWarning ( "unknown state: %d", m_curState ); } m_buffer.clear(); } void PSCommentLexer::gotComment (const char *value) { - qDebug ( "gotComment: %s ", value ); + tqDebug ( "gotComment: %s ", value ); } void PSCommentLexer::parsingStarted() { - qDebug ( "parsing started" ); + tqDebug ( "parsing started" ); } void PSCommentLexer::parsingFinished() { - qDebug ( "parsing finished" ); + tqDebug ( "parsing finished" ); } void PSCommentLexer::parsingAborted() { - qDebug ( "parsing aborted" ); + tqDebug ( "parsing aborted" ); } void PSCommentLexer::nextStep (char c, State *newState, Action *newAction) { @@ -219,7 +219,7 @@ void PSCommentLexer::nextStep (char c, State *newState, Action *newAction) { uchar PSCommentLexer::decode() { uchar value = m_temp.toString().toShort(NULL, 8); -// qDebug ("got encoded char %c",value); +// tqDebug ("got encoded char %c",value); return value; } @@ -312,7 +312,7 @@ bool BoundingBoxExtractor::getRectangle (const char* input, int &llx, int &lly, TQString s2 = s.remove("%BoundingBox:"); TQStringList values = TQStringList::split (" ", s2.latin1()); - qDebug("size is %d",values.size()); + tqDebug("size is %d",values.size()); // if (values.size() < 5) return false; llx = values[0].toInt(); lly = values[1].toInt(); diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 7b84c3d0e..4291c0a4e 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -250,7 +250,7 @@ TQByteArray PowerPointImport::createStyles() TQString dbg; for( unsigned i=0; i<stylesData.size(); i++ ) dbg.append( stylesData[i] ); - qDebug("\nstyles.xml:\n%s\n", dbg.latin1() ); + tqDebug("\nstyles.xml:\n%s\n", dbg.latin1() ); return stylesData; } @@ -311,7 +311,7 @@ TQByteArray PowerPointImport::createContent() TQString dbg; for( unsigned i=0; i<contentData.size(); i++ ) dbg.append( contentData[i] ); - qDebug("\ncontent.xml:\n%s\n", dbg.latin1() ); + tqDebug("\ncontent.xml:\n%s\n", dbg.latin1() ); return contentData; } @@ -342,7 +342,7 @@ TQByteArray PowerPointImport::createManifest() TQString dbg; for( unsigned i=0; i<manifestData.size(); i++ ) dbg.append( manifestData[i] ); - qDebug("\nmanifest.xml:\n%s\n", dbg.latin1() ); + tqDebug("\nmanifest.xml:\n%s\n", dbg.latin1() ); return manifestData; } @@ -1479,8 +1479,8 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX std::string s = drawObject->getStrProperty("draw:stroke-dash"); TQString ss( s.c_str() ); xmlWriter->addAttribute( "draw:stroke-dash", ss ); - qDebug("=============stroke dash==================="); -// qDebug("test %g\n",angka); + tqDebug("=============stroke dash==================="); +// tqDebug("test %g\n",angka); } else if (drawObject->getStrProperty( "draw:stroke" ) == "solid") xmlWriter->addAttribute( "draw:stroke", "solid" ); diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp index af035c697..8c9917425 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp @@ -5617,7 +5617,7 @@ void PPTReader::handleTextCharsAtom( TextCharsAtom* atom ) for (uint i=0; i<atom->listSize(); i++) { text->setText(atom->strValue(i)); - // qDebug("=====================text list ================"); + // tqDebug("=====================text list ================"); } if( (d->currentTextType == TextObject::Title) | (d->currentTextType == TextObject::CenterTitle) ) @@ -5653,7 +5653,7 @@ void PPTReader::handleTextBytesAtom( TextBytesAtom* atom ) for (uint i=0; i<atom->listSize(); i++) { text->setText(atom->strValue(i)); - // qDebug("=====================text list ================"); + // tqDebug("=====================text list ================"); } if( (d->currentTextType == TextObject::Title) | (d->currentTextType == TextObject::CenterTitle) ) @@ -6016,60 +6016,60 @@ void PPTReader::handleEscherPropertiesAtom( msofbtOPTAtom* atom ) { case msofbtOPTAtom::LineSolid : {d->currentObject->setProperty( "draw:stroke", "solid"); - //qDebug("=====================solid================"); + //tqDebug("=====================solid================"); } break; case msofbtOPTAtom::LineDashSys : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_2"); - //qDebug("===================== solid================"); + //tqDebug("===================== solid================"); } break; case msofbtOPTAtom::LineDotSys : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_3"); - //qDebug("===================== dash 2================"); + //tqDebug("===================== dash 2================"); } break; case msofbtOPTAtom::LineDashDotSys : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_2"); - //qDebug("===================== dash 3================"); + //tqDebug("===================== dash 3================"); } break; case msofbtOPTAtom::LineDashDotDotSys : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_2"); - //qDebug("===================== dash 4================"); + //tqDebug("===================== dash 4================"); } break; case msofbtOPTAtom::LineDotGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_2"); - //qDebug("===================== dash 5================"); + //tqDebug("===================== dash 5================"); } break; case msofbtOPTAtom::LineDashGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_4"); - //qDebug("===================== dash 6================"); + //tqDebug("===================== dash 6================"); } break; case msofbtOPTAtom::LineLongDashGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_6"); - //qDebug("=====================dash 7================"); + //tqDebug("=====================dash 7================"); } break; case msofbtOPTAtom::LineDashDotGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_5"); - //qDebug("=====================dash 8================"); + //tqDebug("=====================dash 8================"); } break; case msofbtOPTAtom::LineLongDashDotGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_7"); - //qDebug("=====================dash 9================"); + //tqDebug("=====================dash 9================"); } break; case msofbtOPTAtom::LineLongDashDotDotGEL : { d->currentObject->setProperty( "draw:stroke", "dash"); d->currentObject->setProperty( "draw:stroke-dash", "Dash_20_8"); - //qDebug("=====================dash 10================"); + //tqDebug("=====================dash 10================"); } break; default: d->currentObject->setProperty( "draw:stroke", "solid"); break; diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cc index 13685e025..cb333d41f 100644 --- a/filters/kword/latex/import/generator/document.cc +++ b/filters/kword/latex/import/generator/document.cc @@ -85,7 +85,7 @@ bool Document::generate(KoStore* store) void Document::serialize(KoStore* store, TQDomDocument doc) { TQCString str = doc.toCString(); - qWarning(str); + tqWarning(str); if(store->open("root")) { store->write((const char *)str, str.length()); diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index b7155fa8d..50471ede1 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -161,17 +161,17 @@ bool PalmDB::load( const char* filename ) // debugging #ifdef PDB_DEBUG - qDebug( "name: \"%s\"", m_name.latin1() ); - qDebug( "type: \"%s\"", m_type.latin1() ); - qDebug( "creator: \"%s\"", m_creator.latin1() ); - qDebug( "attributes: 0x%04X", m_attributes ); - qDebug( "version: 0x%04X", m_version ); - qDebug( "creation date: %s", m_creationDate.toString().latin1() ); - qDebug( "modification date: %s", m_modificationDate.toString().latin1() ); - qDebug( "last backup date: %s", m_lastBackupDate.toString().latin1() ); - qDebug( "number of records: %d", numrec ); + tqDebug( "name: \"%s\"", m_name.latin1() ); + tqDebug( "type: \"%s\"", m_type.latin1() ); + tqDebug( "creator: \"%s\"", m_creator.latin1() ); + tqDebug( "attributes: 0x%04X", m_attributes ); + tqDebug( "version: 0x%04X", m_version ); + tqDebug( "creation date: %s", m_creationDate.toString().latin1() ); + tqDebug( "modification date: %s", m_modificationDate.toString().latin1() ); + tqDebug( "last backup date: %s", m_lastBackupDate.toString().latin1() ); + tqDebug( "number of records: %d", numrec ); for( int r = 0; r < numrec; r++ ) - qDebug( " rec %d at 0x%X size %d", r, recpos[r], recsize[r] ); + tqDebug( " rec %d at 0x%X size %d", r, recpos[r], recsize[r] ); #endif // load all records diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp index 72bb0434c..9898ad00c 100644 --- a/filters/kword/palmdoc/palmdoc.cpp +++ b/filters/kword/palmdoc/palmdoc.cpp @@ -47,14 +47,14 @@ bool PalmDoc::load( const char* filename ) if( type() != "TEXt" ) { - qDebug( "Type is \"%s\", not \"TEXt\", so this is not Palm DOC!", type().latin1() ); + tqDebug( "Type is \"%s\", not \"TEXt\", so this is not Palm DOC!", type().latin1() ); m_result = PalmDoc::InvalidFormat; return FALSE; } if( creator() != "REAd" ) { - qDebug( "Creator is \"%s\", not \"REAd\", so this is not Palm DOC!", + tqDebug( "Creator is \"%s\", not \"REAd\", so this is not Palm DOC!", creator().latin1() ); m_result = PalmDoc::InvalidFormat; return FALSE; @@ -63,7 +63,7 @@ bool PalmDoc::load( const char* filename ) // must have at least two records if( records.count() < 2 ) { - qDebug( "Palm DOC has at least 2 records!" ); + tqDebug( "Palm DOC has at least 2 records!" ); m_result = PalmDoc::InvalidFormat; return FALSE; } @@ -74,13 +74,13 @@ bool PalmDoc::load( const char* filename ) // format of the DOC int format = (header[0]<<8) + header[1]; - qDebug( "DOC format: %d (%s)", format, + tqDebug( "DOC format: %d (%s)", format, (format==1) ? "Plain" : (format==2) ? "Compressed" : "Unknown" ); // supported is only Plain or Compressed if( ( format != 1 ) && ( format != 2 ) ) { - qDebug( "Unknown format of document!" ); + tqDebug( "Unknown format of document!" ); m_result = PalmDoc::InvalidFormat; return FALSE; } diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 2444998df..a64765306 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 4d8fd0c81..ab83da292 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 ee9dc8791..24f5b9156 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 b24892b14..66dbc45cc 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 7fed7520d..b7b57894e 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 8bfe1a760..dbf6394ab 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 9b4d78551..c8c51c60c 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 c86d0bdce..0854a86ba 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 917136f0f..e361ace5c 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 8876fb8b1..712aedbe4 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 868dfa3a6..ab7750ed4 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 d8f766c27..6073994a1 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 9f0995e81..c25abd856 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 849d2b297..03df77a68 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 e59443fb0..efc2362ca 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 2c8d92e94..60dc529b7 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 86f37d683..19b5c3904 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 99cee953b..4bf6ca0a7 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 247a9182f..f2b65acfe 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 ba1e6fed9..68462b89e 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 fcec2c53e..fddb6c947 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 b95165f78..ddb9c0ff3 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 c09851349..09c0bb785 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 3904bf168..7a21930c4 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 38c6fa456..a8b69e850 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 bf03b362c..21c41592a 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(); diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 66d711971..8867fec18 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -1195,7 +1195,7 @@ void KDGanttMinimizeSplitter::setHidden( TQWidget *w, bool hide ) w2show = !hide; } else { #ifdef TQT_CHECK_RANGE - qWarning( "KDGanttMinimizeSplitter::setHidden(), unknown widget" ); + tqWarning( "KDGanttMinimizeSplitter::setHidden(), unknown widget" ); #endif return; } @@ -1219,7 +1219,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const return !w2show; #ifdef TQT_CHECK_RANGE else - qWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" ); + tqWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" ); #endif return FALSE; } @@ -1379,7 +1379,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( spacerCount ) spacerCount--; // only spacers between things if ( space < cMin + spacerCount * spacer ) { - // qDebug("not enough space"); + // tqDebug("not enough space"); for ( i = start; i < start+count; i++ ) { chain[i].size = chain[i].minimumSize; chain[i].done = TRUE; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 4163fef13..87f5d3ff5 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -303,7 +303,7 @@ void KDGanttView::show() bool KDGanttView::close ( bool alsoDelete ) { - //qDebug("close "); + //tqDebug("close "); if ( closingBlocked ) return false; return TQWidget::close ( alsoDelete ); @@ -346,7 +346,7 @@ TQSize KDGanttView::sizeHint() const //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width(); hintWid += myCanvasView->sizeHint().width(); // add 10 for the splitter-bars - // qDebug("sizehint %d %d ",hintWid+10, hintHeight ); + // tqDebug("sizehint %d %d ",hintWid+10, hintHeight ); myTimeTable->setBlockUpdating( block ); return TQSize( hintWid+10, hintHeight ); } @@ -581,7 +581,7 @@ void KDGanttView::forceRepaint( int ) { if ( myTimeTable->blockUpdating() ) return; - // qDebug("forceRepaint( int ) "); + // tqDebug("forceRepaint( int ) "); myTimeTable->setAllChanged(); myTimeTable->update(); } @@ -821,8 +821,8 @@ bool KDGanttView::loadProject( TQIODevice* device ) TQString err; int errline, errcol; if ( !doc.setContent( device, &err, &errline, &errcol ) ) { - qDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline ); - qDebug("%s ", err.latin1()); + tqDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline ); + tqDebug("%s ", err.latin1()); device->close(); return false; } @@ -2668,7 +2668,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) color = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2733,7 +2733,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if ( value == "Undefined" ) undefinedShape = true; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2772,7 +2772,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if ( value == "Undefined" ) undefinedShape = true; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2810,7 +2810,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if ( value == "Undefined" ) undefinedShape = true; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2821,7 +2821,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) middleShape, endShape, false ); undefinedShape = false; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2853,7 +2853,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2881,7 +2881,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2909,7 +2909,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2918,7 +2918,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) setColors( KDGanttViewItem::Summary, startColor, middleColor, endColor , false); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2946,7 +2946,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) setDefaultColor( KDGanttViewItem::Summary, value , false); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -2979,7 +2979,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3008,7 +3008,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3037,7 +3037,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) endColor = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3047,7 +3047,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) startColor, middleColor, endColor, false ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3075,7 +3075,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) setDefaultHighlightColor( KDGanttViewItem::Summary, value, false ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3102,7 +3102,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) element ); previous = newItem; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3118,7 +3118,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( tagName == "TaskLink" ) KDGanttViewTaskLink::createFromDomElement( element ); else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3134,7 +3134,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( tagName == "TaskLink" ) KDGanttViewTaskLinkGroup::createFromDomElement( element ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } @@ -3165,7 +3165,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) if( KDGanttXML::readColorNode( element, value ) ) color = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3174,7 +3174,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) } setColumnBackgroundColor( dateTime, color ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3217,7 +3217,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) else ok = false; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -3227,17 +3227,17 @@ bool KDGanttView::loadXML( const TQDomDocument& doc ) addLegendItem( tempLegendShape, tempLegendColor, tempLegendString ); - qDebug( "Adding legend item %s", tempLegendString.latin1() ); + tqDebug( "Adding legend item %s", tempLegendString.latin1() ); } } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } node = node.nextSibling(); } } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -4604,7 +4604,7 @@ void KDGanttView::setLvVScrollBarMode( TQScrollView::ScrollBarMode m ) void KDGanttView::setGvVScrollBarMode( TQScrollView::ScrollBarMode m ) { if ( m == TQScrollView::Auto ) - qDebug("KDGanttView::setListViewVScrollBarMode: TQScrollView::Auto not supported. Nothing changed. "); + tqDebug("KDGanttView::setListViewVScrollBarMode: TQScrollView::Auto not supported. Nothing changed. "); else { myCanvasView->setVScrollBarMode ( m ); diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp index 30cdc29ba..7b2c39da9 100644 --- a/kdgantt/KDGanttViewEventItem.cpp +++ b/kdgantt/KDGanttViewEventItem.cpp @@ -139,7 +139,7 @@ KDGanttViewEventItem::~KDGanttViewEventItem() void KDGanttViewEventItem::setStartTime( const TQDateTime& start ) { if (! start.isValid() ) { - qDebug("KDGanttViewEventItem::setStartTime():Invalid parameter-no time set"); + tqDebug("KDGanttViewEventItem::setStartTime():Invalid parameter-no time set"); return; } myStartTime = start; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index 62205b6b2..b2ff44c20 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -563,16 +563,16 @@ void KDGanttViewItem::setEndTime( const TQDateTime& end ) { switch( type() ) { case Event: - qDebug( "KDGantt:Event Item has no end time" ); + tqDebug( "KDGantt:Event Item has no end time" ); break; case Summary: ((KDGanttViewSummaryItem*)this)->setEndTime( end ); break; case Task: - qDebug( "KDGantt:Task Item has no end time" ); + tqDebug( "KDGantt:Task Item has no end time" ); break; default: - qDebug( "Unknown type in KDGanttViewItem::typeToString()" ); + tqDebug( "Unknown type in KDGanttViewItem::typeToString()" ); } } @@ -1325,7 +1325,7 @@ void KDGanttViewItem::updateCanvasItems() } else { b.setStyle(Qt::SolidPattern); b.setColor(myStartColor); - // qDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() ); + // tqDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() ); startShape->setBrush(b); b.setColor(myMiddleColor); midShape->setBrush(b); @@ -1470,12 +1470,12 @@ void KDGanttViewItem::initColorAndShapes(Type t) // set shapes if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) { - //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes"); + //tqDebug("KDGantt::KDGanttViewItem created with not user defined shapes"); }; setShapes(myStartShape,myMiddleShape,myEndShape); if ( type() == Task ) { - //qDebug("new task %s ", listViewText().latin1()); + //tqDebug("new task %s ", listViewText().latin1()); if ( startShape ) delete startShape; startShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); @@ -1625,7 +1625,7 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view, else if( typeString == "Event" ) item = new KDGanttViewEventItem( view ); else { - qDebug( "Unknown item type %s in KDGanttViewItem::createFromDomElement()", typeString.latin1() ); + tqDebug( "Unknown item type %s in KDGanttViewItem::createFromDomElement()", typeString.latin1() ); return 0; } @@ -1657,7 +1657,7 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view, else if( typeString == "Event" ) item = new KDGanttViewEventItem( view, previous ); else { - qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); + tqDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); return 0; } @@ -1689,7 +1689,7 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent, else if( typeString == "Event" ) item = new KDGanttViewEventItem( parent ); else { - qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); + tqDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); return 0; } @@ -1721,7 +1721,7 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent, else if( typeString == "Event" ) item = new KDGanttViewEventItem( parent, previous ); else { - qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); + tqDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); return 0; } @@ -1857,7 +1857,7 @@ void KDGanttViewItem::loadFromDomElement( TQDomElement& element ) element ); previous = newItem; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -1865,7 +1865,7 @@ void KDGanttViewItem::loadFromDomElement( TQDomElement& element ) node = node.nextSibling(); } } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -1891,7 +1891,7 @@ TQString KDGanttViewItem::typeToString( Type type ) case Task: return "Task"; default: - qDebug( "Unknown type in KDGanttViewItem::typeToString()" ); + tqDebug( "Unknown type in KDGanttViewItem::typeToString()" ); return "Summary"; } return ""; @@ -2103,7 +2103,7 @@ int KDGanttViewItem::computeHeight() showItem( false ); if ( firstChild() ) firstChild()->hideSubtree(); - // qDebug("KDGanttViewItem::computeHeight() %s returns 0 ", TQListViewItem::text(0).latin1()); + // tqDebug("KDGanttViewItem::computeHeight() %s returns 0 ", TQListViewItem::text(0).latin1()); return 0; } @@ -2144,7 +2144,7 @@ int KDGanttViewItem::computeHeight() // display closed item as usual // if ( isOpen() ) { - //qDebug("KDGanttViewItem::computeHeight() %s is open ", TQListViewItem::text(0).latin1()); + //tqDebug("KDGanttViewItem::computeHeight() %s is open ", TQListViewItem::text(0).latin1()); temp = firstChild(); // if item opened, iterate over all subitems int tempHeight; @@ -2155,19 +2155,19 @@ int KDGanttViewItem::computeHeight() if ( special ) { if ( temp->displaySubitemsAsGroup() ) { hei += tempHeight; - //qDebug(" hei added "); + //tqDebug(" hei added "); } else { temp->showSubitemTree( getCoordY() ); } } else { hei += tempHeight; - //qDebug(" hei added "); + //tqDebug(" hei added "); } temp = temp->nextSibling(); } } else { // closed! - //qDebug("KDGanttViewItem::computeHeight() %s is closed ", TQListViewItem::text(0).latin1()); + //tqDebug("KDGanttViewItem::computeHeight() %s is closed ", TQListViewItem::text(0).latin1()); if ( !displaySubitemsAsGroup() ) { if ( firstChild() ) { @@ -2185,7 +2185,7 @@ int KDGanttViewItem::computeHeight() showItem( true ); hei += height(); - //qDebug("KDGanttViewItem::computeHeight() %s returns: %d ", TQListViewItem::text(0).latin1(), hei); + //tqDebug("KDGanttViewItem::computeHeight() %s returns: %d ", TQListViewItem::text(0).latin1(), hei); return hei; } @@ -2217,11 +2217,11 @@ void KDGanttViewItem::paintBranches ( TQPainter* p, const TQColorGroup& cg, KDGanttViewItem * temp = firstChild(); while ( temp ) { if ( temp->showNoCross() ) { - //qDebug("paintNoCross %s ", temp->listViewText(0).latin1()); + //tqDebug("paintNoCross %s ", temp->listViewText(0).latin1()); int y_coord = temp->itemPos() -height ()- itemPos(); int hei = temp->height(); - //qDebug(" y %d w %d h %d ", y,w,h); - //qDebug("yc %d hei %d",y_coord,hei ); + //tqDebug(" y %d w %d h %d ", y,w,h); + //tqDebug("yc %d hei %d",y_coord,hei ); myGanttView->myListView->paintemptyarea( p, TQRect( 0,y+y_coord,w,hei)); int x_c = w/2; int y_c = y+y_coord+ temp->height ()/2; @@ -2485,7 +2485,7 @@ void KDGanttViewItem::moveTextCanvas(int x, int y) mx -= 2*myItemSize; // keep old behaviour textCanvas->move(mx+2*myItemSize,my-myItemSize/2); - //qDebug("%s: moveTextCanvas(%d,%d) offset: %d,%d moved to %d,%d",listViewText(0).latin1(),x,y,myTextOffset.x(),myTextOffset.y(),mx+2*myItemSize,my-myItemSize/2); + //tqDebug("%s: moveTextCanvas(%d,%d) offset: %d,%d moved to %d,%d",listViewText(0).latin1(),x,y,myTextOffset.x(),myTextOffset.y(),mx+2*myItemSize,my-myItemSize/2); } /*! @@ -2503,7 +2503,7 @@ void KDGanttViewItem::moveTextCanvas() */ void KDGanttViewItem::setTextOffset(TQPoint p) { - //qDebug("%s: setTextOffset() offset: %d,%d",listViewText(0).latin1(),p.x(),p.y()); + //tqDebug("%s: setTextOffset() offset: %d,%d",listViewText(0).latin1(),p.x(),p.y()); myTextOffset.setX(p.x()); myTextOffset.setY(p.y()); } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 2bcbe5ae7..31830dfdf 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -179,7 +179,7 @@ int KDTimeTableWidget::computeHeight() if (hei == 0) { hei = 1; } - //qDebug("COMPUTED HEI %d ", hei); + //tqDebug("COMPUTED HEI %d ", hei); emit heightComputed( hei ); return hei; } @@ -188,7 +188,7 @@ void KDTimeTableWidget::computeVerticalGrid() // recompute the vertical grid // compute the vertical grid // if we have too much lines, hide them - //qDebug("computeVerticalGrid() "); + //tqDebug("computeVerticalGrid() "); int cw = myGanttView->myTimeHeader->myGridMinorWidth; int i = 0; int h ; @@ -434,7 +434,7 @@ void KDTimeTableWidget::computeVerticalGrid() void KDTimeTableWidget::computeHorizontalGrid() { // compute horizontal grid - //qDebug("computeHorizontalGrid() "); + //tqDebug("computeHorizontalGrid() "); KDGanttViewItem* temp = myGanttView->firstChild(); int wid; if ( pendingWidth ) @@ -474,7 +474,7 @@ void KDTimeTableWidget::computeHorizontalGrid() //TQString ts = "asGroup"; //if (!temp->displaySubitemsAsGroup() ) // ts = " NOT asGroup"; - //qDebug("temp name %s %s", temp->listViewText(0).latin1(), ts.latin1()); + //tqDebug("temp name %s %s", temp->listViewText(0).latin1(), ts.latin1()); temp = temp->itemBelow (); } @@ -586,10 +586,10 @@ void KDTimeTableWidget::computeTaskLinks() void KDTimeTableWidget::updateMyContent() { if ( flag_blockUpdating || int_blockUpdating ) { - // qDebug("KDTimeTableWidget::updateMyContent() blocked! "); + // tqDebug("KDTimeTableWidget::updateMyContent() blocked! "); return; } - //qDebug("KDTimeTableWidget::updateMyContent() ********************************* "); + //tqDebug("KDTimeTableWidget::updateMyContent() ********************************* "); /* // debug output KDGanttViewItem* temp = myGanttView->firstChild(); @@ -638,7 +638,7 @@ void KDTimeTableWidget::updateMyContent() } pendingWidth = 0; pendingHeight = 0; - //qDebug("KDTimeTableWidget::updateMyContent() -------------------------"); + //tqDebug("KDTimeTableWidget::updateMyContent() -------------------------"); } // used for blocking recursive methods // e.g. KDGanttViewItem::setHighlight() and displaySubitemsAsGroup() == true @@ -1111,12 +1111,12 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end) if (start < myHorizonStart) { myHorizonStart = start; flagStartTimeSet = true; - //qDebug("myHorizonStart reset"); + //tqDebug("myHorizonStart reset"); } if (end > myHorizonEnd) { myHorizonEnd = end; flagEndTimeSet = true; - //qDebug("myHorizonEnd reset "); + //tqDebug("myHorizonEnd reset "); } flagDoNotRepaintAfterChange = true;//avoid flicker zoom(1.0); // set to 100% @@ -1134,7 +1134,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end) zoom (fac); timeWid = getCoordX(end)-getCoordX(start); if ( count++ > 10 ) { - //qDebug("Exiting while loop in zoomToSelection "); + //tqDebug("Exiting while loop in zoomToSelection "); break; } } @@ -1156,7 +1156,7 @@ void KDTimeHeaderWidget::zoom(double factor, bool absolute) { flagZoomToFit = false; if ( factor < 0.000001 ) { - qDebug("KDGanttView::zoom() : Zoom factor to low. Nothing zoomed. "); + tqDebug("KDGanttView::zoom() : Zoom factor to low. Nothing zoomed. "); return; } double newZoom; @@ -1167,12 +1167,12 @@ void KDTimeHeaderWidget::zoom(double factor, bool absolute) double relativeZoom; relativeZoom = newZoom / myZoomFactor; - //qDebug("zooming relative %f ", relativeZoom); - //qDebug("zooming absolute %f ", newZoom); + //tqDebug("zooming relative %f ", relativeZoom); + //tqDebug("zooming absolute %f ", newZoom); int viewWid = myGanttView->myCanvasView->viewport()->width(); if ( width() * relativeZoom < viewWid && ( newZoom > 1.01 || newZoom < 0.99 ) ) { - qDebug("KDGanttView::zoom() : Zoom factor to low for current horizon. "); - // qDebug("zooming relative %f, zooming absolute %f, viewWidth %d width %d ", relativeZoom, newZoom, viewWid, width() ); + tqDebug("KDGanttView::zoom() : Zoom factor to low for current horizon. "); + // tqDebug("zooming relative %f, zooming absolute %f, viewWidth %d width %d ", relativeZoom, newZoom, viewWid, width() ); return; } myZoomFactor = newZoom; @@ -1831,14 +1831,14 @@ int KDTimeHeaderWidget::minorScaleCount() const void KDTimeHeaderWidget::resizeEvent ( TQResizeEvent * ) { - // qDebug("KDTimeHeaderWidget:: resizeEvent "); + // tqDebug("KDTimeHeaderWidget:: resizeEvent "); paintPix.resize( 800, height () ); } void KDTimeHeaderWidget::updateTimeTable() { - //qDebug("KDTimeHeaderWidget::updateTimeTable() "); + //tqDebug("KDTimeHeaderWidget::updateTimeTable() "); if (flagDoNotRecomputeAfterChange) return; // setting the scrolling steps int scrollLineStep = myGridMinorWidth; @@ -1981,7 +1981,7 @@ TQDateTime KDTimeHeaderWidget::getEvenTimeDate(TQDateTime tempdatetime ,Scale sc min = tempdatetime.time().minute(); while (60%tempMinorScaleCount > 0 && 60%tempMinorScaleCount < 60) ++tempMinorScaleCount; - // qDebug("myMinorScaleCount %d %d %d",myMinorScaleCount, myRealMinorScaleCount, tempMinorScaleCount); + // tqDebug("myMinorScaleCount %d %d %d",myMinorScaleCount, myRealMinorScaleCount, tempMinorScaleCount); min = (min /tempMinorScaleCount)*tempMinorScaleCount; tempdatetime = TQDateTime (tempdatetime.date(), TQTime (tempdatetime.time().hour(),min )); @@ -1997,7 +1997,7 @@ void KDTimeHeaderWidget::computeRealScale(TQDateTime start) { if (myScale ==KDGanttView::Auto) { - //qDebug("Autoscale "); + //tqDebug("Autoscale "); //double secsPerMinor = (((double)start.daysTo(myHorizonEnd))* 86400.00)/((double)myAutoScaleMinorTickcount); double secsPerMinor = (((double)start.secsTo(myHorizonEnd)))/((double)myAutoScaleMinorTickcount); secsPerMinor /= myZoomFactor; @@ -2029,7 +2029,7 @@ void KDTimeHeaderWidget::computeRealScale(TQDateTime start) myRealMajorScaleCount = 1; } else { - //qDebug("Fixed scale "); + //tqDebug("Fixed scale "); myRealScale = myScale; if (myRealScale > myMaxScale) myRealScale = myMaxScale; @@ -2079,7 +2079,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) if (flagDoNotRecomputeAfterChange) return; bool block = myGanttView->myTimeTable->blockUpdating(); myGanttView->myTimeTable->setBlockUpdating( true ); - //qDebug("computeticks "); + //tqDebug("computeticks "); majorTicks.clear(); minorText.clear(); majorText.clear(); @@ -2094,7 +2094,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) tempMajorScaleCount = myRealMajorScaleCount; int minorItems,minorPerMajor = 1; minorItems = (int) (secsFromTo( myRealStart, myHorizonEnd)/60.0); - //qDebug("tempMinorScaleCount %d ", tempMinorScaleCount); + //tqDebug("tempMinorScaleCount %d ", tempMinorScaleCount); TQPainter p(this); int Width, Height; TQString testTextMinor,testTextMajor, tempStr; @@ -2143,14 +2143,14 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) minorPerMajor = 1200; break; case KDGanttView::Auto: - qDebug("KDGanttView::Internal Error in KDTimeHeaderWidget::computeTicks() "); - qDebug(" RealScale == Auto : This may not be! "); + tqDebug("KDGanttView::Internal Error in KDTimeHeaderWidget::computeTicks() "); + tqDebug(" RealScale == Auto : This may not be! "); break; } itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); p.end(); - //qDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); + //tqDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); Height = itemRectMinor.height()+itemRectMajor.height()+11; Width = (itemRectMinor.width()+5); if (Width < minimumColumnWidth()) Width = minimumColumnWidth(); @@ -2161,7 +2161,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) maxWid = maximumWidth(); while((minorItems/tempMinorScaleCount+1)*Width > maxWid) ++tempMinorScaleCount; - //qDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); + //tqDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); mySizeHint = (minorItems/tempMinorScaleCount+1)*Width; switch (myRealScale) { @@ -2174,7 +2174,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myRealMinorScaleCount = tempMinorScaleCount/ 60; // myRealMinorScaleCount = 1; myRealMajorScaleCount = 1; - qDebug("KDGantt::Overzoom:Rescaling from Minute to Hour"); + tqDebug("KDGantt::Overzoom:Rescaling from Minute to Hour"); myGanttView->myTimeTable->setBlockUpdating( block ); emit myGanttView->rescaling( KDGanttView::Hour ); computeTicks(true); @@ -2189,7 +2189,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myRealMinorScaleCount = tempMinorScaleCount/ 24; //myRealMinorScaleCount = 1; myRealMajorScaleCount = 1; - qDebug("KDGantt::Overzoom:Rescaling from Hour to Day"); + tqDebug("KDGantt::Overzoom:Rescaling from Hour to Day"); myGanttView->myTimeTable->setBlockUpdating( block ); emit myGanttView->rescaling( KDGanttView::Day ); computeTicks(true); @@ -2351,7 +2351,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGanttView->myTimeTable->setBlockUpdating( block ); return; } - //qDebug("KDTimeHeaderWidget width %d, viewport width %d ",width (), myGanttView->myCanvasView->viewport()->width()); + //tqDebug("KDTimeHeaderWidget width %d, viewport width %d ",width (), myGanttView->myCanvasView->viewport()->width()); myGanttView->myTimeTable->setBlockUpdating( block ); updateTimeTable(); centerDateTime(myCenterDateTime); @@ -2376,7 +2376,7 @@ void KDTimeHeaderWidget::saveCenterDateTime() void KDTimeHeaderWidget::centerDateTime( const TQDateTime& center ) { moveTimeLineTo(getCoordX( center )-(myGanttView->myCanvasView->viewport()->width() /2)); - // qDebug("centerDateTime %s %d %d", center.toString().latin1(),getCoordX( center ),(myGanttView->myCanvasView->viewport()->width() /2) ); + // tqDebug("centerDateTime %s %d %d", center.toString().latin1(),getCoordX( center ),(myGanttView->myCanvasView->viewport()->width() /2) ); } @@ -2494,8 +2494,8 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent * ) start = 0; if ( end > width() ) end = width(); - //qDebug("start %s ",getDateTimeForIndex(start).toString().latin1() ); - //qDebug("end %s ",getDateTimeForIndex(end).toString().latin1() ); + //tqDebug("start %s ",getDateTimeForIndex(start).toString().latin1() ); + //tqDebug("end %s ",getDateTimeForIndex(end).toString().latin1() ); emit myGanttView->timeIntervalSelected( getDateTimeForIndex(start),getDateTimeForIndex(end) ); emit myGanttView->timeIntervallSelected( getDateTimeForIndex(start),getDateTimeForIndex(end) ); //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) ); @@ -2541,7 +2541,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) } myGanttView->myCanvasView->horizontalScrollBar()->setValue( val ); } - //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y()); + //tqDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y()); } } @@ -2720,7 +2720,7 @@ KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (pare void KDListView::dragItem( TQListViewItem * ) { - // qDebug("drag "); + // tqDebug("drag "); // startDrag(); } TQString KDListView::getWhatsThisText(TQPoint p) @@ -2758,7 +2758,7 @@ void KDListView::setOpen(TQListViewItem * item, bool open ) } else { temp->setVisible( false ); - //qDebug(" temp->setVisible( false );"); + //tqDebug(" temp->setVisible( false );"); } temp = temp->nextSibling(); } @@ -3021,7 +3021,7 @@ void KDListView::dragMoveEvent ( TQDragMoveEvent * e) void KDListView::dragLeaveEvent ( TQDragLeaveEvent * ) { - //qDebug("contentsDragLeaveEvent "); + //tqDebug("contentsDragLeaveEvent "); } void KDListView::dropEvent ( TQDropEvent *e ) { @@ -3040,7 +3040,7 @@ void KDListView::dropEvent ( TQDropEvent *e ) KDGanttViewItem* newItem = 0; if ( gItem == myGanttView->myCanvasView->lastClickedItem && gItem != 0 ) { - qDebug("KDGanttView::Possible bug in drag&drop code "); + tqDebug("KDGanttView::Possible bug in drag&drop code "); return; } @@ -3068,16 +3068,16 @@ void KDListView::dropEvent ( TQDropEvent *e ) newItem = KDGanttViewItem::createFromDomElement( myGanttView, element ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } - //qDebug("next node1 "); + //tqDebug("next node1 "); node = node.nextSibling(); } } } - //qDebug("next node2 "); + //tqDebug("next node2 "); node = node.nextSibling(); } newItem->setDisplaySubitemsAsGroup(myGanttView->displaySubitemsAsGroup()); @@ -3282,7 +3282,7 @@ void KDGanttCanvasView::myUpdateScrollBars() } void KDGanttCanvasView::setMyContentsHeight( int hei ) { - //qDebug("setMyContentsHeight %d %d ", hei, myMyContentsHeight); + //tqDebug("setMyContentsHeight %d %d ", hei, myMyContentsHeight); if ( hei > 0 ) myMyContentsHeight = hei; verticalScrollBar()->setUpdatesEnabled( true ); // set false in resizeEvent() @@ -3303,7 +3303,7 @@ void KDGanttCanvasView::setMyContentsHeight( int hei ) // Call after *internal* resizing (like addTickRight()) // Then the new scrollbar maxValue is in myTimeHeader. void KDGanttCanvasView::updateHorScrollBar() { - //qDebug("horizontalScrollBar max=%d, myTimeHeaderScroll=%d", horizontalScrollBar()->maxValue(), mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->value()); + //tqDebug("horizontalScrollBar max=%d, myTimeHeaderScroll=%d", horizontalScrollBar()->maxValue(), mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->value()); horizontalScrollBar()->setRange(mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->minValue(), mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->maxValue()); @@ -3341,7 +3341,7 @@ void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewI void KDGanttCanvasView::cutItem() { lastClickedItem->hideSubtree(); - //qDebug("last clicked %d parent %d ", lastClickedItem , lastClickedItem->parent()); + //tqDebug("last clicked %d parent %d ", lastClickedItem , lastClickedItem->parent()); if ( lastClickedItem->parent() ) lastClickedItem->parent()->takeItem(lastClickedItem); else @@ -3505,8 +3505,8 @@ TQString KDGanttCanvasView::getWhatsThisText(TQPoint p) void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) { - //qDebug("mousepress! %d ", this); - //qDebug("focus %d ",tqApp->focusWidget()); + //tqDebug("mousepress! %d ", this); + //tqDebug("focus %d ",tqApp->focusWidget()); setFocus(); currentLink = 0; currentItem = 0; @@ -3600,9 +3600,9 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) { static KDGanttViewItem* lastClicked = 0; mySignalSender->gvMouseButtonClicked( e->button(), currentItem , e->globalPos() ); - //qDebug("datetime %s ",mySignalSender->getDateTimeForCoordX(e->globalPos().x(), true ).toString().latin1() ); - //qDebug("mousepos %d %d ",e->pos().x(),e->pos().y() ); - //qDebug("mouseup "); + //tqDebug("datetime %s ",mySignalSender->getDateTimeForCoordX(e->globalPos().x(), true ).toString().latin1() ); + //tqDebug("mousepos %d %d ",e->pos().x(),e->pos().y() ); + //tqDebug("mouseup "); // if ( currentLink || currentItem ) { switch ( e->button() ) { @@ -3730,7 +3730,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) void KDGanttCanvasView::contentsMouseMoveEvent ( TQMouseEvent *e ) { - //qDebug("mousemove! "); + //tqDebug("mousemove! "); static int moves = 0; if ( (currentLink || currentItem) && (moves < 3) ) { ++moves; @@ -3743,12 +3743,12 @@ void KDGanttCanvasView::contentsMouseMoveEvent ( TQMouseEvent *e ) if (autoScrollEnabled) mousePos = e->pos()- TQPoint(contentsX(),contentsY()); // make mousePos relative 0 if (fromItem) { - //qDebug("mousemove: linking %s: %d,%d ",fromItem->listViewText().latin1(), e->pos().x(), e->pos().y()); + //tqDebug("mousemove: linking %s: %d,%d ",fromItem->listViewText().latin1(), e->pos().x(), e->pos().y()); linkLine->setPoints(linkLine->startPoint().x(), linkLine->startPoint().y(), e->pos().x(), e->pos().y()); canvas()->update(); } // no action implemented - //qDebug("mousemove "); + //tqDebug("mousemove "); //TQToolTip::setGloballyEnabled (false); //TQToolTip::remove(viewport()); // TQToolTip::add(viewport(), "hello"); @@ -3829,7 +3829,7 @@ int KDGanttCanvasView::getItemArea(KDGanttViewItem *item, int x) { // TODO: middle (move, dnd), front, back (resize) KDTimeTableWidget *tt = dynamic_cast<KDTimeTableWidget *>(canvas()); if (!tt) { - qWarning("Cannot cast canvas to KDTimeTableWidget"); + tqWarning("Cannot cast canvas to KDTimeTableWidget"); return 0; } int area = 0; diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp index a2cf28f30..9d9317fcf 100644 --- a/kdgantt/KDGanttViewSummaryItem.cpp +++ b/kdgantt/KDGanttViewSummaryItem.cpp @@ -138,7 +138,7 @@ KDGanttViewSummaryItem::~KDGanttViewSummaryItem() void KDGanttViewSummaryItem::setMiddleTime( const TQDateTime& dateTime ) { if (! dateTime.isValid() ) { - qDebug("KDGanttViewSummaryItem::setMiddleTime():Invalid parameter-no time set"); + tqDebug("KDGanttViewSummaryItem::setMiddleTime():Invalid parameter-no time set"); return; } if (!myMiddleTime) myMiddleTime = new TQDateTime; @@ -177,7 +177,7 @@ TQDateTime KDGanttViewSummaryItem::middleTime() const void KDGanttViewSummaryItem::setEndTime( const TQDateTime& end ) { if (! end.isValid() ) { - qDebug("KDGanttViewSummaryItem::setEndTime():Invalid parameter-no time set"); + tqDebug("KDGanttViewSummaryItem::setEndTime():Invalid parameter-no time set"); return; } myEndTime = end; @@ -200,7 +200,7 @@ void KDGanttViewSummaryItem::setEndTime( const TQDateTime& end ) void KDGanttViewSummaryItem::setStartTime( const TQDateTime& start ) { if (! start.isValid() ) { - qDebug("KDGanttViewSummaryItem::setStartTime():Invalid parameter-no time set"); + tqDebug("KDGanttViewSummaryItem::setStartTime():Invalid parameter-no time set"); return; } myStartTime = start; diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index 64ecbd84b..6c27aaa98 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -171,7 +171,7 @@ void KDGanttViewTaskItem::setEndTime( const TQDateTime& end ) void KDGanttViewTaskItem::setStartTime( const TQDateTime& start ) { if (! start.isValid() ) { - qDebug("KDGanttViewTaskItem::setStartTime():Invalid parameter-no time set"); + tqDebug("KDGanttViewTaskItem::setStartTime():Invalid parameter-no time set"); return; } myStartTime = start; @@ -199,7 +199,7 @@ void KDGanttViewTaskItem::hideMe() void KDGanttViewTaskItem::showItem(bool show, int coordY) { - //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1()); + //tqDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1()); isVisibleInGanttView = show; invalidateHeight () ; if (!show) { @@ -361,7 +361,7 @@ void KDGanttViewTaskItem::initItem() parent()->setVisible( true ); } else showItem(true); - //qDebug("initItem %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() ); + //tqDebug("initItem %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() ); myGanttView->myTimeTable->updateMyContent(); setDragEnabled( myGanttView->dragEnabled() ); setDropEnabled( myGanttView->dropEnabled() ); diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index 13872900a..5d303b141 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -326,7 +326,7 @@ void KDGanttViewTaskLink::showMe( bool visible ) void KDGanttViewTaskLink::showMeType( bool visible ) { - //qDebug("KDGanttViewTaskLink::showMeType %d",linkType()); + //tqDebug("KDGanttViewTaskLink::showMeType %d",linkType()); hide(); isvisible = visible; int wid = 1; @@ -486,7 +486,7 @@ void KDGanttViewTaskLink::showMeType( bool visible ) break; } default: - qWarning("KDGanttViewTaskLink: Unknown link type"); + tqWarning("KDGanttViewTaskLink: Unknown link type"); break; } (*horIt)->show(); @@ -803,7 +803,7 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el if( KDGanttXML::readStringNode( element, value ) ) fromList << value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -820,7 +820,7 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el if( KDGanttXML::readStringNode( element, value ) ) toList << value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -859,7 +859,7 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el if( KDGanttXML::readStringNode( element, value ) ) linktype = stringToLinkType( value ); } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -882,11 +882,11 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el } // safeguard aginst incorrect names if (fromItemList.isEmpty()) { - qDebug("Cannot create link: fromItemList is empty"); + tqDebug("Cannot create link: fromItemList is empty"); return 0; } if (toItemList.isEmpty()) { - qDebug("Cannot create link: toItemList is empty"); + tqDebug("Cannot create link: toItemList is empty"); return 0; } KDGanttViewTaskLink* tl = new KDGanttViewTaskLink( fromItemList, diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp index 2082629a4..a1c6f6d27 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.cpp +++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp @@ -337,7 +337,7 @@ KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::createFromDomElement( TQDomE if( KDGanttXML::readStringNode( element, value ) ) name = value; } else { - qDebug( "Unrecognized tag name: %s", tagName.latin1() ); + tqDebug( "Unrecognized tag name: %s", tagName.latin1() ); Q_ASSERT( false ); } } @@ -382,6 +382,6 @@ void KDGanttViewTaskLinkGroup::generateAndInsertName( const TQString& name ) } sGroupDict.insert( newName, this ); _name = newName; - //qDebug("KDGanttViewTaskLinkGroup::generateAndInsertName: inserted '%s'",newName.latin1()); + //tqDebug("KDGanttViewTaskLinkGroup::generateAndInsertName: inserted '%s'",newName.latin1()); } diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index aea239441..4acfca198 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -415,7 +415,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush ) } else if( tagName == "Pixmap" ) { ok = ok & readPixmapNode( element, tempPixmap ); } else { - qDebug( "Unknown tag in brush" ); + tqDebug( "Unknown tag in brush" ); } } node = node.nextSibling(); @@ -447,14 +447,14 @@ bool readPixmapNode( const TQDomElement& element, TQPixmap& pixmap ) 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" ) { ok = ok & readIntNode( element, tempLengthi ); } else if( tagName == "Data" ) { ok = ok & readStringNode( element, tempData ); } else { - qDebug( "Unknown tag in Pixmap" ); + tqDebug( "Unknown tag in Pixmap" ); } } node = node.nextSibling(); @@ -521,7 +521,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen ) ok = ok & readStringNode( element, value ); tempStyle = stringToPenStyle( value ); } else { - qDebug( "Unknown tag in brush" ); + tqDebug( "Unknown tag in brush" ); } } node = node.nextSibling(); @@ -561,7 +561,7 @@ bool readFontNode( const TQDomElement& element, TQFont& font ) } 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(); @@ -596,7 +596,7 @@ bool readRectNode( const TQDomElement& element, TQRect& value ) } else if( tagName == "Y" ) { ok = ok & readIntNode( element, y ); } else { - qDebug( "Unknown tag in rect" ); + tqDebug( "Unknown tag in rect" ); } } node = node.nextSibling(); @@ -629,7 +629,7 @@ bool readDateTimeNode( const TQDomElement& element, TQDateTime& datetime ) } else if( tagName == "Time" ) { ok = ok & readTimeNode( element, tempTime ); } else { - qDebug( "Unknown tag in datetime" ); + tqDebug( "Unknown tag in datetime" ); } } node = node.nextSibling(); diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 1ba85265b..4c7bc9ea1 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -246,12 +246,12 @@ KAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQ new KAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (qstricmp(subclassName,"KToggleAction")==0) + else if (tqstricmp(subclassName,"KToggleAction")==0) return createSharedActionInternal( new KToggleAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (qstricmp(subclassName,"KActionMenu")==0) + else if (tqstricmp(subclassName,"KActionMenu")==0) return createSharedActionInternal( new KActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name) ); diff --git a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp index 7b245d9a2..74479fe77 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp @@ -153,7 +153,7 @@ bool MySqlPreparedStatement::execute() if (field->isTextType()) { //! @todo optimize m_stringBuffer[ 1024 ]; ??? - char *str = qstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024); + char *str = tqstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024); m_mysqlBind[arg].buffer_type = MYSQL_TYPE_STRING; m_mysqlBind[arg].buffer = m_stringBuffer; m_mysqlBind[arg].is_null = (my_bool*)0; diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 38a7d3862..1d2e52952 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -84,11 +84,11 @@ void yyerror(const char *str) KexiDBDbg << "at character " << current << " near tooken " << ctoken << endl; parser->setOperation(Parser::OP_Error); - const bool otherError = (qstrnicmp(str, "other error", 11)==0); + const bool otherError = (tqstrnicmp(str, "other error", 11)==0); if (parser->error().type().isEmpty() && (str==0 || strlen(str)==0 - || qstrnicmp(str, "syntax error", 12)==0 || qstrnicmp(str, "parse error", 11)==0) + || tqstrnicmp(str, "syntax error", 12)==0 || tqstrnicmp(str, "parse error", 11)==0) || otherError) { KexiDBDbg << parser->statement() << endl; diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp index 570043fe6..c0f953915 100644 --- a/kexi/kexidb/simplecommandlineapp.cpp +++ b/kexi/kexidb/simplecommandlineapp.cpp @@ -108,17 +108,17 @@ SimpleCommandLineApp::SimpleCommandLineApp( d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1]; KCmdLineOptions *allOptionsPtr = d->allOptions; for (KCmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, allOptionsPtr++) { - allOptionsPtr->name = qstrdup(optionsPtr->name); - allOptionsPtr->description = qstrdup(optionsPtr->description); + allOptionsPtr->name = tqstrdup(optionsPtr->name); + allOptionsPtr->description = tqstrdup(optionsPtr->description); if (optionsPtr == predefinedOptions) //first row == drv - allOptionsPtr->def = qstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1()); + allOptionsPtr->def = tqstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1()); else - allOptionsPtr->def = qstrdup(optionsPtr->def); + allOptionsPtr->def = tqstrdup(optionsPtr->def); } for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, allOptionsPtr++) { - allOptionsPtr->name = qstrdup(optionsPtr->name); - allOptionsPtr->description = qstrdup(optionsPtr->description); - allOptionsPtr->def = qstrdup(optionsPtr->def); + allOptionsPtr->name = tqstrdup(optionsPtr->name); + allOptionsPtr->description = tqstrdup(optionsPtr->description); + allOptionsPtr->def = tqstrdup(optionsPtr->def); } allOptionsPtr->name = 0; //end allOptionsPtr->description = 0; diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 489640a2e..7934ec715 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -86,7 +86,7 @@ void KexiMacroProperty::init() } //TESTCASE!!!!!!!!!!!!!!!!!!!!!! - //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() ); + //if(! variable->isEnabled()) tqFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() ); Q_ASSERT(! d->name.isNull()); m_property->setName( d->name.latin1() ); diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp index 55d017a9a..cc64aa8df 100644 --- a/kexi/plugins/macros/tests/komacrotest.cpp +++ b/kexi/plugins/macros/tests/komacrotest.cpp @@ -53,6 +53,6 @@ int main( int argc, char** argv ) } // mmh seems we forgot to catch an exception... catch(...) { - qFatal("Unhandled Exception!"); + tqFatal("Unhandled Exception!"); } } diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp index abf4459d2..cddb4596b 100644 --- a/kexi/plugins/macros/tests/komacrotestgui.cpp +++ b/kexi/plugins/macros/tests/komacrotestgui.cpp @@ -55,6 +55,6 @@ int main( int argc, char** argv ) } // mmh seems we forgot to catch an exception... catch(...) { - qFatal("Unhandled Exception!"); + tqFatal("Unhandled Exception!"); } } diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp index 55cd5a1cf..7e8af75bb 100644 --- a/kexi/tests/altertable/altertable.cpp +++ b/kexi/tests/altertable/altertable.cpp @@ -216,7 +216,7 @@ AlterTableTester::AlterTableTester() , m_finishedCopying(false) { //copy the db file to a temp file - qInitNetworkProtocols(); + tqInitNetworkProtocols(); TQPtrList<TQNetworkOperation> list = m_copyOperator.copy( "file://" + TQDir::current().path() + "/" + origDbFilename, "file://" + TQDir::current().path() + "/" + dbFilename, false, false ); @@ -687,8 +687,8 @@ int main(int argc, char *argv[]) newArgc = 2; newArgv = new char*[newArgc]; - newArgv[0] = qstrdup(argv[0]); - newArgv[1] = qstrdup( "--skip-startup-dialog" ); + newArgv[0] = tqstrdup(argv[0]); + newArgv[1] = tqstrdup( "--skip-startup-dialog" ); KAboutData* aboutdata = Kexi::createAboutData(); aboutdata->setProgramName( "Kexi Alter Table Test" ); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index f5e3a3763..a766c5973 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -643,7 +643,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch) rowlast = tmp; } -// qDebug("cx:%3d cy:%3d w:%3d h:%3d col:%2d..%2d row:%2d..%2d tsize:%4d,%4d", +// tqDebug("cx:%3d cy:%3d w:%3d h:%3d col:%2d..%2d row:%2d..%2d tsize:%4d,%4d", // cx, cy, cw, ch, colfirst, collast, rowfirst, rowlast, tableSize().width(), tableSize().height()); // triggerUpdate(); @@ -923,7 +923,7 @@ TQPoint KexiTableView::viewportToContents2( const TQPoint& vp ) void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch ) { -// qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch); +// tqDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch); // Regions work with shorts, so avoid an overflow and adjust the // table size to the visible size diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 5e0b7ab81..4931eb195 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -71,15 +71,15 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p) void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle ) { //<hack> - if (qstricmp(style().name(),"thinkeramik")==0) { + if (tqstricmp(style().name(),"thinkeramik")==0) { m_fixForHeight = 3; } else m_fixForHeight = 0; //</hack> m_drawComplexControl = - (style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0) - || qstricmp(style().name(),"platinum")==0; + (style().inherits("KStyle") && tqstricmp(style().name(),"qtcurve")!=0) + || tqstricmp(style().name(),"platinum")==0; if (m_fixForHeight==0) setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, (const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 ); diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index 0710b4d06..fa9b24976 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -33,7 +33,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent) // setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); int fixedWidth; //hack - if (qstricmp(style().name(),"thinkeramik")==0) + if (tqstricmp(style().name(),"thinkeramik")==0) fixedWidth = 18; //typical width as in "windows" style else fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox, diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp index 9b6b9a46a..1649cfc35 100644 --- a/kivio/kiviopart/kiviodragobject.cpp +++ b/kivio/kiviopart/kiviodragobject.cpp @@ -62,7 +62,7 @@ TQByteArray KivioDragObject::encodedData(const char* mimetype) const (m_encodeMimeList[1] == mimetype)) { return kivioEncoded(); - } else if(qstrnicmp(mimetype, "image/", 6) == 0) { + } else if(tqstrnicmp(mimetype, "image/", 6) == 0) { return imageEncoded(mimetype); } diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 50c31cf03..b2e6b3480 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -1885,7 +1885,7 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return 0; } //kdDebug() << "KWOasisPasteCommand::execute m_parag=" << m_parag << " m_idx=" << m_idx @@ -1955,7 +1955,7 @@ KoTextCursor * KPrOasisPasteTextCommand::unexecute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return 0; } cursor.setParag( firstParag ); @@ -1964,7 +1964,7 @@ KoTextCursor * KPrOasisPasteTextCommand::unexecute( KoTextCursor *c ) KoTextParag *lastParag = doc->paragAt( m_lastParag ); if ( !lastParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); return 0; } //Q_ASSERT( lastParag->document() ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 8f76a9f04..d0b9c3472 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -243,7 +243,7 @@ static void enableDPMS(bool enable) DPMSDisable(display); } } else - qWarning("Server has no DPMS extension"); + tqWarning("Server has no DPMS extension"); XFlush(display); #else diff --git a/kpresenter/KoPointArray.cpp b/kpresenter/KoPointArray.cpp index 2ac496eac..77cb6e15f 100644 --- a/kpresenter/KoPointArray.cpp +++ b/kpresenter/KoPointArray.cpp @@ -256,7 +256,7 @@ KoPointArray KoPointArray::cubicBezier() const { if ( size() != 4 ) { #if defined(TQT_CHECK_RANGE) - qWarning( "TQPointArray::bezier: The array must have 4 control points" ); + tqWarning( "TQPointArray::bezier: The array must have 4 control points" ); #endif KoPointArray pa; return pa; diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 0d957265e..0130e8630 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -1128,7 +1128,7 @@ void DatabaseDialog::startingRegion_clicked() void DatabaseDialog::connectButton_clicked() { - qWarning( "DatabaseDialog::connectButton_clicked(): Not implemented yet!" ); + tqWarning( "DatabaseDialog::connectButton_clicked(): Not implemented yet!" ); } void DatabaseDialog::databaseNameChanged(const TQString & s) diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index ea698845c..461173a4d 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -642,7 +642,7 @@ bool Doc::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, SaveFlag //Check that temp file was successfully created if (contentTmpFile.status() != 0) { - qWarning("Creation of temporary file to store document content failed."); + tqWarning("Creation of temporary file to store document content failed."); return false; } diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index a24c8cf25..d39f6c1fa 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -210,7 +210,7 @@ bool Map::saveOasis( KoXmlWriter & xmlWriter, KoGenStyles & mainStyles, KoStore //Check that creation of temp file was successful if (bodyTmpFile.status() != 0) { - qWarning("Creation of temporary file to store document body failed."); + tqWarning("Creation of temporary file to store document body failed."); return false; } diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index e84f1d47b..ab6871a52 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -1214,5 +1214,5 @@ TQString KSpread::Oasis::decodeFormula(const TQString& expr, const KLocale* loca //expr = "not here yet"; //Q_UNUSED(locale); kdDebug() << k_funcinfo << " not implemented" - qFatal(0); + tqFatal(0); }*/ diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index f32444c01..77400ea01 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -2856,7 +2856,7 @@ void View::createTemplate() //Check that creation of temp file was successful if (tempFile.status() != 0) { - qWarning("Creation of temprary file to store template failed."); + tqWarning("Creation of temprary file to store template failed."); return; } @@ -6928,7 +6928,7 @@ void View::slotUpdateView( Sheet *_sheet ) void View::slotUpdateView( Sheet * _sheet, const Region& region ) { - // qDebug("void View::slotUpdateView( Sheet *_sheet, const TQRect& %i %i|%i %i )\n",_rect.left(),_rect.top(),_rect.right(),_rect.bottom()); + // tqDebug("void View::slotUpdateView( Sheet *_sheet, const TQRect& %i %i|%i %i )\n",_rect.left(),_rect.top(),_rect.right(),_rect.bottom()); // Do we display this sheet ? if ( _sheet != d->activeSheet ) diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index 3d4ba6035..2bad9157a 100644 --- a/kugar/kudesigner_lib/canvas.cpp +++ b/kugar/kudesigner_lib/canvas.cpp @@ -77,10 +77,10 @@ void Canvas::scaleCanvas( int scale ) void Canvas::drawForeground ( TQPainter & painter, const TQRect & /*clip*/ ) { //kdDebug()<<"Canvas::drawForeGround"<<endl; - // qWarning("drawForeground "); + // tqWarning("drawForeground "); for ( BoxList::iterator it = selected.begin(); it != selected.end(); ++it ) { - // qWarning("sel:"); + // tqWarning("sel:"); ( *it ) ->drawHolders( painter ); } } diff --git a/kugar/kudesigner_lib/kugartemplate.cpp b/kugar/kudesigner_lib/kugartemplate.cpp index 28dc10d70..1945b714a 100644 --- a/kugar/kudesigner_lib/kugartemplate.cpp +++ b/kugar/kudesigner_lib/kugartemplate.cpp @@ -307,7 +307,7 @@ bool KugarTemplate::removeReportItem( TQCanvasItem *item ) if ( ritem != 0 ) { ritem->section() ->items.remove( ritem ); - qWarning( "good" ); + tqWarning( "good" ); } //delete item; // section = 0; diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp index a7b3ca1ff..e26da9231 100644 --- a/kugar/kudesigner_lib/view.cpp +++ b/kugar/kudesigner_lib/view.cpp @@ -154,7 +154,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) m_canvas->unselectAll(); m_canvas->selectItem( b, false ); m_canvas->update(); - // qWarning("selected item set"); + // tqWarning("selected item set"); // selected->drawHolders(); return ; } @@ -171,7 +171,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) } } m_canvas->unselectAll(); - // qWarning("unselect"); + // tqWarning("unselect"); } @@ -206,8 +206,8 @@ bool View::startResizing( TQMouseEvent * /*e*/, TQPoint &p ) { Kudesigner::Box *cbx = *it; resizing_type = cbx->isInHolder( p ); - /* qWarning("POINT: %d %d", p.x(), p.y()); - qWarning("RESIZE: %d", resizing_type);*/ + /* tqWarning("POINT: %d %d", p.x(), p.y()); + tqWarning("RESIZE: %d", resizing_type);*/ if ( resizing_type ) { m_canvas->selectItem( cbx, false ); @@ -280,14 +280,14 @@ void View::startMoveOrResizeOrSelectItem( TQCanvasItemList &l, } moving = 0; resizing = 0; - // qWarning("1"); + // tqWarning("1"); selectionStarted = 1; selectionRect->setX( p.x() ); selectionRect->setY( p.y() ); selectionRect->setZ( 50 ); - // qWarning("2"); + // tqWarning("2"); selectionRect->show(); - // qWarning("3"); + // tqWarning("3"); } void View::contentsMousePressEvent( TQMouseEvent* e ) @@ -298,7 +298,7 @@ void View::contentsMousePressEvent( TQMouseEvent* e ) //if there is a request for properties or for delete operation //perform that and do not take care about mouse buttons - // qWarning("mouse press"); + // tqWarning("mouse press"); switch ( request ) { @@ -321,9 +321,9 @@ void View::contentsMousePressEvent( TQMouseEvent* e ) /* Kudesigner::Box *b; - qWarning("Selected items:"); + tqWarning("Selected items:"); for (b = selected.first(); b; b = selected.next()) - qWarning("%s", b->props["Text"].first.latin1()); + tqWarning("%s", b->props["Text"].first.latin1()); */ switch ( e->button() ) @@ -331,13 +331,13 @@ void View::contentsMousePressEvent( TQMouseEvent* e ) case Qt::LeftButton: if ( itemToInsert ) { - // qWarning("placing item"); + // tqWarning("placing item"); m_canvas->unselectAll(); placeItem( l, e ); } else { - // qWarning("starting move or resize"); + // tqWarning("starting move or resize"); if ( !startResizing( e, p ) ) { selectItemFromList( l ); @@ -696,9 +696,9 @@ void View::finishSelection() Kudesigner::Box *b = *it; Buffer *buf = new Buffer( &( b->props ) ); ++it; - // qWarning("== %d", m_canvas->selected.count()); + // tqWarning("== %d", m_canvas->selected.count()); // Kudesigner::BoxList::const_iterator it2 = m_canvas->selected.end(); - // qWarning("41: %d", it != it2); + // tqWarning("41: %d", it != it2); for ( ; it != m_canvas->selected.end(); ++it ) { b = *it; diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp index b412d3326..4fc4f5bdb 100644 --- a/kugar/lib/mreportsection.cpp +++ b/kugar/lib/mreportsection.cpp @@ -316,7 +316,7 @@ void MReportSection::setFieldData( TQString name, TQString data ) MFieldObject * field; for ( field = fields.first(); field != 0; field = fields.next() ) { - qWarning( " checking field %s", field->getFieldName().ascii() ); + tqWarning( " checking field %s", field->getFieldName().ascii() ); if ( field->getFieldName() == name ) field->setText( data ); } diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index 20a4c9182..5acb647ee 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -88,7 +88,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return 0; } //kdDebug() << "KWPasteTextCommand::execute m_parag=" << m_parag << " m_idx=" << m_idx @@ -206,7 +206,7 @@ KoTextCursor * KWPasteTextCommand::unexecute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return 0; } cursor.setParag( firstParag ); @@ -215,7 +215,7 @@ KoTextCursor * KWPasteTextCommand::unexecute( KoTextCursor *c ) KoTextParag *lastParag = doc->paragAt( m_lastParag ); if ( !lastParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); return 0; } Q_ASSERT( lastParag->document() ); @@ -255,7 +255,7 @@ KoTextCursor * KWOasisPasteCommand::execute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return c; } //kdDebug() << "KWOasisPasteCommand::execute m_parag=" << m_parag << " m_idx=" << m_idx @@ -285,7 +285,7 @@ KoTextCursor * KWOasisPasteCommand::unexecute( KoTextCursor *c ) { KoTextParag *firstParag = doc->paragAt( m_parag ); if ( !firstParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_parag, doc->lastParag()->paragId() ); return 0; } cursor.setParag( firstParag ); @@ -294,7 +294,7 @@ KoTextCursor * KWOasisPasteCommand::unexecute( KoTextCursor *c ) KoTextParag *lastParag = doc->paragAt( m_lastParag ); if ( !lastParag ) { - qWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", m_lastParag, doc->lastParag()->paragId() ); return 0; } Q_ASSERT( lastParag->document() ); @@ -340,7 +340,7 @@ void KWTextDeleteCommand::createBookmarkList() #if 0 KoTextParag *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { - qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParag()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParag()->paragId() ); return; } diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp index ebf6c480b..85b18a0a8 100644 --- a/kword/KWInsertTOCCommand.cpp +++ b/kword/KWInsertTOCCommand.cpp @@ -42,7 +42,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c ) KoTextParag *insertionParag = textdoc->paragAt( m_paragId ); if ( !insertionParag ) { - qWarning( "KWInsertTOCCommand:: can't locate parag at %d, last parag: %d", m_paragId, textdoc->lastParag()->paragId() ); + tqWarning( "KWInsertTOCCommand:: can't locate parag at %d, last parag: %d", m_paragId, textdoc->lastParag()->paragId() ); return c; } KWTextParag *body = static_cast<KWTextParag *>( insertionParag ); diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc index 2257d262c..53d02b1f8 100644 --- a/lib/kformula/formulacursor.cc +++ b/lib/kformula/formulacursor.cc @@ -650,7 +650,7 @@ void FormulaCursor::copy( TQDomDocument& doc ) } else { // This must never happen. - qFatal("A not normalized cursor is selecting."); + tqFatal("A not normalized cursor is selecting."); } } } diff --git a/lib/kofficecore/KoSize.h b/lib/kofficecore/KoSize.h index 6f8aa253f..04fce9c35 100644 --- a/lib/kofficecore/KoSize.h +++ b/lib/kofficecore/KoSize.h @@ -84,7 +84,7 @@ private: static void warningDivByZero() { #if defined(TQT_CHECK_MATH) - qWarning( "KoSize: Division by zero error" ); + tqWarning( "KoSize: Division by zero error" ); #endif } diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 16a08f0ce..2b976c13a 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -554,7 +554,7 @@ void KoXmlNodeData::loadChildren( int depth ) // parsing error has occurred, which should not happen // nothing we can do except... loaded = false; - qWarning( "On-demand loading triggers parse error!" ); + tqWarning( "On-demand loading triggers parse error!" ); } else loaded = true; diff --git a/lib/kofficecore/tests/kodomtest.cpp b/lib/kofficecore/tests/kodomtest.cpp index 14cae56ee..f4f197a38 100644 --- a/lib/kofficecore/tests/kodomtest.cpp +++ b/lib/kofficecore/tests/kodomtest.cpp @@ -25,7 +25,7 @@ //static void debugElemNS( const TQDomElement& elem ) //{ -// qDebug( "nodeName=%s tagName=%s localName=%s prefix=%s namespaceURI=%s", elem.nodeName().latin1(), elem.tagName().latin1(), elem.localName().latin1(), elem.prefix().latin1(), elem.namespaceURI().latin1() ); +// tqDebug( "nodeName=%s tagName=%s localName=%s prefix=%s namespaceURI=%s", elem.nodeName().latin1(), elem.tagName().latin1(), elem.localName().latin1(), elem.prefix().latin1(), elem.namespaceURI().latin1() ); //} void testTQDom( const TQDomDocument& doc ) @@ -61,7 +61,7 @@ void testTQDom( const TQDomDocument& doc ) assert( e.namespaceURI() == KoXmlNS::text ); } - qDebug("testTQDom... ok"); + tqDebug("testTQDom... ok"); } void testKoDom( const TQDomDocument& doc ) @@ -100,10 +100,10 @@ void testKoDom( const TQDomDocument& doc ) // Attributes // ### TQt bug: it doesn't work if using style-name instead of text:style-name in the XML const TQString styleName = p.attributeNS( KoXmlNS::text, "style-name", TQString() ); - qDebug( "%s", styleName.latin1() ); + tqDebug( "%s", styleName.latin1() ); assert( styleName == "L1" ); - qDebug("testKoDom... ok"); + tqDebug("testKoDom... ok"); } int main( int argc, char** argv ) { diff --git a/lib/kofficecore/tests/kooasissettingstest.cpp b/lib/kofficecore/tests/kooasissettingstest.cpp index a60fbd869..4f637ff11 100644 --- a/lib/kofficecore/tests/kooasissettingstest.cpp +++ b/lib/kofficecore/tests/kooasissettingstest.cpp @@ -34,7 +34,7 @@ void testParseConfigItemString( KoOasisSettings& settings ) { KoOasisSettings::Items viewSettings = settings.itemSet( "view-settings" ); const TQString unit = viewSettings.parseConfigItemString( "unit" ); - qDebug( "%s", unit.latin1() ); + tqDebug( "%s", unit.latin1() ); assert( unit == "mm" ); kdDebug() << "testParseConfigItemString OK" << endl; } diff --git a/lib/kotext/tests/kovariabletest.cpp b/lib/kotext/tests/kovariabletest.cpp index 6d0403501..aae070ff3 100644 --- a/lib/kotext/tests/kovariabletest.cpp +++ b/lib/kotext/tests/kovariabletest.cpp @@ -26,7 +26,7 @@ void testMinutes() int minutes = 145; TQString str = minutesToISODuration( minutes ); int result = ISODurationToMinutes( str ); - qDebug( "%d minutes -> %s -> %d", minutes, str.latin1(), result ); + tqDebug( "%d minutes -> %s -> %d", minutes, str.latin1(), result ); assert( result == minutes ); } @@ -35,7 +35,7 @@ void testNegativeMinutes() int minutes = -15; TQString str = minutesToISODuration( minutes ); int result = ISODurationToMinutes( str ); - qDebug( "%d minutes -> %s -> %d", minutes, str.latin1(), result ); + tqDebug( "%d minutes -> %s -> %d", minutes, str.latin1(), result ); assert( result == minutes ); } @@ -44,7 +44,7 @@ void testDays() int days = 14; TQString str = daysToISODuration( days ); int result = ISODurationToDays( str ); - qDebug( "%d days -> %s -> %d", days, str.latin1(), result ); + tqDebug( "%d days -> %s -> %d", days, str.latin1(), result ); assert( result == days ); } @@ -53,7 +53,7 @@ void testNegativeDays() int days = -14; TQString str = daysToISODuration( days ); int result = ISODurationToDays( str ); - qDebug( "%d days -> %s -> %d", days, str.latin1(), result ); + tqDebug( "%d days -> %s -> %d", days, str.latin1(), result ); assert( result == days ); } diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 7845a3936..09e308266 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -64,7 +64,7 @@ void StoreDropTest::keyPressEvent( TQKeyEvent * e ) void StoreDropTest::paste() { - qDebug( "paste" ); + tqDebug( "paste" ); TQMimeSource* m = TQApplication::clipboard()->data(); if ( !m ) return; diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp index e4280cec1..d4fc14f47 100644 --- a/lib/store/tests/xmlwritertest.cpp +++ b/lib/store/tests/xmlwritertest.cpp @@ -31,7 +31,7 @@ void speedTest() writer.endDocument(); } out.close(); - qDebug( "writing %i XML elements using KoXmlWriter: %i ms", numParagraphs, time.elapsed() ); + tqDebug( "writing %i XML elements using KoXmlWriter: %i ms", numParagraphs, time.elapsed() ); } int main( int argc, char** argv ) { diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h index 12011c033..eb6c6e449 100644 --- a/lib/store/tests/xmlwritertest.h +++ b/lib/store/tests/xmlwritertest.h @@ -27,17 +27,17 @@ TQCString expectedFull( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ); \ expectedFull += expected; \ if ( cstr == expectedFull ) \ - qDebug( "%s OK", testname ); \ + tqDebug( "%s OK", testname ); \ else { \ - qDebug( "%s FAILED!", testname ); \ + tqDebug( "%s FAILED!", testname ); \ TQCString s1 = cstr; \ TQCString s2 = expectedFull; \ if ( s1.length() != s2.length() ) \ - qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \ + tqDebug( "got length %d, expected %d", s1.length(), s2.length() ); \ s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ - qDebug( "%s", s1.data() ); \ - qDebug( "Expected:\n%s", s2.data() ); \ + tqDebug( "%s", s1.data() ); \ + tqDebug( "Expected:\n%s", s2.data() ); \ return 1; /*exit*/ \ } \ } |