Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 26 insertions, 26 deletions

diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 49aff880..578bd3ba 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -33,7 +33,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
  
  #include "marshall.cpp"
  
-+typedef QMap<QString, QString> UserList;
++typedef QMap<TQString, TQString> UserList;
 +
  static DCOPClient* dcop = 0;
  
@@ -62,7 +62,7 @@ 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.
+     TQString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -183,7 +183,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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() )
 +    {
@@ -223,7 +223,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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 )
 +{
      QCString app;
      QCString objid;
@@ -328,7 +328,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +    QStringList sessions;
 +    bool presetDCOPServer = false;
 +//    char *dcopStr = 0L;
-+    QString dcopServer;
++    TQString dcopServer;
 +    
 +    for( it = users.begin(); it != users.end() || firstRun; it++ )
 +    {
@@ -397,8 +397,8 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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() )
 +	    {
@@ -447,7 +447,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +	{
 +	    if( !presetDCOPServer && !users.isEmpty() )
 +	    {
-+		QString dcopFile = it.data() + "/" + *sIt;
++		TQString dcopFile = it.data() + "/" + *sIt;
 +		QFile f( dcopFile );
 +		if( !f.open( IO_ReadOnly ) )
 +		{
@@ -544,9 +544,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/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++ )
@@ -562,7 +562,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +	{
 +	    if( pos <= argc - 2 )
 +	    {
-+		user = QString::fromLocal8Bit( argv[ pos + 1] );
++		user = TQString::fromLocal8Bit( argv[ pos + 1] );
 +		numOptions +=2;
 +		pos++;
 +	    }
@@ -656,7 +656,7 @@ 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.
+     TQString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;
@@ -699,11 +699,11 @@ 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 )
+-void  marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type)
++void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type )
  {
 -	if (type == "TQStringList")
--           type = "QValueList<QString>";
+-           type = "QValueList<TQString>";
 -	if (type == "QCStringList")
 -           type = "QValueList<QCString>";
 -	if (i >= argc)
@@ -711,7 +711,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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();
@@ -739,7 +739,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 );
@@ -758,14 +758,14 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 == "(")
@@ -774,7 +774,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 -	    QByteArray dummy_data;
 -            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() )
@@ -782,7 +782,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 +	tqWarning("Not enough arguments.");
 +	exit(1);
 +    }       
-+    QString s = QString::fromLocal8Bit( args[ i ] );
++    TQString s = TQString::fromLocal8Bit( args[ i ] );
  
 -            int j = i;
 -            int count = 0;
@@ -838,7 +838,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 );
@@ -857,14 +857,14 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 == "(")
@@ -882,7 +882,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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++;
@@ -895,7 +895,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 );
 +	}