summaryrefslogtreecommitdiffstats
path: root/kompare/tests/diff/normalm.diff
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/tests/diff/normalm.diff')
-rw-r--r--kompare/tests/diff/normalm.diff48
1 files changed, 24 insertions, 24 deletions
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index 0344923a..6a9743c1 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -28,7 +28,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/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 );
@@ -149,7 +149,7 @@ diff -r 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() )
> {
@@ -189,7 +189,7 @@ diff -r 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 )
> {
286,287c402,404
< char **args = 0;
@@ -293,7 +293,7 @@ diff -r 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++ )
> {
@@ -362,8 +362,8 @@ diff -r 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() )
> {
@@ -412,7 +412,7 @@ diff -r 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 ) )
> {
@@ -509,9 +509,9 @@ diff -r 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++ )
@@ -527,7 +527,7 @@ diff -r 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++;
> }
@@ -635,12 +635,12 @@ diff -r dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
> findObject( app, objid, function, params );
diff -r dcop/client/marshall.cpp dcop2/client/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)
@@ -648,7 +648,7 @@ diff -r 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();
@@ -676,7 +676,7 @@ diff -r 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 );
@@ -695,14 +695,14 @@ diff -r 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 == "(")
@@ -712,7 +712,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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() )
@@ -720,7 +720,7 @@ diff -r 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 ] );
319,346c258,314
< int j = i;
< int count = 0;
@@ -777,7 +777,7 @@ diff -r 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 );
@@ -796,14 +796,14 @@ diff -r 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 == "(")
@@ -821,7 +821,7 @@ diff -r 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++;
@@ -834,7 +834,7 @@ diff -r 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 );
> }
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 12:26:16 +0000