TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0ffe839d6e)
r14.1.x r14.1.1
Michele Calgaro 1 year ago
parent 2611dd9a20
commit 7485c8248a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
28 changed files with 274 additions and 274 deletions
Show Stats Download Patch File Download Diff File

2
cervisia/HACKING
Unescape View File

@ -14,7 +14,7 @@ Formatting
Example:
void MyClass::myFunction(const QString& arg)
void MyClass::myFunction(const TQString& arg)
{
if( blah == "halb" )
{

8
cervisia/cvsservice/DESIGN
Unescape View File

@ -27,7 +27,7 @@ USAGE
How-to use this service in C++ applications:
// start DCOP service
QString error;
TQString error;
QCString appId;
TDEApplication::startServiceByDesktopName("cvsservice", QStringList(), &error,
@ -47,7 +47,7 @@ How-to use this service in C++ applications:
// connect to Q_SIGNALS to get output
connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]);
connectDCOPSignal(job.app(), job.obj(), "receivedStdout(QString)",
connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)",
[MY SLOT]);
// execute the cvs command
@ -88,10 +88,10 @@ How-to use this service in a javascript:
var appID = client.dcopStart("cvsservice");
// set directory of working copy
client.send(appID, "CvsRepository", "setWorkingCopy(QString)", "/home/user/kde/tdesdk/cervisia");
client.send(appID, "CvsRepository", "setWorkingCopy(TQString)", "/home/user/kde/tdesdk/cervisia");
// call "cvs log" for cervisiapart.h
var job = client.call(appID, "CvsService", "log(QString)", "cervisiapart.h");
var job = client.call(appID, "CvsService", "log(TQString)", "cervisiapart.h");
// execute the cvs command
job.call("execute()");

6
doc/man/kspy/testkspy.1
Unescape View File

@ -26,10 +26,10 @@ It simply uses KSpy to spy on itself.
.PP
\fBKSpy\fP is a tiny library which can be used to graphically display
the TQObjects in use by a TQt/TDE app. In addition to the object tree,
you can also view the properties, signals and slots of any QObject.
you can also view the properties, signals and slots of any TQObject.
.PP
Basically it provides much the same info as QObject::dumpObjectTree() and
QObject::dumpObjectInfo(), but in a much more convenient form. KSpy has
Basically it provides much the same info as TQObject::dumpObjectTree() and
TQObject::dumpObjectInfo(), but in a much more convenient form. KSpy has
minimal overhead for the application, because the kspy library is
loaded dynamically using KLibLoader.
.PP

4
doc/man/scripts/qtdoc.1
Unescape View File

@ -35,10 +35,10 @@ The directory beneath which the Qt documentation is installed.
Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
.SH EXAMPLES
To bring up help on class QString:
To bring up help on class TQString:
.PP
.RS
qtdoc QString
qtdoc TQString
.RE
.SH DEBIAN USERS
The Qt documentation is in the Debian package \fIqt3-doc\fP, which will

4
doc/scripts/man-qtdoc.1.docbook
Unescape View File

@ -54,8 +54,8 @@ page for that class. Otherwise the main &Qt; help page is opened.
<refsect1>
<title>Examples</title>
<para>To display the help on the class <classname>QString</classname>:</para>
<screen><userinput><command>qtdoc</command> <option>QString</option></userinput></screen>
<para>To display the help on the class <classname>TQString</classname>:</para>
<screen><userinput><command>qtdoc</command> <option>TQString</option></userinput></screen>
</refsect1>
<refsect1>

4
kbabel/kbabeldict/modules/dbsearchengine/TODO
Unescape View File

@ -19,9 +19,9 @@ Major rewrite:
-download compendium from the internet
Matthias ask:
- searching in translations, equivalent to searching in msgids (SearchEngine::startTranslationSearch(QString s) )
- searching in translations, equivalent to searching in msgids (SearchEngine::startTranslationSearch(TQString s) )
- the absolute path of the files and maybe the number of the entry in the file ( maybe I will add this information to the TranslationInfo )
- the possibility to get a list of all entries in a po file from the database. For this, I think, I will create a interface and send it to you. Maybe something like this: class TranslationDatabase {
public: // name is something like "kbabel.po" QList<CatalogItem> entriesOfFile(QString name); }
public: // name is something like "kbabel.po" QList<CatalogItem> entriesOfFile(TQString name); }

8
kmtrace/kde.excludes
Unescape View File

@ -23,10 +23,10 @@ QTimer::singleShot
QTextCodec::codecForLocale
# Yeah, yeah we know that this metaobject stuff is never free'ed.
QMetaObject::new_meta
QObject::initMetaObject
QObject::staticMetaObject
QString::sprintf
QWidget::createTLExtra
TQObject::initMetaObject
TQObject::staticMetaObject
TQString::sprintf
TQWidget::createTLExtra
# static KDE stuff
kdbgstream::flush
TDECmdLineArgs::addCmdLineOptions

4
kompare/tests/cvsdiff/context.diff
Unescape View File

@ -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 ****

56
kompare/tests/cvsdiff/contextm.diff
Unescape View File

@ -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 );
+ }

