From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/rcsm.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kompare/tests/cvsdiff/rcsm.diff')

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 );
-- 
cgit v1.2.1