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.diff44
-rw-r--r--kompare/tests/cvsdiff/edm.diff12
-rw-r--r--kompare/tests/cvsdiff/normalm.diff20
-rw-r--r--kompare/tests/cvsdiff/rcsm.diff12
-rw-r--r--kompare/tests/cvsdiff/unified.diff4
-rw-r--r--kompare/tests/cvsdiff/unifiedm.diff32
7 files changed, 66 insertions, 66 deletions
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff
index c9a7f855..eab790d0 100644
--- a/kompare/tests/cvsdiff/context.diff
+++ b/kompare/tests/cvsdiff/context.diff
@@ -12,16 +12,16 @@ diff -c -r1.2 dcopfind.cpp
! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
--- 36,42 ----
static bool bAppIdOnly = 0;
static bool bLaunchApp = 0;
! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
***************
*** 118,124 ****
f = fc;
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index ef20ec4c..cde99b5e 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -82,18 +82,18 @@ diff -c -r1.26 dcop.cpp
! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args )
{
-
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
- int right = f.find( ')' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
+ int right = f.tqfind( ')' );
--- 146,153 ----
}
}
! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
- int right = f.find( ')' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
+ int right = f.tqfind( ')' );
***************
*** 136,142 ****
bool ok = false;
@@ -116,7 +116,7 @@ diff -c -r1.26 dcop.cpp
if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
-! int a = (*it).contains(',');
+! int a = (*it).tqcontains(',');
! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) )
break;
}
@@ -127,12 +127,12 @@ diff -c -r1.26 dcop.cpp
! exit(1);
}
f = realfunc;
- left = f.find( '(' );
+ left = f.tqfind( '(' );
--- 180,195 ----
if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
-! uint a = (*it).contains(',');
+! uint a = (*it).tqcontains(',');
! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) )
break;
}
@@ -144,7 +144,7 @@ diff -c -r1.26 dcop.cpp
! return;
}
f = realfunc;
- left = f.find( '(' );
+ left = f.tqfind( '(' );
***************
*** 243,253 ****
QCString replyType;
@@ -363,13 +363,13 @@ diff -c -r1.26 dcop.cpp
QCString function;
! QCStringList params;
! DCOPClient *client = 0L;
-! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
{
! // WARNING: This part (until the closing '}') could very
! // well be broken now. As I don't know how to trigger and test
! // dcoprefs this code is *not* tested. It compiles and it looks
! // ok to me, but that's all I can say - Martijn (2001/12/24)
-! int delimPos = args[ 0 ].findRev( ',' );
+! int delimPos = args[ 0 ].tqfindRev( ',' );
! if( delimPos == -1 )
! {
! cerr << "Error: '" << args[ 0 ]
@@ -747,16 +747,16 @@ diff -c -r1.2 dcopfind.cpp
! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
--- 36,42 ----
static bool bAppIdOnly = 0;
static bool bLaunchApp = 0;
! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
***************
*** 118,124 ****
f = fc;
@@ -830,7 +830,7 @@ diff -c -r1.3 marshall.cpp
! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
{
-! if (type == "QStringList")
+! if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
! type = "QValueList<QString>";
! if (type == "QCStringList")
! type = "QValueList<QCString>";
@@ -863,13 +863,13 @@ diff -c -r1.3 marshall.cpp
! arg << s.toDouble();
! else if ( type == "bool" )
! arg << mkBool( s );
-! else if ( type == "QString" )
+! else if ( type == TQSTRING_OBJECT_NAME_STRING )
! arg << s;
! else if ( type == "QCString" )
! arg << QCString( argv[i] );
! else if ( type == "QColor" )
! arg << mkColor( s );
-! else if ( type == "QPoint" )
+! else if ( type == TQPOINT_OBJECT_NAME_STRING )
! arg << mkPoint( s );
! else if ( type == "QSize" )
! arg << mkSize( s );
@@ -939,7 +939,7 @@ diff -c -r1.3 marshall.cpp
! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
{
-! if (type == "QStringList")
+! if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
! type = "QValueList<QString>";
! if (type == "QCStringList")
! type = "QValueList<QCString>";
@@ -972,13 +972,13 @@ diff -c -r1.3 marshall.cpp
! arg << s.toDouble();
! else if ( type == "bool" )
! arg << mkBool( s );
-! else if ( type == "QString" )
+! else if ( type == TQSTRING_OBJECT_NAME_STRING )
! arg << s;
! else if ( type == "QCString" )
! arg << QCString( args[ i ] );
! else if ( type == "QColor" )
! arg << mkColor( s );
-! else if ( type == "QPoint" )
+! else if ( type == TQPOINT_OBJECT_NAME_STRING )
! arg << mkPoint( s );
! else if ( type == "QSize" )
! arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index 0fb04575..a5672a1c 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -352,7 +352,7 @@ int main( int argc, char** argv )
// well be broken now. As I don't know how to trigger and test
// dcoprefs this code is *not* tested. It compiles and it looks
// ok to me, but that's all I can say - Martijn (2001/12/24)
- int delimPos = args[ 0 ].findRev( ',' );
+ int delimPos = args[ 0 ].tqfindRev( ',' );
if( delimPos == -1 )
{
cerr << "Error: '" << args[ 0 ]
@@ -376,7 +376,7 @@ int main( int argc, char** argv )
286,287c
QCStringList params;
DCOPClient *client = 0L;
- if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
.
282a
/**
@@ -498,7 +498,7 @@ void showHelp( int exitCode = 0 )
return;
.
156,157c
- uint a = (*it).contains(',');
+ uint a = (*it).tqcontains(',');
if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) )
.
139c
@@ -639,13 +639,13 @@ diff -e -r1.3 marshall.cpp
arg << s.toDouble();
else if ( type == "bool" )
arg << mkBool( s );
- else if ( type == "QString" )
+ else if ( type == TQSTRING_OBJECT_NAME_STRING )
arg << s;
else if ( type == "QCString" )
arg << QCString( args[ i ] );
else if ( type == "QColor" )
arg << mkColor( s );
- else if ( type == "QPoint" )
+ else if ( type == TQPOINT_OBJECT_NAME_STRING )
arg << mkPoint( s );
else if ( type == "QSize" )
arg << mkSize( s );
@@ -676,7 +676,7 @@ diff -e -r1.3 marshall.cpp
delim = ")";
.
247,317c
- if (type == "QStringList")
+ if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
type = "QValueList<QString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index 935763a0..b191cb2c 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -60,10 +60,10 @@ diff -r1.26 dcop.cpp
---
> if ( !ok && args.isEmpty() )
156,157c183,184
-< int a = (*it).contains(',');
+< int a = (*it).tqcontains(',');
< if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) )
---
-> uint a = (*it).contains(',');
+> uint a = (*it).tqcontains(',');
> if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) )
164c191,192
< exit(1);
@@ -201,7 +201,7 @@ diff -r1.26 dcop.cpp
---
> QCStringList params;
> DCOPClient *client = 0L;
-> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
289,304c406,429
< char *delim = strchr(argv[1], ',');
< if (!delim)
@@ -224,7 +224,7 @@ diff -r1.26 dcop.cpp
> // well be broken now. As I don't know how to trigger and test
> // dcoprefs this code is *not* tested. It compiles and it looks
> // ok to me, but that's all I can say - Martijn (2001/12/24)
-> int delimPos = args[ 0 ].findRev( ',' );
+> int delimPos = args[ 0 ].tqfindRev( ',' );
> if( delimPos == -1 )
> {
> cerr << "Error: '" << args[ 0 ]
@@ -655,7 +655,7 @@ diff -r1.3 marshall.cpp
---
> void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
247,317c247,256
-< if (type == "QStringList")
+< if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
< type = "QValueList<QString>";
< if (type == "QCStringList")
< type = "QValueList<QCString>";
@@ -688,13 +688,13 @@ diff -r1.3 marshall.cpp
< arg << s.toDouble();
< else if ( type == "bool" )
< arg << mkBool( s );
-< else if ( type == "QString" )
+< else if ( type == TQSTRING_OBJECT_NAME_STRING )
< arg << s;
< else if ( type == "QCString" )
< arg << QCString( argv[i] );
< else if ( type == "QColor" )
< arg << mkColor( s );
-< else if ( type == "QPoint" )
+< else if ( type == TQPOINT_OBJECT_NAME_STRING )
< arg << mkPoint( s );
< else if ( type == "QSize" )
< arg << mkSize( s );
@@ -727,7 +727,7 @@ diff -r1.3 marshall.cpp
< QByteArray dummy_data;
< QDataStream dummy_arg(dummy_data, IO_WriteOnly);
---
-> if (type == "QStringList")
+> if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
> type = "QValueList<QString>";
> if (type == "QCStringList")
> type = "QValueList<QCString>";
@@ -789,13 +789,13 @@ diff -r1.3 marshall.cpp
> arg << s.toDouble();
> else if ( type == "bool" )
> arg << mkBool( s );
-> else if ( type == "QString" )
+> else if ( type == TQSTRING_OBJECT_NAME_STRING )
> arg << s;
> else if ( type == "QCString" )
> arg << QCString( args[ i ] );
> else if ( type == "QColor" )
> arg << mkColor( s );
-> else if ( type == "QPoint" )
+> else if ( type == TQPOINT_OBJECT_NAME_STRING )
> arg << mkPoint( s );
> else if ( type == "QSize" )
> arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index c690b2a7..a67d7e54 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -53,7 +53,7 @@ a139 1
if ( !ok && args.isEmpty() )
d156 2
a157 2
- uint a = (*it).contains(',');
+ uint a = (*it).tqcontains(',');
if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) )
d164 1
a164 2
@@ -175,14 +175,14 @@ d286 2
a287 3
QCStringList params;
DCOPClient *client = 0L;
- if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
d289 16
a304 24
// WARNING: This part (until the closing '}') could very
// well be broken now. As I don't know how to trigger and test
// dcoprefs this code is *not* tested. It compiles and it looks
// ok to me, but that's all I can say - Martijn (2001/12/24)
- int delimPos = args[ 0 ].findRev( ',' );
+ int delimPos = args[ 0 ].tqfindRev( ',' );
if( delimPos == -1 )
{
cerr << "Error: '" << args[ 0 ]
@@ -577,7 +577,7 @@ a245 1
void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
d247 71
a317 10
- if (type == "QStringList")
+ if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
type = "QValueList<QString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
@@ -611,13 +611,13 @@ a346 57
arg << s.toDouble();
else if ( type == "bool" )
arg << mkBool( s );
- else if ( type == "QString" )
+ else if ( type == TQSTRING_OBJECT_NAME_STRING )
arg << s;
else if ( type == "QCString" )
arg << QCString( args[ i ] );
else if ( type == "QColor" )
arg << mkColor( s );
- else if ( type == "QPoint" )
+ else if ( type == TQPOINT_OBJECT_NAME_STRING )
arg << mkPoint( s );
else if ( type == "QSize" )
arg << mkSize( s );
diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff
index 562dee43..ab69a295 100644
--- a/kompare/tests/cvsdiff/unified.diff
+++ b/kompare/tests/cvsdiff/unified.diff
@@ -12,8 +12,8 @@ diff -u -r1.2 dcopfind.cpp
-bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
+bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
@@ -118,7 +118,7 @@
f = fc;
}
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index 1de79f8f..b4e8b2a1 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -66,9 +66,9 @@ diff -u -r1.26 dcop.cpp
+void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
-
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
- int right = f.find( ')' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
+ int right = f.tqfind( ')' );
@@ -136,7 +163,7 @@
bool ok = false;
QCStringList funcs = dcop->remoteFunctions( app, obj, &ok );
@@ -82,9 +82,9 @@ diff -u -r1.26 dcop.cpp
if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
-- int a = (*it).contains(',');
+- int a = (*it).tqcontains(',');
- if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) )
-+ uint a = (*it).contains(',');
++ uint a = (*it).tqcontains(',');
+ if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) )
break;
}
@@ -97,7 +97,7 @@ diff -u -r1.26 dcop.cpp
+ return;
}
f = realfunc;
- left = f.find( '(' );
+ left = f.tqfind( '(' );
@@ -243,11 +271,12 @@
QCString replyType;
QDataStream arg(data, IO_WriteOnly);
@@ -237,7 +237,7 @@ diff -u -r1.26 dcop.cpp
- if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0)
+ QCStringList params;
+ DCOPClient *client = 0L;
-+ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
++ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
{
- char *delim = strchr(argv[1], ',');
- if (!delim)
@@ -259,7 +259,7 @@ diff -u -r1.26 dcop.cpp
+ // well be broken now. As I don't know how to trigger and test
+ // dcoprefs this code is *not* tested. It compiles and it looks
+ // ok to me, but that's all I can say - Martijn (2001/12/24)
-+ int delimPos = args[ 0 ].findRev( ',' );
++ int delimPos = args[ 0 ].tqfindRev( ',' );
+ if( delimPos == -1 )
+ {
+ cerr << "Error: '" << args[ 0 ]
@@ -668,8 +668,8 @@ diff -u -r1.2 dcopfind.cpp
-bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
+bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- QString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
+ QString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
@@ -118,7 +118,7 @@
f = fc;
}
@@ -718,7 +718,7 @@ diff -u -r1.3 marshall.cpp
-void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
+void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
{
-- if (type == "QStringList")
+- if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
- type = "QValueList<QString>";
- if (type == "QCStringList")
- type = "QValueList<QCString>";
@@ -751,13 +751,13 @@ diff -u -r1.3 marshall.cpp
- arg << s.toDouble();
- else if ( type == "bool" )
- arg << mkBool( s );
-- else if ( type == "QString" )
+- else if ( type == TQSTRING_OBJECT_NAME_STRING )
- arg << s;
- else if ( type == "QCString" )
- arg << QCString( argv[i] );
- else if ( type == "QColor" )
- arg << mkColor( s );
-- else if ( type == "QPoint" )
+- else if ( type == TQPOINT_OBJECT_NAME_STRING )
- arg << mkPoint( s );
- else if ( type == "QSize" )
- arg << mkSize( s );
@@ -789,7 +789,7 @@ diff -u -r1.3 marshall.cpp
- i++;
- QByteArray dummy_data;
- QDataStream dummy_arg(dummy_data, IO_WriteOnly);
-+ if (type == "QStringList")
++ if (type == TQSTRINGLIST_OBJECT_NAME_STRING)
+ type = "QValueList<QString>";
+ if (type == "QCStringList")
+ type = "QValueList<QCString>";
@@ -850,13 +850,13 @@ diff -u -r1.3 marshall.cpp
+ arg << s.toDouble();
+ else if ( type == "bool" )
+ arg << mkBool( s );
-+ else if ( type == "QString" )
++ else if ( type == TQSTRING_OBJECT_NAME_STRING )
+ arg << s;
+ else if ( type == "QCString" )
+ arg << QCString( args[ i ] );
+ else if ( type == "QColor" )
+ arg << mkColor( s );
-+ else if ( type == "QPoint" )
++ else if ( type == TQPOINT_OBJECT_NAME_STRING )
+ arg << mkPoint( s );
+ else if ( type == "QSize" )
+ arg << mkSize( s );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-28 04:04:59 +0000