36
kompare/tests/cvsdiff/edm.diff
Unescape View File

@ -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 )
.

48
kompare/tests/cvsdiff/normalm.diff
Unescape View File

@ -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 );
> }

36
kompare/tests/cvsdiff/rcsm.diff
Unescape View File

@ -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 );
}

2
kompare/tests/cvsdiff/unified.diff
Unescape View File

@ -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;

52
kompare/tests/cvsdiff/unifiedm.diff
Unescape View File

@ -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 );
+ }

56
kompare/tests/diff/contextm.diff
Unescape View File

@ -49,7 +49,7 @@ diff -cr 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;
@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/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 ----
@ -87,7 +87,7 @@ diff -cr 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( ')' );
***************
@ -310,7 +310,7 @@ diff -cr 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() )
! {
@ -350,7 +350,7 @@ diff -cr 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;
@ -406,7 +406,7 @@ diff -cr 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++ )
! {
@ -475,8 +475,8 @@ diff -cr 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() )
+ {
@ -525,7 +525,7 @@ diff -cr 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 ) )
+ {
@ -622,9 +622,9 @@ diff -cr 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++ )
@ -640,7 +640,7 @@ diff -cr 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++;
+ }
@ -734,7 +734,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/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;
@ -742,7 +742,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/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 ****
@ -811,10 +811,10 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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)
@ -822,7 +822,7 @@ diff -cr 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();
@ -850,7 +850,7 @@ diff -cr 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 );
@ -869,14 +869,14 @@ diff -cr 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 == "(")
@ -920,10 +920,10 @@ diff -cr dcop/client/marshall.cpp dcop2/client/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() )
@ -931,7 +931,7 @@ diff -cr 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 ] );
! if ( type == "int" )
! arg << s.toInt();
@ -959,7 +959,7 @@ diff -cr 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 );
@ -978,14 +978,14 @@ diff -cr 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 == "(")
@ -1003,7 +1003,7 @@ diff -cr 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++;
@ -1016,7 +1016,7 @@ diff -cr 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 );
+ }

36
kompare/tests/diff/edm.diff
Unescape View File

@ -8,9 +8,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++ )
@ -26,7 +26,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++;
}
@ -113,8 +113,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() )
{
@ -163,7 +163,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 ) )
{
@ -274,7 +274,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++ )
{
@ -375,7 +375,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
@ -386,7 +386,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() )
{
@ -517,7 +517,7 @@ enum Session { DefaultSession = 0, AllSessions, QuerySessions, CustomSession };
.
33a
typedef QMap<QString, QString> UserList;
typedef QMap<TQString, TQString> UserList;
.
28,30c
@ -577,7 +577,7 @@ diff -er 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++;
@ -590,7 +590,7 @@ diff -er 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 );
}
@ -627,7 +627,7 @@ diff -er 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 );
@ -646,14 +646,14 @@ diff -er 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 == "(")
@ -661,7 +661,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp
.
247,317c
if (type == "TQStringList")
type = "QValueList<QString>";
type = "QValueList<TQString>";
if (type == "QCStringList")
type = "QValueList<QCString>";
if( i > args.count() )
@ -669,8 +669,8 @@ diff -er 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 ] );
.
245c
void marshall( QDataStream &arg, QCStringList args, uint &i, QString type )
void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type )
.

48
kompare/tests/diff/normalm.diff
Unescape View File

@ -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 );
> }

36
kompare/tests/diff/rcsm.diff
Unescape View File

