summaryrefslogtreecommitdiffstats
path: root/kompare/tests/cvsdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/tests/cvsdiff')
-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
7 files changed, 50 insertions, 50 deletions
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++;
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-27 21:09:35 +0000