From dd844d7919e7f0f95c010378e7af1434ea904fff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:36:05 -0600 Subject: Rename additional global TQt functions --- kompare/tests/cvsdiff/context.diff | 8 ++++---- kompare/tests/cvsdiff/contextm.diff | 32 ++++++++++++++++---------------- kompare/tests/cvsdiff/edm.diff | 8 ++++---- kompare/tests/cvsdiff/normalm.diff | 16 ++++++++-------- kompare/tests/cvsdiff/rcsm.diff | 8 ++++---- kompare/tests/cvsdiff/unified.diff | 4 ++-- kompare/tests/cvsdiff/unifiedm.diff | 24 ++++++++++++------------ kompare/tests/diff/contextm.diff | 32 ++++++++++++++++---------------- kompare/tests/diff/edm.diff | 8 ++++---- kompare/tests/diff/normalm.diff | 16 ++++++++-------- kompare/tests/diff/rcsm.diff | 8 ++++---- kompare/tests/diff/unifiedm.diff | 24 ++++++++++++------------ 12 files changed, 94 insertions(+), 94 deletions(-) (limited to 'kompare') 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"; ! 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"; ! 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"; 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"; < 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"; > 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"; 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"; - 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"; + 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"; ! 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"; ! 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"; 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"; < 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"; > 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"; 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"; - 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"; + 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++; -- cgit v1.2.3