1 files changed, 18 insertions, 18 deletions

diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index f1c582cb..eea4c2b8 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -13,9 +13,9 @@ int main( int argc, char** argv )
 {
     bool readStdin = false;
     int numOptions = 0;
-    QString user;
+    TQString user;
     Session session = DefaultSession;
-    QString sessionName;
+    TQString sessionName;
     
     // Scan for command-line options first
     for( int pos = 1 ; pos <= argc - 1 ; pos++ )
@@ -31,7 +31,7 @@ int main( int argc, char** argv )
 	{
 	    if( pos <= argc - 2 )
 	    {
-		user = QString::fromLocal8Bit( argv[ pos + 1] );
+		user = TQString::fromLocal8Bit( argv[ pos + 1] );
 		numOptions +=2;
 		pos++;
 	    }
@@ -118,8 +118,8 @@ int main( int argc, char** argv )
 	    ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) )
 	{
 	    // Check for ICE authority file and if the file can be read by us
-	    QString home = it.data();
-	    QString iceFile = it.data() + "/.ICEauthority";
+	    TQString home = it.data();
+	    TQString iceFile = it.data() + "/.ICEauthority";
 	    QFileInfo fi( iceFile );
 	    if( iceFile.isEmpty() )
 	    {
@@ -168,7 +168,7 @@ int main( int argc, char** argv )
 	{
 	    if( !presetDCOPServer && !users.isEmpty() )
 	    {
-		QString dcopFile = it.data() + "/" + *sIt;
+		TQString dcopFile = it.data() + "/" + *sIt;
 		QFile f( dcopFile );
 		if( !f.open( IO_ReadOnly ) )
 		{
@@ -279,7 +279,7 @@ int main( int argc, char** argv )
     QStringList sessions;
     bool presetDCOPServer = false;
 //    char *dcopStr = 0L;
-    QString dcopServer;
+    TQString dcopServer;
     
     for( it = users.begin(); it != users.end() || firstRun; it++ )
     {
@@ -380,7 +380,7 @@ int main( int argc, char** argv )
  * Do the actual DCOP call
  */
 void runDCOP( QCStringList args, UserList users, Session session,
-              const QString sessionName, bool readStdin )
+              const TQString sessionName, bool readStdin )
 {
 .
 279,281c
@@ -391,7 +391,7 @@ void runDCOP( QCStringList args, UserList users, Session session,
  * Return a list of available DCOP sessions for the specified user
  * An empty list means no sessions are available, or an error occurred.
  */
-QStringList dcopSessionList( const QString &user, const QString &home )
+QStringList dcopSessionList( const TQString &user, const TQString &home )
 {
     if( home.isEmpty() )
     {
@@ -522,7 +522,7 @@ enum Session { DefaultSession = 0, AllSessions, QuerySessions, CustomSession };
 
 .
 33a
-typedef QMap<QString, QString> UserList;
+typedef QMap<TQString, TQString> UserList;
 
 .
 28,30c
@@ -590,7 +590,7 @@ diff -e -r1.3 marshall.cpp
 		tqWarning("List end-delimiter '%s' not found.", delim.latin1());
 		exit(1);
 	    }
-	    if( QString::fromLocal8Bit( args[ j ] ) == delim )
+	    if( TQString::fromLocal8Bit( args[ j ] ) == delim )
 		break;
 	    marshall( dummy_arg, args, j, type );
 	    count++;
@@ -603,7 +603,7 @@ diff -e -r1.3 marshall.cpp
 		tqWarning("List end-delimiter '%s' not found.", delim.latin1());
 		exit(1);
 	    }
-	    if( QString::fromLocal8Bit( args[ i ] ) == delim )
+	    if( TQString::fromLocal8Bit( args[ i ] ) == delim )
 		break;
 	    marshall( arg, args, i, type );
 	}
@@ -640,7 +640,7 @@ diff -e -r1.3 marshall.cpp
 	arg << s;
     else if ( type == "QCString" )
 	arg << QCString( args[ i ] );
-    else if ( type == "QColor" )
+    else if ( type == "TQColor" )
 	arg << mkColor( s );
     else if ( type == "TQPoint" )
 	arg << mkPoint( s );
@@ -659,14 +659,14 @@ diff -e -r1.3 marshall.cpp
 	    arg << QVariant( mkSize( s.mid(6, s.length()-7) ) );
 	else if ( s.left( 6 ) == "QRect(" )
 	    arg << QVariant( mkRect( s.mid(6, s.length()-7) ) );
-	else if ( s.left( 7 ) == "QColor(" )
+	else if ( s.left( 7 ) == "TQColor(" )
 	    arg << QVariant( mkColor( s.mid(7, s.length()-8) ) );
 	else
 	    arg << QVariant( s );
     } else if ( type.startsWith("QValueList<")) {
 	type = type.mid(11, type.length() - 12);
 	QStringList list;
-	QString delim = s;
+	TQString delim = s;
 	if (delim == "[")
 	   delim = "]";
 	if (delim == "(")
@@ -674,7 +674,7 @@ diff -e -r1.3 marshall.cpp
 .
 247,317c
     if (type == "TQStringList")
-       type = "QValueList<QString>";
+       type = "QValueList<TQString>";
     if (type == "QCStringList")
        type = "QValueList<QCString>";
     if( i > args.count() )
@@ -682,8 +682,8 @@ diff -e -r1.3 marshall.cpp
 	tqWarning("Not enough arguments.");
 	exit(1);
     }       
-    QString s = QString::fromLocal8Bit( args[ i ] );
+    TQString s = TQString::fromLocal8Bit( args[ i ] );
 .
 245c
-void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
+void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type )
 .