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

5 files changed, 60 insertions, 60 deletions

diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 0b1bba5a..1833fa06 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -78,18 +78,18 @@ diff -cr dcop/client/dcop.cpp dcop2/client/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;
@@ -112,7 +112,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/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;
   	    }
@@ -123,12 +123,12 @@ diff -cr dcop/client/dcop.cpp dcop2/client/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;
   	    }
@@ -140,7 +140,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
 ! 	    return;
   	}
   	f = realfunc;
-  	left = f.find( '(' );
+  	left = f.tqfind( '(' );
 ***************
 *** 243,253 ****
       QCString replyType;
@@ -357,13 +357,13 @@ diff -cr dcop/client/dcop.cpp dcop2/client/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 ]
@@ -737,16 +737,16 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/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;
@@ -816,7 +816,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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>";
@@ -849,13 +849,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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 );
@@ -925,7 +925,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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>";
@@ -958,13 +958,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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/diff/edm.diff b/kompare/tests/diff/edm.diff
index 0df2abc1..e2ad0672 100644
--- a/kompare/tests/diff/edm.diff
+++ b/kompare/tests/diff/edm.diff
@@ -348,7 +348,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 ]
@@ -372,7 +372,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
 /**
@@ -494,7 +494,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
@@ -627,13 +627,13 @@ diff -er dcop/client/marshall.cpp dcop2/client/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 );
@@ -664,7 +664,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/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/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index 3db667ba..c08da23b 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -56,10 +56,10 @@ diff -r dcop/client/dcop.cpp dcop2/client/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);
@@ -197,7 +197,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/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)
@@ -220,7 +220,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/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 ]
@@ -643,7 +643,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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>";
@@ -676,13 +676,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/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 );
@@ -715,7 +715,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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>";
@@ -777,13 +777,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/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/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff
index 0c4222f9..9df85d76 100644
--- a/kompare/tests/diff/rcsm.diff
+++ b/kompare/tests/diff/rcsm.diff
@@ -49,7 +49,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
@@ -171,14 +171,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 ]
@@ -565,7 +565,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>";
@@ -599,13 +599,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/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 4a30c6b4..e4fbd157 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -62,9 +62,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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 );
@@ -78,9 +78,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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;
  	    }
@@ -93,7 +93,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +	    return;
  	}
  	f = realfunc;
- 	left = f.find( '(' );
+ 	left = f.tqfind( '(' );
 @@ -243,11 +271,12 @@
      QCString replyType;
      QDataStream arg(data, IO_WriteOnly);
@@ -232,7 +232,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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)
@@ -254,7 +254,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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 ]
@@ -659,8 +659,8 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/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;
      }
@@ -705,7 +705,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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>";
@@ -738,13 +738,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 );
@@ -776,7 +776,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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>";
@@ -837,13 +837,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 );