summaryrefslogtreecommitdiffstats
path: root/kompare/tests/cvsdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/tests/cvsdiff')
-rw-r--r--kompare/tests/cvsdiff/context.diff4
-rw-r--r--kompare/tests/cvsdiff/contextm.diff56
-rw-r--r--kompare/tests/cvsdiff/edm.diff36
-rw-r--r--kompare/tests/cvsdiff/normalm.diff48
-rw-r--r--kompare/tests/cvsdiff/rcsm.diff36
-rw-r--r--kompare/tests/cvsdiff/unified.diff2
-rw-r--r--kompare/tests/cvsdiff/unifiedm.diff52
7 files changed, 117 insertions, 117 deletions
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff
index 8f955b5c..38c89bae 100644
--- a/kompare/tests/cvsdiff/context.diff
+++ b/kompare/tests/cvsdiff/context.diff
@@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp
! bool findObject( const char* app, const char* obj, const char* func, int argc, char** 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( '(' );
--- 36,42 ----
static bool bAppIdOnly = 0;
@@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp
! 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,124 ****
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index 436f926b..ea31b3f6 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -53,7 +53,7 @@ diff -c -r1.26 dcop.cpp
#include "marshall.cpp"
-+ typedef QMap<QString, QString> UserList;
++ typedef QMap<TQString, TQString> UserList;
+
static DCOPClient* dcop = 0;
@@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp
! void callFunction( const char* app, const char* obj, const char* func, int argc, char** 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( ')' );
--- 146,153 ----
@@ -91,7 +91,7 @@ diff -c -r1.26 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( ')' );
***************
@@ -316,7 +316,7 @@ diff -c -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() )
! {
@@ -356,7 +356,7 @@ diff -c -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 )
+ {
QCString app;
QCString objid;
@@ -412,7 +412,7 @@ diff -c -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++ )
! {
@@ -481,8 +481,8 @@ diff -c -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() )
+ {
@@ -531,7 +531,7 @@ diff -c -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 ) )
+ {
@@ -628,9 +628,9 @@ diff -c -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++ )
@@ -646,7 +646,7 @@ diff -c -r1.26 dcop.cpp
+ {
+ if( pos <= argc - 2 )
+ {
-+ user = QString::fromLocal8Bit( argv[ pos + 1] );
++ user = TQString::fromLocal8Bit( argv[ pos + 1] );
+ numOptions +=2;
+ pos++;
+ }
@@ -744,7 +744,7 @@ diff -c -r1.2 dcopfind.cpp
! bool findObject( const char* app, const char* obj, const char* func, int argc, char** 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( '(' );
--- 36,42 ----
static bool bAppIdOnly = 0;
@@ -752,7 +752,7 @@ diff -c -r1.2 dcopfind.cpp
! 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,124 ****
@@ -825,10 +825,10 @@ diff -c -r1.3 marshall.cpp
}
-! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type)
+! void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type)
{
! if (type == "TQStringList")
-! type = "QValueList<QString>";
+! type = "QValueList<TQString>";
! if (type == "QCStringList")
! type = "QValueList<QCString>";
! if (i >= argc)
@@ -836,7 +836,7 @@ diff -c -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();
@@ -864,7 +864,7 @@ diff -c -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 );
@@ -883,14 +883,14 @@ diff -c -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 == "(")
@@ -934,10 +934,10 @@ diff -c -r1.3 marshall.cpp
}
-! void marshall( QDataStream &arg, QCStringList args, uint &i, QString 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 > args.count() )
@@ -945,7 +945,7 @@ diff -c -r1.3 marshall.cpp
! tqWarning("Not enough arguments.");
! exit(1);
! }
-! QString s = QString::fromLocal8Bit( args[ i ] );
+! TQString s = TQString::fromLocal8Bit( args[ i ] );
! if ( type == "int" )
! arg << s.toInt();
@@ -973,7 +973,7 @@ diff -c -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 );
@@ -992,14 +992,14 @@ diff -c -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 == "(")
@@ -1017,7 +1017,7 @@ diff -c -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++;
@@ -1030,7 +1030,7 @@ diff -c -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 );
+ }
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 )
.
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 );
> }
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index 5ffc4d4f..c477f41b 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -27,7 +27,7 @@ d28 3
a30 1
#include "../kdatastream.h"
a33 2
-typedef QMap<QString, QString> UserList;
+typedef QMap<TQString, TQString> UserList;
a35 14
static QTextStream cout( stdout, IO_WriteOnly );
@@ -129,7 +129,7 @@ a281 42
* 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() )
{
@@ -169,7 +169,7 @@ a282 6
* Do the actual DCOP call
*/
void runDCOP( QCStringList args, UserList users, Session session,
- const QString sessionName, bool readStdin )
+ const TQString sessionName, bool readStdin )
{
d286 2
a287 3
@@ -224,7 +224,7 @@ a338 84
QStringList sessions;
bool presetDCOPServer = false;
// char *dcopStr = 0L;
- QString dcopServer;
+ TQString dcopServer;
for( it = users.begin(); it != users.end() || firstRun; it++ )
{
@@ -293,8 +293,8 @@ a339 143
( 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() )
{
@@ -343,7 +343,7 @@ a339 143
{
if( !presetDCOPServer && !users.isEmpty() )
{
- QString dcopFile = it.data() + "/" + *sIt;
+ TQString dcopFile = it.data() + "/" + *sIt;
QFile f( dcopFile );
if( !f.open( IO_ReadOnly ) )
{
@@ -440,9 +440,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++ )
@@ -458,7 +458,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++;
}
@@ -570,11 +570,11 @@ retrieving revision 1.3
diff -n -r1.3 marshall.cpp
d245 1
a245 1
-void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
+void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type )
d247 71
a317 10
if (type == "TQStringList")
- type = "QValueList<QString>";
+ type = "QValueList<TQString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
if( i > args.count() )
@@ -582,7 +582,7 @@ a317 10
tqWarning("Not enough arguments.");
exit(1);
}
- QString s = QString::fromLocal8Bit( args[ i ] );
+ TQString s = TQString::fromLocal8Bit( args[ i ] );
d319 28
a346 57
if ( type == "int" )
@@ -611,7 +611,7 @@ a346 57
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 );
@@ -630,14 +630,14 @@ a346 57
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 == "(")
@@ -655,7 +655,7 @@ a347 34
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++;
@@ -668,7 +668,7 @@ a347 34
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 );
}
diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff
index f991a658..885b26eb 100644
--- a/kompare/tests/cvsdiff/unified.diff
+++ b/kompare/tests/cvsdiff/unified.diff
@@ -12,7 +12,7 @@ diff -u -r1.2 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;
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index 356a7f52..01ee0297 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -37,7 +37,7 @@ diff -u -r1.26 dcop.cpp
#include "marshall.cpp"
-+typedef QMap<QString, QString> UserList;
++typedef QMap<TQString, TQString> UserList;
+
static DCOPClient* dcop = 0;
@@ -66,7 +66,7 @@ diff -u -r1.26 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 @@
@@ -188,7 +188,7 @@ diff -u -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() )
+ {
@@ -228,7 +228,7 @@ diff -u -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 )
+{
QCString app;
QCString objid;
@@ -333,7 +333,7 @@ diff -u -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++ )
+ {
@@ -402,8 +402,8 @@ diff -u -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() )
+ {
@@ -452,7 +452,7 @@ diff -u -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 ) )
+ {
@@ -549,9 +549,9 @@ diff -u -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++ )
@@ -567,7 +567,7 @@ diff -u -r1.26 dcop.cpp
+ {
+ if( pos <= argc - 2 )
+ {
-+ user = QString::fromLocal8Bit( argv[ pos + 1] );
++ user = TQString::fromLocal8Bit( argv[ pos + 1] );
+ numOptions +=2;
+ pos++;
+ }
@@ -665,7 +665,7 @@ diff -u -r1.2 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;
@@ -712,11 +712,11 @@ diff -u -r1.3 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)
@@ -724,7 +724,7 @@ diff -u -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();
@@ -752,7 +752,7 @@ diff -u -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 );
@@ -771,14 +771,14 @@ diff -u -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 == "(")
@@ -787,7 +787,7 @@ diff -u -r1.3 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() )
@@ -795,7 +795,7 @@ diff -u -r1.3 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;
@@ -851,7 +851,7 @@ diff -u -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 );
@@ -870,14 +870,14 @@ diff -u -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 == "(")
@@ -895,7 +895,7 @@ diff -u -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++;
@@ -908,7 +908,7 @@ diff -u -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 );
+ }
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 18:19:41 +0000