summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cervisia/qttableview.cpp12
-rw-r--r--cervisia/updateview_items.cpp2
-rw-r--r--kdeaccounts-plugin/kdeaccountsformat.h6
-rw-r--r--kmtrace/kmtrace.cpp8
-rw-r--r--kmtrace/match.cpp2
-rw-r--r--kompare/tests/cvsdiff/context.diff8
-rw-r--r--kompare/tests/cvsdiff/contextm.diff32
-rw-r--r--kompare/tests/cvsdiff/edm.diff8
-rw-r--r--kompare/tests/cvsdiff/normalm.diff16
-rw-r--r--kompare/tests/cvsdiff/rcsm.diff8
-rw-r--r--kompare/tests/cvsdiff/unified.diff4
-rw-r--r--kompare/tests/cvsdiff/unifiedm.diff24
-rw-r--r--kompare/tests/diff/contextm.diff32
-rw-r--r--kompare/tests/diff/edm.diff8
-rw-r--r--kompare/tests/diff/normalm.diff16
-rw-r--r--kompare/tests/diff/rcsm.diff8
-rw-r--r--kompare/tests/diff/unifiedm.diff24
-rw-r--r--kspy/kspy.h2
-rw-r--r--kspy/spy.cpp2
-rw-r--r--poxml/parser.cpp56
-rw-r--r--poxml/po2xml.cpp12
-rw-r--r--poxml/split.cpp2
-rw-r--r--poxml/swappo.cpp2
-rw-r--r--poxml/transxx.cpp4
-rw-r--r--poxml/xml2pot.cpp2
-rwxr-xr-xscripts/kDebug2kdDebug.sh14
-rw-r--r--tdecachegrind/ChangeLog4
-rw-r--r--tdecachegrind/tdecachegrind/callgraphview.cpp62
-rw-r--r--tdecachegrind/tdecachegrind/callmapview.cpp14
-rw-r--r--tdecachegrind/tdecachegrind/configdlg.cpp12
-rw-r--r--tdecachegrind/tdecachegrind/configuration.cpp10
-rw-r--r--tdecachegrind/tdecachegrind/coverage.cpp14
-rw-r--r--tdecachegrind/tdecachegrind/fixcost.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/functionselection.cpp6
-rw-r--r--tdecachegrind/tdecachegrind/instritem.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/instrview.cpp16
-rw-r--r--tdecachegrind/tdecachegrind/listutils.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/multiview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/partgraph.cpp14
-rw-r--r--tdecachegrind/tdecachegrind/partselection.cpp6
-rw-r--r--tdecachegrind/tdecachegrind/pool.cpp12
-rw-r--r--tdecachegrind/tdecachegrind/sourceitem.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/sourceview.cpp16
-rw-r--r--tdecachegrind/tdecachegrind/stackbrowser.cpp6
-rw-r--r--tdecachegrind/tdecachegrind/tabview.cpp22
-rw-r--r--tdecachegrind/tdecachegrind/toplevel.cpp28
-rw-r--r--tdecachegrind/tdecachegrind/tracedata.cpp172
-rw-r--r--tdecachegrind/tdecachegrind/utils.cpp10
-rw-r--r--umbrello/umbrello/clipboard/umldrag.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp2
-rw-r--r--umbrello/umbrello/uml.cpp2
51 files changed, 381 insertions, 381 deletions
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index 7d33862c..43c82cf2 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -273,7 +273,7 @@ void QtTableView::setNumRows( int rows )
{
if ( rows < 0 ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
+ tqWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
name( "unnamed" ), rows );
#endif
return;
@@ -315,7 +315,7 @@ void QtTableView::setNumCols( int cols )
{
if ( cols < 0 ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
+ tqWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
name( "unnamed" ), cols );
#endif
return;
@@ -581,7 +581,7 @@ void QtTableView::setCellWidth( int cellWidth )
return;
#if defined(TQT_CHECK_RANGE)
if ( cellWidth < 0 || cellWidth > SHRT_MAX ) {
- qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
+ tqWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
name( "unnamed" ), cellWidth );
return;
}
@@ -635,7 +635,7 @@ void QtTableView::setCellHeight( int cellHeight )
return;
#if defined(TQT_CHECK_RANGE)
if ( cellHeight < 0 || cellHeight > SHRT_MAX ) {
- qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
+ tqWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
name( "unnamed" ), cellHeight );
return;
}
@@ -1584,7 +1584,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) {
if ( yPos < minViewY() ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "QtTableView::findRawRow: (%s) internal error: "
+ tqWarning( "QtTableView::findRawRow: (%s) internal error: "
"yPos < minViewY() && goOutsideView "
"not supported. (%d,%d)",
name( "unnamed" ), yPos, yOffs );
@@ -1631,7 +1631,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) {
if ( xPos < minViewX() ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "QtTableView::findRawCol: (%s) internal error: "
+ tqWarning( "QtTableView::findRawCol: (%s) internal error: "
"xPos < minViewX() && goOutsideView "
"not supported. (%d,%d)",
name( "unnamed" ), xPos, xOffs );
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 9e0abc22..360e137c 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -279,7 +279,7 @@ TQDateTime parseDateTime(const TQString &s)
}
}
if ( month < 1 || month > 12 ) {
- qWarning( "TQDateTime::fromString: Parameter out of range" );
+ tqWarning( "TQDateTime::fromString: Parameter out of range" );
TQDateTime dt;
return dt;
}
diff --git a/kdeaccounts-plugin/kdeaccountsformat.h b/kdeaccounts-plugin/kdeaccountsformat.h
index 3e12d30d..db132fef 100644
--- a/kdeaccounts-plugin/kdeaccountsformat.h
+++ b/kdeaccounts-plugin/kdeaccountsformat.h
@@ -27,16 +27,16 @@ public:
virtual bool load( KABC::Addressee&, TQFile *)
{
- qDebug("*** KDE Accounts format: load single entry not supported.");
+ tqDebug("*** KDE Accounts format: load single entry not supported.");
return false;
}
virtual void save( const KABC::Addressee&, TQFile *)
{
- qDebug("*** KDE Accounts format: save not supported.");
+ tqDebug("*** KDE Accounts format: save not supported.");
}
virtual void saveAll( KABC::AddressBook *, KABC::Resource *, TQFile *)
{
- qDebug("*** KDE Accounts format: save not supported.");
+ tqDebug("*** KDE Accounts format: save not supported.");
}
virtual bool checkFormat( TQFile *file ) const
{
diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp
index 0c3dd137..5e3cef8a 100644
--- a/kmtrace/kmtrace.cpp
+++ b/kmtrace/kmtrace.cpp
@@ -229,9 +229,9 @@ int lookupSymbols(FILE *stream)
*addr = 0;
char* str;
if( rindex(line2, '/') != NULL )
- str = qstrdup(rindex(line2, '/')+1);
+ str = tqstrdup(rindex(line2, '/')+1);
else
- str = qstrdup(line2);
+ str = tqstrdup(line2);
symbolDict->replace(i_addr, str);
symbols++;
}
@@ -285,7 +285,7 @@ void lookupUnknownSymbols(const char *appname)
TQCString symbol;
symbol.sprintf("%s(%s)", buffer2, buffer1);
if(*buffer1 != '?')
- symbolDict->replace(it2.currentKey(),qstrdup(symbol.data()));
+ symbolDict->replace(it2.currentKey(),tqstrdup(symbol.data()));
}
fclose(fInputFile);
}
@@ -347,7 +347,7 @@ fprintf(stderr, "Error!\n");
s.replace(start+1, end-start-1, symbol);
}
}
- str = qstrdup(s.data());
+ str = tqstrdup(s.data());
formatDict->insert(addr,str);
return str;
}
diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp
index afa83bc1..47f25ab6 100644
--- a/kmtrace/match.cpp
+++ b/kmtrace/match.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
if (dict.find(line))
{
- qWarning("%s", line.latin1());
+ tqWarning("%s", line.latin1());
}
}
fclose(call_file);
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff
index cef4f0cf..8f955b5c 100644
--- a/kompare/tests/cvsdiff/context.diff
+++ b/kompare/tests/cvsdiff/context.diff
@@ -28,7 +28,7 @@ diff -c -r1.2 dcopfind.cpp
}
! if ( (int) types.count() != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 118,124 ----
@@ -36,7 +36,7 @@ diff -c -r1.2 dcopfind.cpp
}
! if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -47,7 +47,7 @@ diff -c -r1.2 dcopfind.cpp
! marshall(arg, argc, args, i, *it);
}
! if ( (int) i != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 128,136 ----
@@ -57,7 +57,7 @@ diff -c -r1.2 dcopfind.cpp
! marshall(arg, args, i, *it);
}
! if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index 1da3a860..b7d82cff 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -123,7 +123,7 @@ diff -c -r1.26 dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
! exit(1);
}
f = realfunc;
@@ -139,7 +139,7 @@ diff -c -r1.26 dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
! // exit(1);
! return;
}
@@ -155,7 +155,7 @@ diff -c -r1.26 dcop.cpp
! marshall(arg, argc, args, i, *it);
! }
! if ( i != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 271,282 ----
@@ -168,7 +168,7 @@ diff -c -r1.26 dcop.cpp
!
! if ( i != args.count() )
! {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -763,7 +763,7 @@ diff -c -r1.2 dcopfind.cpp
}
! if ( (int) types.count() != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 118,124 ----
@@ -771,7 +771,7 @@ diff -c -r1.2 dcopfind.cpp
}
! if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -782,7 +782,7 @@ diff -c -r1.2 dcopfind.cpp
! marshall(arg, argc, args, i, *it);
}
! if ( (int) i != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 128,136 ----
@@ -792,7 +792,7 @@ diff -c -r1.2 dcopfind.cpp
! marshall(arg, args, i, *it);
}
! if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -836,7 +836,7 @@ diff -c -r1.3 marshall.cpp
! type = "QValueList<QCString>";
! if (i >= argc)
! {
-! qWarning("Not enough arguments.");
+! tqWarning("Not enough arguments.");
! exit(1);
! }
! QString s = QString::fromLocal8Bit(argv[i]);
@@ -908,7 +908,7 @@ diff -c -r1.3 marshall.cpp
! while (true) {
! if (j >= argc)
! {
-! qWarning("List end-delimiter '%s' not found.", delim.latin1());
+! tqWarning("List end-delimiter '%s' not found.", delim.latin1());
! exit(1);
! }
! if (argv[j] == delim) break;
@@ -920,14 +920,14 @@ diff -c -r1.3 marshall.cpp
! while (true) {
! if (i >= argc)
! {
-! qWarning("List end-delimiter '%s' not found.", delim.latin1());
+! tqWarning("List end-delimiter '%s' not found.", delim.latin1());
! exit(1);
! }
! if (argv[i] == delim) break;
! marshall(arg, argc, argv, i, type);
! }
! } else {
-! qWarning( "cannot handle datatype '%s'", type.latin1() );
+! tqWarning( "cannot handle datatype '%s'", type.latin1() );
! exit(1);
! }
i++;
@@ -945,7 +945,7 @@ diff -c -r1.3 marshall.cpp
! type = "QValueList<QCString>";
! if( i > args.count() )
! {
-! qWarning("Not enough arguments.");
+! tqWarning("Not enough arguments.");
! exit(1);
! }
! QString s = QString::fromLocal8Bit( args[ i ] );
@@ -1017,7 +1017,7 @@ diff -c -r1.3 marshall.cpp
+ while (true) {
+ if( j > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -1030,7 +1030,7 @@ diff -c -r1.3 marshall.cpp
+ while (true) {
+ if( i > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -1038,7 +1038,7 @@ diff -c -r1.3 marshall.cpp
+ marshall( arg, args, i, type );
+ }
+ } else {
-+ qWarning( "cannot handle datatype '%s'", type.latin1() );
++ tqWarning( "cannot handle datatype '%s'", type.latin1() );
+ exit(1);
+ }
+ i++;
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index 53c58d72..5e1f338d 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -590,7 +590,7 @@ diff -e -r1.3 marshall.cpp
while (true) {
if( j > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -603,7 +603,7 @@ diff -e -r1.3 marshall.cpp
while (true) {
if( i > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -611,7 +611,7 @@ diff -e -r1.3 marshall.cpp
marshall( arg, args, i, type );
}
} else {
- qWarning( "cannot handle datatype '%s'", type.latin1() );
+ tqWarning( "cannot handle datatype '%s'", type.latin1() );
exit(1);
}
i++;
@@ -682,7 +682,7 @@ diff -e -r1.3 marshall.cpp
type = "QValueList<QCString>";
if( i > args.count() )
{
- qWarning("Not enough arguments.");
+ tqWarning("Not enough arguments.");
exit(1);
}
QString s = QString::fromLocal8Bit( args[ i ] );
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index de88506e..ead8a517 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -661,7 +661,7 @@ diff -r1.3 marshall.cpp
< type = "QValueList<QCString>";
< if (i >= argc)
< {
-< qWarning("Not enough arguments.");
+< tqWarning("Not enough arguments.");
< exit(1);
< }
< QString s = QString::fromLocal8Bit(argv[i]);
@@ -733,7 +733,7 @@ diff -r1.3 marshall.cpp
> type = "QValueList<QCString>";
> if( i > args.count() )
> {
-> qWarning("Not enough arguments.");
+> tqWarning("Not enough arguments.");
> exit(1);
> }
> QString s = QString::fromLocal8Bit( args[ i ] );
@@ -744,7 +744,7 @@ diff -r1.3 marshall.cpp
< while (true) {
< if (j >= argc)
< {
-< qWarning("List end-delimiter '%s' not found.", delim.latin1());
+< tqWarning("List end-delimiter '%s' not found.", delim.latin1());
< exit(1);
< }
< if (argv[j] == delim) break;
@@ -756,14 +756,14 @@ diff -r1.3 marshall.cpp
< while (true) {
< if (i >= argc)
< {
-< qWarning("List end-delimiter '%s' not found.", delim.latin1());
+< tqWarning("List end-delimiter '%s' not found.", delim.latin1());
< exit(1);
< }
< if (argv[i] == delim) break;
< marshall(arg, argc, argv, i, type);
< }
< } else {
-< qWarning( "cannot handle datatype '%s'", type.latin1() );
+< tqWarning( "cannot handle datatype '%s'", type.latin1() );
< exit(1);
< }
---
@@ -834,7 +834,7 @@ diff -r1.3 marshall.cpp
> while (true) {
> if( j > args.count() )
> {
-> qWarning("List end-delimiter '%s' not found.", delim.latin1());
+> tqWarning("List end-delimiter '%s' not found.", delim.latin1());
> exit(1);
> }
> if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -847,7 +847,7 @@ diff -r1.3 marshall.cpp
> while (true) {
> if( i > args.count() )
> {
-> qWarning("List end-delimiter '%s' not found.", delim.latin1());
+> tqWarning("List end-delimiter '%s' not found.", delim.latin1());
> exit(1);
> }
> if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -855,7 +855,7 @@ diff -r1.3 marshall.cpp
> marshall( arg, args, i, type );
> }
> } else {
-> qWarning( "cannot handle datatype '%s'", type.latin1() );
+> tqWarning( "cannot handle datatype '%s'", type.latin1() );
> exit(1);
> }
> i++;
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index 994369c3..d3ac561c 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -583,7 +583,7 @@ a317 10
type = "QValueList<QCString>";
if( i > args.count() )
{
- qWarning("Not enough arguments.");
+ tqWarning("Not enough arguments.");
exit(1);
}
QString s = QString::fromLocal8Bit( args[ i ] );
@@ -656,7 +656,7 @@ a347 34
while (true) {
if( j > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -669,7 +669,7 @@ a347 34
while (true) {
if( i > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -677,7 +677,7 @@ a347 34
marshall( arg, args, i, type );
}
} else {
- qWarning( "cannot handle datatype '%s'", type.latin1() );
+ tqWarning( "cannot handle datatype '%s'", type.latin1() );
exit(1);
}
i++;
diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff
index 0c8a20fb..f991a658 100644
--- a/kompare/tests/cvsdiff/unified.diff
+++ b/kompare/tests/cvsdiff/unified.diff
@@ -20,7 +20,7 @@ diff -u -r1.2 dcopfind.cpp
- if ( (int) types.count() != argc ) {
+ if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -128,9 +128,9 @@
@@ -32,7 +32,7 @@ diff -u -r1.2 dcopfind.cpp
}
- if ( (int) i != argc ) {
+ if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -221,7 +221,11 @@
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index e6a6e040..a459066e 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -91,7 +91,7 @@ diff -u -r1.26 dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
- exit(1);
+// exit(1);
+ return;
@@ -113,7 +113,7 @@ diff -u -r1.26 dcop.cpp
+
+ if ( i != args.count() )
+ {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -265,79 +294,480 @@
@@ -676,7 +676,7 @@ diff -u -r1.2 dcopfind.cpp
- if ( (int) types.count() != argc ) {
+ if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -128,9 +128,9 @@
@@ -688,7 +688,7 @@ diff -u -r1.2 dcopfind.cpp
}
- if ( (int) i != argc ) {
+ if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -221,7 +221,11 @@
@@ -724,7 +724,7 @@ diff -u -r1.3 marshall.cpp
- type = "QValueList<QCString>";
- if (i >= argc)
- {
-- qWarning("Not enough arguments.");
+- tqWarning("Not enough arguments.");
- exit(1);
- }
- QString s = QString::fromLocal8Bit(argv[i]);
@@ -795,7 +795,7 @@ diff -u -r1.3 marshall.cpp
+ type = "QValueList<QCString>";
+ if( i > args.count() )
+ {
-+ qWarning("Not enough arguments.");
++ tqWarning("Not enough arguments.");
+ exit(1);
+ }
+ QString s = QString::fromLocal8Bit( args[ i ] );
@@ -806,7 +806,7 @@ diff -u -r1.3 marshall.cpp
- while (true) {
- if (j >= argc)
- {
-- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+- tqWarning("List end-delimiter '%s' not found.", delim.latin1());
- exit(1);
- }
- if (argv[j] == delim) break;
@@ -818,14 +818,14 @@ diff -u -r1.3 marshall.cpp
- while (true) {
- if (i >= argc)
- {
-- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+- tqWarning("List end-delimiter '%s' not found.", delim.latin1());
- exit(1);
- }
- if (argv[i] == delim) break;
- marshall(arg, argc, argv, i, type);
- }
- } else {
-- qWarning( "cannot handle datatype '%s'", type.latin1() );
+- tqWarning( "cannot handle datatype '%s'", type.latin1() );
- exit(1);
- }
+ if ( type == "int" )
@@ -895,7 +895,7 @@ diff -u -r1.3 marshall.cpp
+ while (true) {
+ if( j > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -908,7 +908,7 @@ diff -u -r1.3 marshall.cpp
+ while (true) {
+ if( i > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -916,7 +916,7 @@ diff -u -r1.3 marshall.cpp
+ marshall( arg, args, i, type );
+ }
+ } else {
-+ qWarning( "cannot handle datatype '%s'", type.latin1() );
++ tqWarning( "cannot handle datatype '%s'", type.latin1() );
+ exit(1);
+ }
+ i++;
diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 38db371e..570d23fa 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -119,7 +119,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
! exit(1);
}
f = realfunc;
@@ -135,7 +135,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
! // exit(1);
! return;
}
@@ -151,7 +151,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
! marshall(arg, argc, args, i, *it);
! }
! if ( i != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 271,282 ----
@@ -164,7 +164,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
!
! if ( i != args.count() )
! {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -753,7 +753,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
}
! if ( (int) types.count() != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 118,124 ----
@@ -761,7 +761,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
}
! if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -772,7 +772,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
! marshall(arg, argc, args, i, *it);
}
! if ( (int) i != argc ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
--- 128,136 ----
@@ -782,7 +782,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
! marshall(arg, args, i, *it);
}
! if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
***************
@@ -822,7 +822,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
! type = "QValueList<QCString>";
! if (i >= argc)
! {
-! qWarning("Not enough arguments.");
+! tqWarning("Not enough arguments.");
! exit(1);
! }
! QString s = QString::fromLocal8Bit(argv[i]);
@@ -894,7 +894,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
! while (true) {
! if (j >= argc)
! {
-! qWarning("List end-delimiter '%s' not found.", delim.latin1());
+! tqWarning("List end-delimiter '%s' not found.", delim.latin1());
! exit(1);
! }
! if (argv[j] == delim) break;
@@ -906,14 +906,14 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
! while (true) {
! if (i >= argc)
! {
-! qWarning("List end-delimiter '%s' not found.", delim.latin1());
+! tqWarning("List end-delimiter '%s' not found.", delim.latin1());
! exit(1);
! }
! if (argv[i] == delim) break;
! marshall(arg, argc, argv, i, type);
! }
! } else {
-! qWarning( "cannot handle datatype '%s'", type.latin1() );
+! tqWarning( "cannot handle datatype '%s'", type.latin1() );
! exit(1);
! }
i++;
@@ -931,7 +931,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
! type = "QValueList<QCString>";
! if( i > args.count() )
! {
-! qWarning("Not enough arguments.");
+! tqWarning("Not enough arguments.");
! exit(1);
! }
! QString s = QString::fromLocal8Bit( args[ i ] );
@@ -1003,7 +1003,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ while (true) {
+ if( j > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -1016,7 +1016,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ while (true) {
+ if( i > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -1024,7 +1024,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ marshall( arg, args, i, type );
+ }
+ } else {
-+ qWarning( "cannot handle datatype '%s'", type.latin1() );
++ tqWarning( "cannot handle datatype '%s'", type.latin1() );
+ exit(1);
+ }
+ i++;
diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff
index 2d802765..654e1131 100644
--- a/kompare/tests/diff/edm.diff
+++ b/kompare/tests/diff/edm.diff
@@ -578,7 +578,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
while (true) {
if( j > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -591,7 +591,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
while (true) {
if( i > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -599,7 +599,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
marshall( arg, args, i, type );
}
} else {
- qWarning( "cannot handle datatype '%s'", type.latin1() );
+ tqWarning( "cannot handle datatype '%s'", type.latin1() );
exit(1);
}
i++;
@@ -670,7 +670,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
type = "QValueList<QCString>";
if( i > args.count() )
{
- qWarning("Not enough arguments.");
+ tqWarning("Not enough arguments.");
exit(1);
}
QString s = QString::fromLocal8Bit( args[ i ] );
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index 2ce10d6a..d3c9d893 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -649,7 +649,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
< type = "QValueList<QCString>";
< if (i >= argc)
< {
-< qWarning("Not enough arguments.");
+< tqWarning("Not enough arguments.");
< exit(1);
< }
< QString s = QString::fromLocal8Bit(argv[i]);
@@ -721,7 +721,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
> type = "QValueList<QCString>";
> if( i > args.count() )
> {
-> qWarning("Not enough arguments.");
+> tqWarning("Not enough arguments.");
> exit(1);
> }
> QString s = QString::fromLocal8Bit( args[ i ] );
@@ -732,7 +732,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
< while (true) {
< if (j >= argc)
< {
-< qWarning("List end-delimiter '%s' not found.", delim.latin1());
+< tqWarning("List end-delimiter '%s' not found.", delim.latin1());
< exit(1);
< }
< if (argv[j] == delim) break;
@@ -744,14 +744,14 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
< while (true) {
< if (i >= argc)
< {
-< qWarning("List end-delimiter '%s' not found.", delim.latin1());
+< tqWarning("List end-delimiter '%s' not found.", delim.latin1());
< exit(1);
< }
< if (argv[i] == delim) break;
< marshall(arg, argc, argv, i, type);
< }
< } else {
-< qWarning( "cannot handle datatype '%s'", type.latin1() );
+< tqWarning( "cannot handle datatype '%s'", type.latin1() );
< exit(1);
< }
---
@@ -822,7 +822,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
> while (true) {
> if( j > args.count() )
> {
-> qWarning("List end-delimiter '%s' not found.", delim.latin1());
+> tqWarning("List end-delimiter '%s' not found.", delim.latin1());
> exit(1);
> }
> if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -835,7 +835,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
> while (true) {
> if( i > args.count() )
> {
-> qWarning("List end-delimiter '%s' not found.", delim.latin1());
+> tqWarning("List end-delimiter '%s' not found.", delim.latin1());
> exit(1);
> }
> if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -843,7 +843,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp
> marshall( arg, args, i, type );
> }
> } else {
-> qWarning( "cannot handle datatype '%s'", type.latin1() );
+> tqWarning( "cannot handle datatype '%s'", type.latin1() );
> exit(1);
> }
> i++;
diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff
index ac8061f5..d2a6aa73 100644
--- a/kompare/tests/diff/rcsm.diff
+++ b/kompare/tests/diff/rcsm.diff
@@ -571,7 +571,7 @@ a317 10
type = "QValueList<QCString>";
if( i > args.count() )
{
- qWarning("Not enough arguments.");
+ tqWarning("Not enough arguments.");
exit(1);
}
QString s = QString::fromLocal8Bit( args[ i ] );
@@ -644,7 +644,7 @@ a347 34
while (true) {
if( j > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -657,7 +657,7 @@ a347 34
while (true) {
if( i > args.count() )
{
- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
exit(1);
}
if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -665,7 +665,7 @@ a347 34
marshall( arg, args, i, type );
}
} else {
- qWarning( "cannot handle datatype '%s'", type.latin1() );
+ tqWarning( "cannot handle datatype '%s'", type.latin1() );
exit(1);
}
i++;
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 7763ce5e..85adad04 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -87,7 +87,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
}
if ( realfunc.isEmpty() )
{
- qWarning("no such function");
+ tqWarning("no such function");
- exit(1);
+// exit(1);
+ return;
@@ -109,7 +109,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
+
+ if ( i != args.count() )
+ {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -266,78 +295,479 @@
@@ -667,7 +667,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
- if ( (int) types.count() != argc ) {
+ if ( types.count() != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -128,9 +128,9 @@
@@ -679,7 +679,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
}
- if ( (int) i != argc ) {
+ if ( (uint) i != args.count() ) {
- qWarning( "arguments do not match" );
+ tqWarning( "arguments do not match" );
exit(1);
}
@@ -221,7 +221,11 @@
@@ -711,7 +711,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
- type = "QValueList<QCString>";
- if (i >= argc)
- {
-- qWarning("Not enough arguments.");
+- tqWarning("Not enough arguments.");
- exit(1);
- }
- QString s = QString::fromLocal8Bit(argv[i]);
@@ -782,7 +782,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ type = "QValueList<QCString>";
+ if( i > args.count() )
+ {
-+ qWarning("Not enough arguments.");
++ tqWarning("Not enough arguments.");
+ exit(1);
+ }
+ QString s = QString::fromLocal8Bit( args[ i ] );
@@ -793,7 +793,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
- while (true) {
- if (j >= argc)
- {
-- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+- tqWarning("List end-delimiter '%s' not found.", delim.latin1());
- exit(1);
- }
- if (argv[j] == delim) break;
@@ -805,14 +805,14 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
- while (true) {
- if (i >= argc)
- {
-- qWarning("List end-delimiter '%s' not found.", delim.latin1());
+- tqWarning("List end-delimiter '%s' not found.", delim.latin1());
- exit(1);
- }
- if (argv[i] == delim) break;
- marshall(arg, argc, argv, i, type);
- }
- } else {
-- qWarning( "cannot handle datatype '%s'", type.latin1() );
+- tqWarning( "cannot handle datatype '%s'", type.latin1() );
- exit(1);
- }
+ if ( type == "int" )
@@ -882,7 +882,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ while (true) {
+ if( j > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ j ] ) == delim )
@@ -895,7 +895,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ while (true) {
+ if( i > args.count() )
+ {
-+ qWarning("List end-delimiter '%s' not found.", delim.latin1());
++ tqWarning("List end-delimiter '%s' not found.", delim.latin1());
+ exit(1);
+ }
+ if( QString::fromLocal8Bit( args[ i ] ) == delim )
@@ -903,7 +903,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
+ marshall( arg, args, i, type );
+ }
+ } else {
-+ qWarning( "cannot handle datatype '%s'", type.latin1() );
++ tqWarning( "cannot handle datatype '%s'", type.latin1() );
+ exit(1);
+ }
+ i++;
diff --git a/kspy/kspy.h b/kspy/kspy.h
index e6b79618..e1e8565d 100644
--- a/kspy/kspy.h
+++ b/kspy/kspy.h
@@ -24,7 +24,7 @@ public:
KLibrary *lib = loader->library( "libkspy" );
if ( !lib ) {
- qWarning( "Unable to load KSpy library\n" );
+ tqWarning( "Unable to load KSpy library\n" );
return;
}
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 8f106cda..4c1f73ce 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -36,7 +36,7 @@ extern "C"
{
KDE_EXPORT void* init_libkspy()
{
- qWarning( "KSpy: Initialising...\n" );
+ tqWarning( "KSpy: Initialising...\n" );
Spy *s = new Spy();
s->show();
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index be06d80a..fc19468d 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -173,7 +173,7 @@ bool StructureParser::isClosure(const TQString &message)
bool StructureParser::closureTag(const TQString& message, const TQString &tag)
{
#ifdef POXML_DEBUG
- qDebug("closureTag %s %s", message.latin1(), tag.latin1());
+ tqDebug("closureTag %s %s", message.latin1(), tag.latin1());
#endif
int inside = 0;
@@ -182,10 +182,10 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
{
int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index);
int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index);
- // qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
+ // tqDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
if (nextclose == -1) {
#ifdef POXML_DEBUG
- qDebug("ending on no close anymore %d %d %d %d", (!inside && index >= message.length()), inside, index, message.length());
+ tqDebug("ending on no close anymore %d %d %d %d", (!inside && index >= message.length()), inside, index, message.length());
#endif
return !inside && index >= message.length();
}
@@ -206,7 +206,7 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
index++;
if (!inside) {
#ifdef POXML_DEBUG
- qDebug("ending on exit %d", index >= message.length());
+ tqDebug("ending on exit %d", index >= message.length());
#endif
return index >= message.length();
}
@@ -260,7 +260,7 @@ void StructureParser::descape(TQString &message)
bool StructureParser::formatMessage(MsgBlock &msg) const
{
#ifdef POXML_DEBUG
- qDebug("formatMessage %s", msg.msgid.latin1());
+ tqDebug("formatMessage %s", msg.msgid.latin1());
#endif
int offset = 0;
@@ -282,7 +282,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
!msg.msgid.at( slen + 1 ).isLetterOrNumber() )
{
#ifdef POXML_DEBUG
- qDebug("removing single tag %s", singletags[index]);
+ tqDebug("removing single tag %s", singletags[index]);
#endif
int strindex = strlen(singletags[index]) + 1;
while (msg.msgid.at(strindex) != '>')
@@ -321,7 +321,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
while (msg.msgid.at(endindex) != '<' && msg.msgid.at(endindex + 1) != '/')
endindex--;
#ifdef POXML_DEBUG
- qDebug("endIndex %d", endindex);
+ tqDebug("endIndex %d", endindex);
#endif
strindex = endindex;
TQString orig = msg.msgid;
@@ -349,7 +349,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
msg.lines.first().start_line = infos_reg.cap(1).toInt();
msg.lines.first().start_col = infos_reg.cap(2).toInt();
#ifdef POXML_DEBUG
- qDebug("col %s %s %d", attr.latin1(), msg.msgid.latin1(), msg.lines.first().start_col);
+ tqDebug("col %s %s %d", attr.latin1(), msg.msgid.latin1(), msg.lines.first().start_col);
#endif
offset = 0;
@@ -369,7 +369,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
}
#ifdef POXML_DEBUG
- qDebug("formatMessage result %s %d %d", msg.msgid.latin1(), changed && recurse, msg.lines.first().start_col);
+ tqDebug("formatMessage result %s %d %d", msg.msgid.latin1(), changed && recurse, msg.lines.first().start_col);
#endif
msg.lines.first().offset += offset;
@@ -392,7 +392,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
TQString message = mb.msgid;
#ifdef POXML_DEBUG
- qDebug("splitMessage %s", message.latin1());
+ tqDebug("splitMessage %s", message.latin1());
#endif
if (message.at(0) == '<') {
@@ -414,7 +414,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
int inside = 1;
while (true) {
#ifdef POXML_DEBUG
- qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
+ tqDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
#endif
// the exception for poxml_* attributes is made in the closing tag
@@ -424,7 +424,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
strindex);
#ifdef POXML_DEBUG
- qDebug("index1 %d %d %d", closing_index, starting_index, strindex);
+ tqDebug("index1 %d %d %d", closing_index, starting_index, strindex);
#endif
// when a new start was found, we set the start_index after the next match
@@ -437,7 +437,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
}
#ifdef POXML_DEBUG
- qDebug("index %d %d %d", closing_index, starting_index, strindex);
+ tqDebug("index %d %d %d", closing_index, starting_index, strindex);
#endif
assert(closing_index != -1);
@@ -448,7 +448,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
if (starting_index == -1) {
strindex = closing_index;
#ifdef POXML_DEBUG
- qDebug("set strindex %d", strindex);
+ tqDebug("set strindex %d", strindex);
#endif
inside--;
if (!inside)
@@ -469,7 +469,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
}
#ifdef POXML_DEBUG
- qDebug("split into %s -AAAAAANNNNNNDDDDDD- %s", message.left(strindex).latin1(), message.mid(strindex).latin1());
+ tqDebug("split into %s -AAAAAANNNNNNDDDDDD- %s", message.left(strindex).latin1(), message.mid(strindex).latin1());
#endif
msg1.msgid = message.left(strindex);
bool leave = formatMessage(msg1);
@@ -487,7 +487,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
}
#ifdef POXML_DEBUG
- qDebug("splited %d-%d(%s) and %d-%d(%s)", msg1.lines.first().end_line,msg1.lines.first().end_col,
+ tqDebug("splited %d-%d(%s) and %d-%d(%s)", msg1.lines.first().end_line,msg1.lines.first().end_col,
msg1.msgid.latin1(),
msg2.lines.first().start_line,msg2.lines.first().start_col, msg2.msgid.latin1());
#endif
@@ -514,7 +514,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
tag = tag.left(tag.find(' '));
}
#ifdef POXML_DEBUG
- qDebug("behind tag %s", tag.latin1());
+ tqDebug("behind tag %s", tag.latin1());
#endif
if (isCuttingTag(tag))
@@ -526,7 +526,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
int inside = 1;
while (true) {
#ifdef POXML_DEBUG
- qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
+ tqDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
#endif
int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
@@ -535,7 +535,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
strindex - 1);
#ifdef POXML_DEBUG
- qDebug("index1 %d %d %d", closing_index, starting_index, strindex);
+ tqDebug("index1 %d %d %d", closing_index, starting_index, strindex);
#endif
if (starting_index == -1) {
@@ -558,7 +558,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
#ifdef POXML_DEBUG
- qDebug("split2 into \"%s\" -AAAAAANNNNNNNNNDDDDDDDDDDD- \"%s\"", message.left(strindex).latin1(), message.mid(strindex).latin1());
+ tqDebug("split2 into \"%s\" -AAAAAANNNNNNNNNDDDDDDDDDDD- \"%s\"", message.left(strindex).latin1(), message.mid(strindex).latin1());
#endif
msg1.msgid = message.left(strindex);
@@ -577,7 +577,7 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
}
#ifdef POXML_DEBUG
- qDebug("splited %d-%d(%s) and %d-%d(%s)", msg1.lines.first().end_line,msg1.lines.first().end_col,
+ tqDebug("splited %d-%d(%s) and %d-%d(%s)", msg1.lines.first().end_line,msg1.lines.first().end_col,
msg1.msgid.latin1(),
msg2.lines.first().start_line,msg2.lines.first().start_col, msg2.msgid.latin1());
#endif
@@ -597,7 +597,7 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr
{
TQString tname = qName.lower();
- // qDebug("endElement %s - %s %d", tname.latin1(), message.latin1(), inside);
+ // tqDebug("endElement %s - %s %d", tname.latin1(), message.latin1(), inside);
if (inside) {
if (!isSingleTag(qName)) {
@@ -629,7 +629,7 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr
it != messages.end(); ++it)
{
#ifdef POXML_DEBUG
- qDebug("parser '%s' %d '%s' %d:%d", (*it).msgid.latin1(), (*it).lines.first().offset, message.mid((*it).lines.first().offset, 15).latin1(), (*it).lines.first().start_line, (*it).lines.first().start_col);
+ tqDebug("parser '%s' %d '%s' %d:%d", (*it).msgid.latin1(), (*it).lines.first().offset, message.mid((*it).lines.first().offset, 15).latin1(), (*it).lines.first().start_line, (*it).lines.first().start_col);
#endif
// if the remaining text still starts with a tag, the poxml_ info
// is most probably more correct
@@ -752,7 +752,7 @@ void StructureParser::cleanupTags( TQString &contents )
break;
TQString tag = start.cap(1);
TQString cut = start.capturedTexts().last();
- // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1());
+ // tqDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1());
contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut));
}
TQRegExp singletag("<(\\w*)\\s([^><]*)/>");
@@ -779,14 +779,14 @@ void StructureParser::cleanupTags( TQString &contents )
}
#ifdef POXML_DEBUG
- qDebug("final %s", contents.latin1());
+ tqDebug("final %s", contents.latin1());
#endif
}
static bool removeEmptyTag( TQString &contents, const TQString & tag)
{
-// qDebug("cont %s %s", contents.latin1(), tag.latin1());
+// tqDebug("cont %s %s", contents.latin1(), tag.latin1());
TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag));
int strindex = 0;
@@ -794,7 +794,7 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag)
strindex = contents.find(empty, strindex);
if (strindex < 0)
break;
- qDebug("found empty tag %s", tag.latin1());
+ tqDebug("found empty tag %s", tag.latin1());
contents.replace(strindex, empty.matchedLength(), " ");
strindex++;
return true;
@@ -985,7 +985,7 @@ MsgList parseXML(const char *filename)
if (found != msgids.end()) {
if (found.data() != (*it).tag) {
#ifdef POXML_DEBUG
- qDebug("same msgid for '%s' and '%s'", found.data().latin1(), (*it).tag.latin1());
+ tqDebug("same msgid for '%s' and '%s'", found.data().latin1(), (*it).tag.latin1());
#endif
changed = true;
TQString msgid = (*it).msgid;
diff --git a/poxml/po2xml.cpp b/poxml/po2xml.cpp
index c30a340f..e43f464a 100644
--- a/poxml/po2xml.cpp
+++ b/poxml/po2xml.cpp
@@ -30,7 +30,7 @@ TQString translate(TQString xml, TQString orig, TQString translation)
int index = xml.find(orig);
if (index == -1) {
- qWarning("can't find\n%s\nin\n%s", orig.latin1(), xml.latin1());
+ tqWarning("can't find\n%s\nin\n%s", orig.latin1(), xml.latin1());
exit(1);
}
if (!translation.isEmpty())
@@ -41,7 +41,7 @@ TQString translate(TQString xml, TQString orig, TQString translation)
int main( int argc, char **argv )
{
if (argc != 3) {
- qWarning("usage: %s english-XML translated-PO", argv[0]);
+ tqWarning("usage: %s english-XML translated-PO", argv[0]);
::exit(1);
}
@@ -69,7 +69,7 @@ int main( int argc, char **argv )
msgstr = escapePO((*it).msgstr);
#ifdef POXML_DEBUG
- qDebug("inserting translations '%s' -> '%s'", msgid.latin1(),msgstr.latin1());
+ tqDebug("inserting translations '%s' -> '%s'", msgid.latin1(),msgstr.latin1());
#endif
translations.insert(msgid, msgstr);
}
@@ -181,7 +181,7 @@ int main( int argc, char **argv )
if (!descaped.isEmpty()) {
if (descaped.at(0) != '<') {
- qWarning("the translation of '%s' doesn't start with a tag.", omsgid.latin1());
+ tqWarning("the translation of '%s' doesn't start with a tag.", omsgid.latin1());
exit(1);
}
index = 0;
@@ -201,7 +201,7 @@ int main( int argc, char **argv )
}
#ifdef POXML_DEBUG
- qDebug("english \"%s\" ORIG \"%s\" %d(%d-%d) %d(%d-%d) %d %d TRANS \"%s\" %d '%s'", xml.latin1(), (*it).msgid.latin1(),
+ tqDebug("english \"%s\" ORIG \"%s\" %d(%d-%d) %d(%d-%d) %d %d TRANS \"%s\" %d '%s'", xml.latin1(), (*it).msgid.latin1(),
start_pos, bi.start_line, bi.start_col,
end_pos, bi.end_line, bi.end_col,
(*it).lines.first().offset,
@@ -223,7 +223,7 @@ int main( int argc, char **argv )
} else {
if (start_pos != old_pos) {
if (start_pos < old_pos) {
- qDebug("so far: '%s'", output.latin1());
+ tqDebug("so far: '%s'", output.latin1());
}
assert(start_pos > old_pos);
ts << xml_text.mid(old_pos, start_pos - old_pos);
diff --git a/poxml/split.cpp b/poxml/split.cpp
index 29104d3e..cf09debe 100644
--- a/poxml/split.cpp
+++ b/poxml/split.cpp
@@ -9,7 +9,7 @@ int main( int argc, char **argv )
bool report_mismatches = qstrcmp(getenv("REPORT_MISMATCHES"), "no");
if (argc != 3) {
- qWarning("usage: %s english-XML translated-XML", argv[0]);
+ tqWarning("usage: %s english-XML translated-XML", argv[0]);
exit(1);
}
diff --git a/poxml/swappo.cpp b/poxml/swappo.cpp
index 94c308ae..8e2e8344 100644
--- a/poxml/swappo.cpp
+++ b/poxml/swappo.cpp
@@ -7,7 +7,7 @@ using namespace std;
int main(int argc, char **argv)
{
if ( argc != 2 ) {
- qWarning( "usage: %s pofile", argv[0] );
+ tqWarning( "usage: %s pofile", argv[0] );
return -1;
}
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index bfc2e9cf..ef451fe0 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -11,7 +11,7 @@ using namespace std;
int main(int argc, char **argv)
{
if ( argc != 2 && argc != 4 ) {
- qWarning( "usage: %s [--text translation] potfile", argv[0] );
+ tqWarning( "usage: %s [--text translation] potfile", argv[0] );
return -1;
}
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
if( argc == 4 ) {
if( argv[1]!=TQString("--text") ) {
- qWarning( "usage: %s [--text translation] potfile", argv[0] );
+ tqWarning( "usage: %s [--text translation] potfile", argv[0] );
return -1;
}
translation = TQString::fromLocal8Bit(argv[2]);
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index 345a53e6..d3af9a0e 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -9,7 +9,7 @@ using namespace std;
int main( int argc, char **argv )
{
if (argc != 2) {
- qWarning("usage: %s english-XML", argv[0]);
+ tqWarning("usage: %s english-XML", argv[0]);
exit(1);
}
diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh
index a238845e..2a08b610 100755
--- a/scripts/kDebug2kdDebug.sh
+++ b/scripts/kDebug2kdDebug.sh
@@ -1,5 +1,5 @@
## kDebug2kdDebug.sh
-## Script to port from qDebug, kdebug, kDebugInfo etc. to kdDebug/kdWarning/...
+## Script to port from tqDebug, kdebug, kDebugInfo etc. to kdDebug/kdWarning/...
## Example:
## kDebugInfo( [area,] "format %a - %b", arga, argb )
## becomes
@@ -27,7 +27,7 @@ while (<>)
#print "Reading line : " . $_ . "\n";
$statement .= $_;
}
- elsif ( /kdebug\s*\(/ || /kDebug[a-zA-Z]*\s*\(/ || /qDebug\s*/ || /qWarning\s*/ )
+ elsif ( /kdebug\s*\(/ || /kDebug[a-zA-Z]*\s*\(/ || /tqDebug\s*/ || /tqWarning\s*/ )
{
# Very old kdebug stuff :)
s/kdebug\s*\(\s*KDEBUG_INFO,/kDebugInfo\(/;
@@ -51,14 +51,14 @@ while (<>)
## 1 - Parse
if (s/(^.*kDebug[a-zA-Z]*)\s*\(\s*//) {
$line=$1; # has the indentation, //, and the kDebug* name
- } elsif (s/(^.*qDebug)\s*\(\s*// || s/(^.*qWarning)\s*\(\s*//) {
+ } elsif (s/(^.*tqDebug)\s*\(\s*// || s/(^.*tqWarning)\s*\(\s*//) {
$line=$1;
- } else { die "parse error on kDebug/qDebug/qWarning..."; }
+ } else { die "parse error on kDebug/tqDebug/tqWarning..."; }
$line=$1; # has the indentation, //, and the kDebug* name
$line =~ s/kDebugInfo/kdDebug/;
$line =~ s/kDebugArea/kdDebug/;
- $line =~ s/qDebug/kdDebug/;
- $line =~ s/qWarning/kdWarning/;
+ $line =~ s/tqDebug/kdDebug/;
+ $line =~ s/tqWarning/kdWarning/;
$line =~ s/kDebugWarning/kdWarning/;
$line =~ s/kDebugError/kdError/;
$line =~ s/kDebugFatal/kdFatal/;
@@ -72,7 +72,7 @@ while (<>)
$area = $1; # Store it
$line .= "(" . $area . ")";
} else
- { $line .= "()"; } # You can set an area here if converting qDebugs
+ { $line .= "()"; } # You can set an area here if converting tqDebugs
$arguments = ""; # for final test
$commented = 0;
diff --git a/tdecachegrind/ChangeLog b/tdecachegrind/ChangeLog
index 05f3081e..5c0c8cf8 100644
--- a/tdecachegrind/ChangeLog
+++ b/tdecachegrind/ChangeLog
@@ -9,7 +9,7 @@
2004/04/28
* toplevel.h/cpp, tdecachegrindui.rc
- Switching Layouts
- * multiview.cpp: Removed some qDebug's
+ * multiview.cpp: Removed some tqDebug's
* Same term fixes
2004/04/26
@@ -37,7 +37,7 @@
- Add Context menu item "Export as Image"
- Hide Birdseye-View if call-graph fits into widget
- Error messages in Canvas when something goes wrong
- * Some Fixes, qDebug->kdDebug
+ * Some Fixes, tqDebug->kdDebug
2004/04/02
* In most views columns for 2nd Event Type added
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index bc01da8b..7ded6678 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -130,7 +130,7 @@ GraphNode::GraphNode()
TraceCall* GraphNode::visibleCaller()
{
- if (0) qDebug("GraphNode::visibleCaller %s: last %d, count %d",
+ if (0) tqDebug("GraphNode::visibleCaller %s: last %d, count %d",
_f->prettyName().ascii(), _lastCallerIndex, callers.count());
GraphEdge* e = callers.at(_lastCallerIndex);
@@ -152,7 +152,7 @@ TraceCall* GraphNode::visibleCaller()
TraceCall* GraphNode::visibleCalling()
{
- if (0) qDebug("GraphNode::visibleCalling %s: last %d, count %d",
+ if (0) tqDebug("GraphNode::visibleCalling %s: last %d, count %d",
_f->prettyName().ascii(), _lastCallingIndex, callings.count());
GraphEdge* e = callings.at(_lastCallingIndex);
@@ -840,12 +840,12 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
double incl = f->inclusive()->subCost(_costType) * factor;
n.incl += incl;
n.self += f->subCost(_costType) * factor;
- if (0) qDebug(" Added Incl. %f, now %f", incl, n.incl);
+ if (0) tqDebug(" Added Incl. %f, now %f", incl, n.incl);
// A negative depth limit means "unlimited"
int maxDepth = toCallings ? _go->maxCallingDepth() : _go->maxCallerDepth();
if ((maxDepth>=0) && (d >= maxDepth)) {
- if (0) qDebug(" Cutoff, max depth reached");
+ if (0) tqDebug(" Cutoff, max depth reached");
return;
}
@@ -858,7 +858,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
// note: a 2nd visit never should happen, as we don't follow inner-cycle
// calls
if (oldIncl > 0.0) {
- if (0) qDebug(" Cutoff, 2nd visit to Cycle Member");
+ if (0) tqDebug(" Cutoff, 2nd visit to Cycle Member");
// and takeback cost addition, as it's added twice
n.incl = oldIncl;
n.self -= f->subCost(_costType) * factor;
@@ -866,7 +866,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
}
}
else if (incl <= _realFuncLimit) {
- if (0) qDebug(" Cutoff, below limit");
+ if (0) tqDebug(" Cutoff, below limit");
return;
}
@@ -903,7 +903,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
e.cost += cost;
e.count += count;
- if (0) qDebug(" Edge to %s, added cost %f, now %f",
+ if (0) tqDebug(" Edge to %s, added cost %f, now %f",
f2->prettyName().ascii(), cost, e.cost);
// if this call goes into a FunctionCycle, we also show the real call
@@ -945,7 +945,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
// from here with full incl. cost because of previous cutoffs
if ((e.cost >= _realCallLimit) && (oldCost < _realCallLimit)) cost = e.cost;
if (cost < _realCallLimit) {
- if (0) qDebug(" Edge Cutoff, limit not reached");
+ if (0) tqDebug(" Edge Cutoff, limit not reached");
continue;
}
@@ -1204,14 +1204,14 @@ TQPointArray CanvasEdge::areaPoints() const
int maxX = minX, maxY = minY;
int i;
- if (0) qDebug("CanvasEdge::areaPoints\n P 0: %d/%d", minX, minY);
+ if (0) tqDebug("CanvasEdge::areaPoints\n P 0: %d/%d", minX, minY);
int len = poly.count();
for (i=1;i<len;i++) {
if (poly[i].x() < minX) minX = poly[i].x();
if (poly[i].y() < minY) minY = poly[i].y();
if (poly[i].x() > maxX) maxX = poly[i].x();
if (poly[i].y() > maxY) maxY = poly[i].y();
- if (0) qDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y());
+ if (0) tqDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y());
}
TQPointArray a = poly.copy(), b = poly.copy();
if (minX == maxX) {
@@ -1227,9 +1227,9 @@ TQPointArray CanvasEdge::areaPoints() const
a[2 * len - 1 -i] = b[i];
if (0) {
- qDebug(" Result:");
+ tqDebug(" Result:");
for (i=0;i<2*len;i++)
- qDebug(" P %d: %d/%d", i, a[i].x(), a[i].y());
+ tqDebug(" P %d: %d/%d", i, a[i].x(), a[i].y());
}
return a;
@@ -1318,7 +1318,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
TQPoint cPos = cgv->viewportToContents(pos);
- if (0) qDebug("CallGraphTip for (%d/%d) -> (%d/%d) ?",
+ if (0) tqDebug("CallGraphTip for (%d/%d) -> (%d/%d) ?",
pos.x(), pos.y(), cPos.x(), cPos.y());
TQCanvasItemList l = cgv->canvas()->collisions(cPos);
@@ -1328,7 +1328,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
if (i->rtti() == CANVAS_NODE) {
CanvasNode* cn = (CanvasNode*)i;
GraphNode* n = cn->node();
- if (0) qDebug("CallGraphTip: Mouse on Node '%s'",
+ if (0) tqDebug("CallGraphTip: Mouse on Node '%s'",
n->function()->prettyName().ascii());
TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1));
@@ -1348,7 +1348,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
if (i->rtti() == CANVAS_EDGE) {
CanvasEdge* ce = (CanvasEdge*)i;
GraphEdge* e = ce->edge();
- if (0) qDebug("CallGraphTip: Mouse on Edge '%s'",
+ if (0) tqDebug("CallGraphTip: Mouse on Edge '%s'",
e->prettyName().ascii());
TQString tipStr;
@@ -1474,7 +1474,7 @@ void CallGraphView::updateSizes(TQSize s)
if (zoom != _cvZoom) {
_cvZoom = zoom;
- if (0) qDebug("Canvas Size: %dx%d, Visible: %dx%d, Zoom: %f",
+ if (0) tqDebug("Canvas Size: %dx%d, Visible: %dx%d, Zoom: %f",
_canvas->width(), _canvas->height(),
cWidth, cHeight, zoom);
@@ -1915,7 +1915,7 @@ void CallGraphView::dotExited()
TQTextStream lineStream(line, IO_ReadOnly);
lineStream >> cmd;
- if (0) qDebug("%s:%d - line '%s', cmd '%s'",
+ if (0) tqDebug("%s:%d - line '%s', cmd '%s'",
_exporter.filename().ascii(), lineno,
line.ascii(), cmd.ascii());
@@ -2010,7 +2010,7 @@ void CallGraphView::dotExited()
}
if (!n) {
- qDebug("Warning: Unknown function '%s' ?!", nodeName.ascii());
+ tqDebug("Warning: Unknown function '%s' ?!", nodeName.ascii());
continue;
}
n->setVisible(true);
@@ -2050,7 +2050,7 @@ void CallGraphView::dotExited()
if (e->fromNode()) e->fromNode()->callings.append(e);
if (e->toNode()) e->toNode()->callers.append(e);
- if (0) qDebug(" Edge with %d points:", points);
+ if (0) tqDebug(" Edge with %d points:", points);
pa.resize(points);
for (i=0;i<points;i++) {
@@ -2062,13 +2062,13 @@ void CallGraphView::dotExited()
int xx = (int)(scaleX * x + _xMargin);
int yy = (int)(scaleY * (dotHeight - y) + _yMargin);
- if (0) qDebug(" P %d: ( %f / %f ) => ( %d / %d)",
+ if (0) tqDebug(" P %d: ( %f / %f ) => ( %d / %d)",
i, x, y, xx, yy);
pa.setPoint(i, xx, yy);
}
if (i < points) {
- qDebug("CallGraphView: Can't read %d spline points (%s:%d)",
+ tqDebug("CallGraphView: Can't read %d spline points (%s:%d)",
points, _exporter.filename().ascii(), lineno);
continue;
}
@@ -2134,7 +2134,7 @@ void CallGraphView::dotExited()
a.setPoint(2, pa.point(indexHead) + TQPoint(-arrowDir.y()/2,
arrowDir.x()/2));
- if (0) qDebug(" Arrow: ( %d/%d, %d/%d, %d/%d)",
+ if (0) tqDebug(" Arrow: ( %d/%d, %d/%d, %d/%d)",
a.point(0).x(), a.point(0).y(),
a.point(1).x(), a.point(1).y(),
a.point(2).x(), a.point(2).y());
@@ -2174,7 +2174,7 @@ void CallGraphView::dotExited()
int xx = (int)(scaleX * x + _xMargin);
int yy = (int)(scaleY * (dotHeight - y) + _yMargin);
- if (0) qDebug(" Label '%s': ( %f / %f ) => ( %d / %d)",
+ if (0) tqDebug(" Label '%s': ( %f / %f ) => ( %d / %d)",
label.ascii(), x, y, xx, yy);
// Fixed Dimensions for Label: 100 x 40
@@ -2275,7 +2275,7 @@ void CallGraphView::contentsMovingSlot(int x, int y)
{
TQRect z(int(x * _cvZoom), int(y * _cvZoom),
int(visibleWidth() * _cvZoom)-1, int(visibleHeight() * _cvZoom)-1);
- if (0) qDebug("moving: (%d,%d) => (%d/%d - %dx%d)",
+ if (0) tqDebug("moving: (%d,%d) => (%d/%d - %dx%d)",
x, y, z.x(), z.y(), z.width(), z.height());
_completeView->setZoomRect(z);
}
@@ -2305,7 +2305,7 @@ void CallGraphView::contentsMousePressEvent(TQMouseEvent* e)
if (i->rtti() == CANVAS_NODE) {
GraphNode* n = ((CanvasNode*)i)->node();
- if (0) qDebug("CallGraphView: Got Node '%s'",
+ if (0) tqDebug("CallGraphView: Got Node '%s'",
n->function()->prettyName().ascii());
selected(n->function());
@@ -2319,7 +2319,7 @@ void CallGraphView::contentsMousePressEvent(TQMouseEvent* e)
if (i->rtti() == CANVAS_EDGE) {
GraphEdge* e = ((CanvasEdge*)i)->edge();
- if (0) qDebug("CallGraphView: Got Edge '%s'",
+ if (0) tqDebug("CallGraphView: Got Edge '%s'",
e->prettyName().ascii());
if (e->call()) selected(e->call());
@@ -2352,7 +2352,7 @@ void CallGraphView::contentsMouseDoubleClickEvent(TQMouseEvent* e)
if (i->rtti() == CANVAS_NODE) {
GraphNode* n = ((CanvasNode*)i)->node();
- if (0) qDebug("CallGraphView: Double Clicked on Node '%s'",
+ if (0) tqDebug("CallGraphView: Double Clicked on Node '%s'",
n->function()->prettyName().ascii());
activated(n->function());
@@ -2367,7 +2367,7 @@ void CallGraphView::contentsMouseDoubleClickEvent(TQMouseEvent* e)
if (i->rtti() == CANVAS_EDGE) {
GraphEdge* e = ((CanvasEdge*)i)->edge();
if (e->call()) {
- if (0) qDebug("CallGraphView: Double Clicked On Edge '%s'",
+ if (0) tqDebug("CallGraphView: Double Clicked On Edge '%s'",
e->call()->prettyName().ascii());
activated(e->call());
@@ -2387,7 +2387,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
if (i) {
if (i->rtti() == CANVAS_NODE) {
GraphNode* n = ((CanvasNode*)i)->node();
- if (0) qDebug("CallGraphView: Menu on Node '%s'",
+ if (0) tqDebug("CallGraphView: Menu on Node '%s'",
n->function()->prettyName().ascii());
f = n->function();
cycle = f->cycle();
@@ -2410,7 +2410,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
if (i->rtti() == CANVAS_EDGE) {
GraphEdge* e = ((CanvasEdge*)i)->edge();
- if (0) qDebug("CallGraphView: Menu on Edge '%s'",
+ if (0) tqDebug("CallGraphView: Menu on Edge '%s'",
e->prettyName().ascii());
c = e->call();
if (c) {
@@ -2690,7 +2690,7 @@ void CallGraphView::readViewConfig(KConfig* c,
{
KConfigGroup* g = configGroup(c, prefix, postfix);
- if (0) qDebug("CallGraphView::readViewConfig");
+ if (0) tqDebug("CallGraphView::readViewConfig");
_maxCallerDepth = g->readNumEntry("MaxCaller", DEFAULT_MAXCALLER);
_maxCallingDepth = g->readNumEntry("MaxCalling", DEFAULT_MAXCALLING);
diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp
index 0e4d5e38..5af303f9 100644
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@@ -542,7 +542,7 @@ TQString CallMapView::tipString(TreeMapItem* i) const
TQString tip, itemTip;
int count = 0;
- //qDebug("CallMapView::tipString for '%s'", i->text(0).ascii());
+ //tqDebug("CallMapView::tipString for '%s'", i->text(0).ascii());
// first, SubPartItem's
while (i && count<Configuration::maxSymbolCount()) {
@@ -668,7 +668,7 @@ TreeMapItemList* CallMapBaseItem::children()
if (_f && !initialized()) {
CallMapView* w = (CallMapView*)widget();
- if (0) qDebug("Create Function %s (%s)",
+ if (0) tqDebug("Create Function %s (%s)",
w->showCallers() ? "Callers":"Callees",
text(0).ascii());
@@ -795,7 +795,7 @@ bool CallMapCallingItem::isMarked(int) const
TreeMapItemList* CallMapCallingItem::children()
{
if (!initialized()) {
- if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii());
+ if (0) tqDebug("Create Calling subitems (%s)", path(0).join("/").ascii());
TraceCostType* ct;
ct = ((CallMapView*)widget())->costType();
@@ -804,14 +804,14 @@ TreeMapItemList* CallMapCallingItem::children()
SubCost s = _c->called()->inclusive()->subCost(ct);
SubCost v = _c->subCost(ct);
if (v>s) {
- qDebug("Warning: CallingItem subVal %u > Sum %u (%s)",
+ tqDebug("Warning: CallingItem subVal %u > Sum %u (%s)",
(unsigned)v, (unsigned)s, _c->called()->prettyName().ascii());
v = s;
}
double newFactor = _factor * v / s;
#if 0
- qDebug("CallingItem: Subitems of %s => %s, factor %f * %d/%d => %f",
+ tqDebug("CallingItem: Subitems of %s => %s, factor %f * %d/%d => %f",
_c->caller()->prettyName().ascii(),
_c->called()->prettyName().ascii(),
_factor, v, s, newFactor);
@@ -907,7 +907,7 @@ bool CallMapCallerItem::isMarked(int) const
TreeMapItemList* CallMapCallerItem::children()
{
if (!initialized()) {
- //qDebug("Create Caller subitems (%s)", name().ascii());
+ //tqDebug("Create Caller subitems (%s)", name().ascii());
TraceCostType* ct;
ct = ((CallMapView*)widget())->costType();
@@ -918,7 +918,7 @@ TreeMapItemList* CallMapCallerItem::children()
#if 0
- qDebug("CallerItem: Subitems of %s => %s, factor %f * %d/%d => %f",
+ tqDebug("CallerItem: Subitems of %s => %s, factor %f * %d/%d => %f",
_c->caller()->prettyName().ascii(),
_c->called()->prettyName().ascii(),
_factor, v, s, newFactor);
diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp
index e0b45470..0ce58df6 100644
--- a/tdecachegrind/tdecachegrind/configdlg.cpp
+++ b/tdecachegrind/tdecachegrind/configdlg.cpp
@@ -224,7 +224,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p)
void ConfigDlg::objectActivated(const TQString & s)
{
-// qDebug("objectActivated: %s", s.ascii());
+// tqDebug("objectActivated: %s", s.ascii());
if (s.isEmpty()) { _objectCS=0; return; }
@@ -235,7 +235,7 @@ void ConfigDlg::objectActivated(const TQString & s)
if (!cs)
cs = Configuration::color(n);
// else
-// qDebug("found color %s", n.ascii());
+// tqDebug("found color %s", n.ascii());
_objectCS = cs;
@@ -243,7 +243,7 @@ void ConfigDlg::objectActivated(const TQString & s)
objectColor->setColor(cs->color);
/*
- qDebug("Found Color %s, automatic to %s",
+ tqDebug("Found Color %s, automatic to %s",
_objectCS->name.ascii(),
_objectCS->automatic ? "true":"false");
*/
@@ -255,7 +255,7 @@ void ConfigDlg::objectCheckChanged(bool b)
if (_objectCS) {
_objectCS->automatic = b;
/*
- qDebug("Set Color %s automatic to %s",
+ tqDebug("Set Color %s automatic to %s",
_objectCS->name.ascii(),
_objectCS->automatic ? "true":"false");
*/
@@ -269,7 +269,7 @@ void ConfigDlg::objectColorChanged(const TQColor & c)
void ConfigDlg::classActivated(const TQString & s)
{
-// qDebug("classActivated: %s", s.ascii());
+// tqDebug("classActivated: %s", s.ascii());
if (s.isEmpty()) { _classCS=0; return; }
@@ -301,7 +301,7 @@ void ConfigDlg::classColorChanged(const TQColor & c)
void ConfigDlg::fileActivated(const TQString & s)
{
-// qDebug("fileActivated: %s", s.ascii());
+// tqDebug("fileActivated: %s", s.ascii());
if (s.isEmpty()) { _fileCS=0; return; }
diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp
index 02d5c096..d9b902ee 100644
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@@ -136,7 +136,7 @@ void Configuration::saveOptions(KConfig* kconfig)
it.currentKey());
colorConfig.writeEntry( TQString("Color%1").arg(count),
(*it)->color);
- //qDebug("Written Color %s (%d)", it.currentKey().ascii(), count);
+ //tqDebug("Written Color %s (%d)", it.currentKey().ascii(), count);
count++;
}
@@ -229,7 +229,7 @@ void Configuration::readOptions(KConfig* kconfig)
c->_colors.insert(n, cs);
- //qDebug("Read Color %s", n.ascii());
+ //tqDebug("Read Color %s", n.ascii());
}
// source options
@@ -349,7 +349,7 @@ TQColor Configuration::functionColor(TraceCost::CostType gt,
Configuration::ColorSetting* Configuration::color(TQString n, bool createNew)
{
-// qDebug("Color for %s", n.latin1());
+// tqDebug("Color for %s", n.latin1());
// predefined ?
Configuration* c = config();
@@ -365,7 +365,7 @@ Configuration::ColorSetting* Configuration::color(TQString n, bool createNew)
str++;
}
- //qDebug("New color for %s: H %d, S %d", n.ascii(), h, 64+s);
+ //tqDebug("New color for %s: H %d, S %d", n.ascii(), h, 64+s);
TQColor color = TQColor(h, 64+s, 192, TQColor::Hsv);
cs = new ColorSetting;
@@ -374,7 +374,7 @@ Configuration::ColorSetting* Configuration::color(TQString n, bool createNew)
cs->color = color;
c->_colors.insert(n, cs);
- //qDebug("new Color %s", n.ascii());
+ //tqDebug("new Color %s", n.ascii());
return cs;
}
diff --git a/tdecachegrind/tdecachegrind/coverage.cpp b/tdecachegrind/tdecachegrind/coverage.cpp
index 86e6f7ff..b9291163 100644
--- a/tdecachegrind/tdecachegrind/coverage.cpp
+++ b/tdecachegrind/tdecachegrind/coverage.cpp
@@ -114,7 +114,7 @@ void Coverage::addCallerCoverage(TraceFunctionList& fList,
if (_active) {
#ifdef DEBUG_COVERAGE
- qDebug("CallerCov: D %d, %s (was active, incl %f, self %f): newP %f", d,
+ tqDebug("CallerCov: D %d, %s (was active, incl %f, self %f): newP %f", d,
_function->prettyName().ascii(), _incl, _self, pBack);
#endif
_inRecursion = true;
@@ -137,7 +137,7 @@ void Coverage::addCallerCoverage(TraceFunctionList& fList,
}
#ifdef DEBUG_COVERAGE
- qDebug("CallerCov: D %d, %s (now active, new incl %f): newP %f",
+ tqDebug("CallerCov: D %d, %s (now active, new incl %f): newP %f",
d, _function->prettyName().ascii(), _incl, pBack);
#endif
}
@@ -215,7 +215,7 @@ void Coverage::addCallingCoverage(TraceFunctionList& fList,
incl = (double) (_function->inclusive()->subCost(_costType));
#ifdef DEBUG_COVERAGE
- qDebug("CngCov:%s - %s (incl %f, self %f): forward %f, back %f",
+ tqDebug("CngCov:%s - %s (incl %f, self %f): forward %f, back %f",
spaces+strlen(spaces)-d,
_function->prettyName().ascii(), _incl, _self, pForward, pBack);
#endif
@@ -225,7 +225,7 @@ void Coverage::addCallingCoverage(TraceFunctionList& fList,
_inRecursion = true;
#ifdef DEBUG_COVERAGE
- qDebug("CngCov:%s < %s: STOP (is active)",
+ tqDebug("CngCov:%s < %s: STOP (is active)",
spaces+strlen(spaces)-d,
_function->prettyName().ascii());
#endif
@@ -252,7 +252,7 @@ void Coverage::addCallingCoverage(TraceFunctionList& fList,
}
#ifdef DEBUG_COVERAGE
- qDebug("CngCov:%s < %s (incl %f, self %f)",
+ tqDebug("CngCov:%s < %s (incl %f, self %f)",
spaces+strlen(spaces)-d,
_function->prettyName().ascii(), _incl, _self);
#endif
@@ -290,7 +290,7 @@ void Coverage::addCallingCoverage(TraceFunctionList& fList,
c->callCount() += pBack * call->callCount();
#ifdef DEBUG_COVERAGE
- qDebug("CngCov:%s > %s: forward %f, back %f, calls %f -> %f, now %f",
+ tqDebug("CngCov:%s > %s: forward %f, back %f, calls %f -> %f, now %f",
spaces+strlen(spaces)-d,
calling->prettyName().ascii(),
pForwardNew, pBackNew,
@@ -305,7 +305,7 @@ void Coverage::addCallingCoverage(TraceFunctionList& fList,
double fFactor = 1.0 / (1.0 - pForwardNew / c->firstPercentage());
double bFactor = 1.0 / (1.0 - pBackNew);
#ifdef DEBUG_COVERAGE
- qDebug("CngCov:%s Recursion - origP %f, actP %f => factor %f, newP %f",
+ tqDebug("CngCov:%s Recursion - origP %f, actP %f => factor %f, newP %f",
spaces+strlen(spaces)-d,
c->firstPercentage(), pForwardNew,
fFactor, pForwardNew * fFactor);
diff --git a/tdecachegrind/tdecachegrind/fixcost.cpp b/tdecachegrind/tdecachegrind/fixcost.cpp
index 41029265..1379d9e2 100644
--- a/tdecachegrind/tdecachegrind/fixcost.cpp
+++ b/tdecachegrind/tdecachegrind/fixcost.cpp
@@ -65,7 +65,7 @@ FixCallCost::FixCallCost(TracePart* part, FixPool* pool,
TracePartCall* partCall,
SubCost callCount, FixString& s)
{
- if (0) qDebug("Got FixCallCost (addr 0x%s, line %d): calls %s",
+ if (0) tqDebug("Got FixCallCost (addr 0x%s, line %d): calls %s",
addr.toString().ascii(), line,
callCount.pretty().ascii());
@@ -110,7 +110,7 @@ void FixCallCost::addTo(TraceCallCost* c)
}
c->addCallCount(_cost[_count]);
- if (0) qDebug("Adding from (addr 0x%s, ln %d): calls %s",
+ if (0) tqDebug("Adding from (addr 0x%s, ln %d): calls %s",
_addr.toString().ascii(), _line,
_cost[_count].pretty().ascii());
}
diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp
index c5646dd6..da243fdd 100644
--- a/tdecachegrind/tdecachegrind/functionselection.cpp
+++ b/tdecachegrind/tdecachegrind/functionselection.cpp
@@ -425,7 +425,7 @@ void FunctionSelection::refresh()
}
/*
- qDebug("FunctionSelection::fillLists (%s)",
+ tqDebug("FunctionSelection::fillLists (%s)",
_data->command().ascii());
*/
@@ -496,7 +496,7 @@ void FunctionSelection::refresh()
functionList->clear();
setCostColumnWidths();
- if (0) qDebug("Function %s at %d, Item %p",
+ if (0) tqDebug("Function %s at %d, Item %p",
oldFunction ? oldFunction->name().ascii() : "-",
oldPos, (void*)oldItem);
@@ -712,7 +712,7 @@ void FunctionSelection::functionSelected(TQListViewItem* i)
TraceFunction* f = ((FunctionItem*) i)->function();
if (!f) return;
- //qDebug("FunctionSelection::functionSelected %s", f->name().ascii());
+ //tqDebug("FunctionSelection::functionSelected %s", f->name().ascii());
// Don't emit signal if function was changed programatically
if (!_inSetFunction) {
diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp
index ce5e81bb..6815b00a 100644
--- a/tdecachegrind/tdecachegrind/instritem.cpp
+++ b/tdecachegrind/tdecachegrind/instritem.cpp
@@ -97,7 +97,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
_instrJump = 0;
_inside = true;
- //qDebug("InstrItem: (file %d, line %d) Linecall to %s",
+ //tqDebug("InstrItem: (file %d, line %d) Linecall to %s",
// fileno, lineno, _lineCall->call()->called()->prettyName().ascii());
SubCost cc = _instrCall->callCount();
@@ -129,7 +129,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
_instrCall = 0;
_instrJump = instrJump;
- //qDebug("SourceItem: (file %d, line %d) Linecall to %s",
+ //tqDebug("SourceItem: (file %d, line %d) Linecall to %s",
// fileno, lineno, _lineCall->call()->called()->prettyName().ascii());
TQString jStr;
diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp
index 3df16793..ed3ad4de 100644
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@@ -96,7 +96,7 @@ static bool parseLine(char* buf, Addr& addr,
if (strlen(buf+pos2) > 50)
strcpy(buf+pos2+47, "...");
- if (0) qDebug("For 0x%s: Code '%s', Mnc '%s', Args '%s'",
+ if (0) tqDebug("For 0x%s: Code '%s', Mnc '%s', Args '%s'",
addr.toString().ascii(), buf+pos1, buf+pos2, buf+pos3);
return true;
@@ -504,7 +504,7 @@ void InstrView::updateJumpArray(Addr addr, InstrItem* ii,
Addr lowAddr, highAddr;
int iEnd = -1, iStart = -1;
- if (0) qDebug("updateJumpArray(addr 0x%s, jump to %s)",
+ if (0) tqDebug("updateJumpArray(addr 0x%s, jump to %s)",
addr.toString().ascii(),
ii->instrJump()
? ii->instrJump()->instrTo()->name().ascii() : "?" );
@@ -540,7 +540,7 @@ void InstrView::updateJumpArray(Addr addr, InstrItem* ii,
_arrowLevels++;
_jump.resize(_arrowLevels);
}
- if (0) qDebug(" new start at %d for %s", iStart, ij->name().ascii());
+ if (0) tqDebug(" new start at %d for %s", iStart, ij->name().ascii());
_jump[iStart] = ij;
}
ij=_lowList.next();
@@ -569,12 +569,12 @@ void InstrView::updateJumpArray(Addr addr, InstrItem* ii,
}
if (0 && (iEnd>=0))
- qDebug(" end %d (%s to %s)",
+ tqDebug(" end %d (%s to %s)",
iEnd,
_jump[iEnd]->instrFrom()->name().ascii(),
_jump[iEnd]->instrTo()->name().ascii());
- if (0 && ij) qDebug("next end: %s to %s",
+ if (0 && ij) tqDebug("next end: %s to %s",
ij->instrFrom()->name().ascii(),
ij->instrTo()->name().ascii());
@@ -620,7 +620,7 @@ bool InstrView::fillInstrRange(TraceFunction* function,
"--start-address=0x%1 --stop-address=0x%2 \"%3\"")
.arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString())
.arg(objfile);
- if (1) qDebug("Running '%s'...", popencmd.ascii());
+ if (1) tqDebug("Running '%s'...", popencmd.ascii());
// and run...
FILE* iFILE = popen(TQFile::encodeName( popencmd ), "r");
@@ -669,7 +669,7 @@ bool InstrView::fillInstrRange(TraceFunction* function,
objdumpLineno++;
if (readBytes == BUF_SIZE) {
- qDebug("ERROR: Line %d of '%s' too long\n",
+ tqDebug("ERROR: Line %d of '%s' too long\n",
objdumpLineno, popencmd.ascii());
}
else if ((readBytes>0) && (buf[readBytes-1] == '\n'))
@@ -931,7 +931,7 @@ void InstrView::readViewConfig(KConfig* c,
{
KConfigGroup* g = configGroup(c, prefix, postfix);
- if (0) qDebug("InstrView::readViewConfig");
+ if (0) tqDebug("InstrView::readViewConfig");
_showHexCode = g->readBoolEntry("ShowHexCode", DEFAULT_SHOWHEXCODE);
diff --git a/tdecachegrind/tdecachegrind/listutils.cpp b/tdecachegrind/tdecachegrind/listutils.cpp
index 0053646d..2b1a3232 100644
--- a/tdecachegrind/tdecachegrind/listutils.cpp
+++ b/tdecachegrind/tdecachegrind/listutils.cpp
@@ -150,7 +150,7 @@ TQPixmap partitionPixmap(int w, int h,
if (framed)
p.drawRect(0, 0, w, h);
- //qDebug("Sum %f, dw %d", sum,dw);
+ //tqDebug("Sum %f, dw %d", sum,dw);
TQColor c, cLast;
bool leftDrawn = false;
@@ -161,7 +161,7 @@ TQPixmap partitionPixmap(int w, int h,
val += hist[d];
nextPos = (int)(filled * val/sum);
- //qDebug(" hist[%d] %f, val %f, nextPos %d", d, hist[d], val, nextPos);
+ //tqDebug(" hist[%d] %f, val %f, nextPos %d", d, hist[d], val, nextPos);
diff = nextPos-lastPos;
if (diff==0) { d++; continue; }
diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp
index 4288e2df..53307c5c 100644
--- a/tdecachegrind/tdecachegrind/multiview.cpp
+++ b/tdecachegrind/tdecachegrind/multiview.cpp
@@ -169,7 +169,7 @@ void MultiView::readViewConfig(KConfig* c,
TQString prefix, TQString postfix,
bool withOptions)
{
- if (0) qDebug("%s::readConfig(%s%s)", name(),
+ if (0) tqDebug("%s::readConfig(%s%s)", name(),
prefix.ascii(), postfix.ascii());
TQString active;
diff --git a/tdecachegrind/tdecachegrind/partgraph.cpp b/tdecachegrind/tdecachegrind/partgraph.cpp
index a20f53dc..9b5ecbc7 100644
--- a/tdecachegrind/tdecachegrind/partgraph.cpp
+++ b/tdecachegrind/tdecachegrind/partgraph.cpp
@@ -141,7 +141,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
TQString tip, itemTip;
int count = 0;
- //qDebug("PartAreaWidget::tipString for '%s'", i->name().ascii());
+ //tqDebug("PartAreaWidget::tipString for '%s'", i->name().ascii());
// first, SubPartItem's
while (i && count<Configuration::maxSymbolCount() && i->rtti() == 3) {
@@ -174,7 +174,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
tip = itemTip + tip;
}
-// qDebug("PartAreaWidget:: tip %s, itemTip %s",
+// tqDebug("PartAreaWidget:: tip %s, itemTip %s",
// tip.ascii(), itemTip.ascii());
return tip;
@@ -206,7 +206,7 @@ TreeMapItemList* BasePartItem::children()
if (!_data) return _children;
if (!initialized()) {
-// qDebug("Create Parts (%s)", name().ascii());
+// tqDebug("Create Parts (%s)", name().ascii());
PartAreaWidget* w = (PartAreaWidget*) widget();
TracePart* part;
@@ -318,7 +318,7 @@ double PartItem::sum() const
PartAreaWidget* w = (PartAreaWidget*)widget();
if (w->visualisation() == PartAreaWidget::Inclusive) {
double s = value();
- //qDebug("PartItem::sum [part %s]: %d", _p->name().ascii(), s);
+ //tqDebug("PartItem::sum [part %s]: %d", _p->name().ascii(), s);
return s;
}
return 0.0;
@@ -329,7 +329,7 @@ TreeMapItemList* PartItem::children()
if (initialized()) return _children;
TraceCost* c;
-// qDebug("Create Part subitems (%s)", name().ascii());
+// tqDebug("Create Part subitems (%s)", name().ascii());
PartAreaWidget* w = (PartAreaWidget*)widget();
if (w->visualisation() == PartAreaWidget::Inclusive) {
@@ -485,7 +485,7 @@ double SubPartItem::sum() const
PartAreaWidget* w = (PartAreaWidget*)widget();
if (w->visualisation() == PartAreaWidget::Inclusive) {
double s = value();
- //qDebug("SubPartItem::sum [Cost %s]: %d", _cost->name().ascii(), s);
+ //tqDebug("SubPartItem::sum [Cost %s]: %d", _cost->name().ascii(), s);
return s;
}
return 0.0;
@@ -494,7 +494,7 @@ double SubPartItem::sum() const
TreeMapItemList* SubPartItem::children()
{
if (!initialized()) {
-// qDebug("Create Part sub-subitems (%s)", name().ascii());
+// tqDebug("Create Part sub-subitems (%s)", name().ascii());
PartAreaWidget* w = (PartAreaWidget*)widget();
diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp
index 703dd75f..8acef22b 100644
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@@ -222,7 +222,7 @@ void PartSelection::selectionChanged()
}
if (something_changed) {
- //qDebug("PartSelection: Something changed.");
+ //tqDebug("PartSelection: Something changed.");
emit activePartsChanged(pList);
}
}
@@ -242,7 +242,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list)
bool active = (list.containsRef(part)>0);
if (!active && partAreaWidget->isSelected(i)) {
#if 0
- qDebug("PartSelection::partsChangedSlot: Part %s changed to unselected.",
+ tqDebug("PartSelection::partsChangedSlot: Part %s changed to unselected.",
((PartItem*)i)->part()->shortName().ascii());
#endif
@@ -254,7 +254,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list)
bool active = (list.containsRef(part)>0);
if (active && !partAreaWidget->isSelected(i)) {
#if 0
- qDebug("PartSelection::partsChangedSlot: Part %s changed to selected.",
+ tqDebug("PartSelection::partsChangedSlot: Part %s changed to selected.",
((PartItem*)i)->part()->shortName().ascii());
#endif
partAreaWidget->setSelected(i, true);
diff --git a/tdecachegrind/tdecachegrind/pool.cpp b/tdecachegrind/tdecachegrind/pool.cpp
index d4a89a72..47a71f90 100644
--- a/tdecachegrind/tdecachegrind/pool.cpp
+++ b/tdecachegrind/tdecachegrind/pool.cpp
@@ -50,7 +50,7 @@ FixPool::~FixPool()
chunk = next;
}
- if (0) qDebug("~FixPool: Had %d objects with total size %d\n",
+ if (0) tqDebug("~FixPool: Had %d objects with total size %d\n",
_count, _size);
}
@@ -162,7 +162,7 @@ void DynPool::free(char** ptr)
if (!ptr ||
!*ptr ||
(*(char**)(*ptr - 4)) != (char*)ptr )
- qFatal("Chaining error in DynPool::free");
+ tqFatal("Chaining error in DynPool::free");
(*(char**)(*ptr - 4)) = 0;
*ptr = 0;
@@ -178,7 +178,7 @@ bool DynPool::ensureSpace(unsigned int size)
unsigned int freed = 0, len;
char **p, **pnext, **pnew;
- qDebug("DynPool::ensureSpace size: %d => %d, used %d. %p => %p",
+ tqDebug("DynPool::ensureSpace size: %d => %d, used %d. %p => %p",
_size, newsize, _used, _data, newdata);
pnew = (char**) newdata;
@@ -187,7 +187,7 @@ bool DynPool::ensureSpace(unsigned int size)
pnext = (char**) *p;
len = (char*)pnext - (char*)p;
- if (0) qDebug(" [%8p] Len %d (ptr %p), freed %d (=> %p)",
+ if (0) tqDebug(" [%8p] Len %d (ptr %p), freed %d (=> %p)",
p, len, p[1], freed, pnew);
/* skip freed space ? */
@@ -211,7 +211,7 @@ bool DynPool::ensureSpace(unsigned int size)
// update pointer to object
char** ptr = (char**) p[1];
if (*ptr != ((char*)p)+8)
- qFatal("Chaining error in DynPool::ensureSpace");
+ tqFatal("Chaining error in DynPool::ensureSpace");
*ptr = ((char*)pnew)+8;
pnew = (char**) pnew[0];
@@ -220,7 +220,7 @@ bool DynPool::ensureSpace(unsigned int size)
pnew[0] = 0;
unsigned int newused = (char*)pnew - (char*)newdata;
- qDebug("DynPool::ensureSpace size: %d => %d, used %d => %d (%d freed)",
+ tqDebug("DynPool::ensureSpace size: %d => %d, used %d => %d (%d freed)",
_size, newsize, _used, newused, freed);
::free(_data);
diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp
index 305b8244..101d0087 100644
--- a/tdecachegrind/tdecachegrind/sourceitem.cpp
+++ b/tdecachegrind/tdecachegrind/sourceitem.cpp
@@ -77,7 +77,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
_lineCall = lineCall;
_lineJump = 0;
- //qDebug("SourceItem: (file %d, line %d) Linecall to %s",
+ //tqDebug("SourceItem: (file %d, line %d) Linecall to %s",
// fileno, lineno, _lineCall->call()->called()->prettyName().ascii());
SubCost cc = _lineCall->callCount();
@@ -111,7 +111,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
_lineCall = 0;
_lineJump = lineJump;
- //qDebug("SourceItem: (file %d, line %d) Linecall to %s",
+ //tqDebug("SourceItem: (file %d, line %d) Linecall to %s",
// fileno, lineno, _lineCall->call()->called()->prettyName().ascii());
TQString to;
diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp
index dde291ea..52de5209 100644
--- a/tdecachegrind/tdecachegrind/sourceview.cpp
+++ b/tdecachegrind/tdecachegrind/sourceview.cpp
@@ -343,7 +343,7 @@ void SourceView::refresh()
static bool checkFileExistance(TQString& dir, const TQString& name)
{
// we leave this in...
- qDebug("Checking %s/%s", dir.ascii(), name.ascii());
+ tqDebug("Checking %s/%s", dir.ascii(), name.ascii());
if (TQFile::exists(dir + "/" + name)) return true;
@@ -370,7 +370,7 @@ void SourceView::updateJumpArray(uint lineno, SourceItem* si,
uint lowLineno, highLineno;
int iEnd = -1, iStart = -1;
- if (0) qDebug("updateJumpArray(line %d, jump to %s)",
+ if (0) tqDebug("updateJumpArray(line %d, jump to %s)",
lineno,
si->lineJump()
? si->lineJump()->lineTo()->name().ascii() : "?" );
@@ -408,7 +408,7 @@ void SourceView::updateJumpArray(uint lineno, SourceItem* si,
if (asize > _arrowLevels) _arrowLevels = asize;
}
- if (0) qDebug(" start %d (%s to %s)",
+ if (0) tqDebug(" start %d (%s to %s)",
iStart,
lj->lineFrom()->name().ascii(),
lj->lineTo()->name().ascii());
@@ -434,18 +434,18 @@ void SourceView::updateJumpArray(uint lineno, SourceItem* si,
for(iEnd=0;iEnd< (int)_jump.size();iEnd++)
if (_jump[iEnd] == lj) break;
if (iEnd == (int)_jump.size()) {
- qDebug("LineView: no jump start for end at %x ?", highLineno);
+ tqDebug("LineView: no jump start for end at %x ?", highLineno);
iEnd = -1;
}
lj=_highList.next();
if (0 && (iEnd>=0))
- qDebug(" end %d (%s to %s)",
+ tqDebug(" end %d (%s to %s)",
iEnd,
_jump[iEnd]->lineFrom()->name().ascii(),
_jump[iEnd]->lineTo()->name().ascii());
- if (0 && lj) qDebug("next end: %s to %s",
+ if (0 && lj) tqDebug("next end: %s to %s",
lj->lineFrom()->name().ascii(),
lj->lineTo()->name().ascii());
@@ -467,7 +467,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
{
if (!sf) return;
- if (0) qDebug("Selected Item %s",
+ if (0) tqDebug("Selected Item %s",
_selectedItem ? _selectedItem->name().ascii() : "(none)");
TraceLineMap::Iterator lineIt, lineItEnd;
@@ -646,7 +646,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
}
if (readBytes >= (int) sizeof( buf )) {
- qDebug("%s:%d Line too long\n",
+ tqDebug("%s:%d Line too long\n",
sf->file()->name().ascii(), fileLineno);
}
else if ((readBytes>0) && (buf[readBytes-1] == '\n'))
diff --git a/tdecachegrind/tdecachegrind/stackbrowser.cpp b/tdecachegrind/tdecachegrind/stackbrowser.cpp
index 78095eb2..2257e586 100644
--- a/tdecachegrind/tdecachegrind/stackbrowser.cpp
+++ b/tdecachegrind/tdecachegrind/stackbrowser.cpp
@@ -283,7 +283,7 @@ HistoryItem::HistoryItem(Stack* stack, TraceFunction* function)
_next = 0;
/*
- qDebug("New Stack History Item (sRef %d): %s\n %s",
+ tqDebug("New Stack History Item (sRef %d): %s\n %s",
_stack->refCount(), _function->name().ascii(),
_stack->toString().ascii());
*/
@@ -291,7 +291,7 @@ HistoryItem::HistoryItem(Stack* stack, TraceFunction* function)
HistoryItem::~HistoryItem()
{
- if (0) qDebug("Deleting Stack History Item (sRef %d): %s",
+ if (0) tqDebug("Deleting Stack History Item (sRef %d): %s",
_stack->refCount(),
_function->name().ascii());
@@ -349,7 +349,7 @@ HistoryItem* StackBrowser::select(TraceFunction* f)
_current->setLast(item);
}
- // qDebug("Selected %s in StackBrowser", f->name().ascii());
+ // tqDebug("Selected %s in StackBrowser", f->name().ascii());
return _current;
}
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index 0049d1e2..a194ddb4 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -122,7 +122,7 @@ void Splitter::moveEvent(TQMoveEvent* e)
{
TQSplitter::moveEvent(e);
- if (0) qDebug("Splitter %s: Move", name());
+ if (0) tqDebug("Splitter %s: Move", name());
checkVisiblity();
}
@@ -158,7 +158,7 @@ void TabWidget::checkVisibility()
bool hasVisibleRect = (visibleRect().width()>1) &&
(visibleRect().height()>1);
- if (0) qDebug("TabWidget %s: VR (%dx%d) HasVisibleRect: %s => %s",
+ if (0) tqDebug("TabWidget %s: VR (%dx%d) HasVisibleRect: %s => %s",
name(),
visibleRect().width(), visibleRect().height(),
_hasVisibleRect ? "Yes":"No",
@@ -173,7 +173,7 @@ void TabWidget::checkVisibility()
void TabWidget::resizeEvent(TQResizeEvent *e)
{
TQTabWidget::resizeEvent(e);
- if (0) qDebug("TabWidget %s:\n Resize from (%d/%d) to (%d/%d)",
+ if (0) tqDebug("TabWidget %s:\n Resize from (%d/%d) to (%d/%d)",
name(),
e->oldSize().width(), e->oldSize().height(),
e->size().width(), e->size().height());
@@ -184,7 +184,7 @@ void TabWidget::showEvent(TQShowEvent* e)
{
TQTabWidget::showEvent(e);
- if (0) qDebug("TabWidget %s: Show", name());
+ if (0) tqDebug("TabWidget %s: Show", name());
checkVisibility();
}
@@ -192,7 +192,7 @@ void TabWidget::hideEvent(TQHideEvent* e)
{
TQTabWidget::hideEvent(e);
- if (0) qDebug("TabWidget %s: Hide", name());
+ if (0) tqDebug("TabWidget %s: Hide", name());
checkVisibility();
}
@@ -200,7 +200,7 @@ void TabWidget::moveEvent(TQMoveEvent* e)
{
TQTabWidget::moveEvent(e);
- if (0) qDebug("TabWidget %s: Move", name());
+ if (0) tqDebug("TabWidget %s: Move", name());
checkVisibility();
}
@@ -412,7 +412,7 @@ void TabView::updateVisibility()
}
}
- if (0) qDebug("TabView::updateVisiblity t %d, b %d, l %d, r %d",
+ if (0) tqDebug("TabView::updateVisiblity t %d, b %d, l %d, r %d",
t, b, l, r);
TQValueList<int> s;
@@ -618,7 +618,7 @@ void TabView::setActive(bool a)
nameLabel_font.setBold(a);
_nameLabel->setFont( nameLabel_font );
- if (0) qDebug("%s::setActive(%s)", name(), a ? "true":"false");
+ if (0) tqDebug("%s::setActive(%s)", name(), a ? "true":"false");
if (a) emit activated(this);
}
@@ -677,7 +677,7 @@ void TabView::tabChanged(TQWidget* w)
void TabView::visibleRectChangedSlot(TabWidget* tw)
{
- if (0) qDebug("%s: %svisible !",
+ if (0) tqDebug("%s: %svisible !",
tw->name(), tw->hasVisibleRect() ? "":"un");
if (tw->hasVisibleRect()) doUpdate(0);
@@ -693,7 +693,7 @@ void TabView::resizeEvent(TQResizeEvent* e)
updateView();
}
- if (0) qDebug("TabView::Resize from (%d/%d) to (%d/%d)",
+ if (0) tqDebug("TabView::Resize from (%d/%d) to (%d/%d)",
e->oldSize().width(), e->oldSize().height(),
e->size().width(), e->size().height());
}
@@ -713,7 +713,7 @@ void TabView::readViewConfig(KConfig* c,
TQString prefix, TQString postfix,
bool withOptions)
{
- if (0) qDebug("%s::readConfig(%s%s)", name(),
+ if (0) tqDebug("%s::readConfig(%s%s)", name(),
prefix.ascii(), postfix.ascii());
KConfigGroup* g = configGroup(c, prefix, postfix);
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 5a2e1deb..a00002d9 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -390,7 +390,7 @@ void TopLevel::createDocks()
// Restore QT Dock positions...
KConfigGroup dockConfig(KGlobal::config(), TQCString("Docks"));
TQString str = dockConfig.readEntry("Position", TQString());
- if (0) qDebug("Docks/Position: '%s'", str.ascii());
+ if (0) tqDebug("Docks/Position: '%s'", str.ascii());
if (str.isEmpty()) {
// default positions
addDockWindow(_partDock, DockLeft);
@@ -1362,7 +1362,7 @@ bool TopLevel::setFunction(TraceFunction* f)
}
#if TRACE_UPDATES
- qDebug("TopLevel::setFunction(%s), lastSender %s",
+ tqDebug("TopLevel::setFunction(%s), lastSender %s",
f ? f->prettyName().ascii() : "0",
_lastSender ? _lastSender->name() :"0" );
#endif
@@ -1414,7 +1414,7 @@ void TopLevel::setGroupTypeDelayed()
void TopLevel::setGroupDelayed(TraceCostItem* g)
{
#if TRACE_UPDATES
- qDebug("TopLevel::setGroupDelayed(%s), sender %s",
+ tqDebug("TopLevel::setGroupDelayed(%s), sender %s",
g ? g->prettyName().ascii() : "0",
_lastSender ? _lastSender->name() :"0" );
#endif
@@ -1474,7 +1474,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i)
kdDebug() << "Selected " << (i ? i->prettyName() : "(none)") << endl;
#if TRACE_UPDATES
- qDebug("TopLevel::setTraceItemDelayed(%s), sender %s",
+ tqDebug("TopLevel::setTraceItemDelayed(%s), sender %s",
i ? i->prettyName().ascii() : "0",
_lastSender ? _lastSender->name() :"0" );
#endif
@@ -2045,7 +2045,7 @@ void TopLevel::splitDirSlot()
// this is called after a config change in the dialog
void TopLevel::configChanged()
{
- //qDebug("TopLevel::configChanged");
+ //tqDebug("TopLevel::configChanged");
//_showPercentage->setChecked(Configuration::showPercentage());
// invalidate found/cached dirs of source files
@@ -2078,7 +2078,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list)
if (!_data) return;
if (!_data->activateParts(list)) {
-// qDebug("TopLevel::activePartsChangedSlot: No Change!");
+// tqDebug("TopLevel::activePartsChangedSlot: No Change!");
return;
}
_activeParts = list;
@@ -2149,7 +2149,7 @@ void TopLevel::partsUnhideAllSlot()
void TopLevel::forceTrace()
{
-// qDebug("forceTrace");
+// tqDebug("forceTrace");
// Needs Callgrind now...
TQFile cmd("callgrind.cmd");
@@ -2169,7 +2169,7 @@ void TopLevel::forceTrace()
void TopLevel::forceTraceReload()
{
-// qDebug("forceTraceReload");
+// tqDebug("forceTraceReload");
TQFile cmd("callgrind.cmd");
if (cmd.exists()) {
@@ -2210,7 +2210,7 @@ void TopLevel::forwardAboutToShow()
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
- //qDebug("forward: Adding %s", name.ascii());
+ //tqDebug("forward: Adding %s", name.ascii());
popup->insertItem(name, count);
hi = hi->next();
count++;
@@ -2246,7 +2246,7 @@ void TopLevel::backAboutToShow()
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
- //qDebug("back: Adding %s", name.ascii());
+ //tqDebug("back: Adding %s", name.ascii());
popup->insertItem(name, count);
hi = hi->last();
count++;
@@ -2287,7 +2287,7 @@ void TopLevel::upAboutToShow()
void TopLevel::forwardActivated(int id)
{
- //qDebug("forwardActivated: %d", id);
+ //tqDebug("forwardActivated: %d", id);
StackBrowser* b = _stackSelection ? _stackSelection->browser() : 0;
if (!b) return;
@@ -2301,7 +2301,7 @@ void TopLevel::forwardActivated(int id)
void TopLevel::backActivated(int id)
{
- //qDebug("backActivated: %d", id);
+ //tqDebug("backActivated: %d", id);
StackBrowser* b = _stackSelection ? _stackSelection->browser() : 0;
if (!b) return;
@@ -2315,7 +2315,7 @@ void TopLevel::backActivated(int id)
void TopLevel::upActivated(int id)
{
- //qDebug("upActivated: %d", id);
+ //tqDebug("upActivated: %d", id);
StackBrowser* b = _stackSelection ? _stackSelection->browser() : 0;
HistoryItem* hi = b ? b->current() : 0;
@@ -2328,7 +2328,7 @@ void TopLevel::upActivated(int id)
id--;
}
- //qDebug("upActivated: %s", f ? f->prettyName().ascii() : "??" );
+ //tqDebug("upActivated: %s", f ? f->prettyName().ascii() : "??" );
if (f)
setFunction(f);
diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp
index f129c2e5..70a8bd05 100644
--- a/tdecachegrind/tdecachegrind/tracedata.cpp
+++ b/tdecachegrind/tdecachegrind/tracedata.cpp
@@ -440,7 +440,7 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s)
#if TRACE_DEBUG
_dirty = false; // don't recurse !
- qDebug("%s\n now %s", fullName().ascii(),
+ tqDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of invalidate()
#endif
@@ -492,7 +492,7 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s)
#if TRACE_DEBUG
_dirty = false; // don't recurse !
- qDebug("%s\n now %s", fullName().ascii(),
+ tqDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of invalidate()
#endif
@@ -548,7 +548,7 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s)
#if TRACE_DEBUG
_dirty = false; // don't recurse !
- qDebug("%s\n now %s", fullName().ascii(),
+ tqDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of invalidate()
#endif
@@ -582,7 +582,7 @@ void TraceCost::addCost(TraceCost* item)
#if TRACE_DEBUG
_dirty = false; // don't recurse !
- qDebug("%s added cost item\n %s\n now %s",
+ tqDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of invalidate()
@@ -616,7 +616,7 @@ void TraceCost::maxCost(TraceCost* item)
#if TRACE_DEBUG
_dirty = false; // don't recurse !
- qDebug("%s added cost item\n %s\n now %s",
+ tqDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
_dirty = true; // because of invalidate()
@@ -834,12 +834,12 @@ bool TraceCostType::parseFormula()
{
if (_parsed) return true;
if (_inParsing) {
- qDebug("TraceCostType::parseFormula: Recursion detected.");
+ tqDebug("TraceCostType::parseFormula: Recursion detected.");
return false;
}
if (!_mapping) {
- qDebug("TraceCostType::parseFormula: No mapping set!");
+ tqDebug("TraceCostType::parseFormula: No mapping set!");
return false;
}
@@ -861,13 +861,13 @@ bool TraceCostType::parseFormula()
pos += rx.matchedLength();
if (rx.cap(0).isEmpty()) break;
- //qDebug("parseFormula: matched '%s','%s','%s'",
+ //tqDebug("parseFormula: matched '%s','%s','%s'",
// rx.cap(1).ascii(), rx.cap(2).ascii(), rx.cap(3).ascii());
costName = rx.cap(3);
costType = _mapping->type(costName);
if (!costType) {
- // qDebug("Cost type '%s': In formula cost '%s' unknown.",
+ // tqDebug("Cost type '%s': In formula cost '%s' unknown.",
// _name.ascii(), costName.ascii());
_inParsing = false;
@@ -1146,7 +1146,7 @@ int TraceCostMapping::add(TraceCostType* ct)
if (ct->isReal()) {
if (_realCount >= TraceCost::MaxRealIndex) {
- qDebug("WARNING: Maximum for real cost types reached (on adding '%s')",
+ tqDebug("WARNING: Maximum for real cost types reached (on adding '%s')",
ct->name().ascii());
return TraceCost::InvalidIndex;
}
@@ -1159,7 +1159,7 @@ int TraceCostMapping::add(TraceCostType* ct)
}
if (_virtualCount >= TraceCost::MaxRealIndex) {
- qDebug("WARNING: Maximum for virtual cost types reached (on adding '%s')",
+ tqDebug("WARNING: Maximum for virtual cost types reached (on adding '%s')",
ct->name().ascii());
return TraceCost::InvalidIndex;
}
@@ -1444,7 +1444,7 @@ void TraceListCost::addDep(TraceCost* dep)
{
#if TRACE_ASSERTIONS
if (_deps.findRef(dep)>=0) {
- qDebug("addDep: %s already in list!",
+ tqDebug("addDep: %s already in list!",
dep->fullName().ascii());
return;
}
@@ -1455,7 +1455,7 @@ void TraceListCost::addDep(TraceCost* dep)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), dep->fullName().ascii(),
_deps.count());
#endif
@@ -1481,7 +1481,7 @@ void TraceListCost::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("update %s (count %d)",
+ tqDebug("update %s (count %d)",
fullName().ascii(), _deps.count());
#endif
@@ -1497,7 +1497,7 @@ void TraceListCost::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -1518,7 +1518,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep)
{
#if TRACE_ASSERTIONS
if (_deps.findRef(dep)>=0) {
- qDebug("addDep: %s already in list!",
+ tqDebug("addDep: %s already in list!",
dep->fullName().ascii());
return;
}
@@ -1529,7 +1529,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), dep->fullName().ascii(),
_deps.count());
#endif
@@ -1555,7 +1555,7 @@ void TraceJumpListCost::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("update %s (count %d)",
+ tqDebug("update %s (count %d)",
fullName().ascii(), _deps.count());
#endif
@@ -1571,7 +1571,7 @@ void TraceJumpListCost::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -1592,7 +1592,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep)
{
#if TRACE_ASSERTIONS
if (_deps.findRef(dep)>=0) {
- qDebug("addDep: %s already in list!",
+ tqDebug("addDep: %s already in list!",
dep->fullName().ascii());
return;
}
@@ -1603,7 +1603,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), dep->fullName().ascii(),
_deps.count());
#endif
@@ -1629,7 +1629,7 @@ void TraceCallListCost::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("update %s (count %d)",
+ tqDebug("update %s (count %d)",
fullName().ascii(), _deps.count());
#endif
@@ -1650,7 +1650,7 @@ void TraceCallListCost::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -1671,7 +1671,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep)
{
#if TRACE_ASSERTIONS
if (_deps.findRef(dep)>=0) {
- qDebug("addDep: %s already in list!",
+ tqDebug("addDep: %s already in list!",
dep->fullName().ascii());
return;
}
@@ -1682,7 +1682,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), dep->fullName().ascii(),
_deps.count());
#endif
@@ -1707,7 +1707,7 @@ void TraceInclusiveListCost::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("update %s (count %d)",
+ tqDebug("update %s (count %d)",
fullName().ascii(), _deps.count());
#endif
@@ -1724,7 +1724,7 @@ void TraceInclusiveListCost::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -1835,7 +1835,7 @@ void TracePartCall::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("update %s", fullName().ascii());
+ tqDebug("update %s", fullName().ascii());
#endif
/* Without dependent cost items, assume fixed costs,
@@ -1850,7 +1850,7 @@ void TracePartCall::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
#endif // USE_FIXCOST
@@ -1909,7 +1909,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref)
{
#if TRACE_ASSERTIONS
if (_partInstr.findRef(ref)>=0) {
- qDebug("TracePartFunction::addPartInstr: %s already in list!",
+ tqDebug("TracePartFunction::addPartInstr: %s already in list!",
ref->name().ascii());
return;
}
@@ -1919,7 +1919,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), ref->fullName().ascii(),
_partInstr.count());
#endif
@@ -1930,7 +1930,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref)
{
#if TRACE_ASSERTIONS
if (_partLines.findRef(ref)>=0) {
- qDebug("TracePartFunction::addPartLine: %s already in list!",
+ tqDebug("TracePartFunction::addPartLine: %s already in list!",
ref->name().ascii());
return;
}
@@ -1940,7 +1940,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(), ref->fullName().ascii(),
_partLines.count());
#endif
@@ -1951,7 +1951,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref)
{
#if TRACE_ASSERTIONS
if (_partCallers.findRef(ref)>=0) {
- qDebug("TracePartFunction::addPartCaller: %s already in list!",
+ tqDebug("TracePartFunction::addPartCaller: %s already in list!",
ref->name().ascii());
return;
}
@@ -1961,7 +1961,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added Caller\n %s (now %d)",
+ tqDebug("%s added Caller\n %s (now %d)",
fullName().ascii(), ref->fullName().ascii(),
_partCallers.count());
#endif
@@ -1972,7 +1972,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref)
{
#if TRACE_ASSERTIONS
if (_partCallings.findRef(ref)>=0) {
- qDebug("TracePartFunction::addPartCalling: %s already in list!",
+ tqDebug("TracePartFunction::addPartCalling: %s already in list!",
ref->name().ascii());
return;
}
@@ -1982,7 +1982,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added Calling\n %s (now %d)",
+ tqDebug("%s added Calling\n %s (now %d)",
fullName().ascii(), ref->fullName().ascii(),
_partCallings.count());
#endif
@@ -2023,7 +2023,7 @@ void TracePartFunction::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("TracePartFunction::update %s (Callers %d, Callings %d, lines %d)",
+ tqDebug("TracePartFunction::update %s (Callers %d, Callings %d, lines %d)",
name().ascii(), _partCallers.count(), _partCallings.count(),
_partLines.count());
#endif
@@ -2116,7 +2116,7 @@ void TracePartFunction::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -2222,11 +2222,11 @@ void TraceInstrJump::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug("updated %s", fullName().ascii());
+ tqDebug("updated %s", fullName().ascii());
#endif
#if TRACE_DEBUG
- qDebug(" > %s", costString(0).ascii());
+ tqDebug(" > %s", costString(0).ascii());
#endif
}
@@ -2481,7 +2481,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i)
invalidate();
#if TRACE_DEBUG
- qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii());
+ tqDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii());
#endif
i->addInstrCall(icall);
}
@@ -2503,7 +2503,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l)
invalidate();
#if TRACE_DEBUG
- qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii());
+ tqDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii());
#endif
l->addLineCall(lcall);
}
@@ -2686,7 +2686,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
if (_instrCalls.findRef(instrCall)>=0) return;
if (instrCall->instr() != this) {
- qDebug("Can't add instruction call to another instruction!");
+ tqDebug("Can't add instruction call to another instruction!");
return;
}
#endif
@@ -2695,7 +2695,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(),
instrCall->fullName().ascii(), _instrCalls.count());
#endif
@@ -2786,7 +2786,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
if (_lineCalls.findRef(lineCall)>=0) return;
if (lineCall->line() != this) {
- qDebug("Can't add line call to another line!");
+ tqDebug("Can't add line call to another line!");
return;
}
#endif
@@ -2800,7 +2800,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
(caller->name() != function->name()) ||
(caller->object() != function->object())) {
- qDebug("ERROR: Adding line call, line %d\n of %s to\n %s ?!",
+ tqDebug("ERROR: Adding line call, line %d\n of %s to\n %s ?!",
lineCall->line()->lineno(),
caller->info().ascii(), function->info().ascii());
}
@@ -2810,7 +2810,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(),
lineCall->fullName().ascii(), _lineCalls.count());
#endif
@@ -2921,7 +2921,7 @@ TraceLine* TraceFunctionSource::line(uint lineno, bool createNew)
l.setLineno(lineno);
#if TRACE_DEBUG
- qDebug("Created %s [TraceFunctionSource::line]",
+ tqDebug("Created %s [TraceFunctionSource::line]",
l.fullName().ascii());
#endif
}
@@ -2980,7 +2980,7 @@ TraceLineMap* TraceFunctionSource::lineMap()
TracePartFunction* pf = (TracePartFunction*) pfList.first();
for(; pf; pf = (TracePartFunction*) pfList.next()) {
- if (0) qDebug("PartFunction %s:%d",
+ if (0) tqDebug("PartFunction %s:%d",
pf->function()->name().ascii(), pf->part()->partNumber());
FixCost* fc = pf->firstFixCost();
@@ -3038,7 +3038,7 @@ TraceLineMap* TraceFunctionSource::lineMap()
TracePartCall* pc = pcList.first();
for(; pc; pc = pcList.next()) {
- if (0) qDebug("PartCall %s:%d",
+ if (0) tqDebug("PartCall %s:%d",
pc->call()->name().ascii(),
pf->part()->partNumber());
@@ -3062,7 +3062,7 @@ TraceLineMap* TraceFunctionSource::lineMap()
plc = lc->partLineCall(fcc->part(), pc);
fcc->addTo(plc);
- if (0) qDebug("Add FixCallCost %s:%d/0x%s, CallCount %s",
+ if (0) tqDebug("Add FixCallCost %s:%d/0x%s, CallCount %s",
fcc->functionSource()->file()->shortName().ascii(),
fcc->line(), fcc->addr().toString().ascii(),
fcc->callCount().pretty().ascii());
@@ -3395,7 +3395,7 @@ TraceInstr* TraceFunction::instr(Addr addr, bool createNew)
i.setFunction(this);
#if TRACE_DEBUG
- qDebug("Created %s [TraceFunction::instr]",
+ tqDebug("Created %s [TraceFunction::instr]",
i.fullName().ascii());
#endif
}
@@ -3406,7 +3406,7 @@ void TraceFunction::addCaller(TraceCall* caller)
{
#if TRACE_ASSERTIONS
if (caller->called() != this) {
- qDebug("Can't add call to another line!\n");
+ tqDebug("Can't add call to another line!\n");
return;
}
@@ -3417,7 +3417,7 @@ void TraceFunction::addCaller(TraceCall* caller)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added Caller\n %s (now %d)",
+ tqDebug("%s added Caller\n %s (now %d)",
fullName().ascii(), caller->fullName().ascii(), _callers.count());
#endif
}
@@ -3439,7 +3439,7 @@ TraceCall* TraceFunction::calling(TraceFunction* called)
invalidate();
#if TRACE_DEBUG
- qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii());
+ tqDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii());
#endif
called->addCaller(calling);
}
@@ -3464,7 +3464,7 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file,
invalidate();
#if TRACE_DEBUG
- qDebug("Created SourceFile %s [TraceFunction::line]",
+ tqDebug("Created SourceFile %s [TraceFunction::line]",
file->name().ascii());
#endif
file->addSourceFile(sourceFile);
@@ -3612,7 +3612,7 @@ void TraceFunction::update()
if (!_dirty) return;
#if TRACE_DEBUG
- qDebug("Update %s (Callers %d, sourceFiles %d, instrs %d)",
+ tqDebug("Update %s (Callers %d, sourceFiles %d, instrs %d)",
_name.ascii(), _callers.count(),
_sourceFiles.count(), _instrMap ? _instrMap->count():0);
#endif
@@ -3683,7 +3683,7 @@ void TraceFunction::update()
_dirty = false;
#if TRACE_DEBUG
- qDebug("> %s", costString(0).ascii());
+ tqDebug("> %s", costString(0).ascii());
#endif
}
@@ -3710,7 +3710,7 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
if (_cycleLow != 0) return;
if (0)
- qDebug("%s D%02d > %s (%d)",
+ tqDebug("%s D%02d > %s (%d)",
TQString().fill(' ', d).ascii(), d, prettyName().ascii(), pNo+1);
@@ -3744,7 +3744,7 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
SubCost cutLimit = SubCost(base * Configuration::cycleCut());
if (0)
- qDebug("%s Cum. %s, Max Caller %s, cut limit %s",
+ tqDebug("%s Cum. %s, Max Caller %s, cut limit %s",
TQString().fill(' ', d).ascii(),
inclusive()->subCost(0).pretty().ascii(),
base.pretty().ascii(),
@@ -3757,7 +3757,7 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
// cycle cut heuristic
if (calling->subCost(0) < cutLimit) {
- if (0) qDebug("%s Cut call to %s (cum. %s)",
+ if (0) tqDebug("%s Cut call to %s (cum. %s)",
TQString().fill(' ', d).ascii(),
called->prettyName().ascii(),
calling->subCost(0).pretty().ascii());
@@ -3777,13 +3777,13 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
_cycleLow = called->_cycleLow;
if (0)
- qDebug("%s D%02d - %s (%d)",
+ tqDebug("%s D%02d - %s (%d)",
TQString().fill(' ', d+1).ascii(), d+1,
called->prettyName().ascii(), called->_cycleLow);
}
else {
if (0)
- qDebug("%s D%02d - %s (%d) [Not on stack]",
+ tqDebug("%s D%02d - %s (%d) [Not on stack]",
TQString().fill(' ', d+1).ascii(), d+1,
called->prettyName().ascii(), called->_cycleLow);
}
@@ -3800,7 +3800,7 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
// a SCC with >1 members
TraceFunctionCycle* cycle = data()->functionCycle(this);
- if (0) qDebug("BASE CYC %d %s",
+ if (0) tqDebug("BASE CYC %d %s",
cycle->cycleNo(), prettyName().ascii());
while(*pTop) {
TraceFunction* top = *pTop;
@@ -3810,13 +3810,13 @@ void TraceFunction::cycleDFS(int d, int& pNo, TraceFunction** pTop)
*pTop = top->_cycleStackDown;
top->_cycleStackDown = 0;
- if (0) qDebug("CYC %s", top->prettyName().ascii());
+ if (0) tqDebug("CYC %s", top->prettyName().ascii());
if (top == this) break;
}
}
}
if (0)
- qDebug("%s D%02d < %s (%d)",
+ tqDebug("%s D%02d < %s (%d)",
TQString().fill(' ', d).ascii(), d,
prettyName().ascii(), _cycleLow);
}
@@ -3841,7 +3841,7 @@ TraceInstrMap* TraceFunction::instrMap()
TracePartFunction* pf = (TracePartFunction*) pfList.first();
for(; pf; pf = (TracePartFunction*) pfList.next()) {
- if (0) qDebug("PartFunction %s:%d",
+ if (0) tqDebug("PartFunction %s:%d",
pf->function()->name().ascii(), pf->part()->partNumber());
FixCost* fc = pf->firstFixCost();
@@ -3898,7 +3898,7 @@ TraceInstrMap* TraceFunction::instrMap()
TracePartCall* pc = pcList.first();
for(; pc; pc = pcList.next()) {
- if (0) qDebug("PartCall %s:%d",
+ if (0) tqDebug("PartCall %s:%d",
pc->call()->name().ascii(),
pf->part()->partNumber());
@@ -3926,7 +3926,7 @@ TraceInstrMap* TraceFunction::instrMap()
pic = ic->partInstrCall(fcc->part(), pc);
fcc->addTo(pic);
- if (0) qDebug("Add FixCallCost %s:%d/0x%s, CallCount %s",
+ if (0) tqDebug("Add FixCallCost %s:%d/0x%s, CallCount %s",
fcc->functionSource()->file()->shortName().ascii(),
fcc->line(), fcc->addr().toString().ascii(),
fcc->callCount().pretty().ascii());
@@ -4037,7 +4037,7 @@ void TraceClass::addFunction(TraceFunction* function)
{
#if TRACE_ASSERTIONS
if (function->cls() != this) {
- qDebug("Can't add function to a class not enclosing this function\n");
+ tqDebug("Can't add function to a class not enclosing this function\n");
return;
}
@@ -4049,7 +4049,7 @@ void TraceClass::addFunction(TraceFunction* function)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(),
function->fullName().ascii(), _functions.count());
#endif
@@ -4084,7 +4084,7 @@ void TraceFile::addFunction(TraceFunction* function)
{
#if TRACE_ASSERTIONS
if (function->file() != this) {
- qDebug("Can't add function to a file not enclosing this function\n");
+ tqDebug("Can't add function to a file not enclosing this function\n");
return;
}
@@ -4096,7 +4096,7 @@ void TraceFile::addFunction(TraceFunction* function)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(),
function->fullName().ascii(), _functions.count());
#endif
@@ -4107,7 +4107,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile)
{
#if TRACE_ASSERTIONS
if (sourceFile->file() != this) {
- qDebug("Can't add sourceFile to a file not having lines for it\n");
+ tqDebug("Can't add sourceFile to a file not having lines for it\n");
return;
}
#endif
@@ -4117,7 +4117,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile)
invalidate();
#if TRACE_DEBUG
- qDebug("%s \n added SourceFile %s (now %d)",
+ tqDebug("%s \n added SourceFile %s (now %d)",
fullName().ascii(), sourceFile->fullName().ascii(),
_sourceFiles.count());
#endif
@@ -4202,7 +4202,7 @@ void TraceObject::addFunction(TraceFunction* function)
{
#if TRACE_ASSERTIONS
if (function->object() != this) {
- qDebug("Can't add function to an object not enclosing this function\n");
+ tqDebug("Can't add function to an object not enclosing this function\n");
return;
}
@@ -4214,7 +4214,7 @@ void TraceObject::addFunction(TraceFunction* function)
invalidate();
#if TRACE_DEBUG
- qDebug("%s added\n %s (now %d)",
+ tqDebug("%s added\n %s (now %d)",
fullName().ascii(),
function->fullName().ascii(), _functions.count());
#endif
@@ -4513,7 +4513,7 @@ void TraceData::load(const TQString& base)
}
}
- //qDebug("File %s: Part %d, Thread %d", (*it).ascii(), n, t);
+ //tqDebug("File %s: Part %d, Thread %d", (*it).ascii(), n, t);
if (p->partNumber()>0) n = p->partNumber();
if (n>maxNumber) maxNumber = n;
@@ -4538,7 +4538,7 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
{
TQString filename = TQString("%1/%2").arg(dir).arg(name);
#if TRACE_DEBUG
- qDebug("TraceData::addPart('%s')", filename.ascii());
+ tqDebug("TraceData::addPart('%s')", filename.ascii());
#endif
TQFile* file = new TQFile(filename);
@@ -4684,7 +4684,7 @@ TraceObject* TraceData::object(const TQString& name)
o.setName(name);
#if TRACE_DEBUG
- qDebug("Created %s [TraceData::object]",
+ tqDebug("Created %s [TraceData::object]",
o.fullName().ascii());
#endif
}
@@ -4701,7 +4701,7 @@ TraceFile* TraceData::file(const TQString& name)
f.setName(name);
#if TRACE_DEBUG
- qDebug("Created %s [TraceData::file]",
+ tqDebug("Created %s [TraceData::file]",
f.fullName().ascii());
#endif
}
@@ -4740,7 +4740,7 @@ TraceClass* TraceData::cls(const TQString& fnName, TQString& shortName)
c.setName(clsName);
#if TRACE_DEBUG
- qDebug("Created %s [TraceData::cls]",
+ tqDebug("Created %s [TraceData::cls]",
c.fullName().ascii());
#endif
}
@@ -4757,7 +4757,7 @@ TraceFunction* TraceData::function(const TQString& name,
TraceClass* c = cls(name, shortName);
if (!file || !object || !c) {
- qDebug("ERROR - no file/object/class for %s ?!", name.ascii());
+ tqDebug("ERROR - no file/object/class for %s ?!", name.ascii());
return 0;
}
@@ -4779,7 +4779,7 @@ TraceFunction* TraceData::function(const TQString& name,
f.setMapIterator(it);
#if TRACE_DEBUG
- qDebug("Created %s [TraceData::function]\n for %s, %s, %s",
+ tqDebug("Created %s [TraceData::function]\n for %s, %s, %s",
f.fullName().ascii(),
c->fullName().ascii(), file->fullName().ascii(),
object ? object->fullName().ascii() : "(unknown object)");
@@ -4996,7 +4996,7 @@ TraceFunctionCycle* TraceData::functionCycle(TraceFunction* f)
void TraceData::updateFunctionCycles()
{
- //qDebug("Updating cycles...");
+ //tqDebug("Updating cycles...");
// init cycle info
TraceFunctionCycle* cycle;
diff --git a/tdecachegrind/tdecachegrind/utils.cpp b/tdecachegrind/tdecachegrind/utils.cpp
index 65c7e347..c1a68044 100644
--- a/tdecachegrind/tdecachegrind/utils.cpp
+++ b/tdecachegrind/tdecachegrind/utils.cpp
@@ -354,7 +354,7 @@ FixFile::FixFile(TQFile* file)
_filename = file->name();
if (!file->isOpen() && !file->open( IO_ReadOnly ) ) {
- qWarning( "%s: %s", (const char*) TQFile::encodeName(_filename),
+ tqWarning( "%s: %s", (const char*) TQFile::encodeName(_filename),
strerror( errno ) );
_len = 0;
_currentLeft = 0;
@@ -377,7 +377,7 @@ FixFile::FixFile(TQFile* file)
_len = len;
_used_mmap = true;
- if (0) qDebug("Mapped '%s'", _filename.ascii());
+ if (0) tqDebug("Mapped '%s'", _filename.ascii());
} else {
#endif // HAVE_MMAP
// try reading the data into memory instead
@@ -398,9 +398,9 @@ FixFile::~FixFile()
#ifdef HAVE_MMAP
if (_used_mmap) {
- if (0) qDebug("Unmapping '%s'", _filename.ascii());
+ if (0) tqDebug("Unmapping '%s'", _filename.ascii());
if (munmap(_base, _len) != 0)
- qWarning( "munmap: %s", strerror( errno ) );
+ tqWarning( "munmap: %s", strerror( errno ) );
}
#endif // HAVE_MMAP
}
@@ -424,7 +424,7 @@ bool FixFile::nextLine(FixString& str)
if (l>199) l = 199;
strncpy(tmp, _current, l);
tmp[l] = 0;
- qDebug("[FixFile::nextLine] At %d, len %d: '%s'",
+ tqDebug("[FixFile::nextLine] At %d, len %d: '%s'",
_current - _base, _currentLeft-left, tmp);
}
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 27f8dde2..ca717606 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -115,7 +115,7 @@ void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
TQByteArray UMLDrag::encodedData(const char* dataName) const {
TQString str(dataName);
for (int i = 0; i < 4; i++) {
- if ( !qstricmp(dataName,data->fmt[i]) ) {
+ if ( !tqstricmp(dataName,data->fmt[i]) ) {
return data->enc[i];
}
}
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 3e6dde46..a9ce6789 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -240,7 +240,7 @@ TQString URLUtil::relativePathToFile( const TQString & dirUrl, const TQString &
{
i >= dir.count() ? currDir = "" : currDir = dir[i];
i >= file.count() ? currFile = "" : currFile = file[i];
- qWarning("i = %d, currDir = %s, currFile = %s", i, currDir.latin1(), currFile.latin1());
+ tqWarning("i = %d, currDir = %s, currFile = %s", i, currDir.latin1(), currFile.latin1());
if (currDir.isEmpty() && currFile.isEmpty())
break;
else if (currDir.isEmpty())
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index bb876b60..cc262b44 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -997,7 +997,7 @@ void UMLApp::initClip() {
bool UMLApp::canDecode(const TQMimeSource* mimeSource) {
const char* f;
for (int i=0; (f=mimeSource->format(i)); i++) {
- if ( !qstrnicmp(f,"application/x-uml-clip", 22) ) {
+ if ( !tqstrnicmp(f,"application/x-uml-clip", 22) ) {
//FIXME need to test for clip1, clip2, clip3, clip4 or clip5
//(the only valid clip types)
return true;