Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* versionr14.1.1

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0ffe839d6e363933ed4d9d212b6fd325a6fc3225)

1 files changed, 24 insertions, 24 deletions

diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index cca2cd9a..7bfa3ae0 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -32,7 +32,7 @@ diff -r1.26 dcop.cpp
 ---
 > #include "../kdatastream.h"
 33a46,47
-> typedef QMap<QString, QString> UserList;
+> typedef QMap<TQString, TQString> UserList;
 > 
 35a50,63
 > static QTextStream cout( stdout, IO_WriteOnly );
@@ -153,7 +153,7 @@ diff -r1.26 dcop.cpp
 >  * 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() )
 >     {
@@ -193,7 +193,7 @@ diff -r1.26 dcop.cpp
 >  * Do the actual DCOP call
 >  */
 > void runDCOP( QCStringList args, UserList users, Session session,
->               const QString sessionName, bool readStdin )
+>               const TQString sessionName, bool readStdin )
 > {
 286,287c402,404
 <     char **args = 0;
@@ -297,7 +297,7 @@ diff -r1.26 dcop.cpp
 >     QStringList sessions;
 >     bool presetDCOPServer = false;
 > //    char *dcopStr = 0L;
->     QString dcopServer;
+>     TQString dcopServer;
 >     
 >     for( it = users.begin(); it != users.end() || firstRun; it++ )
 >     {
@@ -366,8 +366,8 @@ diff -r1.26 dcop.cpp
 > 	    ( 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() )
 > 	    {
@@ -416,7 +416,7 @@ diff -r1.26 dcop.cpp
 > 	{
 > 	    if( !presetDCOPServer && !users.isEmpty() )
 > 	    {
-> 		QString dcopFile = it.data() + "/" + *sIt;
+> 		TQString dcopFile = it.data() + "/" + *sIt;
 > 		QFile f( dcopFile );
 > 		if( !f.open( IO_ReadOnly ) )
 > 		{
@@ -513,9 +513,9 @@ diff -r1.26 dcop.cpp
 > {
 >     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++ )
@@ -531,7 +531,7 @@ diff -r1.26 dcop.cpp
 > 	{
 > 	    if( pos <= argc - 2 )
 > 	    {
-> 		user = QString::fromLocal8Bit( argv[ pos + 1] );
+> 		user = TQString::fromLocal8Bit( argv[ pos + 1] );
 > 		numOptions +=2;
 > 		pos++;
 > 	    }
@@ -647,12 +647,12 @@ RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v
 retrieving revision 1.3
 diff -r1.3 marshall.cpp
 245c245
-< void  marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
+< void  marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type)
 ---
-> void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
+> void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type )
 247,317c247,256
 < 	if (type == "TQStringList")
-<            type = "QValueList<QString>";
+<            type = "QValueList<TQString>";
 < 	if (type == "QCStringList")
 <            type = "QValueList<QCString>";
 < 	if (i >= argc)
@@ -660,7 +660,7 @@ diff -r1.3 marshall.cpp
 < 	    tqWarning("Not enough arguments.");
 <             exit(1);
 <         }       
-<         QString s = QString::fromLocal8Bit(argv[i]);
+<         TQString s = TQString::fromLocal8Bit(argv[i]);
 <  
 < 	if ( type == "int" )
 < 	    arg << s.toInt();
@@ -688,7 +688,7 @@ diff -r1.3 marshall.cpp
 < 	    arg << s;
 < 	else if ( type == "QCString" )
 < 	    arg << QCString( argv[i] );
-< 	else if ( type == "QColor" )
+< 	else if ( type == "TQColor" )
 < 	    arg << mkColor( s );
 < 	else if ( type == "TQPoint" )
 < 	    arg << mkPoint( s );
@@ -707,14 +707,14 @@ diff -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 == "(")
@@ -724,7 +724,7 @@ diff -r1.3 marshall.cpp
 <             QDataStream dummy_arg(dummy_data, IO_WriteOnly);
 ---
 >     if (type == "TQStringList")
->        type = "QValueList<QString>";
+>        type = "QValueList<TQString>";
 >     if (type == "QCStringList")
 >        type = "QValueList<QCString>";
 >     if( i > args.count() )
@@ -732,7 +732,7 @@ diff -r1.3 marshall.cpp
 > 	tqWarning("Not enough arguments.");
 > 	exit(1);
 >     }       
->     QString s = QString::fromLocal8Bit( args[ i ] );
+>     TQString s = TQString::fromLocal8Bit( args[ i ] );
 319,346c258,314
 <             int j = i;
 <             int count = 0;
@@ -789,7 +789,7 @@ diff -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 );
@@ -808,14 +808,14 @@ diff -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 == "(")
@@ -833,7 +833,7 @@ diff -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++;
@@ -846,7 +846,7 @@ diff -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 );
 > 	}