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