@ -23,7 +23,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 );
@ -125,7 +125,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() )
{
@ -165,7 +165,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
@ -220,7 +220,7 @@ a338 84
QStringList sessions;
bool presetDCOPServer = false;
// char *dcopStr = 0L;
QString dcopServer;
TQString dcopServer;
for( it = users.begin(); it != users.end() || firstRun; it++ )
{
@ -289,8 +289,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() )
{
@ -339,7 +339,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 ) )
{
@ -436,9 +436,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++ )
@ -454,7 +454,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++;
}
@ -558,11 +558,11 @@ a224 5
diff -nr dcop/client/marshall.cpp dcop2/client/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() )
@ -570,7 +570,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" )
@ -599,7 +599,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 );
@ -618,14 +618,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 == "(")
@ -643,7 +643,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++;
@ -656,7 +656,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 );
}

52
kompare/tests/diff/unifiedm.diff
Unescape View File

@ -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 );
+ }

14
poxml/gettext.g
Unescape View File

@ -57,17 +57,17 @@ string c, mi, mip, ms;
: c=comment mi=msgid
(
( ms=msgstr {
mb.comment = QString::fromUtf8(c.c_str());
mb.msgid = QString::fromUtf8(mi.c_str());
mb.msgstr = QString::fromUtf8(ms.c_str());
mb.comment = TQString::fromUtf8(c.c_str());
mb.msgid = TQString::fromUtf8(mi.c_str());
mb.msgstr = TQString::fromUtf8(ms.c_str());
}
)
|
( mip=msgid_plural ms=msgstr_plural {
mb.comment = QString::fromUtf8(c.c_str());
mb.msgid = QString::fromUtf8(mi.c_str());
mb.msgid_plural = QString::fromUtf8(mip.c_str());
mb.msgstr = QString::fromUtf8(ms.c_str());
mb.comment = TQString::fromUtf8(c.c_str());
mb.msgid = TQString::fromUtf8(mi.c_str());
mb.msgid_plural = TQString::fromUtf8(mip.c_str());
mb.msgstr = TQString::fromUtf8(ms.c_str());
}
)
)

4
scripts/add_trace.pl
Unescape View File

