Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 42 insertions, 42 deletions

diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 1d167ce70..a76610505 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )
 
 int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
 {
-    TQString f = func; // Qt is better with unicode strings, so use one.
-    int left = f.find( '(' );
-    int right = f.find( ')' );
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
+    int left = f.tqfind( '(' );
+    int right = f.tqfind( ')' );
 
     if ( right <  left )
     {
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	    return( 1 );
 	}
 	for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
-	    int l = (*it).find( '(' );
+	    int l = (*it).tqfind( '(' );
 	    int s;
 	    if (l > 0)
-	        s = (*it).findRev( ' ', l);
+	        s = (*it).tqfindRev( ' ', l);
 	    else
-	        s = (*it).find( ' ' );
+	        s = (*it).tqfind( ' ' );
 
 	    if ( s < 0 )
 		s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 
 	    if ( l > 0 && (*it).mid( s, l - s ) == func ) {
 		realfunc = (*it).mid( s );
-		const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
-		uint a = arguments.contains(',');
+		const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
+		uint a = arguments.tqcontains(',');
 		if ( (a==0 && !arguments.isEmpty()) || a>0)
 			a++;
 		if ( a == args.count()  )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	    return( 1 );
 	}
 	f = realfunc;
-	left = f.find( '(' );
-	right = f.find( ')' );
+	left = f.tqfind( '(' );
+	right = f.tqfind( ')' );
     }
 
  doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
 	    TQString lt = (*it).simplifyWhiteSpace();
 
-	    int s = lt.find(' ');
+	    int s = lt.tqfind(' ');
 
 	    // If there are spaces in the name, there may be two
 	    // reasons: the parameter name is still there, ie.
@@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 		//
 		s=1;
 
-		while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
+		while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
 		{
 			s++;
 		}
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
     QCStringList params;
     DCOPClient *client = 0L;
     int retval = 0;
-    if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+    if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
     {
-	int delimPos = args[ 0 ].findRev( ',' );
+	int delimPos = args[ 0 ].tqfindRev( ',' );
 	if( delimPos == -1 )
         {
 	    cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
 	    }
 	    else if( !sessionName.isEmpty() )
 	    {
-		if( sessions.contains( sessionName ) )
+		if( sessions.tqcontains( sessionName ) )
 		{
 		    sessions.clear();
 		    sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
           if (prog[prog.length()-1] != '*')
           {
              // Strip a trailing -<PID> part.
-             int i = prog.findRev('-');
+             int i = prog.tqfindRev('-');
              if ((i >= 0) && prog.mid(i+1).toLong())
              {
                 prog = prog.left(i);      
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index cd3e4d517..0cc48c435 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -40,9 +40,9 @@ static bool bLaunchApp = 0;
 
 bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
 {
-    TQString f = func; // Qt is better with unicode strings, so use one.
-    int left = f.find( '(' );
-    int right = f.find( ')' );
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
+    int left = f.tqfind( '(' );
+    int right = f.tqfind( ')' );
 
     if ( right <  left )
     {
@@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
 	    TQString lt = (*it).simplifyWhiteSpace();
 
-	    int s = lt.find(' ');
+	    int s = lt.tqfind(' ');
 
 	    // If there are spaces in the name, there may be two
 	    // reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 		//
 	    	s=1;
 
-		while (s < (int)partl.count() && intTypes.contains(partl[s]))
+		while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
 		{
 			s++;
 		}
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 5741ef775..f46531735 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
 void startApp(const char *_app, int argc, const char **args)
 {
     const char *function = 0;
-    TQString app = TQString::fromLatin1(_app);
+    TQString app = TQString::tqfromLatin1(_app);
     if (app.endsWith(".desktop"))
        function = "start_service_by_desktop_path(TQString,TQStringList)";
     else
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index f9b7955f2..496880aad 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
 {
     TQCString result;
 
-    if ( type == "int" || type == "Q_INT32" )
+    if ( type == "int" || type == "TQ_INT32" )
     {
         int i;
         stream >> i;
         result.setNum( i );
-    } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
+    } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
     {
         uint i;
         stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         double d;
         stream >> d;
         result.setNum( d, 'f' );
-    } else if ( type == "Q_INT64" ) {
-        Q_INT64 i;
+    } else if ( type == "TQ_INT64" ) {
+        TQ_INT64 i;
         stream >> i;
         result.sprintf( "%lld", i );
-    } else if ( type == "Q_UINT64" ) {
-        Q_UINT64 i;
+    } else if ( type == "TQ_UINT64" ) {
+        TQ_UINT64 i;
         stream >> i;
         result.sprintf( "%llu", i );
     } else if ( type == "bool" )
@@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
     {
         TQColor c;
         stream >> c;
-        result = c.name().local8Bit();
+        result = TQString(c.name()).local8Bit();
     } else if ( type == "TQSize" )
     {
         TQSize s;
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
     } else if ( type == "TQVariant" )
     {
-        Q_INT32 type;
+        TQ_INT32 type;
         stream >> type;
         return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
     } else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result = r.url().local8Bit();
     } else if ( type.left( 11 ) == "TQValueList<" )
     {
-        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
+        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
             return result;
 
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         if ( nestedType.isEmpty() )
             return result;
 
-        Q_UINT32 count;
+        TQ_UINT32 count;
         stream >> count;
 
-        Q_UINT32 i = 0;
+        TQ_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         }
     } else if ( type.left( 5 ) == "TQMap<" )
     {
-        int commaPos = type.find( ',', 5 );
+        int commaPos = type.tqfind( ',', 5 );
 
         if ( commaPos == -1 )
             return result;
 
-        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
+        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
             return result;
 
         TQString keyType = type.mid( 5, commaPos - 5 );
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
 
-        Q_UINT32 count;
+        TQ_UINT32 count;
         stream >> count;
 
-        Q_UINT32 i = 0;
+        TQ_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	arg << s.toUInt();
     else if ( type == "unsigned int" )
 	arg << s.toUInt();
-    else if ( type == "Q_INT32" )
+    else if ( type == "TQ_INT32" )
 	arg << s.toInt();
-    else if ( type == "Q_INT64" ) {
+    else if ( type == "TQ_INT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toLongLong();
     }
-    else if ( type == "Q_UINT32" )
+    else if ( type == "TQ_UINT32" )
 	arg << s.toUInt();
-    else if ( type == "Q_UINT64" ) {
+    else if ( type == "TQ_UINT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toULongLong();
     }
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	    marshall( dummy_arg, args, j, type );
 	    count++;
 	}
-	arg << (Q_UINT32) count;
+	arg << (TQ_UINT32) count;
 	// Parse the list for real
 	while (true) {
 	    if( i > args.count() )