diff options
Diffstat (limited to 'kompare/tests/diff/contextm.diff')
| -rw-r--r-- | kompare/tests/diff/contextm.diff | 32 |
1 files changed, 16 insertions, 16 deletions
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++; |