From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kompare/tests/cvsdiff/normalm.diff | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kompare/tests/cvsdiff/normalm.diff') 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"; < if (type == "QCStringList") < type = "QValueList"; @@ -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"; > if (type == "QCStringList") > type = "QValueList"; @@ -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 ); -- cgit v1.2.1