@ -97,8 +97,8 @@ while (<>)
elsif ( m/^bool\s+([a-zA-Z0-9_]+)/ ) {
$line = $line . " << \" $1=\" << (" . $1 . " ? \"true\" : \"false\" )";
}
## QString and friends
elsif ( m/QString[\&\s]+([a-zA-Z0-9_]+)/ || m/QCString[\&\s]*([a-zA-Z0-9_]+)/ ) {
## TQString and friends
elsif ( m/TQString[\&\s]+([a-zA-Z0-9_]+)/ || m/QCString[\&\s]*([a-zA-Z0-9_]+)/ ) {
$line = $line . " << \" $1=\" << " . $1;
}
## KURL

6
scripts/fixheaders
Unescape View File

@ -57,7 +57,7 @@ $lastdir = '.';
'`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
'`kdDebug\' undeclared \(first use this function\)' => "kdebug",
'`kdWarning\' undeclared \(first use this function\)' => "kdebug",
'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "tdepopupmenu",
'no matching function for call to `KMenuBar::insertItem\(TQString, TDEPopupMenu' => "tdepopupmenu",
'no matching function for call to `KMenuBar::' => "kmenubar",
'invalid use of undefined type `class QPointArray' => "qpointarray",
'variable `QPainter \S*\' has initializer but incomplete type' => "qpainter",
@ -79,7 +79,7 @@ $lastdir = '.';
'`DCOPClient\' undeclared \(first use this function\)' => "dcopclient",
'invalid use of undefined type `class KStatusBar\'' => "kstatusbar",
'invalid use of undefined type `class QLabel\'' => "qlabel",
'invalid use of undefined type `class QImage\'' => "qimage",
'invalid use of undefined type `class TQImage\'' => "qimage",
'invalid use of undefined type `class QImageIO\'' => "qimage",
'invalid use of undefined type `class QLineEdit\'' => "qlineedit",
'invalid use of undefined type `class QComboBox\'' => "qcombobox",
@ -97,7 +97,7 @@ $lastdir = '.';
'error: incomplete type `Q3ValueList' => 'q3valuelist',
'error: variable `Q3ValueList<' => 'q3valuelist',
'error: `Q3PointArray\' undeclared' => 'q3pointarray',
'error: invalid use of undefined type \`struct QColor' => 'qcolor',
'error: invalid use of undefined type \`struct TQColor' => 'qcolor',
'error: `QX11Info::' => 'qx11info_x11',
'error: incomplete type \'QX11Info' => 'qx11info_x11',
'error: \'Q3AsciiDi' => 'q3asciidict'

4
scripts/includemocs
Unescape View File

@ -71,14 +71,14 @@ includemocs -- handle mocifyable headers, whose .moc file is nowhere included.
=head1 DESCRIPTION
Header files declaring a QObject descendant have to be run through moc to
Header files declaring a TQObject descendant have to be run through moc to
produce a .moc file. This .moc file has to be compiled, for which two
possibilities exists: compile it separately, or #include it in the C++ file
implementing that above mentioned class. The latter is more efficient in term
of compilation speed.
This script searches in the current directory and its subdirs for header files
declaring a QObject descendant class. If it finds some, it looks, if there is
declaring a TQObject descendant class. If it finds some, it looks, if there is
a C++ file containing an '#include' for the generated .moc file. If thats not
the case, it tries to guess into which C++ file that '#include' is placed best
(based on the filename). If it fails to guess a proper place, it mentions

4
scripts/kDebug2kdDebug.sh
Unescape View File

@ -99,8 +99,8 @@ while (<>)
if ( /(%[0-9]*[a-z])/ ) # This item is a format
{
## 3 - Find argument
# kludge for QString(a,b) constructions
$arguments =~ s/(QString\s*\([^,]+,[^,]+\))/QStrKLUDGE/;
# kludge for TQString(a,b) constructions
$arguments =~ s/(TQString\s*\([^,]+,[^,]+\))/QStrKLUDGE/;
$kludge = $1;
$arguments =~ s/\s*([^,]+)\s*,//;
# Remove trailing .ascii() and latin1()

12
scripts/kde-devel-gdb
Unescape View File

@ -12,7 +12,7 @@ define printqstring
printqstringdata $arg0.d
end
document printqstring
Prints the contents of a QString
Prints the contents of a TQString
end
define printq4string
printq4stringdata $arg0.d
@ -32,8 +32,8 @@ end
document printqstringdata
Prints the contents of a QStringData
This is useful when the output of another command (e.g. printqmap)
shows {d = 0xdeadbeef} for a QString, i.e. the qstringdata address
instead of the QString object itself.
shows {d = 0xdeadbeef} for a TQString, i.e. the qstringdata address
instead of the TQString object itself.
printqstring $s and printqstringdata $s.d are equivalent.
end
@ -73,7 +73,7 @@ define printqstring_utf8
printf "\n"
end
document printqstring_utf8
Prints the contents of a QString encoded in utf8.
Prints the contents of a TQString encoded in utf8.
Nice if you run your debug session in a utf8 enabled terminal.
end
@ -106,8 +106,8 @@ define printqcolor
printf "(%d,%d,%d)\n", ($arg0).red(), ($arg0).green(), ($arg0).blue()
end
document printqcolor
Prints a QColor as (R,G,B).
Usage: 'printqcolor <QColor col>
Prints a TQColor as (R,G,B).
Usage: 'printqcolor <TQColor col>
end
define printqmemarray

2
scripts/kde-devel-vim.vim
Unescape View File

@ -215,7 +215,7 @@ function! MapIdentHeader( ident )
return '<qvalidator.h>'
elseif a:ident =~ 'QListBox.*'
return '<qlistbox.h>'
elseif a:ident == 'QChar' ||
elseif a:ident == 'TQChar' ||
\a:ident == 'QCharRef' ||
\a:ident == 'QConstString'
return '<qstring.h>'

2
scripts/kde-emacs/klaralv.el
Unescape View File

@ -73,7 +73,7 @@
(qaction.h QActionGroup)
(qvalidator.h QIntValidator QDoubleValidator QRegExpValidator)
(qlistbox.h QListBoxItem QListBoxText QListBoxPixmap)
(qstring.h QChar QCharRef QConstString)
(qstring.h TQChar QCharRef QConstString)
(qcanvas.h QCanvasSprite QCanvasPolygonalItem QCanvasRectangle
QCanvasPolygon QCanvasEllipse QCanvasText QCanvasLine
QCanvasChunk QCanvas QCanvasItem QCanvasView QCanvasPixmap)

2
umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
Unescape View File

@ -270,7 +270,7 @@
</property>
<property name="historyItems">
<stringlist>
<string>QString</string>
<string>TQString</string>
<string>string</string>
</stringlist>
</property>

Write Preview
Loading…
Cancel
Save