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

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

KDE3PORTING.html

@@ -474,7 +474,7 @@ setURLArgs does the job.
 The API has been cleaned up to be in line with the rest of tdelibs, in particular:
 <ul>
 <li>suggestions() now returns a TQStringList instead of a pointer to a QStringList
-<li>intermediateBuffer() now returns a TQString instead of a pointer to a QString
+<li>intermediateBuffer() now returns a TQString instead of a pointer to a TQString
 <li>The signal <b>misspelling(TQString, TQStringList *, unsigned)</b> has changed to
     misspelling(const TQString &amp;, const TQStringList &amp;, unsigned int)
 <li>The signal <b>corrected(TQString, TQString, unsigned)</b> has changed to

TODO

@@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release.
 
 - Check for forked classes in kde pim and other modules
 
-- There is no reason why TDEConfigBase should inherit from QObject, get rid of that.
+- There is no reason why TDEConfigBase should inherit from TQObject, get rid of that.
 
 - Change all FooPrivate *d; -> Private * const d; and place initialization
   in the constructor (for classes that would benefit from this).  To help catch silly
@@ -202,7 +202,7 @@ an alternative help->contents action)
   requests for things like re-reading the config of a KPanelExtension can be
   done by its parent.
 
-- Fix KURLRequester API to use KURL for urls instead of QString to make clear that
+- Fix KURLRequester API to use KURL for urls instead of TQString to make clear that
   we work with URLs and not with paths.
 
 - Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,

arts/kde/README

@@ -6,7 +6,7 @@ libartskde is a simple KDE->aRts wrapper
 that allows the developer to use KDE
 technology to access aRts.
 ie. no need to deal with std::string's anymore
-etc.. you can just use QString's or KURL's
+etc.. you can just use TQString's or KURL's
 to play sound
 
 2. How to use it to play sounds?

arts/kde/kvideowidget.cpp

@@ -213,7 +213,7 @@ TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
     }
 
     // Convert 32bit RGBA image data into Qt image
-    TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy();
+    TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (TQRgb *)0, 0, TQImage::IgnoreEndian ).copy();
 
     // Free X11 resources and return Qt image
     XDestroyImage( xImage );

dcop/HOWTO

@@ -169,8 +169,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
   tqDebug("there was some error using DCOP.");
 else {
   QDataStream reply(replyData, IO_ReadOnly);
-  if (replyType == "QString") {
+  if (replyType == "TQString") {
-    QString result;
+    TQString result;
     reply >> result;
     print("the result is: %s",result.latin1());
   } else
@@ -190,7 +190,7 @@ Receiving Data via DCOP:
 
 Currently the only real way to receive data from DCOP is to multiply
 inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
 DCOPObject provides one very important method: DCOPObject::process().
 This is a pure virtual method that you must implement in order to
 process DCOP messages that you receive.  It takes a function
@@ -210,10 +210,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt (i);
+    TQString result = self->doIt (i);
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    replyType = "QString";
+    replyType = "TQString";
     return true;
   } else {
     tqDebug("unknown function call to BarObject::process()");
@@ -244,7 +244,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt(i);
+    TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
     myTransaction = kapp->dcopClient()->beginTransaction();
@@ -260,9 +260,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
   }
 }
 
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
 {
-    QCString replyType = "QString";
+    QCString replyType = "TQString";
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
@@ -358,7 +358,7 @@ class MyInterface : virtual public DCOPObject
 
   k_dcop:
 
-    virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+    virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
     virtual QRect mySynchronousMethod() = 0;
 };
 
@@ -385,7 +385,7 @@ but virtual, not pure virtual.
 
 Example:
 
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
 {
   TQ_OBJECT
   
@@ -393,11 +393,11 @@ class MyClass: public QObject, virtual public MyInterface
     MyClass(); 
     ~MyClass();
 
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 
-Note: (Qt issue) Remember that if you are inheriting from QObject, you must
+Note: (Qt issue) Remember that if you are inheriting from TQObject, you must
 place it first in the list of inherited classes.
 
 In the implementation of your class' ctor, you must explicitly initialize
@@ -408,7 +408,7 @@ the interface which your are implementing.
 Example:
 
 MyClass::MyClass()
-  : QObject(),
+  : TQObject(),
     DCOPObject("MyInterface")
 {
   // whatever...
@@ -419,7 +419,7 @@ exactly the same as you would normally.
 
 Example:
 
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
 {
   tqDebug("myAsyncMethod called with param `" + someParameter + "'");
 }
@@ -429,7 +429,7 @@ It is not necessary (though very clean) to define an interface as an
 abstract class of its own, like we did in the example above. We could
 just as well have defined a k_dcop section directly within MyClass:
 
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
 {
   TQ_OBJECT
   K_DCOP
@@ -439,7 +439,7 @@ class MyClass: public QObject, virtual public DCOPObject
     ~MyClass();
 
   k_dcop:
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 

dcop/Mainpage.dox

@@ -134,8 +134,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
   tqDebug("there was some error using DCOP.");
 else {
   QDataStream reply(replyData, IO_ReadOnly);
-  if (replyType == "QString") {
+  if (replyType == "TQString") {
-    QString result;
+    TQString result;
     reply >> result;
     print("the result is: %s",result.latin1());
   } else
@@ -148,7 +148,7 @@ else {
 
 Currently the only real way to receive data from DCOP is to multiply
 inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
 DCOPObject provides one very important method: DCOPObject::process().
 This is a pure virtual method that you must implement in order to
 process DCOP messages that you receive.  It takes a function
@@ -169,10 +169,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt (i);
+    TQString result = self->doIt (i);
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    replyType = "QString";
+    replyType = "TQString";
     return true;
   } else {
     tqDebug("unknown function call to BarObject::process()");
@@ -205,7 +205,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt(i);
+    TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
     myTransaction = kapp->dcopClient()->beginTransaction();
@@ -221,9 +221,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
   }
 }
 
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
 {
-    QCString replyType = "QString";
+    QCString replyType = "TQString";
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
@@ -260,7 +260,7 @@ class MyInterface : virtual public DCOPObject
 
   k_dcop:
 
-    virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+    virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
     virtual QRect mySynchronousMethod() = 0;
 };
 
@@ -289,7 +289,7 @@ but virtual, not pure virtual.
 Example:
 
 \code
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
 {
   TQ_OBJECT
 
@@ -297,11 +297,11 @@ class MyClass: public QObject, virtual public MyInterface
     MyClass();
     ~MyClass();
 
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 \endcode
-\note (Qt issue) Remember that if you are inheriting from QObject, you must
+\note (Qt issue) Remember that if you are inheriting from TQObject, you must
 place it first in the list of inherited classes.
 
 In the implementation of your class' ctor, you must explicitly initialize
@@ -313,7 +313,7 @@ Example:
 
 \code
 MyClass::MyClass()
-  : QObject(),
+  : TQObject(),
     DCOPObject("MyInterface")
 {
   // whatever...
@@ -327,7 +327,7 @@ exactly the same as you would normally.
 Example:
 
 \code
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
 {
   tqDebug("myAsyncMethod called with param `" + someParameter + "'");
 }
@@ -338,7 +338,7 @@ abstract class of its own, like we did in the example above. We could
 just as well have defined a k_dcop section directly within MyClass:
 
 \code
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
 {
   TQ_OBJECT
   K_DCOP
@@ -348,7 +348,7 @@ class MyClass: public QObject, virtual public DCOPObject
     ~MyClass();
 
   k_dcop:
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 \endcode

dcop/client/README.dcop

@@ -43,10 +43,10 @@ error message is printed to stderr and the command exits with exit-code '2'.
 
 The default selection criteria is "any". Applications can declare their own 
 select_func as they see fit, e.g. konqueror could declare 
-"isDoingProtocol(QString protocol)" and then the following command would 
+"isDoingProtocol(TQString protocol)" and then the following command would 
 select a konqueror mainwindow that is currently handling the help-protocol:
 
-   "dcopfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(QString 
+   "dcopfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(TQString 
 protocol)' help"
 
 

dcop/dcopidl/dcopidl_output.kidl

@@ -8,13 +8,13 @@
     <LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE>
     <SUPER>MyNamespace::MyParentClass</SUPER>
     <SUPER>DCOPObject</SUPER>
-    <SUPER>QValueList&lt;<TYPE>QString</TYPE>&gt;</SUPER>
+    <SUPER>QValueList&lt;<TYPE>TQString</TYPE>&gt;</SUPER>
     <FUNC>
-        <TYPE>QString</TYPE>
+        <TYPE>TQString</TYPE>
         <NAME>url</NAME>
      </FUNC>
     <FUNC qual="const">
-        <TYPE>QString</TYPE>
+        <TYPE>TQString</TYPE>
         <NAME>constTest</NAME>
      </FUNC>
     <FUNC>

dcop/dcopidl/yacc.cpp

@@ -113,14 +113,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern int yylex();
 
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
 extern int idl_line_no;
 extern int function_mode;
 
 static int dcop_area = 0;
 static int dcop_signal_area = 0;
 
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
 
 void dcopidlInitFlex( const char *_code );
 
@@ -238,7 +238,7 @@ typedef union YYSTYPE
 #line 67 "yacc.yy"
 
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 
@@ -2096,7 +2096,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 308 "yacc.yy"
     {
-	   QString* tmp = new QString( "%1::%2" );
+	   TQString* tmp = new TQString( "%1::%2" );
            *tmp = tmp->arg(*((yyvsp[(1) - (3)]._str))).arg(*((yyvsp[(3) - (3)]._str)));
            (yyval._str) = tmp;
 	;}
@@ -2107,7 +2107,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 317 "yacc.yy"
     {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
 		(yyval._str) = tmp;
 	  ;}
@@ -2118,7 +2118,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 323 "yacc.yy"
     {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *((yyvsp[(1) - (4)]._str)) + "&lt;" + *((yyvsp[(3) - (4)]._str)) + "&gt;" );
 		(yyval._str) = tmp;
 	  ;}
@@ -2157,7 +2157,7 @@ yyreduce:
 #line 347 "yacc.yy"
     {
 		/* $$ = $1; */
-		(yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2175,7 +2175,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 359 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2192,7 +2192,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 373 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2201,7 +2201,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 377 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
 	  ;}
     break;
 
@@ -2210,7 +2210,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 381 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2219,7 +2219,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 385 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
 	  ;}
     break;
 
@@ -2416,11 +2416,11 @@ yyreduce:
 #line 475 "yacc.yy"
     {
 		if (dcop_area) {
- 		  QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ 		  TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
 		  *tmp = tmp->arg( *((yyvsp[(6) - (7)]._str)) ).arg( *((yyvsp[(2) - (7)]._str)) ).arg( *((yyvsp[(4) - (7)]._str)) );
 		  (yyval._str) = tmp;
 		} else {
-		  (yyval._str) = new QString("");
+		  (yyval._str) = new TQString("");
 		}
 	  ;}
     break;
@@ -2457,140 +2457,140 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 503 "yacc.yy"
-    { (yyval._str) = new QString("signed int"); ;}
+    { (yyval._str) = new TQString("signed int"); ;}
     break;
 
   case 90:
 
 /* Line 1455 of yacc.c  */
 #line 504 "yacc.yy"
-    { (yyval._str) = new QString("signed int"); ;}
+    { (yyval._str) = new TQString("signed int"); ;}
     break;
 
   case 91:
 
 /* Line 1455 of yacc.c  */
 #line 505 "yacc.yy"
-    { (yyval._str) = new QString("unsigned int"); ;}
+    { (yyval._str) = new TQString("unsigned int"); ;}
     break;
 
   case 92:
 
 /* Line 1455 of yacc.c  */
 #line 506 "yacc.yy"
-    { (yyval._str) = new QString("unsigned int"); ;}
+    { (yyval._str) = new TQString("unsigned int"); ;}
     break;
 
   case 93:
 
 /* Line 1455 of yacc.c  */
 #line 507 "yacc.yy"
-    { (yyval._str) = new QString("signed short int"); ;}
+    { (yyval._str) = new TQString("signed short int"); ;}
     break;
 
   case 94:
 
 /* Line 1455 of yacc.c  */
 #line 508 "yacc.yy"
-    { (yyval._str) = new QString("signed short int"); ;}
+    { (yyval._str) = new TQString("signed short int"); ;}
     break;
 
   case 95:
 
 /* Line 1455 of yacc.c  */
 #line 509 "yacc.yy"
-    { (yyval._str) = new QString("signed long int"); ;}
+    { (yyval._str) = new TQString("signed long int"); ;}
     break;
 
   case 96:
 
 /* Line 1455 of yacc.c  */
 #line 510 "yacc.yy"
-    { (yyval._str) = new QString("signed long int"); ;}
+    { (yyval._str) = new TQString("signed long int"); ;}
     break;
 
   case 97:
 
 /* Line 1455 of yacc.c  */
 #line 511 "yacc.yy"
-    { (yyval._str) = new QString("unsigned short int"); ;}
+    { (yyval._str) = new TQString("unsigned short int"); ;}
     break;
 
   case 98:
 
 /* Line 1455 of yacc.c  */
 #line 512 "yacc.yy"
-    { (yyval._str) = new QString("unsigned short int"); ;}
+    { (yyval._str) = new TQString("unsigned short int"); ;}
     break;
 
   case 99:
 
 /* Line 1455 of yacc.c  */
 #line 513 "yacc.yy"
-    { (yyval._str) = new QString("unsigned long int"); ;}
+    { (yyval._str) = new TQString("unsigned long int"); ;}
     break;
 
   case 100:
 
 /* Line 1455 of yacc.c  */
 #line 514 "yacc.yy"
-    { (yyval._str) = new QString("unsigned long int"); ;}
+    { (yyval._str) = new TQString("unsigned long int"); ;}
     break;
 
   case 101:
 
 /* Line 1455 of yacc.c  */
 #line 515 "yacc.yy"
-    { (yyval._str) = new QString("int"); ;}
+    { (yyval._str) = new TQString("int"); ;}
     break;
 
   case 102:
 
 /* Line 1455 of yacc.c  */
 #line 516 "yacc.yy"
-    { (yyval._str) = new QString("long int"); ;}
+    { (yyval._str) = new TQString("long int"); ;}
     break;
 
   case 103:
 
 /* Line 1455 of yacc.c  */
 #line 517 "yacc.yy"
-    { (yyval._str) = new QString("long int"); ;}
+    { (yyval._str) = new TQString("long int"); ;}
     break;
 
   case 104:
 
 /* Line 1455 of yacc.c  */
 #line 518 "yacc.yy"
-    { (yyval._str) = new QString("short int"); ;}
+    { (yyval._str) = new TQString("short int"); ;}
     break;
 
   case 105:
 
 /* Line 1455 of yacc.c  */
 #line 519 "yacc.yy"
-    { (yyval._str) = new QString("short int"); ;}
+    { (yyval._str) = new TQString("short int"); ;}
     break;
 
   case 106:
 
 /* Line 1455 of yacc.c  */
 #line 520 "yacc.yy"
-    { (yyval._str) = new QString("char"); ;}
+    { (yyval._str) = new TQString("char"); ;}
     break;
 
   case 107:
 
 /* Line 1455 of yacc.c  */
 #line 521 "yacc.yy"
-    { (yyval._str) = new QString("signed char"); ;}
+    { (yyval._str) = new TQString("signed char"); ;}
     break;
 
   case 108:
 
 /* Line 1455 of yacc.c  */
 #line 522 "yacc.yy"
-    { (yyval._str) = new QString("unsigned char"); ;}
+    { (yyval._str) = new TQString("unsigned char"); ;}
     break;
 
   case 111:
@@ -2598,7 +2598,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 532 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2607,7 +2607,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 537 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2637,7 +2637,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 548 "yacc.yy"
     {
-		QString *tmp = new QString("%1&lt;%2&gt;");
+		TQString *tmp = new TQString("%1&lt;%2&gt;");
 		*tmp = tmp->arg(*((yyvsp[(1) - (4)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(3) - (4)]._str)));
 		(yyval._str) = tmp;
@@ -2649,7 +2649,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 554 "yacc.yy"
     {
-		QString *tmp = new QString("%1&lt;%2&gt;::%3");
+		TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
 		*tmp = tmp->arg(*((yyvsp[(1) - (6)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(3) - (6)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(6) - (6)]._str)));
@@ -2662,7 +2662,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 566 "yacc.yy"
     {
-	    (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+	    (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
 	  ;}
     break;
 
@@ -2710,7 +2710,7 @@ yyreduce:
 #line 596 "yacc.yy"
     {
 	     if (dcop_area) {
-	  	QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+	  	TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
 		(yyval._str) = tmp;
 	     }
@@ -2722,7 +2722,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 603 "yacc.yy"
     {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(2) - (2)]._str)) );
 		(yyval._str) = tmp;
 	;}
@@ -2733,7 +2733,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 608 "yacc.yy"
     {
-        QString* tmp = new QString("<TYPE>%1</TYPE>");
+        TQString* tmp = new TQString("<TYPE>%1</TYPE>");
         *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
         (yyval._str) = tmp;
     ;}
@@ -2745,7 +2745,7 @@ yyreduce:
 #line 613 "yacc.yy"
     { 
         if (dcop_area) { 
-           QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
+           TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
            *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); 
            (yyval._str) = tmp; 
         } 
@@ -2767,7 +2767,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 625 "yacc.yy"
     {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
 		(yyval._str) = tmp;
 	;}
@@ -2788,7 +2788,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 639 "yacc.yy"
     {
-	    (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+	    (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
 	  ;}
     break;
 
@@ -2807,11 +2807,11 @@ yyreduce:
 #line 650 "yacc.yy"
     {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
   		   *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) );
   		   *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
 		   (yyval._str) = tmp;		
-		} else (yyval._str) = new QString();
+		} else (yyval._str) = new TQString();
 	  ;}
     break;
 
@@ -2821,10 +2821,10 @@ yyreduce:
 #line 659 "yacc.yy"
     {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1</ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1</ARG>");
   		   *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
 		   (yyval._str) = tmp;		
-		} else (yyval._str) = new QString();
+		} else (yyval._str) = new TQString();
 	  ;}
     break;
 
@@ -2835,7 +2835,7 @@ yyreduce:
     {
 		if (dcop_area)
 			yyerror("variable arguments not supported in dcop area.");
-		(yyval._str) = new QString("");
+		(yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -2923,8 +2923,8 @@ yyreduce:
 #line 716 "yacc.yy"
     {
 	     if (dcop_area || dcop_signal_area) {
-		QString* tmp = 0;
+		TQString* tmp = 0;
-                tmp = new QString(
+                tmp = new TQString(
                         "    <%4>\n"
                         "        %2\n"
                         "        <NAME>%1</NAME>"
@@ -2934,13 +2934,13 @@ yyreduce:
 		*tmp = tmp->arg( *((yyvsp[(1) - (6)]._str)) );
                 *tmp = tmp->arg( *((yyvsp[(4) - (6)]._str)) );
                 
-                QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+                TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
-                QString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
+                TQString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
-                *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
+                *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
-                *tmp = tmp->arg( QString("%1").arg(tagname) );
+                *tmp = tmp->arg( TQString("%1").arg(tagname) );
 		(yyval._str) = tmp;
    	     } else
-	        (yyval._str) = new QString("");
+	        (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -2951,7 +2951,7 @@ yyreduce:
     {
 	     if (dcop_area)
 		yyerror("operators aren't allowed in dcop areas!");
-	     (yyval._str) = new QString("");
+	     (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3031,7 +3031,7 @@ yyreduce:
     {
 	      /* The constructor */
 	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3042,7 +3042,7 @@ yyreduce:
     {
 	      /* The constructor */
 	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3053,7 +3053,7 @@ yyreduce:
     {
 	      /* The destructor */
   	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3068,7 +3068,7 @@ yyreduce:
                  else
                      yyerror("DCOP functions cannot be static");
               } else {
-                 (yyval._str) = new QString();
+                 (yyval._str) = new TQString();
               }  
 	  ;}
     break;

dcop/dcopidl/yacc.cpp.h

@@ -116,7 +116,7 @@ typedef union YYSTYPE
 #line 67 "yacc.yy"
 
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 

dcop/dcopidl/yacc.yy

@@ -42,14 +42,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern int yylex();
 
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
 extern int idl_line_no;
 extern int function_mode;
 
 static int dcop_area = 0;
 static int dcop_signal_area = 0;
 
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
 
 void dcopidlInitFlex( const char *_code );
 
@@ -66,7 +66,7 @@ void yyerror( const char *s )
 %union
 {
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 }
@@ -306,7 +306,7 @@ Identifier
 	  $$ = $1;
 	}
 	| T_IDENTIFIER T_SCOPE Identifier {
-	   QString* tmp = new QString( "%1::%2" );
+	   TQString* tmp = new TQString( "%1::%2" );
            *tmp = tmp->arg(*($1)).arg(*($3));
            $$ = tmp;
 	}
@@ -315,13 +315,13 @@ Identifier
 super_class_name
 	: Identifier
 	  {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *($1) );
 		$$ = tmp;
 	  }
 	| Identifier T_LESS type_list T_GREATER
 	  {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *($1) + "&lt;" + *($3) + "&gt;" );
 		$$ = tmp;
 	  }
@@ -346,7 +346,7 @@ super_classes
 	| super_class T_COMMA super_classes
 	  {
 		/* $$ = $1; */
-		$$ = new QString( *($1) + *($3) );
+		$$ = new TQString( *($1) + *($3) );
 	  }
 	;
 
@@ -357,7 +357,7 @@ class_header
 	  }
 	| T_LEFT_CURLY_BRACKET
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	;
 
@@ -371,19 +371,19 @@ opt_semicolon
 body
 	: T_RIGHT_CURLY_BRACKET
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	| typedef body
 	  {
-		$$ = new QString( *($1) + *($2) );
+		$$ = new TQString( *($1) + *($2) );
 	  }
 	| T_INLINE function body
 	  {
-		$$ = new QString( *($2) + *($3) );
+		$$ = new TQString( *($2) + *($3) );
 	  }
 	| function body
 	  {
-		$$ = new QString( *($1) + *($2) );
+		$$ = new TQString( *($1) + *($2) );
 	  }
 	| dcop_signal_area_begin body
 	  {
@@ -474,11 +474,11 @@ typedef
 	: T_TYPEDEF Identifier T_LESS type_list T_GREATER Identifier T_SEMICOLON
 	  {
 		if (dcop_area) {
- 		  QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ 		  TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
 		  *tmp = tmp->arg( *($6) ).arg( *($2) ).arg( *($4) );
 		  $$ = tmp;
 		} else {
-		  $$ = new QString("");
+		  $$ = new TQString("");
 		}
 	  }
 	| T_TYPEDEF Identifier T_LESS type_list T_GREATER T_SCOPE T_IDENTIFIER Identifier T_SEMICOLON
@@ -500,26 +500,26 @@ const_qualifier
 	;
 
 int_type
-	: T_SIGNED { $$ = new QString("signed int"); }
+	: T_SIGNED { $$ = new TQString("signed int"); }
-	| T_SIGNED T_INT { $$ = new QString("signed int"); }
+	| T_SIGNED T_INT { $$ = new TQString("signed int"); }
-	| T_UNSIGNED { $$ = new QString("unsigned int"); }
+	| T_UNSIGNED { $$ = new TQString("unsigned int"); }
-	| T_UNSIGNED T_INT { $$ = new QString("unsigned int"); }
+	| T_UNSIGNED T_INT { $$ = new TQString("unsigned int"); }
-	| T_SIGNED T_SHORT { $$ = new QString("signed short int"); }
+	| T_SIGNED T_SHORT { $$ = new TQString("signed short int"); }
-	| T_SIGNED T_SHORT T_INT { $$ = new QString("signed short int"); }
+	| T_SIGNED T_SHORT T_INT { $$ = new TQString("signed short int"); }
-	| T_SIGNED T_LONG { $$ = new QString("signed long int"); }
+	| T_SIGNED T_LONG { $$ = new TQString("signed long int"); }
-	| T_SIGNED T_LONG T_INT { $$ = new QString("signed long int"); }
+	| T_SIGNED T_LONG T_INT { $$ = new TQString("signed long int"); }
-	| T_UNSIGNED T_SHORT { $$ = new QString("unsigned short int"); }
+	| T_UNSIGNED T_SHORT { $$ = new TQString("unsigned short int"); }
-	| T_UNSIGNED T_SHORT T_INT { $$ = new QString("unsigned short int"); }
+	| T_UNSIGNED T_SHORT T_INT { $$ = new TQString("unsigned short int"); }
-	| T_UNSIGNED T_LONG { $$ = new QString("unsigned long int"); }
+	| T_UNSIGNED T_LONG { $$ = new TQString("unsigned long int"); }
-	| T_UNSIGNED T_LONG T_INT { $$ = new QString("unsigned long int"); }
+	| T_UNSIGNED T_LONG T_INT { $$ = new TQString("unsigned long int"); }
-	| T_INT { $$ = new QString("int"); }
+	| T_INT { $$ = new TQString("int"); }
-	| T_LONG { $$ = new QString("long int"); }
+	| T_LONG { $$ = new TQString("long int"); }
-	| T_LONG T_INT { $$ = new QString("long int"); }
+	| T_LONG T_INT { $$ = new TQString("long int"); }
-	| T_SHORT { $$ = new QString("short int"); }
+	| T_SHORT { $$ = new TQString("short int"); }
-	| T_SHORT T_INT { $$ = new QString("short int"); }
+	| T_SHORT T_INT { $$ = new TQString("short int"); }
-	| T_CHAR { $$ = new QString("char"); }
+	| T_CHAR { $$ = new TQString("char"); }
-	| T_SIGNED T_CHAR { $$ = new QString("signed char"); }
+	| T_SIGNED T_CHAR { $$ = new TQString("signed char"); }
-	| T_UNSIGNED T_CHAR { $$ = new QString("unsigned char"); }
+	| T_UNSIGNED T_CHAR { $$ = new TQString("unsigned char"); }
 	;
 
 asterisks
@@ -530,12 +530,12 @@ asterisks
 params
 	: /* empty */
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	| param
 	| params T_COMMA param
 	  {
-		$$ = new QString( *($1) + *($3) );
+		$$ = new TQString( *($1) + *($3) );
 	  }
 	;
 
@@ -546,13 +546,13 @@ type_name
 	| T_STRUCT Identifier { $$ = $2; }
 	| T_CLASS Identifier { $$ = $2; }
 	| Identifier T_LESS templ_type_list T_GREATER {
-		QString *tmp = new QString("%1&lt;%2&gt;");
+		TQString *tmp = new TQString("%1&lt;%2&gt;");
 		*tmp = tmp->arg(*($1));
 		*tmp = tmp->arg(*($3));
 		$$ = tmp;
 	 }
 	| Identifier T_LESS templ_type_list T_GREATER T_SCOPE Identifier{
-		QString *tmp = new QString("%1&lt;%2&gt;::%3");
+		TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
 		*tmp = tmp->arg(*($1));
 		*tmp = tmp->arg(*($3));
 		*tmp = tmp->arg(*($6));
@@ -564,7 +564,7 @@ type_name
 templ_type_list
 	: templ_type T_COMMA templ_type_list
 	  {
-	    $$ = new QString(*($1) + "," + *($3));
+	    $$ = new TQString(*($1) + "," + *($3));
 	  }
 	| templ_type
   	  {
@@ -595,24 +595,24 @@ type
 	  }
 	| T_CONST type_name T_AMPERSAND {
 	     if (dcop_area) {
-	  	QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+	  	TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
 		*tmp = tmp->arg( *($2) );
 		$$ = tmp;
 	     }
 	  }
 	| T_CONST type_name %prec T_UNIMPORTANT {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *($2) );
 		$$ = tmp;
 	}
     | type_name T_CONST %prec T_UNIMPORTANT {
-        QString* tmp = new QString("<TYPE>%1</TYPE>");
+        TQString* tmp = new TQString("<TYPE>%1</TYPE>");
         *tmp = tmp->arg( *($1) );
         $$ = tmp;
     }
     | type_name T_CONST T_AMPERSAND { 
         if (dcop_area) { 
-           QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
+           TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
            *tmp = tmp->arg( *($1) ); 
            $$ = tmp; 
         } 
@@ -623,7 +623,7 @@ type
 	  }
 
 	| type_name %prec T_UNIMPORTANT {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *($1) );
 		$$ = tmp;
 	}
@@ -637,7 +637,7 @@ type
 type_list
 	: type T_COMMA type_list
 	  {
-	    $$ = new QString(*($1) + "," + *($3));
+	    $$ = new TQString(*($1) + "," + *($3));
 	  }
 	| type
   	  {
@@ -649,25 +649,25 @@ param
 	: type Identifier default
 	  {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
   		   *tmp = tmp->arg( *($1) );
   		   *tmp = tmp->arg( *($2) );
 		   $$ = tmp;		
-		} else $$ = new QString();
+		} else $$ = new TQString();
 	  }
 	| type default
 	  {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1</ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1</ARG>");
   		   *tmp = tmp->arg( *($1) );
 		   $$ = tmp;		
-		} else $$ = new QString();
+		} else $$ = new TQString();
 	  }
 	| T_TRIPLE_DOT
 	  {
 		if (dcop_area)
 			yyerror("variable arguments not supported in dcop area.");
-		$$ = new QString("");
+		$$ = new TQString("");
 	  }
 	;
 
@@ -715,8 +715,8 @@ function_header
 	: type Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
 	  {
 	     if (dcop_area || dcop_signal_area) {
-		QString* tmp = 0;
+		TQString* tmp = 0;
-                tmp = new QString(
+                tmp = new TQString(
                         "    <%4>\n"
                         "        %2\n"
                         "        <NAME>%1</NAME>"
@@ -726,19 +726,19 @@ function_header
 		*tmp = tmp->arg( *($1) );
                 *tmp = tmp->arg( *($4) );
                 
-                QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+                TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
-                QString attr = ($6) ? " qual=\"const\"" : "";
+                TQString attr = ($6) ? " qual=\"const\"" : "";
-                *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
+                *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
-                *tmp = tmp->arg( QString("%1").arg(tagname) );
+                *tmp = tmp->arg( TQString("%1").arg(tagname) );
 		$$ = tmp;
    	     } else
-	        $$ = new QString("");
+	        $$ = new TQString("");
 	  }
 	| type T_FUNOPERATOR operator T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
 	  {
 	     if (dcop_area)
 		yyerror("operators aren't allowed in dcop areas!");
-	     $$ = new QString("");
+	     $$ = new TQString("");
 	  }
 	;
 
@@ -778,19 +778,19 @@ function
 	  {
 	      /* The constructor */
 	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS T_COLON init_list function_body
 	  {
 	      /* The constructor */
 	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| virtual_qualifier T_TILDE Identifier T_LEFT_PARANTHESIS T_RIGHT_PARANTHESIS function_body
 	  {
 	      /* The destructor */
   	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| T_STATIC function_header function_body
 	  {
@@ -800,7 +800,7 @@ function
                  else
                      yyerror("DCOP functions cannot be static");
               } else {
-                 $$ = new QString();
+                 $$ = new TQString();
               }  
 	  }      
 	;

dcop/dcopidlng/kalyptus

@@ -73,9 +73,9 @@ public:
     virtual bool tqt_emit( int, QUObject* );
     virtual bool tqt_property( int, int, QVariant* );
     static QMetaObject* staticMetaObject();
-    QObject* qObject();
+    TQObject* qObject();
-    static QString tr( const char *, const char * = 0 );
+    static TQString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 
@@ -119,8 +119,8 @@ public:
     virtual const char *className() const;
     virtual bool tqt_invoke( int, QUObject* );
     virtual bool tqt_emit( int, QUObject* );
-    static QString tr( const char *, const char * = 0 );
+    static TQString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 };
@@ -418,7 +418,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*TQ_OBJECT/		# QObject macro
+#			|| $p =~ /^\s*TQ_OBJECT/		# TQObject macro
 #			);
 #
 
@@ -1470,7 +1470,7 @@ sub newMethod
 	This property contains a list of nodes, one for each parameter.
 
 	Each parameter node has the following properties:
-	* ArgType the type of the argument, e.g. const QString&
+	* ArgType the type of the argument, e.g. const TQString&
 	* ArgName the name of the argument - optionnal
 	* DefaultValue the default value of the argument - optionnal
 

dcop/dcopidlng/kdocUtil.pm

@@ -139,7 +139,7 @@ sub userName
 =head2 splitUnnested
 	Helper to split a list using a delimiter, but looking for
 	nesting with (), {}, [] and <>.
-        Example: splitting   int a, QPair<c,b> d, e=","
+        Example: splitting   int a, TQPair<c,b> d, e=","
 	on ',' will give 3 items in the list.
 
 	Parameter: delimiter, string

dcop/tests/testcases

@@ -19,7 +19,7 @@
 # 2. First you put shell like argument:
 # "string with spaces" 4 string_without_spaces
 # Then you should put c++ style arguments: 
-# QString::fromLatin1("string with spaces"),4,"string_with_spaces"
+# TQString::fromLatin1("string with spaces"),4,"string_with_spaces"
 #
 # Note that the first argument has type TQString and the last type const char*
 # (adapt accordingly)
@@ -29,7 +29,7 @@ TQString
 url
 ()
 {
-return QString::fromLatin1( "http://www.kde.org/");
+return TQString::fromLatin1( "http://www.kde.org/");
 }
 -
 
@@ -63,7 +63,7 @@ identity
 {
 	return x;
 }
-"test";QString::fromLatin1("test")
+"test";TQString::fromLatin1("test")
 
 // 2.3 unsigned long int
 unsigned long int

interfaces/tdeimproxy/TODO

@@ -1,10 +1,10 @@
 For the future, the following modifications need to be done:
 
 Currently there is a function :
-  virtual QString presenceString( const QString & uid ) = 0;
+  virtual TQString presenceString( const TQString & uid ) = 0;
 This needs to be broken into:
-  virtual QString presenceString( const QString & uid ) = 0;
+  virtual TQString presenceString( const TQString & uid ) = 0;
-  virtual QString presenceLongString( const QString & uid ) = 0;
+  virtual TQString presenceLongString( const TQString & uid ) = 0;
 
 The former returning, say "Away", the latter returning the long away
 message.

interfaces/tdescript/scriptloader.h

@@ -26,7 +26,7 @@
 /**
  * Script loader
  */
-class ScriptLoader : virtual public QObject
+class ScriptLoader : virtual public TQObject
 {
 	TQ_OBJECT
 	public:

interfaces/tdetexteditor/blockselectiondcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent BlockSelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/clipboarddcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ClipboardInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/documentdcopinfo.h

@@ -25,7 +25,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent DocumentInfoInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/editdcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
     Construct a new interface object for the text editor.
     @param Parent the parent EditInterface object
     that will provide us with the functions for the interface.
-    @param name the QObject's name
+    @param name the TQObject's name
     */
     EditDCOPInterface( EditInterface *Parent, const char *name );
     /**
@@ -34,7 +34,7 @@ namespace KTextEditor
     virtual ~EditDCOPInterface();
   k_dcop:
     /**
-    * @return the complete document as a single QString
+    * @return the complete document as a single TQString
     */
     virtual TQString text ();
 

interfaces/tdetexteditor/editinterface.h

@@ -48,12 +48,12 @@ class KTEXTEDITOR_EXPORT EditInterface
   * slots !!!
   */
     /**
-    * @return the complete document as a single QString
+    * @return the complete document as a single TQString
     */
     virtual TQString text () const = 0;
 
     /**
-    * @return a QString
+    * @return a TQString
     */
     virtual TQString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0;
 

interfaces/tdetexteditor/encodingdcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent EncodingInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		EncodingDCOPInterface( EncodingInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/printdcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent PrintInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		PrintDCOPInterface( PrintInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/searchdcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SearchInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		SearchDCOPInterface( SearchInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/selectiondcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		SelectionDCOPInterface( SelectionInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/undodcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent UndoInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		UndoDCOPInterface( UndoInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/viewcursordcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewCursorInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name );
 		/**

interfaces/tdetexteditor/viewstatusmsgdcopinterface.h

@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewStatusMsgInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name );
 		/**

kab/qconfigDB.cpp

@@ -656,7 +656,7 @@ KeyValueMap::insert(const TQCString& key, const TQString& value, bool force)
   TQCString v;
   // -----
   v=value.utf8();
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::insert[QString]: trying to "
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::insert[TQString]: trying to "
       "insert \"" << (!value.isNull() ? "true" : "false")
 				  << "\" for key\n           -->"
 				  << v
@@ -670,19 +670,19 @@ KeyValueMap::get(const TQCString& key, TQString& value) const
 {
   bool GUARD; GUARD=false;
   // ###########################################################################
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: trying to get "
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: trying to get "
       "a TQString value for key " << key << endl;
   TQCString v;
   // ----- get string representation:
   if(!get(key, v))
     {
-	kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: key "
+	kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: key "
 					<< key << " not in KeyValueMap.\n";
 	return false;
     }
   // ----- find its state:
   value=TQString::fromUtf8(v); // is there a better way?
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: success, value"
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: success, value"
 	     " (in UTF8) is " << v << endl;
   return true;
   // ###########################################################################

kate/part/katehighlight.cpp

@@ -1289,7 +1289,7 @@ void KateHighlighting::generateContextStack(int *ctxNum, int ctx, TQMemArray<sho
  */
 int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringList *args)
 {
-  QPair<KateHlContext *, TQString> key(model, args->front());
+  TQPair<KateHlContext *, TQString> key(model, args->front());
   short value;
 
   if (dynamicCtxs.contains(key))
@@ -1694,7 +1694,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
 
       TQString tmp=s[0]; if (!tmp.isEmpty()) p->defStyleNum=tmp.toInt();
 
-      QRgb col;
+      TQRgb col;
 
       tmp=s[1]; if (!tmp.isEmpty()) {
          col=tmp.toUInt(0,16); p->setTextColor(col); }
@@ -3281,7 +3281,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
         s << "";
 
       TQString tmp;
-      QRgb col;
+      TQRgb col;
 
       tmp=s[0]; if (!tmp.isEmpty()) {
          col=tmp.toUInt(0,16); i->setTextColor(col); }

kate/part/katehighlight.h

@@ -251,7 +251,7 @@ class KateHighlighting
     TQValueVector<KateHlContext*> m_contexts;
     inline KateHlContext *contextNum (uint n) { if (n < m_contexts.size()) return m_contexts[n]; return 0; }
 
-    TQMap< QPair<KateHlContext *, TQString>, short> dynamicCtxs;
+    TQMap< TQPair<KateHlContext *, TQString>, short> dynamicCtxs;
 
     // make them pointers perhaps
     KateEmbeddedHlInfos embeddedHls;

kate/part/katetextline.h

@@ -167,7 +167,7 @@ class KateTextLine : public TDEShared
     inline uchar *attributes () const { return m_attributes.data(); }
 
     /**
-     * Gets a QString
+     * Gets a TQString
      * @return text of line as TQString reference
      */
     inline const TQString& string() const { return m_text; }

kded/tdebuildsycoca.cpp

@@ -709,7 +709,7 @@ static TDECmdLineOptions options[] = {
 static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
-class WaitForSignal : public QObject
+class WaitForSignal : public TQObject
 {
 public:
    ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }

kimgio/README

@@ -1,7 +1,7 @@
 KDE Image I/O library
 ---------------------
 This library allows applications that use the Qt library
-(i.e. QImageIO, QImage, QPixmap and friends) to read and
+(i.e. QImageIO, TQImage, QPixmap and friends) to read and
 write images in extra formats. Current formats include:
 
 JPEG	<read> <write>

kimgio/dds.cpp

@@ -294,7 +294,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b, a;
 				s >> b >> g >> r >> a;
@@ -311,7 +311,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b;
 				s >> b >> g >> r;
@@ -328,7 +328,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color1555 color;
 				s >> color.u;
@@ -349,7 +349,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color4444 color;
 				s >> color.u;
@@ -370,7 +370,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color565 color;
 				s >> color.u;
@@ -524,11 +524,11 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		BlockDXT block;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -564,11 +564,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaExplicit alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -616,11 +616,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaLinear alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -671,11 +671,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaLinear alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -720,11 +720,11 @@ namespace {	// Private.
 
 		BlockDXTAlphaLinear xblock;
 		BlockDXTAlphaLinear yblock;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -941,9 +941,9 @@ namespace {	// Private.
 
 			// Copy face on the image.
 			for( uint y = 0; y < header.height; y++ ) {
-				QRgb * src = (QRgb *) face.scanLine( y );
+				TQRgb * src = (TQRgb *) face.scanLine( y );
-    			QRgb * dst = (QRgb *) img.scanLine( y + offset_y ) + offset_x;
+    			TQRgb * dst = (TQRgb *) img.scanLine( y + offset_y ) + offset_x;
-				memcpy( dst, src, sizeof(QRgb) * header.width );
+				memcpy( dst, src, sizeof(TQRgb) * header.width );
 			}
 		}
 

kimgio/exr.cpp

@@ -53,7 +53,7 @@ using namespace Imf;
  * format into the normal 32 bit pixel format. Process is from the
  * ILM code.
  */
-QRgb RgbaToQrgba(struct Rgba imagePixel)
+TQRgb RgbaToQrgba(struct Rgba imagePixel)
 {
 	float r,g,b,a;
 	

kimgio/hdr.cpp

@@ -69,7 +69,7 @@ namespace {	// Private.
 	}
 
 
-	static void RGBE_To_QRgbLine(uchar * image, QRgb * scanline, int width)
+	static void RGBE_To_QRgbLine(uchar * image, TQRgb * scanline, int width)
 	{
 		for (int j = 0; j < width; j++)
 		{
@@ -108,7 +108,7 @@ namespace {	// Private.
 	
 		for (int cline = 0; cline < height; cline++)
 		{
-			QRgb * scanline = (QRgb *) img.scanLine( cline );
+			TQRgb * scanline = (TQRgb *) img.scanLine( cline );
 
 			// determine scanline type
 			if ((width < MINELEN) || (MAXELEN < width))

kimgio/ico.cpp

@@ -169,9 +169,9 @@ namespace
         if ( icon.isNull() ) return false;
         icon.setAlphaBuffer( true );
 
-        TQMemArray< QRgb > colorTable( paletteSize );
+        TQMemArray< TQRgb > colorTable( paletteSize );
         
-        colorTable.fill( QRgb( 0 ) );
+        colorTable.fill( TQRgb( 0 ) );
         for ( unsigned i = 0; i < paletteEntries; ++i )
         {
             unsigned char rgb[ 4 ];
@@ -188,7 +188,7 @@ namespace
         {
             stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl );
             unsigned char* pixel = buf;
-            QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+            TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
             switch ( header.biBitCount )
             {
                 case 1:
@@ -230,7 +230,7 @@ namespace
             for ( unsigned y = rec.height; y--; )
             {
                 stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl );
-                QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+                TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
                 for ( unsigned x = 0; x < rec.width; ++x, ++p )
                     if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
                         *p &= TQRGB_MASK;

kimgio/jp2.cpp

@@ -45,7 +45,7 @@ jas_image_t*
 read_image( const TQImageIO* io )
 {
     jas_stream_t* in = 0;
-    // for QIODevice's other than TQFile, a temp. file is used.
+    // for TQIODevice's other than TQFile, a temp. file is used.
     KTempFile* tempf = 0;
 
     TQFile* qf = 0;

kimgio/pcx.cpp

@@ -467,7 +467,7 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header )
 
     for ( unsigned int x=0; x<header.width(); ++x )
     {
-      QRgb rgb = *p++;
+      TQRgb rgb = *p++;
       r_buf[ x ] = tqRed( rgb );
       g_buf[ x ] = tqGreen( rgb );
       b_buf[ x ] = tqBlue( rgb );

kimgio/pcx.h

@@ -27,7 +27,7 @@ class RGB
   public:
     RGB() { }
 
-    RGB( const QRgb color )
+    RGB( const TQRgb color )
     {
       r = tqRed( color );
       g = tqGreen( color );
@@ -44,12 +44,12 @@ class Palette
   public:
     Palette() { }
 
-    void setColor( int i, const QRgb color )
+    void setColor( int i, const TQRgb color )
     {
       rgb[ i ] = RGB( color );
     }
 
-    QRgb color( int i ) const
+    TQRgb color( int i ) const
     {
       return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b );
     }

kimgio/rgb.cpp

@@ -120,7 +120,7 @@ bool SGIImage::getRow(uchar *dest)
 
 bool SGIImage::readData(TQImage& img)
 {
-	QRgb *c;
+	TQRgb *c;
 	TQ_UINT32 *start = m_starttab;
 	TQByteArray lguard(m_xsize);
 	uchar *line = (uchar *)lguard.data();
@@ -134,7 +134,7 @@ bool SGIImage::readData(TQImage& img)
 			m_pos = m_data.begin() + *start++;
 		if (!getRow(line))
 			return false;
-		c = (QRgb *)img.scanLine(m_ysize - y - 1);
+		c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
 			*c = tqRgb(line[x], line[x], line[x]);
 	}
@@ -148,7 +148,7 @@ bool SGIImage::readData(TQImage& img)
 				m_pos = m_data.begin() + *start++;
 			if (!getRow(line))
 				return false;
-			c = (QRgb *)img.scanLine(m_ysize - y - 1);
+			c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
 				*c = tqRgb(tqRed(*c), line[x], line[x]);
 		}
@@ -158,7 +158,7 @@ bool SGIImage::readData(TQImage& img)
 				m_pos = m_data.begin() + *start++;
 			if (!getRow(line))
 				return false;
-			c = (QRgb *)img.scanLine(m_ysize - y - 1);
+			c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
 				*c = tqRgb(tqRed(*c), tqGreen(*c), line[x]);
 		}
@@ -172,7 +172,7 @@ bool SGIImage::readData(TQImage& img)
 			m_pos = m_data.begin() + *start++;
 		if (!getRow(line))
 			return false;
-		c = (QRgb *)img.scanLine(m_ysize - y - 1);
+		c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
 			*c = tqRgba(tqRed(*c), tqGreen(*c), tqBlue(*c), line[x]);
 	}
@@ -394,12 +394,12 @@ bool SGIImage::scanData(const TQImage& img)
 	TQCString bufguard(m_xsize);
 	uchar *line = (uchar *)lineguard.data();
 	uchar *buf = (uchar *)bufguard.data();
-	QRgb *c;
+	TQRgb *c;
 	unsigned x, y;
 	uint len;
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			buf[x] = intensity(tqRed(*c++));
 		len = compact(line, buf);
@@ -411,7 +411,7 @@ bool SGIImage::scanData(const TQImage& img)
 
 	if (m_zsize != 2) {
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				buf[x] = intensity(tqGreen(*c++));
 			len = compact(line, buf);
@@ -419,7 +419,7 @@ bool SGIImage::scanData(const TQImage& img)
 		}
 
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				buf[x] = intensity(tqBlue(*c++));
 			len = compact(line, buf);
@@ -431,7 +431,7 @@ bool SGIImage::scanData(const TQImage& img)
 	}
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			buf[x] = intensity(tqAlpha(*c++));
 		len = compact(line, buf);
@@ -494,11 +494,11 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	kdDebug(399) << "writing verbatim data" << endl;
 	writeHeader();
 
-	QRgb *c;
+	TQRgb *c;
 	unsigned x, y;
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			m_stream << TQ_UINT8(tqRed(*c++));
 	}
@@ -508,13 +508,13 @@ void SGIImage::writeVerbatim(const TQImage& img)
 
 	if (m_zsize != 2) {
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				m_stream << TQ_UINT8(tqGreen(*c++));
 		}
 
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				m_stream << TQ_UINT8(tqBlue(*c++));
 		}
@@ -524,7 +524,7 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	}
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			m_stream << TQ_UINT8(tqAlpha(*c++));
 	}

kimgio/tga.cpp

@@ -262,7 +262,7 @@ namespace {	// Private.
 		uchar * src = image;
                
 		for( int y = y_start; y != y_end; y += y_step ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 		
 			if( info.pal ) {
 				// Paletted.
@@ -377,7 +377,7 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io )
 
     for( int y = 0; y < img.height(); y++ )
         for( int x = 0; x < img.width(); x++ ) {
-            const QRgb color = img.pixel( x, y );
+            const TQRgb color = img.pixel( x, y );
             s << TQ_UINT8( tqBlue( color ) );
             s << TQ_UINT8( tqGreen( color ) );
             s << TQ_UINT8( tqRed( color ) );

kimgio/xcf.cpp

@@ -77,8 +77,8 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
 };
 
 
-//! Change a QRgb value's alpha only.
+//! Change a TQRgb value's alpha only.
-inline QRgb tqRgba ( QRgb rgb, int a )
+inline TQRgb tqRgba ( TQRgb rgb, int a )
 {
 	return ((a & 0xff) << 24 | (rgb & TQRGB_MASK));
 }
@@ -676,7 +676,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 				for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 					layer.image_tiles[j][i].setPixel(k, l,
 							tqRgb(tile[0], tile[1], tile[2]));
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -686,7 +686,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 				for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) {
 					layer.image_tiles[j][i].setPixel(k, l,
 							tqRgba(tile[0], tile[1], tile[2], tile[3]));
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -696,7 +696,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 			for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 				for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 					layer.image_tiles[j][i].setPixel(k, l, tile[0]);
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -714,7 +714,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 						layer.image_tiles[j][i].setPixel(k, l, tile[0]);
 
 					layer.alpha_tiles[j][i].setPixel(k, l, tile[1]);
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -723,7 +723,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 
 
 /*!
- * The GIMP stores images in a "mipmap"-like hierarchy. As far as the QImage
+ * The GIMP stores images in a "mipmap"-like hierarchy. As far as the TQImage
  * is concerned, however, only the top level (i.e., the full resolution image)
  * is used.
  * \param xcf_io the data stream connected to the XCF image.
@@ -963,7 +963,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si
 
 				while (length-- > 0) {
 					*data = *xcfdata++;
-					data += sizeof(QRgb);
+					data += sizeof(TQRgb);
 				}
 			} else {
 				length += 1;
@@ -988,7 +988,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si
 
 				while (length-- > 0) {
 					*data = val;
-					data += sizeof(QRgb);
+					data += sizeof(TQRgb);
 				}
 			}
 		}
@@ -1071,14 +1071,14 @@ void XCFImageFormat::assignMaskBytes(Layer& layer, uint i, uint j)
 	for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 		for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 			layer.mask_tiles[j][i].setPixel(k, l, tile[0]);
-			tile += sizeof(QRgb);
+			tile += sizeof(TQRgb);
 		}
 	}
 }
 
 
 /*!
- * Construct the TQImage which will eventually be returned to the QImage
+ * Construct the TQImage which will eventually be returned to the TQImage
  * loader.
  *
  * There are a couple of situations which require that the TQImage is not
@@ -1320,7 +1320,7 @@ void XCFImageFormat::copyLayerToImage(XCFImage& xcf_image)
 void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 
 	if (layer.type == RGBA_GIMAGE)
@@ -1371,7 +1371,7 @@ void XCFImageFormat::copyGrayToGray(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 	image.setPixel(m, n, tqRgba(src, src_a));
 }
@@ -1393,7 +1393,7 @@ void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::copyGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 				      TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -1474,7 +1474,7 @@ image.setPixel(m, n, src);
 void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -1583,8 +1583,8 @@ void XCFImageFormat::mergeLayerIntoImage(XCFImage& xcf_image)
 void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
-	QRgb dst = image.pixel(m, n);
+	TQRgb dst = image.pixel(m, n);
 
 	uchar src_r = tqRed(src);
 	uchar src_g = tqGreen(src);
@@ -1872,7 +1872,7 @@ void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l
 void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 	image.setPixel(m, n, tqRgba(src, src_a));
 }
@@ -2034,7 +2034,7 @@ void XCFImageFormat::mergeIndexedAToIndexed(Layer& layer, uint i, uint j, int k,
 void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -2073,7 +2073,7 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y )
 
 		for (int k = 0; k < image.width(); k++) {
 			int rand_val = rand() & 0xff;
-			QRgb pixel = image.pixel(k, l);
+			TQRgb pixel = image.pixel(k, l);
 
 			if (rand_val > tqAlpha(pixel)) {
 				image.setPixel(k, l, tqRgba(pixel, 0));

kimgio/xcf.h

@@ -103,7 +103,7 @@ private:
 		TQ_UINT32 tattoo;		//!< (unique identifier?)
 
 		//! As each tile is read from the file, it is buffered here.
-		uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(QRgb)];
+		uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(TQRgb)];
 
 		//! The data from tile buffer is copied to the Tile by this
 		//! method.  Depending on the type of the tile (RGB, Grayscale,
@@ -132,13 +132,13 @@ private:
 		TQ_INT32 tattoo;			//!< (unique identifier?)
 		TQ_UINT32 unit;			//!< Units of The GIMP (inch, mm, pica, etc...)
 		TQ_INT32 num_colors;		//!< number of colors in an indexed image
-		TQValueVector<QRgb> palette;	//!< indexed image color palette
+		TQValueVector<TQRgb> palette;	//!< indexed image color palette
 
 		int num_layers;			//!< number of layers
 		Layer layer;			//!< most recently read layer
 
 		bool initialized;		//!< Is the TQImage initialized?
-		TQImage image;			//!< final QImage
+		TQImage image;			//!< final TQImage
 
 		XCFImage(void) : initialized(false) {}
 	};

kimgio/xview.cpp

@@ -144,15 +144,15 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
 			int r, g, b;
 			if ( image.depth() == 32 )
 			{
-				QRgb *data32 = (QRgb*) data;
+				TQRgb *data32 = (TQRgb*) data;
 				r = tqRed( *data32 ) >> 5;
 				g = tqGreen( *data32 ) >> 5;		
 				b = tqBlue( *data32 ) >> 6;
-				data += sizeof( QRgb );
+				data += sizeof( TQRgb );
 			}
 			else 
 			{
-				QRgb color = image.color( *data );
+				TQRgb color = image.color( *data );
 				r = tqRed( color ) >> 5;
 				g = tqGreen( color ) >> 5;		
 				b = tqBlue( color ) >> 6;

tdeabc/HOWTO

@@ -169,7 +169,7 @@ The following code will create a file resource and save a contact into it:
 39:
 40:  // PHOTO or LOGO
 41:  TDEABC::Picture photo;
-42:  QImage img;
+42:  TQImage img;
 43:  if ( img.load( "face.png", "PNG" ) ) {
 44:    photo.setData( img );
 45:    photo.setType( "image/png" );
@@ -252,10 +252,10 @@ as argument.
 
 In line 41 we make use of TDEABC::Picture class to store the photo of the
 contact. This class can contain either an URL or the raw image data in form
-of a QImage, in this example we use the latter.
+of a TQImage, in this example we use the latter.
 
 In line 43 we try to load the image "face.png" from the local directory and
-assign this QImage to the TDEABC::Picture class via the setData() function.
+assign this TQImage to the TDEABC::Picture class via the setData() function.
 Additionally we set the type of the picture to "image/png".
 
 From 49 - 50 we insert 2 email addresses with the first one as preferred
@@ -337,7 +337,7 @@ representation of one list.
 12:    QStringList emails = list->emails();
 13:    QStringList::Iterator eit;
 14:    for ( eit = emails.begin(); eit != emails.end(); ++eit )
-15:      kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl;
+15:      kdDebug() << TQString( "\t%1" ).arg( (*eit).latin1() ) << endl;
 16:  }
 
 In the first line a TDEABC::DistributionListManager is created. The manager takes

tdeabc/distributionlist.cpp

@@ -108,7 +108,7 @@ DistributionList::Entry::List DistributionList::entries() const
   return mEntries;
 }
 
-typedef TQValueList< QPair<TQString, TQString> > MissingEntryList;
+typedef TQValueList< TQPair<TQString, TQString> > MissingEntryList;
 
 class DistributionListManager::DistributionListManagerPrivate
 {

tdeabc/ldapclient.cpp

@@ -158,7 +158,7 @@ void LdapClient::cancelQuery()
 
 void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
 {
-#ifndef NDEBUG // don't create the QString
+#ifndef NDEBUG // don't create the TQString
 //  TQString str( data );
 //  kdDebug(5700) << "LdapClient: Got \"" << str << "\"\n";
 #endif

tdecore/DESIGN.iconloading

@@ -42,7 +42,7 @@ That way the application's pixmap always remain valid.
 Some example code to get the idea:
 
 Server can publish an icon (test.png) like this:
-   QImage i("test.png");
+   TQImage i("test.png");
    QPixmap p;
    p.convertFromImage(i);
    tqWarning("Handle = %08x", p.handle());

tdecore/DESIGN.tdeconfig

@@ -93,7 +93,7 @@ default so that it doesn't change when the default changes?
 KDE3.0 Changes
 ==============
 
-*) writeEntry now returns void instead of QString.
+*) writeEntry now returns void instead of TQString.
 *) deleteEntry functions added
 
 

tdecore/README.kiosk

@@ -647,9 +647,9 @@ TDE Kiosk Application API
 
 Three new methods have been added to TDEApplication:
 
-- bool authorize(QString action); // Generic actions
+- bool authorize(TQString action); // Generic actions
-- bool authorizeTDEAction(QString action); // For TDEActions exclusively
+- bool authorizeTDEAction(TQString action); // For TDEActions exclusively
-- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling
+- bool authorizeURLAction(TQString, referringURL, destinationURL) // URL Handling
 
 Automatic Logout
 ================

tdecore/kcharsets.cpp

@@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str)
     TQChar res = TQChar::null;
 
     int pos = 0;
-    if(str[pos] == (QChar)'&') pos++;
+    if(str[pos] == (TQChar)'&') pos++;
 
     // Check for '&#000' or '&#x0000' sequence
-    if (str[pos] == (QChar)'#' && str.length()-pos > 1) {
+    if (str[pos] == (TQChar)'#' && str.length()-pos > 1) {
         bool ok;
         pos++;
-        if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
+        if (str[pos] == (TQChar)'x' || str[pos] == (TQChar)'X') {
             pos++;
             // '&#x0000', hexadeciaml character reference
             TQString tmp(str.unicode()+pos, str.length()-pos);
@@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
     {
         TQString tmp = str.left(len);
         TQChar res = fromEntity(tmp);
-        if( res != (QChar)TQChar::null ) return res;
+        if( res != (TQChar)TQChar::null ) return res;
         len--;
     }
     return TQChar::null;
@@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input )
     for ( ; p < end; ++p ) {
         const TQChar ch = *p;
 
-        if ( ch == (QChar)'&' ) {
+        if ( ch == (TQChar)'&' ) {
             ampersand = p;
             scanForSemicolon = true;
             continue;
         }
 
-        if ( ch != (QChar)';' || scanForSemicolon == false )
+        if ( ch != (TQChar)';' || scanForSemicolon == false )
             continue;
 
         assert( ampersand );

tdecore/kdebug.cpp

@@ -343,7 +343,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
       // Since we are in tdecore here, we cannot use KMsgBox and use
       // TQMessageBox instead
       if ( !kDebug_data->aAreaName.isEmpty() )
-          aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );
+          aCaption += TQString("(%1)").arg( TQString(kDebug_data->aAreaName) );
       TQMessageBox::warning( 0L, aCaption, data, i18n("&OK") );
       break;
   }
@@ -432,7 +432,7 @@ kdbgstream& kdbgstream::operator<< (TQChar ch)
     output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0');
   else {
     output += ch;
-    if (ch == QChar('\n')) flush();
+    if (ch == TQChar('\n')) flush();
   }
   return *this;
 }
@@ -471,7 +471,7 @@ kdbgstream& kdbgstream::operator<< (const TQWidget* widget)
       return *this;
     }
   output += string;
-  if (output.at(output.length() -1 ) == QChar('\n'))
+  if (output.at(output.length() -1 ) == TQChar('\n'))
     {
       flush();
     }
@@ -822,7 +822,7 @@ TQString kdBacktrace(int levels)
 
 		if (levels) { 
 			for (int i = 0; i < levels; ++i) {
-				rv += QString().sprintf("#%-2d ", i);
+				rv += TQString().sprintf("#%-2d ", i);
 				rv += formatBacktrace(trace[i]);
 				rv += '\n';
 			}

tdecore/kextsock.h

@@ -40,10 +40,10 @@ class KAddressInfo;		/* our abstraction of it */
 class TQSocketNotifier;
 
 /*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
  *
  * According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
  * (except open, but you shouldn't call open)
  */
 #define IO_ListenError		(IO_UnspecifiedError+1)
@@ -88,7 +88,7 @@ class KExtendedSocketPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public TQIODevice
 {
   TQ_OBJECT
   

tdecore/kglobalaccel.h

@@ -49,8 +49,8 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	/**
 	 * Creates a new TDEGlobalAccel object with the given pParent and
 	 * psName.
-	 * @param pParent the parent of the QObject
+	 * @param pParent the parent of the TQObject
-	 * @param psName the name of the QObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
 	virtual ~TDEGlobalAccel();

tdecore/kiconeffect.cpp

@@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img)
 	else
 	  for (y=0; y<height; y++)
 	  {
-	    QRgb *line = (QRgb *) img.scanLine(y);
+	    TQRgb *line = (TQRgb *) img.scanLine(y);
 	    for (x=(y%2); x<width; x+=2)
 		line[x] &= 0x00ffffff;
 	  }
@@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix)
 
     for (int y=0; y<img.height(); y++)
     {
-	QRgb *line = (QRgb *) img.scanLine(y);
+	TQRgb *line = (TQRgb *) img.scanLine(y);
-	QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
+	TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
 	for (int x=0; x<(img.width()+31)/32; x++)
 	    line[x] &= pattern;
     }
@@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const
     int x, y;
     if (src.depth() == 32)
     {
-	QRgb *l1, *l2;
+	TQRgb *l1, *l2;
 	for (y=0; y<h; y++)
 	{
-	    l1 = (QRgb *) src.scanLine(y);
+	    l1 = (TQRgb *) src.scanLine(y);
-	    l2 = (QRgb *) dst.scanLine(y*2);
+	    l2 = (TQRgb *) dst.scanLine(y*2);
 	    for (x=0; x<w; x++)
 	    {
 		l2[x*2] = l2[x*2+1] = l1[x];
@@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay)
 
     if (src.depth() == 32)
     {
-	QRgb *oline, *sline;
+	TQRgb *oline, *sline;
 	int r1, g1, b1, a1;
 	int r2, g2, b2, a2;
 
 	for (i=0; i<src.height(); i++)
 	{
-	    oline = (QRgb *) overlay.scanLine(i);
+	    oline = (TQRgb *) overlay.scanLine(i);
-	    sline = (QRgb *) src.scanLine(i);
+	    sline = (TQRgb *) src.scanLine(i);
 
 	    for (j=0; j<src.width(); j++)
 	    {

tdecore/kiconloader.cpp

@@ -812,7 +812,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
 	        *img = img->convertDepth(32);
             for (int y = 0; y < img->height(); y++)
             {
-		QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
+		TQRgb *line = reinterpret_cast<TQRgb *>(img->scanLine(y));
                 for (int x = 0; x < img->width();  x++)
                     line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24);
 	    }
@@ -851,8 +851,8 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
              line < favIcon.height();
              ++line )
         {
-            QRgb* fpos = reinterpret_cast< QRgb* >( favIcon.scanLine( line ));
+            TQRgb* fpos = reinterpret_cast< TQRgb* >( favIcon.scanLine( line ));
-            QRgb* ipos = reinterpret_cast< QRgb* >( img->scanLine( line + y )) + x;
+            TQRgb* ipos = reinterpret_cast< TQRgb* >( img->scanLine( line + y )) + x;
             for( int i = 0;
                  i < favIcon.width();
                  ++i, ++fpos, ++ipos )

tdecore/kidna.cpp

@@ -41,7 +41,7 @@ TQCString KIDNA::toAsciiCString(const TQString &idna)
 
 TQString KIDNA::toAscii(const TQString &idna)
 {
-  if (idna.length() && (idna[0] == (QChar)'.'))
+  if (idna.length() && (idna[0] == (TQChar)'.'))
   {
      TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
      if (host.isEmpty())
@@ -54,7 +54,7 @@ TQString KIDNA::toAscii(const TQString &idna)
 TQString KIDNA::toUnicode(const TQString &idna)
 {
 #ifndef Q_WS_WIN //TODO kresolver not ported
-  if (idna.length() && (idna[0] == (QChar)'.'))
+  if (idna.length() && (idna[0] == (TQChar)'.'))
      return idna[0] + KResolver::domainToUnicode(idna.mid(1));
   return KResolver::domainToUnicode(idna);
 #else

tdecore/klibloader.h

@@ -322,7 +322,7 @@ private:
  * The KLibFactory is used to create the components, the library has to offer.
  * The factory of KSpread for example will create instances of KSpreadDoc,
  * while the Konqueror factory will create KonqView widgets.
- * All objects created by the factory must be derived from TQObject, since QObject
+ * All objects created by the factory must be derived from TQObject, since TQObject
  * offers type safe casting.
  *
  * KLibFactory is an abstract class. Reimplement the

tdecore/kmacroexpander.cpp

@@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
     TQString rsts;
 
     for (pos = 0; pos < str.length(); ) {
-        if (ec != (QChar)0) {
+        if (ec != (TQChar)0) {
             if (str.unicode()[pos] != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
 
     while (pos < str.length()) {
         TQChar cc( str.unicode()[pos] );
-        if (ec != (QChar)0) {
+        if (ec != (TQChar)0) {
             if (cc != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -160,20 +160,20 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             continue;
       nohit:
         if (state.current == singlequote) {
-            if (cc == (QChar)'\'')
+            if (cc == (TQChar)'\'')
                 state = sstack.pop();
-        } else if (cc == (QChar)'\\') {
+        } else if (cc == (TQChar)'\\') {
             // always swallow the char -> prevent anomalies due to expansion
             pos += 2;
             continue;
         } else if (state.current == dollarquote) {
-            if (cc == (QChar)'\'')
+            if (cc == (TQChar)'\'')
                 state = sstack.pop();
-        } else if (cc == (QChar)'$') {
+        } else if (cc == (TQChar)'$') {
             cc = str[++pos];
-            if (cc == (QChar)'(') {
+            if (cc == (TQChar)'(') {
                 sstack.push( state );
-                if (str[pos + 1] == (QChar)'(') {
+                if (str[pos + 1] == (TQChar)'(') {
                     Save sav = { str, pos + 2 };
                     ostack.push( sav );
                     state.current = math;
@@ -183,21 +183,21 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     state.current = paren;
                     state.dquote = false;
                 }
-            } else if (cc == (QChar)'{') {
+            } else if (cc == (TQChar)'{') {
                 sstack.push( state );
                 state.current = subst;
             } else if (!state.dquote) {
-                if (cc == (QChar)'\'') {
+                if (cc == (TQChar)'\'') {
                     sstack.push( state );
                     state.current = dollarquote;
-                } else if (cc == (QChar)'"') {
+                } else if (cc == (TQChar)'"') {
                     sstack.push( state );
                     state.current = doublequote;
                     state.dquote = true;
                 }
             }
             // always swallow the char -> prevent anomalies due to expansion
-        } else if (cc == (QChar)'`') {
+        } else if (cc == (TQChar)'`') {
             str.replace( pos, 1, "$( " ); // add space -> avoid creating $((
             pos2 = pos += 3;
             for (;;) {
@@ -206,12 +206,12 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     return false;
                 }
                 cc = str.unicode()[pos2];
-                if (cc == (QChar)'`')
+                if (cc == (TQChar)'`')
                     break;
-                if (cc == (QChar)'\\') {
+                if (cc == (TQChar)'\\') {
                     cc = str[++pos2];
-                    if (cc == (QChar)'$' || cc == (QChar)'`' || cc == (QChar)'\\' ||
+                    if (cc == (TQChar)'$' || cc == (TQChar)'`' || cc == (TQChar)'\\' ||
-                        (cc == (QChar)'"' && state.dquote))
+                        (cc == (TQChar)'"' && state.dquote))
                     {
                         str.remove( pos2 - 1, 1 );
                         continue;
@@ -225,25 +225,25 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             state.dquote = false;
             continue;
         } else if (state.current == doublequote) {
-            if (cc == (QChar)'"')
+            if (cc == (TQChar)'"')
                 state = sstack.pop();
-        } else if (cc == (QChar)'\'') {
+        } else if (cc == (TQChar)'\'') {
             if (!state.dquote) {
                 sstack.push( state );
                 state.current = singlequote;
             }
-        } else if (cc == (QChar)'"') {
+        } else if (cc == (TQChar)'"') {
             if (!state.dquote) {
                 sstack.push( state );
                 state.current = doublequote;
                 state.dquote = true;
             }
         } else if (state.current == subst) {
-            if (cc == (QChar)'}')
+            if (cc == (TQChar)'}')
                 state = sstack.pop();
-        } else if (cc == (QChar)')') {
+        } else if (cc == (TQChar)')') {
             if (state.current == math) {
-                if (str[pos + 1] == (QChar)')') {
+                if (str[pos + 1] == (TQChar)')') {
                     state = sstack.pop();
                     pos += 2;
                 } else {
@@ -261,15 +261,15 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                 state = sstack.pop();
             else
                 break;
-        } else if (cc == (QChar)'}') {
+        } else if (cc == (TQChar)'}') {
             if (state.current == KMacroExpander::group)
                 state = sstack.pop();
             else
                 break;
-        } else if (cc == (QChar)'(') {
+        } else if (cc == (TQChar)'(') {
             sstack.push( state );
             state.current = paren;
-        } else if (cc == (QChar)'{') {
+        } else if (cc == (TQChar)'{') {
             sstack.push( state );
             state.current = KMacroExpander::group;
         }
@@ -407,9 +407,9 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po
         return 2;
     }
     uint sl, rsl, rpos;
-    if (str[pos + 1] == (QChar)'{') {
+    if (str[pos + 1] == (TQChar)'{') {
         rpos = pos + 2;
-        for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+        for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
             if (rpos + sl >= str.length())
                 return 0;
         rsl = sl + 3;
@@ -473,9 +473,9 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
         return 2;
     }
     uint sl, rsl, rpos;
-    if (str[pos + 1] == (QChar)'{') {
+    if (str[pos + 1] == (TQChar)'{') {
         rpos = pos + 2;
-        for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+        for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
             if (rpos + sl >= str.length())
                 return 0;
         rsl = sl + 3;
@@ -494,7 +494,7 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
 ////////////
 
 template<class KT,class VT>
-inline QString
+inline TQString
 TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 {
     TQString str( ostr );
@@ -504,7 +504,7 @@ TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 }
 
 template<class KT,class VT>
-inline QString
+inline TQString
 TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 {
     TQString str( ostr );

tdecore/kmanagerselection.cpp

@@ -52,7 +52,7 @@ DEALINGS IN THE SOFTWARE.
 #include <X11/Xatom.h>
 
 class TDESelectionOwnerPrivate
-    : public QWidget
+    : public TQWidget
     {
     public:
         TDESelectionOwnerPrivate( TDESelectionOwner* owner );
@@ -367,7 +367,7 @@ Atom TDESelectionOwner::xa_timestamp = None;
 
 
 class TDESelectionWatcherPrivate
-    : public QWidget
+    : public TQWidget
     {
     public:
         TDESelectionWatcherPrivate( TDESelectionWatcher* watcher );

tdecore/krfcdate.cpp

@@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
   mday   = l[2].toUInt();
 
   // Z suffix means UTC.
-  if ((QChar)'Z' == timeString.at(timeString.length() - 1)) {
+  if ((TQChar)'Z' == timeString.at(timeString.length() - 1)) {
     timeString.remove(timeString.length() - 1, 1);
   }
 

tdecore/ksavefile.cpp

@@ -171,7 +171,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir
        else
 	   nameOnly = cFilename.mid(slash + 1);
        cBackup = TQFile::encodeName(backupDir);
-       if ( backupDir[backupDir.length()-1] != (QChar)'/' )
+       if ( backupDir[backupDir.length()-1] != (TQChar)'/' )
            cBackup += '/';
        cBackup += nameOnly;
    }

tdecore/kshell.cpp

@@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             c = args.unicode()[pos++];
         } while (c.isSpace());
         TQString cret;
-        if ((flags & TildeExpand) && c == (QChar)'~') {
+        if ((flags & TildeExpand) && c == (TQChar)'~') {
             uint opos = pos;
             for (; ; pos++) {
                 if (pos >= args.length())
                     break;
                 c = args.unicode()[pos];
-                if (c == (QChar)'/' || c.isSpace())
+                if (c == (TQChar)'/' || c.isSpace())
                     break;
                 if (isQuoteMeta( c )) {
                     pos = opos;
-                    c = (QChar)'~';
+                    c = (TQChar)'~';
                     goto notilde;
                 }
                 if ((flags & AbortOnMeta) && isMeta( c ))
@@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() );
             if (ccret.isEmpty()) {
                 pos = opos;
-                c = (QChar)'~';
+                c = (TQChar)'~';
                 goto notilde;
             }
             if (pos >= args.length()) {
@@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
         }
         // before the notilde label, as a tilde does not match anyway
         if (firstword) {
-            if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) {
+            if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) {
                 uint pos2 = pos;
                 TQChar cc;
                 do
                   cc = args[pos2++];
-                while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') ||
+                while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') ||
-                       (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9'));
+                       (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9'));
-                if (cc == (QChar)'=')
+                if (cc == (TQChar)'=')
                     goto metaerr;
             }
         }
       notilde:
         do {
-            if (c == (QChar)'\'') {
+            if (c == (TQChar)'\'') {
                 uint spos = pos;
                 do {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                } while (c != (QChar)'\'');
+                } while (c != (TQChar)'\'');
                 cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string();
-            } else if (c == (QChar)'"') {
+            } else if (c == (TQChar)'"') {
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                    if (c == (QChar)'"')
+                    if (c == (TQChar)'"')
                         break;
-                    if (c == (QChar)'\\') {
+                    if (c == (TQChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
                         c = args.unicode()[pos++];
-                        if (c != (QChar)'"' && c != (QChar)'\\' &&
+                        if (c != (TQChar)'"' && c != (TQChar)'\\' &&
-                            !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')))
+                            !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')))
-                            cret += (QChar)'\\';
+                            cret += (TQChar)'\\';
-                    } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))
+                    } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))
                         goto metaerr;
                     cret += c;
                 }
-            } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') {
+            } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') {
                 pos++;
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                    if (c == (QChar)'\'')
+                    if (c == (TQChar)'\'')
                         break;
-                    if (c == (QChar)'\\') {
+                    if (c == (TQChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
                         c = args.unicode()[pos++];
                         switch (c) {
-                        case 'a': cret += (QChar)'\a'; break;
+                        case 'a': cret += (TQChar)'\a'; break;
-                        case 'b': cret += (QChar)'\b'; break;
+                        case 'b': cret += (TQChar)'\b'; break;
-                        case 'e': cret += (QChar)'\033'; break;
+                        case 'e': cret += (TQChar)'\033'; break;
-                        case 'f': cret += (QChar)'\f'; break;
+                        case 'f': cret += (TQChar)'\f'; break;
-                        case 'n': cret += (QChar)'\n'; break;
+                        case 'n': cret += (TQChar)'\n'; break;
-                        case 'r': cret += (QChar)'\r'; break;
+                        case 'r': cret += (TQChar)'\r'; break;
-                        case 't': cret += (QChar)'\t'; break;
+                        case 't': cret += (TQChar)'\t'; break;
-                        case '\\': cret += (QChar)'\\'; break;
+                        case '\\': cret += (TQChar)'\\'; break;
-                        case '\'': cret += (QChar)'\''; break;
+                        case '\'': cret += (TQChar)'\''; break;
                         case 'c': cret += args[pos++] & 31; break;
                         case 'x':
                           {
@@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                             break;
                           }
                         default:
-                            if (c >= (QChar)'0' && c <= (QChar)'7') {
+                            if (c >= (TQChar)'0' && c <= (TQChar)'7') {
                                 int hv = c - '0';
                                 for (int i = 0; i < 2; i++) {
                                     c = args[pos];
-                                    if (c < (QChar)'0' || c > (QChar)'7')
+                                    if (c < (TQChar)'0' || c > (TQChar)'7')
                                         break;
                                     hv = hv * 8 + (c - '0');
                                     pos++;
@@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                         cret += c;
                 }
             } else {
-                if (c == (QChar)'\\') {
+                if (c == (TQChar)'\\') {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
@@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
 
 TQString KShell::tildeExpand( const TQString &fname )
 {
-    if (fname[0] == (QChar)'~') {
+    if (fname[0] == (TQChar)'~') {
         int pos = fname.find( '/' );
         if (pos < 0)
             return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() );

tdecore/kstandarddirs.cpp

@@ -143,7 +143,7 @@ bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& rel
 void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
-   int i = relPath.find(QChar('/'));
+   int i = relPath.find(TQChar('/'));
    if (i != -1)
       key = "data_"+relPath.left(i);
    else
@@ -188,8 +188,8 @@ void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
+    if (dir.at(dir.length() - 1) != TQChar('/'))
-	dir += QChar('/');
+	dir += TQChar('/');
 
     if (!prefixes.contains(dir)) {
         priorityAdd(prefixes, dir, priority);
@@ -208,8 +208,8 @@ void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
+    if (dir.at(dir.length() - 1) != TQChar('/'))
-	dir += QChar('/');
+	dir += TQChar('/');
 
     if (!d->xdgconf_prefixes.contains(dir)) {
         priorityAdd(d->xdgconf_prefixes, dir, priority);
@@ -228,8 +228,8 @@ void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
+    if (dir.at(dir.length() - 1) != TQChar('/'))
-	dir += QChar('/');
+	dir += TQChar('/');
 
     if (!d->xdgdata_prefixes.contains(dir)) {
 	priorityAdd(d->xdgdata_prefixes, dir, priority);
@@ -270,8 +270,8 @@ bool TDEStandardDirs::addResourceType( const char *type,
 	relatives.insert(type, rels);
     }
     TQString copy = relativename;
-    if (copy.at(copy.length() - 1) != QChar('/'))
+    if (copy.at(copy.length() - 1) != TQChar('/'))
-	copy += QChar('/');
+	copy += TQChar('/');
     if (!rels->contains(copy)) {
         if (priority)
 	    rels->prepend(copy);
@@ -300,8 +300,8 @@ bool TDEStandardDirs::addResourceDir( const char *type,
 	absolutes.insert(type, paths);
     }
     TQString copy = absdir;
-    if (copy.at(copy.length() - 1) != QChar('/'))
+    if (copy.at(copy.length() - 1) != TQChar('/'))
-      copy += QChar('/');
+      copy += TQChar('/');
 
     if (!paths->contains(copy)) {
         if (priority)
@@ -388,7 +388,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
             if (reldir.endsWith("/"))
                list.append(reldir);
             else
-               list.append(reldir+QChar('/'));
+               list.append(reldir+TQChar('/'));
         }
         return list;
     }
@@ -403,7 +403,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
          it != candidates.end(); ++it) {
         testdir.setPath(*it + reldir);
         if (testdir.exists())
-            list.append(testdir.absPath() + QChar('/'));
+            list.append(testdir.absPath() + TQChar('/'));
     }
 
     return list;
@@ -451,7 +451,7 @@ bool TDEStandardDirs::exists(const TQString &fullPath)
 {
     KDE_struct_stat buff;
     if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
-	if (fullPath.at(fullPath.length() - 1) != QChar('/')) {
+	if (fullPath.at(fullPath.length() - 1) != TQChar('/')) {
 	    if (S_ISREG( buff.st_mode ))
 		return true;
 	}
@@ -481,9 +481,9 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
       return;
 
 #ifdef Q_WS_WIN
-    assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\'));
+    assert(path.at(path.length() - 1) == TQChar('/') || path.at(path.length() - 1) == TQChar('\\'));
 #else
-    assert(path.at(path.length() - 1) == QChar('/'));
+    assert(path.at(path.length() - 1) == TQChar('/'));
 #endif
 
     struct dirent *ep;
@@ -508,7 +508,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
       }
       if ( recursive ) {
 	if ( S_ISDIR( buff.st_mode )) {
-	  lookupDirectory(pathfn + QChar('/'), relPart + fn + QChar('/'), regexp, list, relList, recursive, unique);
+	  lookupDirectory(pathfn + TQChar('/'), relPart + fn + TQChar('/'), regexp, list, relList, recursive, unique);
 	}
         if (!regexp.exactMatch(fn))
 	  continue; // No match
@@ -560,7 +560,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
     if (relpath.length())
     {
-       int slash = relpath.find(QChar('/'));
+       int slash = relpath.find(TQChar('/'));
        if (slash < 0)
 	   rest = relpath.left(relpath.length() - 1);
        else {
@@ -572,9 +572,9 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
     if (prefix.isEmpty()) //for sanity
       return;
 #ifdef Q_WS_WIN
-    assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\'));
+    assert(prefix.at(prefix.length() - 1) == TQChar('/') || prefix.at(prefix.length() - 1) == TQChar('\\'));
 #else
-    assert(prefix.at(prefix.length() - 1) == QChar('/'));
+    assert(prefix.at(prefix.length() - 1) == TQChar('/'));
 #endif
     KDE_struct_stat buff;
 
@@ -594,7 +594,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 	while( ( ep = readdir( dp ) ) != 0L )
 	    {
 		TQString fn( TQFile::decodeName(ep->d_name));
-		if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~'))
+		if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == TQChar('~'))
 		    continue;
 
 		if ( !pathExp.exactMatch(fn) )
@@ -606,15 +606,15 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 		    continue; // Couldn't stat (e.g. no permissions)
 		}
 		if ( S_ISDIR( buff.st_mode ))
-		    lookupPrefix(fn + QChar('/'), rest, rfn + QChar('/'), regexp, list, relList, recursive, unique);
+		    lookupPrefix(fn + TQChar('/'), rest, rfn + TQChar('/'), regexp, list, relList, recursive, unique);
 	    }
 
 	closedir( dp );
     } else {
         // Don't stat, if the dir doesn't exist we will find out
         // when we try to open it.
-        lookupPrefix(prefix + path + QChar('/'), rest,
+        lookupPrefix(prefix + path + TQChar('/'), rest,
-                     relPart + path + QChar('/'), regexp, list,
+                     relPart + path + TQChar('/'), regexp, list,
                      relList, recursive, unique);
     }
 }
@@ -789,7 +789,7 @@ void TDEStandardDirs::createSpecialResource(const char *type)
       }
    }
 #endif
-   addResourceDir(type, dir+QChar('/'));
+   addResourceDir(type, dir+TQChar('/'));
 }
 
 TQStringList TDEStandardDirs::resourceDirs(const char *type) const
@@ -904,9 +904,9 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
     {
 	p = tokens[ i ];
 
-        if ( p[ 0 ] == QChar('~') )
+        if ( p[ 0 ] == TQChar('~') )
         {
-            int len = p.find( QChar('/') );
+            int len = p.find( TQChar('/') );
             if ( len == -1 )
                 len = p.length();
             if ( len == 1 )
@@ -1183,8 +1183,8 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
     uint len = target.length();
 
     // append trailing slash if missing
-    if (dir.at(len - 1) != QChar('/'))
+    if (dir.at(len - 1) != TQChar('/'))
-        target += QChar('/');
+        target += TQChar('/');
 
     TQString base("");
     uint i = 1;
@@ -1192,7 +1192,7 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
     while( i < len )
     {
         KDE_struct_stat st;
-        int pos = target.find(QChar('/'), i);
+        int pos = target.find(TQChar('/'), i);
         base += target.mid(i - 1, pos - i + 1);
         TQCString baseEncoded = TQFile::encodeName(base);
         // bail out if we encountered a problem
@@ -1340,15 +1340,15 @@ void TDEStandardDirs::addKDEDefaults()
     }
     if (!localKdeDir.isEmpty())
     {
-       if (localKdeDir[localKdeDir.length()-1] != QChar('/'))
+       if (localKdeDir[localKdeDir.length()-1] != TQChar('/'))
-          localKdeDir += QChar('/');
+          localKdeDir += TQChar('/');
     }
     else
     {
        localKdeDir =  TQDir::homeDirPath() + "/.trinity/";
     }
 
-    if (localKdeDir != QString("-/"))
+    if (localKdeDir != TQString("-/"))
     {
         localKdeDir = KShell::tildeExpand(localKdeDir);
         addPrefix(localKdeDir);
@@ -1384,8 +1384,8 @@ void TDEStandardDirs::addKDEDefaults()
     TQString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())
     {
-       if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
+       if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
-          localXdgDir += QChar('/');
+          localXdgDir += TQChar('/');
     }
     else
     {
@@ -1416,8 +1416,8 @@ void TDEStandardDirs::addKDEDefaults()
            it != tdedirList.end(); ++it)
         {
            TQString dir = *it;
-           if (dir[dir.length()-1] != QChar('/'))
+           if (dir[dir.length()-1] != TQChar('/'))
-             dir += QChar('/');
+             dir += TQChar('/');
            xdgdirList.append(dir+"share/");
         }
 
@@ -1428,8 +1428,8 @@ void TDEStandardDirs::addKDEDefaults()
     localXdgDir = readEnvPath("XDG_DATA_HOME");
     if (!localXdgDir.isEmpty())
     {
-       if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
+       if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
-          localXdgDir += QChar('/');
+          localXdgDir += TQChar('/');
     }
     else
     {

tdecore/kstringhandler.cpp

@@ -419,8 +419,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
       return false;
 
    // Patterns like "Makefile*"
-   if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) {
+   if ( pattern[ pattern_len - 1 ] == (TQChar)'*' && len + 1 >= pattern_len ) {
-      if ( pattern[ 0 ] == (QChar)'*' )
+      if ( pattern[ 0 ] == (TQChar)'*' )
       {
          return filename.find(pattern.mid(1, pattern_len - 2)) != -1;
       }
@@ -434,7 +434,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    }
 
    // Patterns like "*~", "*.extension"
-   if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len )
+   if ( pattern[ 0 ] == (TQChar)'*' && len + 1 >= pattern_len )
    {
      const TQChar *c1 = pattern.unicode() + pattern_len - 1;
      const TQChar *c2 = filename.unicode() + len - 1;

tdecore/kurl.h

@@ -128,7 +128,7 @@ class TDECORE_EXPORT KURL
 {
 public:
   /**
-   * Flags to choose how file: URLs are treated when creating their QString
+   * Flags to choose how file: URLs are treated when creating their TQString
    * representation with prettyURL(int,AdjustementFlags)
    *
    * However it is recommended to use pathOrURL() instead of this variant of prettyURL()

tdecore/kurldrag.h

@@ -52,7 +52,7 @@ public:
    * @param urls the list of URLs
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the QObject
+   * @param name the name of the TQObject
    */
   KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 );
   /**
@@ -62,7 +62,7 @@ public:
    * @param metaData a map containing meta data
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the QObject
+   * @param name the name of the TQObject
    * @see metaData()
    */
   KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,

tdecore/network/kresolver.cpp

@@ -550,7 +550,7 @@ void KResolver::emitFinished()
   emit finished(d->results);
 
   if (p && d->deleteWhenDone)
-    deleteLater();		// in QObject
+    deleteLater();		// in TQObject
 }
 
 TQString KResolver::errorString(int errorcode, int syserror)

tdecore/network/kstreamsocket.cpp

@@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service)
       // connection hasn't started yet
       if (!blocking())
 	{
-	  QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
+	  TQObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
 	  return lookup();
 	}
 
@@ -196,7 +196,7 @@ bool KStreamSocket::connect(const KResolverEntry& entry)
 
 void KStreamSocket::hostFoundSlot()
 {
-  QObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
+  TQObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
   if (timeout() > 0)
     d->timer.start(timeout(), true);
   TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent()));

tdecore/network/tdesocketbase.h

@@ -63,10 +63,10 @@
 #include <tdelibs_export.h>
 
 /*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
  *
  * According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
  * (except open, but you shouldn't call open)
  */
 #define IO_ListenError		(IO_UnspecifiedError+1)

tdecore/tdeaccel.h

@@ -96,10 +96,10 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
  public:
 	/**
 	 * Creates a new TDEAccel that watches @p pParent, which is also
-	 * the QObject's parent.
+	 * the TQObject's parent.
 	 *
 	 * @param pParent the parent and widget to watch for key strokes
-	 * @param psName the name of the QObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEAccel( TQWidget* pParent, const char* psName = 0 );
 
@@ -107,8 +107,8 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * Creates a new TDEAccel that watches @p watch.
 	 *
 	 * @param watch the widget to watch for key strokes
-	 * @param parent the parent of the QObject
+	 * @param parent the parent of the TQObject
-	 * @param psName the name of the QObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
 	virtual ~TDEAccel();

tdecore/tdeaccelprivate.h

@@ -47,7 +47,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 	void slotShowMenu();
 	void slotMenuActivated( int iAction );
 	
-	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
+	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject
 };
 
 #endif // !__TDEACCELPRIVATE_H

tdecore/tdeapplication.h

@@ -1452,7 +1452,7 @@ signals:
    * connect to this to monitor global font changes, especially if you are
    * using explicit fonts.
    *
-   * Note: If you derive from a QWidget-based class, a faster method is to
+   * Note: If you derive from a TQWidget-based class, a faster method is to
    *       reimplement TQWidget::fontChange(). This is the preferred way
    *       to get informed about font updates.
    */

tdecore/tdecmdlineargs.cpp

@@ -926,7 +926,7 @@ TDECmdLineArgs::usage(const char *id)
             name = name.mid(1);
             if ((name[0] == '[') && (name[name.length()-1] == ']'))
          name = name.mid(1, name.length()-2);
-            printQ(optionFormatString.arg(QString(name), -25)
+            printQ(optionFormatString.arg(TQString(name), -25)
      .arg(description));
          }
          else
@@ -950,12 +950,12 @@ TDECmdLineArgs::usage(const char *id)
                opt = opt + name;
                if (!option->def)
                {
-                  printQ(optionFormatString.arg(QString(opt), -25)
+                  printQ(optionFormatString.arg(TQString(opt), -25)
                          .arg(description));
                }
                else
                {
-                  printQ(optionFormatStringDef.arg(QString(opt), -25)
+                  printQ(optionFormatStringDef.arg(TQString(opt), -25)
                          .arg(description).arg(option->def));
                }
                opt = "";

tdecore/tdeconfig_compiler/README.dox

@@ -213,8 +213,8 @@ color_3=#ffff00
 \endverbatim
 
 The configuration options will be accessible to the application via
-a QColor color(int ColorIndex) and a 
+a TQColor color(int ColorIndex) and a 
-void setColor(int ColorIndex, const QColor &v) function.
+void setColor(int ColorIndex, const TQColor &v) function.
 
 Example 2:
 \verbatim
@@ -239,8 +239,8 @@ sound_Crash=crash.wav
 sound_Missile=missile.wav
 
 The configuration options will be accessible to the application via
-a QString sound(int SoundEvent) and a 
+a TQString sound(int SoundEvent) and a 
-void setSound(int SoundEvent, const QString &v) function.
+void setSound(int SoundEvent, const TQString &v) function.
 
 - Parameterized groups
 

tdecore/tdeconfig_compiler/example/example.kcfg

@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="MyPaths" type="PathList">
       <label>This is a list of paths</label>

tdecore/tdeconfig_compiler/example/general_base.ui

@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>GeneralBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>

tdecore/tdeconfig_compiler/example/myoptions_base.ui

@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MyOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>

tdecore/tdeconfigbase.cpp

@@ -959,7 +959,7 @@ TQColor TDEConfigBase::readColorEntry( const char *pKey,
   TQString aValue = readEntry( pKey );
   if( !aValue.isEmpty() )
     {
-      if ( aValue.at(0) == (QChar)'#' )
+      if ( aValue.at(0) == (TQChar)'#' )
         {
           aRetColor.setNamedColor(aValue);
         }
@@ -1401,7 +1401,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
         }
       str_list += sep;
     }
-  if( str_list.at(str_list.length() - 1) == (QChar)sep )
+  if( str_list.at(str_list.length() - 1) == (TQChar)sep )
     str_list.truncate( str_list.length() -1 );
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
 }
@@ -1445,7 +1445,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
         }
       str_list += sep;
     }
-  if( str_list.at(str_list.length() - 1) == (QChar)sep )
+  if( str_list.at(str_list.length() - 1) == (TQChar)sep )
     str_list.truncate( str_list.length() -1 );
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
 }

tdecore/tdeconfigdialogmanager.cpp

@@ -188,7 +188,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
 		   // If the class name of the widget wasn't in the monitored widgets map, then look for 
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
 		   // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
-		   // though it was a 'QWidget'.
+		   // though it was a 'TQWidget'.
           changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
 

tdecore/tdeglobal.cpp

@@ -139,7 +139,7 @@ void TDEGlobal::setActiveInstance(TDEInstance *i)
 }
 
 /**
- * Create a static QString
+ * Create a static TQString
  *
  * To be used inside functions(!) like:
  * static const TQString &myString = TDEGlobal::staticQString("myText");
@@ -157,7 +157,7 @@ public:
 };
 
 /**
- * Create a static QString
+ * Create a static TQString
  *
  * To be used inside functions(!) like:
  * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text"));

tdecore/tdeglobalsettings.cpp

@@ -33,7 +33,7 @@
 #include <windows.h>
 #include "qt_windows.h"
 #include <win32_utils.h>
-static QRgb qt_colorref2qrgb(COLORREF col)
+static TQRgb qt_colorref2qrgb(COLORREF col)
 {
     return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col));
 }

tdecore/tdelocale.cpp

@@ -1218,34 +1218,34 @@ static void _inc_by_one(TQString &str, int position)
       switch(last_char)
 	{
 	case '0':
-	  str[i] = (QChar)'1';
+	  str[i] = (TQChar)'1';
 	  break;
 	case '1':
-	  str[i] = (QChar)'2';
+	  str[i] = (TQChar)'2';
 	  break;
 	case '2':
-	  str[i] = (QChar)'3';
+	  str[i] = (TQChar)'3';
 	  break;
 	case '3':
-	  str[i] = (QChar)'4';
+	  str[i] = (TQChar)'4';
 	  break;
 	case '4':
-	  str[i] = (QChar)'5';
+	  str[i] = (TQChar)'5';
 	  break;
 	case '5':
-	  str[i] = (QChar)'6';
+	  str[i] = (TQChar)'6';
 	  break;
 	case '6':
-	  str[i] = (QChar)'7';
+	  str[i] = (TQChar)'7';
 	  break;
 	case '7':
-	  str[i] = (QChar)'8';
+	  str[i] = (TQChar)'8';
 	  break;
 	case '8':
-	  str[i] = (QChar)'9';
+	  str[i] = (TQChar)'9';
 	  break;
 	case '9':
-	  str[i] = (QChar)'0';
+	  str[i] = (TQChar)'0';
 	  if (i == 0) str.prepend('1');
 	  continue;
 	case '.':
@@ -1310,8 +1310,8 @@ TQString TDELocale::formatNumber(const TQString &numStr, bool round,
 
   
   // Skip the sign (for now)
-  bool neg = (tmpString[0] == (QChar)'-');
+  bool neg = (tmpString[0] == (TQChar)'-');
-  if (neg  ||  tmpString[0] == (QChar)'+') tmpString.remove(0, 1);
+  if (neg  ||  tmpString[0] == (TQChar)'+') tmpString.remove(0, 1);
 
   // Split off exponential part (including 'e'-symbol)
   TQString mantString = tmpString.section('e', 0, 0,
@@ -1472,7 +1472,7 @@ double TDELocale::readNumber(const TQString &_str, bool * ok) const
   }
 
   TQString tot;
-  if (neg) tot = (QChar)'-';
+  if (neg) tot = (TQChar)'-';
 
   tot += major + '.' + minor + exponentialPart;
 
@@ -1502,7 +1502,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
   // (with a special case for parenthesis)
   if (negativeMonetarySignPosition() == ParensAround)
     {
-      if (str[0] == (QChar)'(' && str[str.length()-1] == (QChar)')')
+      if (str[0] == (TQChar)'(' && str[str.length()-1] == (TQChar)')')
         {
 	  neg = true;
 	  str.remove(str.length()-1,1);
@@ -1569,7 +1569,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
   }
 
   TQString tot;
-  if (neg) tot = (QChar)'-';
+  if (neg) tot = (TQChar)'-';
   tot += major + '.' + minior;
   return tot.toDouble(ok);
 }
@@ -1626,7 +1626,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 
     TQChar c = fmt.at(fmtpos++);
 
-    if (c != (QChar)'%') {
+    if (c != (TQChar)'%') {
       if (c.isSpace() && str.at(strpos).isSpace())
         strpos++;
       else if (c != str.at(strpos++))
@@ -1648,7 +1648,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
           error = true;
 	  j = 1;
 	  while (error && (j < 8)) {
-	    TQString s = calendar()->weekDayName(j, c == (QChar)'a').lower();
+	    TQString s = calendar()->weekDayName(j, c == (TQChar)'a').lower();
 	    int len = s.length();
 	    if (str.mid(strpos, len) == s)
             {
@@ -1665,7 +1665,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 	  if (d->nounDeclension && d->dateMonthNamePossessive) {
 	    j = 1;
 	    while (error && (j < 13)) {
-	      TQString s = calendar()->monthNamePossessive(j, year, c == (QChar)'b').lower();
+	      TQString s = calendar()->monthNamePossessive(j, year, c == (TQChar)'b').lower();
 	      int len = s.length();
 	      if (str.mid(strpos, len) == s) {
 	        month = j;
@@ -1677,7 +1677,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 	  }
 	  j = 1;
 	  while (error && (j < 13)) {
-	    TQString s = calendar()->monthName(j, year, c == (QChar)'b').lower();
+	    TQString s = calendar()->monthName(j, year, c == (TQChar)'b').lower();
 	    int len = s.length();
 	    if (str.mid(strpos, len) == s) {
 	      month = j;
@@ -1766,7 +1766,7 @@ TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok
 
       TQChar c = Format.at(Formatpos++);
 
-      if (c != (QChar)'%')
+      if (c != (TQChar)'%')
 	{
 	  if (c.isSpace())
 	    strpos++;
@@ -1885,7 +1885,7 @@ TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDur
 	  switch ( TQChar(rst.at( format_index )).unicode() )
 	    {
 	    case '%':
-	      buffer[index++] = (QChar)'%';
+	      buffer[index++] = (TQChar)'%';
 	      break;
 	    case 'H':
 	      put_it_in( buffer, index, pTime.hour() );

tdecore/tdestartupinfo.cpp

@@ -1130,9 +1130,9 @@ TQString TDEStartupInfoData::to_text() const
         ret += TQString::fromLatin1( " DESKTOP=%1" )
             .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
     if( !d->wmclass.isEmpty())
-        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( TQString(d->wmclass) );
     if( !d->hostname.isEmpty())
-        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( TQString(d->hostname) );
     for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
          it != d->pids.end();
          ++it )
@@ -1456,7 +1456,7 @@ static
 TQString get_str( const TQString& item_P )
     {
     unsigned int pos = item_P.find( '=' );
-    if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' )
+    if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (TQChar)'\"' )
         {
         int pos2 = item_P.left( pos + 2 ).find( '\"' );
         if( pos2 < 0 )
@@ -1512,8 +1512,8 @@ static TQString escape_str( const TQString& str_P )
 	 pos < str_P.length();
 	 ++pos )
 	{
-	if( str_P[ pos ] == (QChar)'\\'
+	if( str_P[ pos ] == (TQChar)'\\'
-	    || str_P[ pos ] == (QChar)'"' )
+	    || str_P[ pos ] == (TQChar)'"' )
 	    ret += '\\';
 	ret += str_P[ pos ];
 	}

tdecore/tdesycoca.cpp

@@ -228,7 +228,7 @@ KSycoca::~KSycoca()
 
 void KSycoca::closeDatabase()
 {
-   QIODevice *device = 0;
+   TQIODevice *device = 0;
    if (m_str)
       device = m_str->device();
 #ifdef HAVE_MMAP

tdecore/tests/kdebugtest.cpp

@@ -6,7 +6,7 @@
 #include <tqpen.h>
 #include <tqvariant.h>
 
-class TestWidget : public QWidget
+class TestWidget : public TQWidget
 {
 
 public:

tdecore/twinmodule.h

@@ -61,7 +61,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the QObject
+     * @param parent the parent for the TQObject
      * @param what The information you are interested in:
      *   INFO_DESKTOP:  currentDesktop, 
      *                  numberOfDesktops, 
@@ -89,7 +89,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the QObject
+     * @param parent the parent for the TQObject
      **/
     KWinModule( TQObject* parent = 0 );
 

tdefx/kimageeffect.cpp

@@ -58,7 +58,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 //======================================================================
 //
-// Utility stuff for effects ported from ImageMagick to QImage
+// Utility stuff for effects ported from ImageMagick to TQImage
 //
 //======================================================================
 #define MaxRGB 255L
@@ -2820,7 +2820,7 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold)
         data = (unsigned int *)img.tqcolorTable();
     }
     for(i=0; i < count; ++i)
-        data[i] = intensityValue(data[i]) < threshold ? QColor(Qt::black).rgb() : QColor(Qt::white).rgb();
+        data[i] = intensityValue(data[i]) < threshold ? TQColor(Qt::black).rgb() : TQColor(Qt::white).rgb();
 }
 
 void KImageEffect::hull(const int x_offset, const int y_offset,

tdefx/kimageeffect.h

@@ -398,7 +398,7 @@ public:
            const TQColor &cb, int ncols=0);
 
     /**
-     * Build a hash on any given QImage
+     * Build a hash on any given TQImage
      *
      * @param image The TQImage to process
      * @param lite The hash faces the indicated lighting (cardinal poles).

tdefx/kpixmap.cpp

@@ -75,7 +75,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
     pv[2] = new int[sw];
 
     for ( y=0; y < src->height(); y++ ) {
-	// p = (QRgb *)src->scanLine(y);
+	// p = (TQRgb *)src->scanLine(y);
 	b = dst->scanLine(y);
 	int endian = (TQImage::systemBitOrder() == TQImage::BigEndian);
 	int x;

tdehtml/css/css_valueimpl.cpp

@@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r)
     m_type = CSSPrimitiveValue::CSS_RECT;
 }
 
-CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color)
+CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color)
 {
     m_value.rgbcolor = color;
     m_type = CSSPrimitiveValue::CSS_RGBCOLOR;

tdehtml/css/css_valueimpl.h

@@ -163,7 +163,7 @@ public:
     CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type);
     CSSPrimitiveValueImpl(CounterImpl *c);
     CSSPrimitiveValueImpl( RectImpl *r);
-    CSSPrimitiveValueImpl(QRgb color);
+    CSSPrimitiveValueImpl(TQRgb color);
     CSSPrimitiveValueImpl(PairImpl *p);
 
     virtual ~CSSPrimitiveValueImpl();
@@ -206,7 +206,7 @@ public:
 	return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect );
     }
 
-    QRgb getRGBColorValue () const {
+    TQRgb getRGBColorValue () const {
 	return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor );
     }
 
@@ -232,7 +232,7 @@ protected:
 	DOM::DOMStringImpl *string;
 	CounterImpl *counter;
 	RectImpl *rect;
-        QRgb rgbcolor;
+        TQRgb rgbcolor;
         PairImpl* pair;
     } m_value;
 };

tdehtml/css/cssparser.cpp

@@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA
     return true;
 }
 
-static bool parseColor(int unit, const TQString &name, QRgb& rgb)
+static bool parseColor(int unit, const TQString &name, TQRgb& rgb)
 {
     int len = name.length();
 
@@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
 
 CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
 {
-    QRgb c = tdehtml::transparentColor;
+    TQRgb c = tdehtml::transparentColor;
     if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
               value->fValue >= 0. && value->fValue < 1000000. ) {
         TQString str;

tdehtml/css/cssparser.h

@@ -148,7 +148,7 @@ namespace DOM {
         CSSPrimitiveValueImpl *parseColorFromValue(Value* val);
         CSSValueImpl* parseCounterContent(ValueList *args, bool counters);
 
-        static bool parseColor(const TQString &name, QRgb& rgb);
+        static bool parseColor(const TQString &name, TQRgb& rgb);
 
         // CSS3 Parsing Routines (for properties specific to CSS3)
         bool parseShadow(int propId, bool important);

tdehtml/css/cssstyleselector.cpp

@@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl
 // color mapping code
 struct colorMap {
     int css_value;
-    QRgb color;
+    TQRgb color;
 };
 
 static const colorMap cmap[] = {

tdehtml/css/parser.y

@@ -634,7 +634,7 @@ element_name:
     IDENT {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
-	QString tag = qString($1);
+	TQString tag = qString($1);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		tag = tag.lower();
@@ -699,7 +699,7 @@ attrib_id:
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
 
-	QString attr = qString($1);
+	TQString attr = qString($1);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		attr = attr.lower();
@@ -798,7 +798,7 @@ pseudo:
     | ':' FUNCTION INTEGER ')' {
         $$ = new CSSSelector();
         $$->match = CSSSelector::PseudoClass;
-        $$->string_arg = QString::number($3);
+        $$->string_arg = TQString::number($3);
         $$->value = domString($2);
     }
     // used by :nth-* and :lang
@@ -892,7 +892,7 @@ declaration:
 
 property:
     IDENT maybe_space {
-	QString str = qString($1);
+	TQString str = qString($1);
 	$$ = getPropertyID( str.lower().latin1(), str.length() );
     }
   ;
@@ -941,7 +941,7 @@ term:
   | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
   | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
   | IDENT maybe_space {
-      QString str = qString( $1 );
+      TQString str = qString( $1 );
       $$.id = getValueID( str.lower().latin1(), str.length() );
       $$.unit = CSSPrimitiveValue::CSS_IDENT;
       $$.string = $1;

tdehtml/dom/css_value.cpp

@@ -483,7 +483,7 @@ RGBColor::RGBColor(const RGBColor &other)
     m_color = other.m_color;
 }
 
-RGBColor::RGBColor(QRgb color)
+RGBColor::RGBColor(TQRgb color)
 {
     m_color = color;
 }

tdehtml/dom/css_value.h

@@ -596,7 +596,7 @@ public:
      * @deprecated
      */
     RGBColor(const TQColor& c) { m_color = c.rgb(); }
-    RGBColor(QRgb color);
+    RGBColor(TQRgb color);
 
     RGBColor(const RGBColor &other);
     RGBColor & operator = (const RGBColor &other);
@@ -624,9 +624,9 @@ public:
     /**
      * @internal
      */
-    QRgb color() const { return m_color; }
+    TQRgb color() const { return m_color; }
 protected:
-    QRgb m_color;
+    TQRgb m_color;
 };
 
 class RectImpl;

tdehtml/ecma/kjs_binding.cpp

@@ -50,7 +50,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const
   }
   catch (DOM::DOMException e) {
     // ### translate code into readable string ?
-    // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
+    // ### oh, and s/TQString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
     //     and where does it appear to the user ?
     Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
     exec->setException( err );

tdehtml/java/kjavaappletviewer.cpp

@@ -79,7 +79,7 @@ public:
     void setServer (KJavaAppletServer * s);
     TQGuardedPtr <KJavaAppletServer> server;
 private:
-    typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> >
+    typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> >
             ContextMap;
     ContextMap m_contextmap;
 };

tdehtml/java/kjavaprocess.h

@@ -37,7 +37,7 @@
  */
 
 class KJavaProcessPrivate;
-class KJavaProcess : public TDEProcess //QObject
+class KJavaProcess : public TDEProcess //TQObject
 {
 TQ_OBJECT
 
@@ -110,7 +110,7 @@ public:
 
     /**
      * Sends a command to the KJAS Applet Server by building a QByteArray
-     * out of the data, and then writes it standard out.  It adds each QString
+     * out of the data, and then writes it standard out.  It adds each TQString
      * in the arg list, and then adds the data array.
      */
     void send( char cmd_code, const TQStringList& args, const TQByteArray& data );

tdehtml/misc/helper.cpp

@@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal)
 // explanation available at http://en.wikipedia.org/wiki/HSL_color_space
 
 // all values are in the range of 0 to 1.0
-QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
+TQRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
 {
     double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
     double temp1 = 2.0 * l - temp2;

tdehtml/misc/helper.h

@@ -32,15 +32,15 @@ class TQPainter;
 namespace tdehtml
 {
     class RenderObject;
-     const QRgb transparentColor = 0x00000000;
+     const TQRgb transparentColor = 0x00000000;
-     const QRgb invertedColor    = 0x00000002;
+     const TQRgb invertedColor    = 0x00000002;
 
     extern TQPainter *printpainter;
     void setPrintPainter( TQPainter *printer );
     
     bool hasSufficientContrast(const TQColor &c1, const TQColor &c2);
     TQColor retrieveBackgroundColor(const RenderObject *obj);
-    QRgb tqRgbaFromHsla(double h, double s, double l, double a);
+    TQRgb tqRgbaFromHsla(double h, double s, double l, double a);
 
     //enumerator for findSelectionNode
     enum FindSelectionResult { SelectionPointBefore,

tdehtml/misc/loader.h

@@ -317,7 +317,7 @@ namespace tdehtml
         TQPixmap* p;
 	TQPixmap* scaled;
 	TQPixmap* bg;
-        QRgb bgColor;
+        TQRgb bgColor;
         TQSize bgSize;
         mutable TQPixmap* pixPart;
 

tdehtml/tdehtmlpart_p.h

@@ -146,10 +146,10 @@ class TDEHTMLWalletQueue : public TQObject
 #ifndef TDEHTML_NO_WALLET
     TDEWallet::Wallet *wallet;
 #endif // TDEHTML_NO_WALLET
-    typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
+    typedef TQPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
     typedef TQValueList<Caller> CallerList;
     CallerList callers;
-    TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers;
+    TQValueList<TQPair<TQString, TQMap<TQString, TQString> > > savers;
 
   signals:
     void walletOpened(TDEWallet::Wallet*);
@@ -172,7 +172,7 @@ class TDEHTMLWalletQueue : public TQObject
           }
         }
         wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
-        for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
+        for (TQValueList<TQPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
           wallet->writeMap((*i).first, (*i).second);
         }
       }

tdehtml/test_regression.cpp

@@ -994,12 +994,12 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi )
 
     for ( int y = 0; y < h; ++y )
     {
-        QRgb* ls = ( QRgb* ) lhsi.scanLine( y );
+        TQRgb* ls = ( TQRgb* ) lhsi.scanLine( y );
-        QRgb* rs = ( QRgb* ) rhsi.scanLine( y );
+        TQRgb* rs = ( TQRgb* ) rhsi.scanLine( y );
         if ( memcmp( ls, rs, bytes ) ) {
             for ( int x = 0; x < w; ++x ) {
-                QRgb l = ls[x];
+                TQRgb l = ls[x];
-                QRgb r = rs[x];
+                TQRgb r = rs[x];
                 if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) &&
                      ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) &&
                      ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) )

tdehtml/xml/dom_stringimpl.h

@@ -81,7 +81,7 @@ public:
     const TQChar &operator [] (int pos) { return s[pos]; }
     bool containsOnlyWhitespace() const;
 
-    // ignores trailing garbage, unlike QString
+    // ignores trailing garbage, unlike TQString
     int toInt(bool* ok = 0) const;
 
     tdehtml::Length* toLengthArray(int& len) const;

tdeinit/README.DCOP

@@ -26,9 +26,9 @@ void exec_blind(QCString name, QValueList<QCString> argList);
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_name(QString serviceName, QStringList url,
+serviceResult start_service_by_name(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_name(QString serviceName, QStringList url)
+serviceResult start_service_by_name(TQString serviceName, QStringList url)
 
 /**
  * Start a service by desktop path.
@@ -48,9 +48,9 @@ serviceResult start_service_by_name(QString serviceName, QStringList url)
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_desktop_path(QString serviceName, QStringList url,
+serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_desktop_path(QString serviceName, QStringList url)
+serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url)
 
 
 /**
@@ -70,14 +70,14 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_desktop_name(QString serviceName, QStringList url,
+serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_desktop_name(QString serviceName, QStringList url)
+serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url)
 
 struct serviceResult
 {
   int result;         // 0 means success. > 0 means error
   QCString dcopName; // Contains DCOP name on success
-  QString error;     // Contains error description on failure.
+  TQString error;     // Contains error description on failure.
 }
 

tdeinit/tdelauncher.cpp

@@ -164,7 +164,7 @@ IdleSlave::age(time_t now)
 
 TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
 //  : TDEApplication( false, false ), // No Styles, No GUI
-  : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
+  : TDEApplication( false, true ),	// TQClipboard tries to construct a TQWidget so a GUI is technically needed, even though it is not used
     DCOPObject("tdelauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )

tdeio/bookmarks/kbookmarkmanager.h

@@ -352,7 +352,7 @@ class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBoo
 {
     TQ_OBJECT
 public:
-    typedef TQValueList<QPair<TQString,TQString> > QStringPairList;
+    typedef TQValueList<TQPair<TQString,TQString> > QStringPairList;
 public slots:
     void fillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list ) { emit signalFillBookmarksList( list ); };
 signals:

tdeio/kssl/ksslcertificate.cpp

@@ -1033,7 +1033,7 @@ unsigned char *p = cert;
 	// FIXME: return code!
 	d->kossl->i2d_X509(getCert(), &p);
 
-	// encode it into a QString
+	// encode it into a TQString
 	qba.duplicate((const char*)cert, certlen);
 	delete[] cert;
 #endif

tdeio/kssl/ksslcsessioncache.cpp

@@ -54,7 +54,7 @@
 
 #ifdef KSSL_HAVE_SSL
 
-typedef QPair<TQString,TQString> KSSLCSession;
+typedef TQPair<TQString,TQString> KSSLCSession;
 typedef TQPtrList<KSSLCSession> KSSLCSessions;
 
 static KSSLCSessions *sessions = 0L;

tdeio/kssl/ksslsession.cpp

@@ -55,7 +55,7 @@ unsigned char *p = csess;
 		return TQString::null;
 	}
 
-	// encode it into a QString
+	// encode it into a TQString
 	qba.duplicate((const char*)csess, slen);
 	delete[] csess;
 	rc = KCodecs::base64Encode(qba);

tdeio/kssl/ksslutils.h

@@ -45,7 +45,7 @@ class TQDateTime;
  *
  *  @param tm the OpenSSL ASN1_UTCTIME pointer
  *
- *  @return the date formatted in a QString
+ *  @return the date formatted in a TQString
  *  @see ASN1_UTCTIME_QDateTime
  */
 KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
@@ -66,7 +66,7 @@ KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt);
  *
  *  @param aint the OpenSSL ASN1_INTEGER pointer
  *
- *  @return the number formatted in a QString
+ *  @return the number formatted in a TQString
  */
 KDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint);
 #endif

tdeio/misc/kpac/script.cpp

@@ -447,11 +447,11 @@ namespace KPAC
 	  throw Error( "No such function FindProxyForURL" );
 
         KURL cleanUrl = url;
-        cleanUrl.setPass(QString());
+        cleanUrl.setPass(TQString());
-        cleanUrl.setUser(QString());
+        cleanUrl.setUser(TQString());
         if (cleanUrl.protocol().lower() == "https") {
-            cleanUrl.setPath(QString());
+            cleanUrl.setPath(TQString());
-            cleanUrl.setQuery(QString());
+            cleanUrl.setQuery(TQString());
         }
 
 	Object thisObj;

tdeio/misc/tdesendbugmail/smtp.h

@@ -37,7 +37,7 @@ int SMTPClientStatus[] = {
 
 #define SMTP_READ_BUFFER_SIZE 256
 
-class SMTP:public QObject
+class SMTP:public TQObject
 {
     TQ_OBJECT
 public:

tdeio/tdefile/NOTES

@@ -26,7 +26,7 @@ for more integration between tdefile and konqueror. 16/08/2000.
     of the visible icons first" algorithm, currently in KonqIconView.
 (3) KFileView, the base class for any view, knows about KFileItem, has
     signals for dropped(), popupMenu(list of actions provided by the view),
-    has a QWidget * canvas() method, xOffset() and yOffset()
+    has a TQWidget * canvas() method, xOffset() and yOffset()
 (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a
     given KFileItem. This will help for e.g. deleteItems and refreshItems.
 (5) KFileListView holds a QPtrDict to find the QListViewItem for a

tdeio/tdefile/images.h

@@ -3,7 +3,7 @@
 #define _QEMBED_1804289383
 #include <tqimage.h>
 #include <tqdict.h>
-static const QRgb group_grey_data[] = {
+static const TQRgb group_grey_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42484848,0xc39b9b9b,0xeab1b1b1,0xce9d9d9d,0x5a4d4d4d,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x563b3b3b,0xfdaeaeae,0xffcfcfcf,0xffcccccc,0xffcecece,
     0xffbababa,0x62393939,0x0,0x0,0x0,0x0,0x0,0x0,0x4525252,0x9383838,0x0,0xd0515151,0xff969696,0xff959595,
@@ -26,7 +26,7 @@ static const QRgb group_grey_data[] = {
 };
 
 /* Generated by qembed */
-static const QRgb group_data[] = {
+static const TQRgb group_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4223731d,0xc37fbb7c,0xea9bca98,0xce86b982,0x5a316e2c,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56146610,0xfd8fce8e,0xffbae4bb,0xffb7e2b7,0xffbae3ba,
     0xff9ed89d,0x62166112,0x0,0x0,0x0,0x0,0x0,0x0,0x4003ca5,0x9003171,0x0,0xd0198b17,0xff6ac468,0xff6ec665,
@@ -48,7 +48,7 @@ static const QRgb group_data[] = {
     0x0,0x0,0x0,0x0
 };
 
-static const QRgb mask_data[] = {
+static const TQRgb mask_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00,
@@ -70,7 +70,7 @@ static const QRgb mask_data[] = {
     0x2000000,0x2000000,0x2000000,0x0
 };
 
-static const QRgb others_grey_data[] = {
+static const TQRgb others_grey_data[] = {
     0x0,0x0,0x0,0xa4c4c4c,0x5d676767,0x777c7c7c,0x3d555555,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x17535353,0xd2afafaf,0xffebebeb,0xffe5e5e5,0xfec2c2c2,0x906d6d6d,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0xa09c9c9c,0xfff1f1f1,0xfff5f5f5,0xffe6e6e6,0xffd4d4d4,0xffbebebe,0x4c424242,0x117b7b7b,
@@ -92,7 +92,7 @@ static const QRgb others_grey_data[] = {
     0x542e2e2e,0x200f0f0f,0x0,0x0
 };
 
-static const QRgb others_data[] = {
+static const TQRgb others_data[] = {
     0x0,0x0,0x0,0xa804618,0x5d95643a,0x77a77c52,0x3d855126,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x17964f11,0xd2cfb190,0xfff8efdf,0xffffeccb,0xfeedce98,0x909b703f,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0xa0d29e66,0xfffff7e3,0xfffff8ec,0xffffedce,0xffffe0a9,0xfff5cd88,0x4c6f4316,0x11f72300,
@@ -114,7 +114,7 @@ static const QRgb others_data[] = {
     0x5403065a,0x2000001e,0x0,0x0
 };
 
-static const QRgb user_green_data[] = {
+static const TQRgb user_green_data[] = {
     0x0,0x0,0x0,0x0,0x5029,0x6c1c6e21,0xe332aa3b,0xf83ac841,0xf838c83f,0xda369a3b,0x5a145819,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e1a6c1e,0xff32da39,0xff3de341,0xff3ee045,0xff3ee042,0xff3de345,0xff27d930,0x68125817,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f013105,0xf721a328,0xff22de27,0xff23dd27,0xff26dc26,0xff26dc2a,0xff22de27,
@@ -136,7 +136,7 @@ static const QRgb user_green_data[] = {
     0x1c020604,0x0,0x0,0x0
 };
 
-static const QRgb user_grey_data[] = {
+static const TQRgb user_grey_data[] = {
     0x0,0x0,0x0,0x0,0x404040,0x6c6e6e6e,0xe3b0b0b0,0xf8cecece,0xf8cccccc,0xdaa6a6a6,0x5a575757,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e6b6b6b,0xffd6d6d6,0xffe6e6e6,0xffe4e4e4,0xffe4e4e4,0xffe6e6e6,0xffcccccc,0x68555555,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f282828,0xf79d9d9d,0xffcccccc,0xffcdcdcd,0xffcecece,0xffcecece,0xffcccccc,
@@ -158,7 +158,7 @@ static const QRgb user_grey_data[] = {
     0x1c070707,0x0,0x0,0x0
 };
 
-static const QRgb user_data[] = {
+static const TQRgb user_data[] = {
     0x0,0x0,0x0,0x0,0x7f,0x6c2c68af,0xe384abdb,0xf8b2ccea,0xf8aecae9,0xda7ba3d1,0x5a20508d,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e2a66ac,0xffb8d4f3,0xffd2e5f9,0xffd0e3f8,0xffcfe3f8,0xffd3e5f9,0xffa7c9f0,0x681d4e8c,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f02244d,0xf75c9ade,0xffa6cbf2,0xffa7ccf2,0xffa9cef2,0xffa9cdf2,0xffa6ccf2,
@@ -180,7 +180,7 @@ static const QRgb user_data[] = {
     0x1c040409,0x0,0x0,0x0
 };
 
-static const QRgb yes_data[] = {
+static const TQRgb yes_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x11049c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -202,7 +202,7 @@ static const QRgb yes_data[] = {
     0x0,0x0,0x0,0x0
 };
 
-static const QRgb yespartial_data[] = {
+static const TQRgb yespartial_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x114e4e4e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -228,7 +228,7 @@ static struct EmbedImage {
     int width, height, depth;
     const unsigned char *data;
     int numColors;
-    const QRgb *colorTable;
+    const TQRgb *colorTable;
     bool alpha;
     const char *name;
 } embed_image_vec[] = {
@@ -256,7 +256,7 @@ static const TQImage& qembed_findImage( const TQString& name )
 			    embed_image_vec[i].width,
 			    embed_image_vec[i].height,
 			    embed_image_vec[i].depth,
-			    (QRgb*)embed_image_vec[i].colorTable,
+			    (TQRgb*)embed_image_vec[i].colorTable,
 			    embed_image_vec[i].numColors,
 			    TQImage::BigEndian );
 		if ( embed_image_vec[i].alpha )

tdeio/tdefile/tdefilemetainfowidget.cpp

@@ -139,7 +139,7 @@ TQWidget* KFileMetaInfoWidget::makeWidget()
 
 #if 0
         case TQVariant::Size:        // a QSize
-        case TQVariant::String:      // a QString
+        case TQVariant::String:      // a TQString
         case TQVariant::List:        // a QValueList
         case TQVariant::Map:         // a QMap
         case TQVariant::StringList:  //  a QStringList
@@ -147,12 +147,12 @@ TQWidget* KFileMetaInfoWidget::makeWidget()
         case TQVariant::Pixmap:      // a QPixmap
         case TQVariant::Brush:       // a QBrush
         case TQVariant::Rect:        // a QRect
-        case TQVariant::Color:       // a QColor
+        case TQVariant::Color:       // a TQColor
         case TQVariant::Palette:     // a QPalette
         case TQVariant::ColorGroup:  // a QColorGroup
         case TQVariant::IconSet:     // a QIconSet
         case TQVariant::Point:       // a QPoint
-        case TQVariant::Image:       // a QImage
+        case TQVariant::Image:       // a TQImage
         case TQVariant::CString:     // a QCString
         case TQVariant::PointArray:  // a QPointArray
         case TQVariant::Region:      // a QRegion

tdeio/tdeio/kacl.cpp

@@ -62,7 +62,7 @@ public:
     bool setMaskPermissions( unsigned short v );
     TQString getUserName( uid_t uid ) const;
     TQString getGroupName( gid_t gid ) const;
-    bool setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type );
+    bool setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type );
     bool setNamedUserOrGroupPermissions( const TQString& name, unsigned short permissions, acl_tag_t type );
 
     acl_t m_acl;
@@ -429,7 +429,7 @@ ACLUserPermissionsList KACL::allUserPermissions() const
 }
 
 #ifdef USE_POSIX_ACL
-bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type )
+bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type )
 {
     bool allIsWell = true;
     bool atLeastOneUserOrGroup = false;
@@ -456,7 +456,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString,
 //printACL( newACL, "After cleaning out entries: " );
 
     // now add the entries from the list
-    TQValueList< QPair<TQString, unsigned short> >::const_iterator it = list.constBegin();
+    TQValueList< TQPair<TQString, unsigned short> >::const_iterator it = list.constBegin();
     while ( it != list.constEnd() ) {
         acl_create_entry( &newACL, &entry );
         acl_set_tag_type( entry, type );

tdeio/tdeio/kacl.h

@@ -23,12 +23,12 @@
 #include <sys/types.h>
 #include <tdeio/global.h>
 
-typedef QPair<TQString, unsigned short> ACLUserPermissions;
+typedef TQPair<TQString, unsigned short> ACLUserPermissions;
 typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList;
 typedef TQValueListIterator<ACLUserPermissions> ACLUserPermissionsIterator;
 typedef TQValueListConstIterator<ACLUserPermissions> ACLUserPermissionsConstIterator;
 
-typedef QPair<TQString, unsigned short> ACLGroupPermissions;
+typedef TQPair<TQString, unsigned short> ACLGroupPermissions;
 typedef TQValueList<ACLGroupPermissions> ACLGroupPermissionsList;
 typedef TQValueListIterator<ACLGroupPermissions> ACLGroupPermissionsIterator;
 typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIterator;
@@ -146,7 +146,7 @@ public:
   bool setNamedUserPermissions( const TQString& name, unsigned short );
 
   /** Returns the list of all group permission entries. Each entry consists
-   * of a name/permissions pair. This is a QPair, therefore access is provided 
+   * of a name/permissions pair. This is a TQPair, therefore access is provided 
    * via the .first and .next members.
    * @return the list of all group permission entries. */
   ACLUserPermissionsList allUserPermissions() const;
@@ -170,7 +170,7 @@ public:
   bool setNamedGroupPermissions( const TQString& name, unsigned short );
 
   /** Returns the list of all group permission entries. Each entry consists
-   * of a name/permissions pair. This is a QPair, therefor access is provided 
+   * of a name/permissions pair. This is a TQPair, therefor access is provided 
    * via the .first and .next members.
    * @return the list of all group permission entries. */
 

tdeio/tdeio/kmimetyperesolver.h

@@ -42,7 +42,7 @@ protected:
 
 /**
  * @internal
- * This class is used by KMimeTypeResolver, because it can't be a QObject
+ * This class is used by KMimeTypeResolver, because it can't be a TQObject
  * itself. So an object of this class is used to handle signals, slots etc.
  * and forwards them to the KMimeTypeResolver instance.
  */

tdeio/tdeio/kscan.h

@@ -70,7 +70,7 @@ public:
      * or 0L if no scan-support
      * is available. Pass a suitable @p parent widget, if you like. If you
      * don't you have to 'delete' the returned pointer yourself.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @return the KScanDialog, or 0 if the function failed
@@ -100,7 +100,7 @@ protected:
      * @param dialogFace the KDialogBase::DialogType
      * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @see KDialogBase
@@ -187,7 +187,7 @@ public:
     /**
      * Your library should reimplement this method to return your KScanDialog
      * derived dialog.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -197,7 +197,7 @@ public:
 protected:
     /**
      * Creates a new KScanDialogFactory.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      */
     KScanDialogFactory( TQObject *parent=0, const char *name=0 );
@@ -243,7 +243,7 @@ public:
      * or 0L if no OCR-support
      * is available. Pass a suitable @p parent widget, if you like. If you
      * don't you have to 'delete' the returned pointer yourself.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @return the KOCRDialog, or 0 if the function failed
@@ -260,7 +260,7 @@ protected:
      * @param dialogFace the KDialogBase::DialogType
      * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -323,7 +323,7 @@ public:
     /**
      * Your library should reimplement this method to return your KOCRDialog
      * derived dialog.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -333,7 +333,7 @@ public:
 protected:
     /**
      * Creates a new KScanDialogFactory.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      */
     KOCRDialogFactory( TQObject *parent=0, const char *name=0 );

tdeio/tdeio/kurifilter.h

@@ -306,7 +306,7 @@ public:
     /**
      * Overloaded assigenment operator.
      *
-     * This function allows you to easily assign a QString
+     * This function allows you to easily assign a TQString
      * to a KURIFilterData object.
      *
      * @return an instance of a KURIFilterData object.

tdeio/tdeio/tdefilemetainfo.h

@@ -1643,7 +1643,7 @@ private:
  *  supported and which groups and items are provided for it, you can ask
  *  the KFileMetainfoProvider for it.
  **/
-class TDEIO_EXPORT KFileMetaInfoProvider: private QObject
+class TDEIO_EXPORT KFileMetaInfoProvider: private TQObject
 {
     friend class KFilePlugin;
 

tdeio/tests/dataprotocoltest.cpp

@@ -247,7 +247,7 @@ const char * const url;
 #if 0
 // == charset tests
 	// -------------------- string
-const QChar
+const TQChar
 const TQChar * const charset_urls[] = {
 #endif
 

tdeioslave/http/README.webdav

@@ -44,9 +44,9 @@ To create a lock, call a special request, with the following data:
 
 int, value 5 (LOCK request)
 KURL url - the location of the resource to lock
-QString scope - the scope of the lock, currently "exclusive" or "shared"
+TQString scope - the scope of the lock, currently "exclusive" or "shared"
-QString type - the type of the lock, currently only "write"
+TQString type - the type of the lock, currently only "write"
-QString owner (optional) - owner contact details (url)
+TQString owner (optional) - owner contact details (url)
 
 Additionally, the lock timeout requested from the server may be altered from the default
 of Infinity by setting the metadata "davTimeout" to the number of seconds, or 0 for

tdemdi/test/main.cpp

@@ -60,7 +60,7 @@ int main( int argc, char **argv )
 //   SHOW(h1->tabCaption());
 
    TQWidget* w = new TQWidget(mainWdg);
-   KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped QWidget!", "Hello2");
+   KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped TQWidget!", "Hello2");
    mainWdg->addWindow( h2 );
 //   SHOW(h2->caption());
 //   SHOW(h2->tabCaption());

tdeparts/COMMENTS

@@ -576,7 +576,7 @@ issue compared to what's above though.
          delegation.
          It works like this:
          We have KReadOnlyPart (short KROP) and KonqyViewerExtension (short KVE). KVE is just
-	 a child of KROP that you can query with the QObject::child method.
+	 a child of KROP that you can query with the TQObject::child method.
          Views which are konquy aware feature their own implementation of KVE and konquy is
          happy :-)
          If a KROP does not feature a KVE then Konqui installs a default KVE that just ignores

tdeparts/browserextension.h

@@ -257,7 +257,7 @@ class BrowserExtensionPrivate;
   * to implement the virtual methods [and the standard-actions slots, see below].
   *
   * The way to associate the BrowserExtension with the part is to simply
-  * create the BrowserExtension as a child of the part (in QObject's terms).
+  * create the BrowserExtension as a child of the part (in TQObject's terms).
   * The hosting application will look for it automatically.
   *
   * Another aspect of the browser integration is that a set of standard
@@ -796,7 +796,7 @@ public:
   enum Type {
       TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeString
   };
-  typedef TQValueList<QPair<Type, TQString> > ArgList;
+  typedef TQValueList<TQPair<Type, TQString> > ArgList;
 
   LiveConnectExtension( KParts::ReadOnlyPart *parent, const char *name = 0L );
 

tdeprint/cups/cupsdconf2/cupsddialog.h

@@ -52,7 +52,7 @@ protected:
 private:
 	TQPtrList<CupsdPage>	pagelist_;
 	CupsdConf		*conf_;
-	QString			filename_;
+	TQString			filename_;
 };
 
 #endif

tdeprint/cups/cupsdconf2/cupsdpage.h

@@ -46,9 +46,9 @@ protected:
 
 protected:
 	CupsdConf	*conf_;
-	QString		label_;
+	TQString		label_;
-	QString		header_;
+	TQString		header_;
-	QString		pixmap_;
+	TQString		pixmap_;
 };
 
 #endif

tdeprint/cups/image.cpp

@@ -249,10 +249,10 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
 {
 	float	mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}};
 	int	lut[3][3][256];
-	QRgb	c;
+	TQRgb	c;
 	int	r,g,b,v,r2,g2,b2;
 	float	gam = 1.0/(float(gamma)/1000.0);
-	QImage	img(image);
+	TQImage	img(image);
 
 	saturate(mat,saturation*0.01);
 	huerotate(mat,(float)hue);

tdeprint/cups/imagepreview.cpp

@@ -55,7 +55,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga
 }
 
 void ImagePreview::paintEvent(TQPaintEvent*){
-	QImage	tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
+	TQImage	tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
 	int	x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
 
 	TQPixmap	buffer(width(), height());

tdeprint/cups/ipprequest.h

@@ -102,7 +102,7 @@ protected:
 
 private:
 	ipp_t	*request_;
-	QString	host_;
+	TQString	host_;
 	int 	port_;
 	bool	connect_;
 	int	dump_;

tdeprint/cups/kmconfigcupsdir.cpp

@@ -55,7 +55,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 void KMConfigCupsDir::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
-	QString	dir = conf->readPathEntry("InstallDir");
+	TQString	dir = conf->readPathEntry("InstallDir");
 	m_stddir->setChecked(dir.isEmpty());
 	m_installdir->setURL(dir);
 }

tdeprint/cups/kmcupsuimanager.cpp

@@ -134,7 +134,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard)
 	backend->addBackend(KMWizard::Class,i18n("Cl&ass of printers"),false,whatsThisClassOfPrinters);
 
 	IppRequest	req;
-	QString		uri;
+	TQString		uri;
 
 	req.setOperation(CUPS_GET_DEVICES);
 	uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());

tdeprint/driver.cpp

@@ -66,7 +66,7 @@ void DrBase::setOptions(const TQMap<TQString,TQString>& opts)
 
 void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 {
-	QString	val = valueText();
+	TQString	val = valueText();
 	if ( incldef || get( "persistent" ) == "1" || get("default") != val )
 		opts[name()] = val;
 }
@@ -455,7 +455,7 @@ DrIntegerOption::~DrIntegerOption()
 
 TQString DrIntegerOption::valueText()
 {
-	QString	s = TQString::number(m_value);
+	TQString	s = TQString::number(m_value);
 	return s;
 }
 
@@ -505,7 +505,7 @@ DrFloatOption::~DrFloatOption()
 
 TQString DrFloatOption::valueText()
 {
-	QString	s = TQString::number(m_value,'f',3);
+	TQString	s = TQString::number(m_value,'f',3);
 	return s;
 }
 
@@ -555,7 +555,7 @@ DrListOption::~DrListOption()
 
 TQString DrListOption::valueText()
 {
-	QString	s = (m_current ? m_current->name() : TQString::null);
+	TQString	s = (m_current ? m_current->name() : TQString::null);
 	return s;
 }
 
@@ -654,7 +654,7 @@ bool DrConstraint::check(DrMain *driver)
 	if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice())
 	{
 		bool	f1(false), f2(false);
-		QString	c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
+		TQString	c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
 		// check choices
 		if (m_choice1.isEmpty())
 			f1 = (c1 != "None" && c1 != "Off" && c1 != "False");
@@ -665,7 +665,7 @@ bool DrConstraint::check(DrMain *driver)
 		else
 			f2 = (c2 == m_choice2);
 		// tag options
-		QString	s((f1 && f2 ? "1" : "0"));
+		TQString	s((f1 && f2 ? "1" : "0"));
 		if (!m_option1->conflict()) m_option1->setConflict(f1 && f2);
 		if (!m_option2->conflict()) m_option2->setConflict(f1 && f2);
 		// return value

tdeprint/driver.h

@@ -87,7 +87,7 @@ public:
 
 protected:
 	TQMap<TQString,TQString>	m_map;
-	QString			m_name;		// used as a search key, better to have defined directly
+	TQString			m_name;		// used as a search key, better to have defined directly
 	Type			m_type;
 	bool			m_conflict;
 };
@@ -212,7 +212,7 @@ public:
 	virtual void setValueText(const TQString& s);
 
 protected:
-	QString	m_value;
+	TQString	m_value;
 };
 
 /**********************************
@@ -336,8 +336,8 @@ public:
 	bool check(DrMain*);
 
 protected:
-	QString		m_opt1, m_opt2;
+	TQString		m_opt1, m_opt2;
-	QString		m_choice1, m_choice2;
+	TQString		m_choice1, m_choice2;
 	DrListOption	*m_option1, *m_option2;
 };
 
@@ -376,7 +376,7 @@ public:
 	TQSize margins() const;
 
 protected:
-	QString	m_name;
+	TQString	m_name;
 	float m_width, m_height, m_left, m_bottom, m_right, m_top;
 };
 

tdeprint/driveritem.cpp

@@ -44,7 +44,7 @@ void DriverItem::updateText()
 {
 	if (m_item)
 	{
-		QString	s(m_item->get("text"));
+		TQString	s(m_item->get("text"));
 		if (m_item->isOption())
 			s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText()));
 		if (m_item->type() == DrBase::List)
@@ -96,7 +96,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
 	else
 	{
 		int	w1(0);
-		QString	s(m_item->get("text") + ": <");
+		TQString	s(m_item->get("text") + ": <");
 		w1 = p->fontMetrics().width(s);
 		p->setPen(cg.text());
 		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);

tdeprint/droptionview.cpp

@@ -123,7 +123,7 @@ void OptionNumericView::slotSliderChanged(int value)
 {
 	if (blockSS) return;
 
-	QString	txt;
+	TQString	txt;
 	if (m_integer)
 		txt = TQString::number(value);
 	else
@@ -226,7 +226,7 @@ void OptionListView::slotSelectionChanged()
 {
 	if (blockSS) return;
 
-	QString	s = m_choices[m_list->currentItem()];
+	TQString	s = m_choices[m_list->currentItem()];
 	emit valueChanged(s);
 }
 

tdeprint/foomatic/kfoomaticprinterimpl.cpp

@@ -35,13 +35,13 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl()
 // look for executable
 TQString KFoomaticPrinterImpl::executable()
 {
-	QString	exe = TDEStandardDirs::findExe("foomatic-printjob");
+	TQString	exe = TDEStandardDirs::findExe("foomatic-printjob");
 	return exe;
 }
 
 bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 {
-	QString		exe = executable();
+	TQString		exe = executable();
 	if (!exe.isEmpty())
 	{
 		cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());

tdeprint/foomatic/kmfoomaticmanager.cpp

@@ -76,7 +76,7 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool)
 		return NULL;
 	}
 
-	QString	cmd = "foomatic-combo-xml -p ";
+	TQString	cmd = "foomatic-combo-xml -p ";
 	cmd += TDEProcess::quote(printer->option("printer"));
 	cmd += " -d ";
 	cmd += TDEProcess::quote(printer->option("driver"));
@@ -99,7 +99,7 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem)
 		printer->setState(KMPrinter::Idle);
 		/*if (printer->name().find('/') != -1)
 		{
-			QString	s(printer->name());
+			TQString	s(printer->name());
 			int	p = s.find('/');
 			printer->setPrinterName(s.left(p));
 			printer->setInstanceName(s.mid(p+1));
@@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 	{
 		driver->set("manufacturer", pelem.namedItem("make").toElement().text());
 		driver->set("model", pelem.namedItem("model").toElement().text());
-		QString	s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
+		TQString	s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
 		driver->set("description", s);
 		driver->set("text", s);
 
@@ -148,14 +148,14 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 			{
 				if (o.tagName() == "option")
 				{
-					QString	type = o.attribute("type");
+					TQString	type = o.attribute("type");
 					DrBase *dropt(0);
 
 					if (type == "bool" || type == "enum")
 					{
 						if (type == "bool") dropt = new DrBooleanOption();
 						else dropt = new DrListOption();
-						QString	defval = o.namedItem("arg_defval").toElement().text(), valuetext;
+						TQString	defval = o.namedItem("arg_defval").toElement().text(), valuetext;
 						QDomNode	val = o.namedItem("enum_vals").firstChild();
 						while (!val.isNull())
 						{
@@ -177,7 +177,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 						else dropt = new DrFloatOption();
 						dropt->set("minval", o.namedItem("arg_min").toElement().text());
 						dropt->set("maxval", o.namedItem("arg_max").toElement().text());
-						QString	defval = o.namedItem("arg_defval").toElement().text();
+						TQString	defval = o.namedItem("arg_defval").toElement().text();
 						dropt->set("default", defval);
 						dropt->setValueText(defval);
 					}

tdeprint/fooscanner.l

@@ -72,7 +72,7 @@ D        [[:digit:]]
 
 %%
 
-void tdeprint_foomatic2scanner_init( QIODevice *d )
+void tdeprint_foomatic2scanner_init( TQIODevice *d )
 {
 	tdeprint_foomatic2scanner_device = d;
 }

tdeprint/kmjob.cpp

@@ -78,7 +78,7 @@ TQString KMJob::pixmap()
 		return TQString::fromLatin1("application-x-executable");
 
 	// normal case
-	QString	str("tdeprint_job");
+	TQString	str("tdeprint_job");
 	switch (m_state)
 	{
 		case KMJob::Printing:
@@ -104,7 +104,7 @@ TQString KMJob::pixmap()
 
 TQString KMJob::stateString()
 {
-	QString	str;
+	TQString	str;
 	switch (m_state)
 	{
 		case KMJob::Printing:

tdeprint/kmjob.h

@@ -111,9 +111,9 @@ protected:
 protected:
 	// normal members
 	int	m_ID;
-	QString	m_name;
+	TQString	m_name;
-	QString	m_printer;
+	TQString	m_printer;
-	QString	m_owner;
+	TQString	m_owner;
 	int	m_state;
 	int	m_size;
 	int	m_type;
@@ -123,7 +123,7 @@ protected:
 	bool	m_remote;
 
 	// internal members
-	QString	m_uri;
+	TQString	m_uri;
 	TQValueVector<TQString>	m_attributes;
 };
 

tdeprint/kmmanager.cpp

@@ -421,7 +421,7 @@ TQString KMManager::testPage()
 {
 	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
-	QString	tpage = conf->readPathEntry("TestPage");
+	TQString	tpage = conf->readPathEntry("TestPage");
 	if (tpage.isEmpty())
 		tpage = locate("data","tdeprint/testprint.ps");
 	return tpage;

tdeprint/kmmanager.h

@@ -170,7 +170,7 @@ protected:
 	virtual void checkUpdatePossibleInternal();
 
 protected:
-	QString			m_errormsg;
+	TQString			m_errormsg;
 	KMPrinterList		m_printers, m_fprinters;	// filtered printers
 	bool 			m_hasmanagement;
 	int			m_printeroperationmask;

tdeprint/kmprinter.cpp

@@ -90,7 +90,7 @@ TQString KMPrinter::pixmap()
 {
 	if (!m_pixmap.isEmpty()) return m_pixmap;
 
-	QString	str("tdeprint_printer");
+	TQString	str("tdeprint_printer");
 	if (!isValid()) str.append("_defect");
 	else
 	{
@@ -133,7 +133,7 @@ int KMPrinter::compare(KMPrinter *p1, KMPrinter *p2)
 
 TQString KMPrinter::stateString() const
 {
-	QString	s;
+	TQString	s;
 	switch (state())
 	{
 		case KMPrinter::Idle: s = i18n("Idle"); break;
@@ -184,7 +184,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
 								true);
 			dialog->setOperationMode (KFileDialog::Saving);
 
-			QString	mimetype = option("kde-special-mimetype");
+			TQString	mimetype = option("kde-special-mimetype");
 
 			if (!mimetype.isEmpty())
 			{

tdeprint/kmspecialmanager.cpp

@@ -43,7 +43,7 @@ KMSpecialManager::KMSpecialManager(KMManager *parent, const char *name)
 bool KMSpecialManager::savePrinters()
 {
 	// for root, use a global location.
-	QString	confname;
+	TQString	confname;
 	if (getuid() == 0)
 	{
 		confname = locate("data", "tdeprint/specials.desktop");
@@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename)
 	int	n = conf.readNumEntry("Number",0);
 	for (int i=0;i<n;i++)
 	{
-		QString	grpname = TQString::fromLatin1("Printer %1").arg(i);
+		TQString	grpname = TQString::fromLatin1("Printer %1").arg(i);
 		if (!conf.hasGroup(grpname)) continue;
 		conf.setGroup(grpname);
 		KMPrinter	*printer = new KMPrinter;
@@ -213,7 +213,7 @@ DrMain* KMSpecialManager::loadDriver(KMPrinter *pr)
 
 TQString KMSpecialManager::setupCommand(const TQString& cmd, const TQMap<TQString,TQString>& opts)
 {
-	QString	s(cmd);
+	TQString	s(cmd);
 	if (!s.isEmpty())
 	{
 		KXmlCommand	*xmlCmd = loadCommand(cmd);

tdeprint/kmthreadjob.cpp

@@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob()
 
 TQString KMThreadJob::jobFile()
 {
-	QString	f = locateLocal("data","tdeprint/printjobs");
+	TQString	f = locateLocal("data","tdeprint/printjobs");
 	return f;
 }
 

tdeprint/kmvirtualmanager.cpp

@@ -38,7 +38,7 @@
 
 static TQString instanceName(const TQString& prname, const TQString& instname)
 {
-	QString	str(prname);
+	TQString	str(prname);
 	if (!instname.isEmpty())
 		str.append("/"+instname);
 	return str;
@@ -60,7 +60,7 @@ KMPrinter* KMVirtualManager::findPrinter(const TQString& name)
 
 KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 	return findPrinter(instname);
 }
 
@@ -96,7 +96,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag)
 
 bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 	KMPrinter	*printer = findPrinter(instname);
 	if (printer)
 		return printer->isSoftDefault();
@@ -106,7 +106,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 {
-	QString	instname = instanceName(p->printerName(),name);
+	TQString	instname = instanceName(p->printerName(),name);
 	if (findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
 	printer->setName(instname);
@@ -123,7 +123,7 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name)
 {
-	QString	instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
+	TQString	instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
 	KMPrinter	*prsrc = findPrinter(instsrc);
 	if (!prsrc || findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
@@ -137,7 +137,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n
 
 void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
 {
-        QString	instname = instanceName(p->printerName(),name);
+        TQString	instname = instanceName(p->printerName(),name);
 	KMPrinter	*printer = findPrinter(instname);
 	if (!printer) return;
         if (name.isEmpty())
@@ -153,7 +153,7 @@ void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget *parent)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 
 	if ( p->isSpecial() )
 	{
@@ -294,7 +294,7 @@ void KMVirtualManager::loadFile(const TQString& filename)
 
 void KMVirtualManager::triggerSave()
 {
-	QString	filename;
+	TQString	filename;
 	if (getuid() == 0)
 	{
 		if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))

tdeprint/kpmarginpage.cpp

@@ -75,7 +75,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 
 	if (driver() && m_usedriver )
 	{
-		QString	pageSize(ps);
+		TQString	pageSize(ps);
 
 		if (pageSize.isEmpty())
 		{
@@ -105,7 +105,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 
 void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	QString	orient = opts["orientation-requested"];
+	TQString	orient = opts["orientation-requested"];
 	bool 	land = (orient.isEmpty()? opts["kde-orientation"] == "Landscape" : orient == "4" || orient == "5");
 	TQString ps = opts[ "kde-printsize" ];
 	if ( ps.isEmpty() )
@@ -120,7 +120,7 @@ void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
 	initPageSize(ps, land);
 
 	bool	marginset(false);
-	QString	value;
+	TQString	value;
 	if (!(value=opts["kde-margin-top"]).isEmpty() && value.toFloat() != m_margin->top())
 	{
 		marginset = true;

tdeprint/kpqtpage.cpp

@@ -235,7 +235,7 @@ void KPQtPage::slotColorModeChanged(int ID)
 
 void KPQtPage::slotNupChanged(int ID)
 {
-	QString	pixstr;
+	TQString	pixstr;
 	switch (ID)
 	{
 		case NUP_1: pixstr = "tdeprint_nup1"; break;
@@ -256,7 +256,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
 	slotColorModeChanged(ID);
 	if (driver())
 	{
-		QString	val = opts["PageSize"];
+		TQString	val = opts["PageSize"];
 		if (!val.isEmpty())
 		{
 			DrListOption	*opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));

tdeprint/kprintdialog.cpp

@@ -554,7 +554,7 @@ void KPrintDialog::initialize(KPrinter *printer)
 
 	if (plist)
 	{
-		QString	oldP = d->m_printers->currentText();
+		TQString	oldP = d->m_printers->currentText();
 		d->m_printers->clear();
 		TQPtrListIterator<KMPrinter>	it(*plist);
 		int 	defsoft(-1), defhard(-1), defsearch(-1);
@@ -969,8 +969,8 @@ void KPrintDialog::slotOpenFileDialog()
 	KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 	if (prt)
 	{
-		QString	mimetype(prt->option("kde-special-mimetype"));
+		TQString	mimetype(prt->option("kde-special-mimetype"));
-		QString	ext(prt->option("kde-special-extension"));
+		TQString	ext(prt->option("kde-special-extension"));
 
 		if (!mimetype.isEmpty())
 		{

tdeprint/kprintdialogpage.h

@@ -144,7 +144,7 @@ public:
 	 * @returns the page title
 	 * @see setTitle()
 	 */
-	QString	title() const 			{ return m_title; }
+	TQString	title() const 			{ return m_title; }
 	/**
 	 * Set the page title. This title will be used as tab name for this page in the print
 	 * dialog.
@@ -183,7 +183,7 @@ protected:
 	KMPrinter	*m_printer;
 	DrMain		*m_driver;
 	int 		m_ID;
-	QString		m_title;
+	TQString		m_title;
 	bool		m_onlyreal;
 };
 

tdeprint/kprinter.cpp

@@ -101,14 +101,14 @@ public:
 	bool		m_restore;
 	bool		m_previewonly;
 	WId		m_parentId;
-	QString		m_docfilename;
+	TQString		m_docfilename;
 	TQString m_docdirectory;
 	KPrinterWrapper		*m_wrapper;
 	TQMap<TQString,TQString>	m_options;
-	QString			m_tmpbuffer;
+	TQString			m_tmpbuffer;
-	QString			m_printername;
+	TQString			m_printername;
-	QString			m_searchname;
+	TQString			m_searchname;
-	QString			m_errormsg;
+	TQString			m_errormsg;
 	bool			m_ready;
 	int		m_pagenumber;
 	DrPageSize *m_pagesize;

tdeprint/kprinterimpl.cpp

@@ -79,7 +79,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer)
 		// Find the page size:
 		// 1) print option
 		// 2) default driver option
-		QString	psname = printer->option("PageSize");
+		TQString	psname = printer->option("PageSize");
 		if (psname.isEmpty())
 		{
 			DrListOption	*opt = (DrListOption*)driver->findOption("PageSize");

tdeprint/kprintpreview.cpp

@@ -129,7 +129,7 @@ static KLibFactory* componentFactory()
 
 static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOnly)
 {
-	QString	msg(msg_);
+	TQString	msg(msg_);
 	if (previewOnly)
 	{
 		KMessageBox::error(parent, msg);
@@ -275,7 +275,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 		exe = conf->readPathEntry("PreviewCommand", "gv");
 		if (TDEStandardDirs::findExe(exe).isEmpty())
 		{
-			QString	msg = i18n("The preview program %1 cannot be found. "
+			TQString	msg = i18n("The preview program %1 cannot be found. "
 						       "Check that the program is correctly installed and "
 						       "located in a directory included in your PATH "
 						       "environment variable.").arg(exe);
@@ -314,7 +314,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	// start the preview process
 	if (!proc.startPreview())
 	{
-		QString	msg = i18n("Preview failed: unable to start program %1.").arg(exe);
+		TQString	msg = i18n("Preview failed: unable to start program %1.").arg(exe);
 		return continuePrint(msg, parentW, previewOnly);
 	}
 	else if (!previewOnly)

tdeprint/kprintprocess.h

@@ -54,7 +54,7 @@ protected slots:
 	void slotExited( TDEProcess* );
 
 private:
-	QString	m_buffer;
+	TQString	m_buffer;
 	TQStringList m_tempfiles;
 	TQString m_output, m_tempoutput, m_command;
 	int m_state;

tdeprint/lpd/gschecker.cpp

@@ -41,7 +41,7 @@ void GsChecker::loadDriverList()
 	if (proc.open("gs -h",IO_ReadOnly))
 	{
 		QTextStream	t(&proc);
-		QString	buffer, line;
+		TQString	buffer, line;
 		bool	ok(false);
 		while (!t.eof())
 		{

tdeprint/lpd/klpdprinterimpl.cpp

@@ -40,7 +40,7 @@ TQString KLpdPrinterImpl::executable()
 
 bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 {
-	QString	exestr = executable();
+	TQString	exestr = executable();
 	if (exestr.isEmpty())
 	{
 		printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));

tdeprint/lpd/kmlpdmanager.cpp

@@ -44,7 +44,7 @@
 
 // only there to allow testing on my system. Should be removed
 // when everything has proven to be working and stable
-QString	lpdprefix = "";
+TQString	lpdprefix = "";
 TQString ptPrinterType(KMPrinter*);
 
 //************************************************************************************************
@@ -83,7 +83,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 	PrintcapEntry	*entry = m_entries.find(printer->name());
 	if (entry)
 	{
-		QString	type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
+		TQString	type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
 		printer->setDescription(i18n("Local printer queue (%1)").arg(type.isEmpty() ? i18n("Unknown type of local printer queue", "Unknown") : type));
 		printer->setLocation(i18n("<Not available>"));
 		printer->setDriverInfo(driver.isEmpty() ? i18n("Unknown Driver", "Unknown") : driver);
@@ -221,7 +221,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer)
 bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
 {
 	KPipeProcess	proc;
-	QString		cmd = programName(0);
+	TQString		cmd = programName(0);
 	cmd += " ";
 	cmd += state ? "up" : "down";
 	cmd += " ";
@@ -229,7 +229,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
 	if (proc.open(cmd))
 	{
 		QTextStream	t(&proc);
-		QString		buffer;
+		TQString		buffer;
 		while (!t.eof())
 			buffer.append(t.readLine());
 		if (buffer.startsWith("?Privilege"))
@@ -287,11 +287,11 @@ TQString KMLpdManager::programName(int f)
 void KMLpdManager::checkStatus()
 {
 	KPipeProcess	proc;
-	QString		cmd = programName(0) + " status all";
+	TQString		cmd = programName(0) + " status all";
 	if (proc.open(cmd))
 	{
 		QTextStream	t(&proc);
-		QString		line;
+		TQString		line;
 		KMPrinter	*printer(0);
 		int		p(-1);
 		while (!t.eof())
@@ -326,7 +326,7 @@ void KMLpdManager::loadPrintcapFile(const TQString& filename)
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
 		QTextStream	t(&f);
-		QString		line, comment;
+		TQString		line, comment;
 		PrintcapEntry	*entry;
 		while (!t.eof())
 		{
@@ -391,7 +391,7 @@ void KMLpdManager::loadPrinttoolDb(const TQString& filename)
 
 DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry)
 {
-	QString	ptdbfilename = driverDirectory() + "/printerdb";
+	TQString	ptdbfilename = driverDirectory() + "/printerdb";
 	if (entry->file == ptdbfilename)
 	{
 		PrinttoolEntry	*ptentry = findPrinttoolEntry(entry->modelname);
@@ -419,7 +419,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config)
 		return NULL;
 
 	// check for printtool driver (only for configuration)
-	QString	sd = entry->arg("sd"), dr(entry->comment(7));
+	TQString	sd = entry->arg("sd"), dr(entry->comment(7));
 	if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty())
 	{
 		TQMap<TQString,TQString>	map = loadPrinttoolCfgFile(sd+"/postscript.cfg");
@@ -462,7 +462,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
 		QTextStream	t(&f);
-		QString		line, name, val;
+		TQString		line, name, val;
 		int 		p(-1);
 		while (!t.eof())
 		{
@@ -488,14 +488,14 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
 bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQString& dirname, const TQMap<TQString,TQString>& options)
 {
 	// defines input and output file
-	QString	fname = TQFileInfo(templatefile).fileName();
+	TQString	fname = TQFileInfo(templatefile).fileName();
 	fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
 	QFile	fin(templatefile);
 	QFile	fout(dirname + "/" + fname);
 	if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
 	{
 		QTextStream	tin(&fin), tout(&fout);
-		QString		line, name;
+		TQString		line, name;
 		int		p(-1);
 		while (!tin.eof())
 		{
@@ -525,7 +525,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 {
 	// To be able to save a printer driver, a printcap entry MUST exist.
 	// We can then retrieve the spool directory from it.
-	QString	spooldir;
+	TQString	spooldir;
 	PrintcapEntry	*ent = findPrintcapEntry(printer->printerName());
 	if (!ent)
 		return false;
@@ -541,7 +541,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 		options["PS_SEND_EOF"] = "NO";
 		if (!checkGsDriver(options["GSDEVICE"]))
 			return false;
-		QString	resol(options["RESOLUTION"]), color(options["COLOR"]);
+		TQString	resol(options["RESOLUTION"]), color(options["COLOR"]);
 		// update entry comment to make printtool happy and save printcap file
 		ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15)));
 		ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter");
@@ -565,7 +565,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry)
 {
 	KURL	dev(printer->device());
-	QString	prot = dev.protocol(), sd(entry->arg("sd"));
+	TQString	prot = dev.protocol(), sd(entry->arg("sd"));
 	entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
 	if (prot == "smb" || prot == "ncp" || prot == "socket")
 	{
@@ -619,7 +619,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 	// first check if it has a "sd" defined
 	if (entry->arg("sd").isEmpty())
 		entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
-	QString	sd = entry->arg("sd");
+	TQString	sd = entry->arg("sd");
 	if (!TDEStandardDirs::exists(sd))
 	{
 		if (!TDEStandardDirs::makeDir(sd,0750))
@@ -641,7 +641,7 @@ bool KMLpdManager::validateDbDriver(KMDBEntry *entry)
 
 TQString ptPrinterType(KMPrinter *p)
 {
-	QString	type, prot = p->device().protocol();
+	TQString	type, prot = p->device().protocol();
 	if (prot == "lpd") type = "REMOTE";
 	else if (prot == "smb") type = "SMB";
 	else if (prot == "ncp") type = "NCP";

tdeprint/lpd/lpdtools.cpp

@@ -88,8 +88,8 @@ bool PrintcapEntry::readLine(const TQString& line)
 		{
 			int	p = l[i].find('=');
 			if (p == -1) p = 2;
-			QString	key = l[i].left(p);
+			TQString	key = l[i].left(p);
-			QString	value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
+			TQString	value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
 			m_args[key] = value;
 		}
 		return true;
@@ -114,7 +114,7 @@ void PrintcapEntry::writeEntry(TQTextStream& t)
 
 TQString PrintcapEntry::comment(int index)
 {
-	QString	w;
+	TQString	w;
 	if (m_comment.startsWith("##PRINTTOOL3##"))
 	{
 		int	p(0);
@@ -166,7 +166,7 @@ TQStringList splitPrinttoolLine(const TQString& line)
 
 bool PrinttoolEntry::readEntry(TQTextStream& t)
 {
-	QString	line;
+	TQString	line;
 	QStringList	args;
 
 	m_resolutions.setAutoDelete(true);
@@ -264,7 +264,7 @@ DrMain* PrinttoolEntry::createDriver()
 					ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
 				lopt->addChoice(ch);
 			}
-			QString	defval = lopt->choices()->first()->name();
+			TQString	defval = lopt->choices()->first()->name();
 			lopt->set("default",defval);
 			lopt->setValueText(defval);
 		}
@@ -290,7 +290,7 @@ DrMain* PrinttoolEntry::createDriver()
 					ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
 				lopt->addChoice(ch);
 			}
-			QString	defval = lopt->choices()->first()->name();
+			TQString	defval = lopt->choices()->first()->name();
 			lopt->set("default",defval);
 			lopt->setValueText(defval);
 		}
@@ -394,7 +394,7 @@ DrMain* PrinttoolEntry::createDriver()
 
 TQString getPrintcapLine(TQTextStream& t, TQString *lastcomment)
 {
-	QString	line, buffer, comm;
+	TQString	line, buffer, comm;
 	while (!t.eof())
 	{
 		buffer = t.readLine().stripWhiteSpace();

tdeprint/lpd/lpdtools.h

@@ -38,8 +38,8 @@ public:
 	TQString arg(const TQString& key) const 	{ return m_args[key]; }
 	TQString comment(int i);
 private:
-	QString			m_name;
+	TQString			m_name;
-	QString			m_comment;
+	TQString			m_comment;
 	TQMap<TQString,TQString>	m_args;
 };
 
@@ -48,13 +48,13 @@ private:
 struct Resolution
 {
 	int 	xdpi, ydpi;
-	QString	comment;
+	TQString	comment;
 };
 
 struct BitsPerPixel
 {
-	QString	bpp;
+	TQString	bpp;
-	QString	comment;
+	TQString	comment;
 };
 
 class PrinttoolEntry
@@ -64,7 +64,7 @@ public:
 	bool readEntry(TQTextStream& t);
 	DrMain* createDriver();
 private:
-	QString			m_name, m_gsdriver, m_description, m_about;
+	TQString			m_name, m_gsdriver, m_description, m_about;
 	TQPtrList<Resolution>	m_resolutions;
 	TQPtrList<BitsPerPixel>	m_depths;
 };

tdeprint/lpdunix/klpdunixprinterimpl.cpp

@@ -47,7 +47,7 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
 // look for executable, starting with "lpr"
 TQString KLpdUnixPrinterImpl::executable()
 {
-	QString	exe = TDEStandardDirs::findExe("lpr");
+	TQString	exe = TDEStandardDirs::findExe("lpr");
 	if (exe.isEmpty())
 		exe = TDEStandardDirs::findExe("lp");
 	return exe;

tdeprint/lpr/klprprinterimpl.cpp

@@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		return false;
 
 	cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
-	QString	opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
+	TQString	opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
 	if (!opts.isEmpty())
 		cmd += (" " + opts);
 	return true;
@@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value
 	KPrinterImpl::broadcastOption(key,value);
 	if (key == "kde-pagesize")
 	{
-		QString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+		TQString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
 		KPrinterImpl::broadcastOption("PageSize",pagename);
 	}
 }

tdeprint/lpr/klprprinterimpl.h

@@ -32,7 +32,7 @@ public:
 	void broadcastOption(const TQString& key, const TQString& value);
 
 private:
-	QString	m_exepath;
+	TQString	m_exepath;
 };
 
 #endif

tdeprint/lpr/lprsettings.h

@@ -58,9 +58,9 @@ protected:
 private:
 	static LprSettings*	m_self;
 	Mode	m_mode;
-	QString	m_printcapfile;
+	TQString	m_printcapfile;
 	bool	m_local;
-	QString	m_spooldir;
+	TQString	m_spooldir;
 	TQString m_defaultremotehost;
 };
 

tdeprint/management/jobitem.h

@@ -40,7 +40,7 @@ public:
 private:
 	KMJob	*m_job;
 	int	m_ID;
-	QString	m_uri;
+	TQString	m_uri;
 };
 
 inline int JobItem::jobID() const

tdeprint/management/kmconfigpage.h

@@ -45,9 +45,9 @@ protected:
 	void setPagePixmap(const TQString& s)	{ m_pixmap = s; }
 
 protected:
-	QString	m_name;
+	TQString	m_name;
-	QString	m_header;
+	TQString	m_header;
-	QString	m_pixmap;
+	TQString	m_pixmap;
 };
 
 #endif

tdeprint/management/kmiconview.h

@@ -40,7 +40,7 @@ protected:
 
 private:
 	int		m_mode;
-	QString		m_pixmap;
+	TQString		m_pixmap;
 	char		m_state;
 	bool		m_isclass;
 };

tdeprint/management/kminfopage.cpp

@@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
 		m_uri->setText(p->uri().prettyURL());
 		if (p->isClass(false))
 		{
-			QString	s;
+			TQString	s;
 			for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it)
 				s.append(KURL(*it).prettyURL() + ", ");
 			s.truncate(s.length()-2);

tdeprint/management/kmlistview.cpp

@@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 		int	st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0));
 		update = (oldstate != m_state);
-		QString	name = (p->isVirtual() ? p->instanceName() : p->name());
+		TQString	name = (p->isVirtual() ? p->instanceName() : p->name());
 		if (name != text(0))
 			setText(0, name);
 		setPixmap(0, SmallIcon(p->pixmap(), 0, st));

tdeprint/management/kmprinterview.cpp

@@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t)
 		default:
 			break;
 	}
-	QString	oldcurrent = m_current;
+	TQString	oldcurrent = m_current;
 	if ( m_listset )
 		setPrinterList(KMManager::self()->printerList(false));
 	if (m_type == KMPrinterView::Tree)

tdeprint/management/kmprinterview.h

@@ -55,7 +55,7 @@ private:
 	KMIconView	*m_iconview;
 	KMListView	*m_listview;
 	ViewType	m_type;
-	QString		m_current;
+	TQString		m_current;
 	bool m_listset;
 };
 

tdeprint/management/kmpropwidget.h

@@ -53,9 +53,9 @@ protected:
 	virtual void configureWizard(KMWizard*);
 
 protected:
-	QString		m_pixmap;
+	TQString		m_pixmap;
-	QString		m_title;
+	TQString		m_title;
-	QString		m_header;
+	TQString		m_header;
 	KMPrinter	*m_printer;
 	bool 		m_canchange;
 };

tdeprint/management/kmwizardpage.h

@@ -43,7 +43,7 @@ public:
         bool needsInitOnBack()          { return m_needsinitonback; }
 
 protected:
-	QString	m_title;
+	TQString	m_title;
 	int	m_ID;
 	int	m_nextpage;
         bool    m_needsinitonback;

tdeprint/management/kmwlpd.cpp

@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
 
 void KMWLpd::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+	TQString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
 	p->setDevice(dev);
 }
 

tdeprint/management/kmwname.cpp

@@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg)
 	}
 	else if (text(0).find(TQRegExp("\\s")) != -1)
 	{
-		QString	conv = text(0);
+		TQString	conv = text(0);
 		conv.replace(TQRegExp("\\s"), "");
 		int result = KMessageBox::warningYesNoCancel(this,
 					i18n("It is usually not a good idea to include spaces "

tdeprint/management/kmwsocketutil.h

@@ -26,8 +26,8 @@
 
 struct SocketInfo
 {
-	QString	IP;
+	TQString	IP;
-	QString	Name;
+	TQString	Name;
 	int	Port;
 };
 

tdeprint/ppdparser.y

@@ -74,7 +74,7 @@ imgarea:   IMGAREA OPTION ':' QUOTED                 { builder->putImageableArea
 	     | IMGAREA OPTION '/' TRANSLATION ':' QUOTED { builder->putImageableArea($2[0], $6[0]); }
 ;
 
-openui:   OPENUI OPTION ':' string                  { builder->openUi($2[0], QString::null, $4[0]); }
+openui:   OPENUI OPTION ':' string                  { builder->openUi($2[0], TQString::null, $4[0]); }
 	    | OPENUI OPTION '/' TRANSLATION ':' string  { builder->openUi($2[0], $4[0], $6[0]); }
 ;
 
@@ -82,7 +82,7 @@ endui:   CLOSEUI ':' string     { builder->endUi($3[0]); }
 	   | CLOSEUI string         { builder->endUi($2[0]); }
 ;
 
-opengroup:   OPENGROUP ':' string                  { builder->openGroup($3.join(" "), QString::null); }
+opengroup:   OPENGROUP ':' string                  { builder->openGroup($3.join(" "), TQString::null); }
 		   | OPENGROUP ':' string '/' TRANSLATION  { builder->openGroup($3.join(" "), $5[0]); }
 ;
 
@@ -91,15 +91,15 @@ endgroup:   CLOSEGROUP ':' string                  { builder->endGroup($3.join("
 ;
 
 constraint:   CONSTRAINT ':' KEYWORD OPTION KEYWORD OPTION { builder->putConstraint($3[0], $5[0], $4[0], $6[0]); }
-		    | CONSTRAINT ':' KEYWORD OPTION KEYWORD        { builder->putConstraint($3[0], $5[0], $4[0], QString::null); }
+		    | CONSTRAINT ':' KEYWORD OPTION KEYWORD        { builder->putConstraint($3[0], $5[0], $4[0], TQString::null); }
-			| CONSTRAINT ':' KEYWORD KEYWORD OPTION        { builder->putConstraint($3[0], $4[0], QString::null, $5[0]); }
+			| CONSTRAINT ':' KEYWORD KEYWORD OPTION        { builder->putConstraint($3[0], $4[0], TQString::null, $5[0]); }
-			| CONSTRAINT ':' KEYWORD KEYWORD               { builder->putConstraint($3[0], $4[0], QString::null, QString::null); }
+			| CONSTRAINT ':' KEYWORD KEYWORD               { builder->putConstraint($3[0], $4[0], TQString::null, TQString::null); }
 ;
 
 ppdelement:   KEYWORD ':' value                          { builder->putStatement2($1[0], $3[0]); }
-		    | KEYWORD OPTION ':' value                   { builder->putStatement($1[0], $2[0], QString::null, $4); }
+		    | KEYWORD OPTION ':' value                   { builder->putStatement($1[0], $2[0], TQString::null, $4); }
 			| KEYWORD OPTION '/' TRANSLATION ':' value   { builder->putStatement($1[0], $2[0], $4[0], $6); }
-			| KEYWORD OPTION '/' ':' value               { builder->putStatement($1[0], $2[0], QString::null, $4); }
+			| KEYWORD OPTION '/' ':' value               { builder->putStatement($1[0], $2[0], TQString::null, $4); }
 			| DEFAULT ':' string                         { builder->putDefault($1[0], $3[0]); }
 			| DEFAULT ':' string '/' TRANSLATION         { builder->putDefault($1[0], $3[0]); }
 			| openui

tdeprint/ppdscanner.l

@@ -25,7 +25,7 @@
 
 #define yylval tdeprint_ppdlval
 
-QIODevice *tdeprint_ppdscanner_device = NULL;
+TQIODevice *tdeprint_ppdscanner_device = NULL;
 #define YY_INPUT(buf,result,max_size) \
 	{ \
 		if (tdeprint_ppdscanner_device) \
@@ -122,7 +122,7 @@ L        [[:alnum:]]
 
 %%
 
-void tdeprint_ppdscanner_init(QIODevice *d)
+void tdeprint_ppdscanner_init(TQIODevice *d)
 {
 	tdeprint_ppdscanner_device = d;
 	tdeprint_ppdscanner_lno = 1;

tdeprint/rlpr/krlprprinterimpl.cpp

@@ -44,10 +44,10 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	if (!rpr)
 		return false;
 
-	QString	host(rpr->option("host")), queue(rpr->option("queue"));
+	TQString	host(rpr->option("host")), queue(rpr->option("queue"));
 	if (!host.isEmpty() && !queue.isEmpty())
 	{
-		QString		exestr = TDEStandardDirs::findExe("rlpr");
+		TQString		exestr = TDEStandardDirs::findExe("rlpr");
 		if (exestr.isEmpty())
 		{
 			printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr"));
@@ -59,7 +59,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		// proxy settings
 		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("RLPR");
-		QString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
+		TQString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
 		if (!host.isEmpty())
 		{
 			cmd.append(" -X ").append(quote(host));

tdeprint/tdeprintcheck.cpp

@@ -74,7 +74,7 @@ bool KdeprintChecker::check(const TQStringList& uris)
 
 bool KdeprintChecker::checkURL(const KURL& url)
 {
-	QString	prot(url.protocol());
+	TQString	prot(url.protocol());
 	if (prot == "config")
 		return checkConfig(url);
 	else if (prot == "exec")
@@ -89,7 +89,7 @@ bool KdeprintChecker::checkURL(const KURL& url)
 bool KdeprintChecker::checkConfig(const KURL& url)
 {
 	// get the config filename (may contain a path)
-	QString	f(url.path().mid(1));
+	TQString	f(url.path().mid(1));
 	bool	state(false);
 
 	// first check for standard KDE config file
@@ -116,13 +116,13 @@ bool KdeprintChecker::checkConfig(const KURL& url)
 
 bool KdeprintChecker::checkExec(const KURL& url)
 {
-	QString	execname(url.path().mid(1));
+	TQString	execname(url.path().mid(1));
 	return !(TDEStandardDirs::findExe(execname).isEmpty());
 }
 
 bool KdeprintChecker::checkService(const KURL& url)
 {
-	QString	serv(url.path().mid(1));
+	TQString	serv(url.path().mid(1));
 	KExtendedSocket	sock;
 
 	bool	ok;

tdeprint/tests/richpage.cpp

@@ -57,7 +57,7 @@ RichPage::~RichPage()
 
 void RichPage::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	QString	value;
+	TQString	value;
 
 	value = opts["app-rich-margin"];
 	if (!value.isEmpty())

tderandr/randr.h

@@ -297,8 +297,8 @@ private:
 	ScreenList		m_screens;
 
 	bool			m_valid;
-	QString			m_errorCode;
+	TQString			m_errorCode;
-	QString			m_version;
+	TQString			m_version;
 
 	int				m_eventBase;
 	int				m_errorBase;

tdespell2/README

@@ -52,7 +52,7 @@ Broker::Ptr broker = Broker::openBroker( someKSettingsObject );
 Dictionary *enDict = broker->dictionary( "en_US" );
 Dictionary *deDict = broker->dictionary( "de_DE" );
 
-void someFunc( const QString& word )
+void someFunc( const TQString& word )
 {
     if ( enDict->check( word ) ) {
         kdDebug()<<"Word \""<<word<<"\" is misspelled." <<endl;

tdestyles/keramik/genembed.cpp

@@ -227,7 +227,7 @@ int main(int argc, char** argv)
 
 		for (int pos=0; pos<size; pos++)
 		{
-			QRgb basePix = (QRgb)*read;
+			TQRgb basePix = (TQRgb)*read;
 
 			if (tqAlpha(basePix) != 255)
 				reallySolid = false;
@@ -245,7 +245,7 @@ int main(int argc, char** argv)
 		read  = reinterpret_cast< TQ_UINT32* >(input.bits() );
 		for (int pos=0; pos<size; pos++)
 		{
-			QRgb basePix = (QRgb)*read;
+			TQRgb basePix = (TQRgb)*read;
 			//cout<<(r*destAlpha.alphas[pos])<<"\n";
 			//cout<<(int)destAlpha.alphas[pos]<<"\n";
 			TQColor clr(basePix);

tdestyles/keramik/gradients.cpp

@@ -35,7 +35,7 @@ namespace
 	struct GradientCacheEntry
 	{
 		TQPixmap* m_pixmap;
-		QRgb     m_color;
+		TQRgb     m_color;
 		bool     m_menu;
 		int      m_width;
 		int      m_height;

tdestyles/keramik/pixmaploader.h

@@ -67,8 +67,8 @@ namespace Keramik
 			int m_id;
 			int m_width;
 			int m_height;
-			QRgb m_colorCode;
+			TQRgb m_colorCode;
-			QRgb m_bgCode;
+			TQRgb m_bgCode;
 			bool    m_disabled;
 			bool    m_blended;
 

tdestyles/plastik/misc.cpp

@@ -23,8 +23,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 {
 
     // normal button...
-    QRgb rgb = bgColor.rgb();
+    TQRgb rgb = bgColor.rgb();
-    QRgb rgb_b = fgColor.rgb();
+    TQRgb rgb_b = fgColor.rgb();
     int alpha = a;
     if(alpha>255) alpha = 255;
     if(alpha<0) alpha = 0;

tdestyles/plastik/plastik.cpp

@@ -664,7 +664,7 @@ void PlastikStyle::renderPixel(TQPainter *p,
     if(fullAlphaBlend)
     // full alpha blend: paint into an image with alpha buffer and convert to a pixmap ...
     {
-        QRgb rgb = color.rgb();
+        TQRgb rgb = color.rgb();
         // generate a quite unique key -- use the unused width field to store the alpha value.
         CacheEntry search(cAlphaDot, alpha, 0, rgb);
         int key = search.key();
@@ -697,8 +697,8 @@ void PlastikStyle::renderPixel(TQPainter *p,
     } else
     // don't use an alpha buffer: calculate the resulting color from the alpha value, the fg- and the bg-color.
     {
-        QRgb rgb_a = color.rgb();
+        TQRgb rgb_a = color.rgb();
-        QRgb rgb_b = background.rgb();
+        TQRgb rgb_b = background.rgb();
         int a = alpha;
         if(a>255) a = 255;
         if(a<0) a = 0;

tdestyles/plastik/plastik.h

@@ -317,13 +317,13 @@ private:
         CacheEntryType type;
         int width;
         int height;
-        QRgb c1Rgb;
+        TQRgb c1Rgb;
-        QRgb c2Rgb;
+        TQRgb c2Rgb;
         bool horizontal;
 
         TQPixmap* pixmap;
 
-        CacheEntry(CacheEntryType t, int w, int h, QRgb c1, QRgb c2 = 0,
+        CacheEntry(CacheEntryType t, int w, int h, TQRgb c1, TQRgb c2 = 0,
                    bool hor = false, TQPixmap* p = 0 ):
             type(t), width(w), height(h), c1Rgb(c1), c2Rgb(c2), horizontal(hor), pixmap(p)
         {}

tdeui/kcolordialog.cpp

@@ -298,7 +298,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap )
 	TQImage image( xSize, ySize, 32 );
 	TQColor col;
 	uint *p;
-	QRgb rgb;
+	TQRgb rgb;
 
 	if ( orientation() == Qt::Horizontal )
 	{

tdeui/kdatetbl.h

@@ -186,7 +186,7 @@ public slots:
    */
   void close(int r);
   /**
-   * Hides the widget. Reimplemented from QWidget
+   * Hides the widget. Reimplemented from TQWidget
    */
   void hide();
 

tdeui/kdockwidget.h

@@ -37,7 +37,7 @@
    - KDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - KDockManager                  - helper class
    - KDockMainWindow               - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
-   - KDockArea                     - like KDockMainWindow but inherits just QWidget
+   - KDockArea                     - like KDockMainWindow but inherits just TQWidget
 
    IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition!
 */

tdeui/keditcl.h

@@ -403,7 +403,7 @@ protected:
 private:
     TQTimer* repaintTimer;
 
-    QString	killbufferstring;
+    TQString	killbufferstring;
     TQWidget     *parent;
     KEdFind 	*srchdialog;
     KEdReplace 	*replace_dialog;

tdeui/kled.h

@@ -236,7 +236,7 @@ public:
    * in OFF state.
    * Defaults to 300.
    *
-   * @see QColor
+   * @see TQColor
    *
    * @param darkfactor sets the factor to darken the LED.
    * @short sets the factor to darken the LED.

tdeui/knuminput.h

@@ -213,7 +213,7 @@ public:
      *
      * @param value  initial value for the control
      * @param base   numeric base used for display
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KIntNumInput(int value, TQWidget* parent=0, int base = 10, const char *name=0);
@@ -232,7 +232,7 @@ public:
      * @param below  append KIntNumInput to the KNumInput chain
      * @param value  initial value for the control
      * @param base   numeric base used for display
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KIntNumInput(KNumInput* below, int value, TQWidget* parent=0, int base = 10, const char *name=0);
@@ -457,7 +457,7 @@ public:
      * Constructor
      *
      * @param value  initial value for the control
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
@@ -470,7 +470,7 @@ public:
      * @param value  initial value for the control
      * @param step   step size to use for up/down arrow clicks
      * @param precision number of digits after the decimal point
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      * @since 3.1
      */
@@ -490,7 +490,7 @@ public:
      *
      * @param  below
      * @param  value  initial value for the control
-     * @param  parent parent QWidget
+     * @param  parent parent TQWidget
      * @param  name   internal name for this widget
      **/
     KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) KDE_DEPRECATED;
@@ -512,7 +512,7 @@ public:
      * @param value  initial value for the control
      * @param step   step size to use for up/down arrow clicks
      * @param precision number of digits after the decimal point
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      * @since 3.1
      */

tdeui/krestrictedline.h

@@ -85,7 +85,7 @@ protected:
 
 private:
   /// TQString of valid characters for this line
-  QString	qsValidChars;
+  TQString	qsValidChars;
 protected:
   virtual void virtual_hook( int id, void* data );
 private:

tdeui/ktip.cpp

@@ -189,7 +189,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	img = TQImage(locate("data", "tdewizard/pics/wizard_small.png"));
 	// colorize and check to figure the correct color
 	TDEIconEffect::colorize(img, mBlendedColor, 1.0);
-	QRgb colPixel( img.pixel(0,0) );
+	TQRgb colPixel( img.pixel(0,0) );
 
 	mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel));
     }

tdeui/kxmlgui.xsd

@@ -56,7 +56,7 @@
         <xsd:annotation>
             <xsd:documentation>
                 
-                The name used for every name and group attribute. Maps to QObject::name() in most cases. 
+                The name used for every name and group attribute. Maps to TQObject::name() in most cases. 
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:Name">

tdeui/tdeaboutdialog.cpp

@@ -1026,7 +1026,7 @@ TDEAboutContributor::setName(const TQString& n)
   // ############################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getName()
 {
   // ###########################################################
@@ -1041,7 +1041,7 @@ TDEAboutContributor::setURL(const TQString& u)
   // ###########################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getURL()
 {
   // ###########################################################
@@ -1057,7 +1057,7 @@ TDEAboutContributor::setEmail(const TQString& e)
   // ###########################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getEmail()
 {
   // ###########################################################

tdeui/tdetoolbar.h

@@ -645,7 +645,7 @@ public:
    * You can do with this whatever you want,
    * except change its height (hardcoded). If you change its width
    * you will probably have to call TQToolBar::updateRects(true)
-   * @see QWidget
+   * @see TQWidget
    * @see updateRects()
    */
     TQWidget *getWidget (int id); // ### KDE4: make this const!

tdeui/tests/kcolortest.cpp

@@ -46,11 +46,11 @@ void KColorWidget::doIntensityLoop()
 	  KImageEffect::intensity(image, -1./max);
 	else {
 	  uint *qptr=(uint *)image.bits();
-	  QRgb qrgb;
+	  TQRgb qrgb;
 	  int size=pixmap.width()*pixmap.height();
 	  for (int i=0;i<size; i++, qptr++)
 	    {
-	      qrgb=*(QRgb *)qptr;
+	      qrgb=*(TQRgb *)qptr;
 	      *qptr=tqRgb((int)(tqRed(qrgb)*1./max),
 			 (int)(tqGreen(qrgb)*1./max),
 			 (int)(tqBlue(qrgb)*1./max));

tdeutils/ksettings/README.dox

@@ -35,7 +35,7 @@ KSettings::Dialog:
 m_dlg = new KSettings::Dialog( QStringList::split( ';', "component1;component2" ) );
 \endcode
 
-The KSettings::Dialog object will be destructed automatically by the QObject
+The KSettings::Dialog object will be destructed automatically by the TQObject
 mechanisms.
 
 
@@ -49,7 +49,7 @@ class MyAppConfig : public TDECModule
 {
   TQ_OBJECT
 public:
-  MyAppConfig( QWidget *parent, const char *name = 0, const QStringList &args =
+  MyAppConfig( TQWidget *parent, const char *name = 0, const QStringList &args =
       QStringList() );
   ~MyAppConfig();
 
@@ -62,11 +62,11 @@ public:
 and in the cpp file:
 
 \code
-typedef KGenericFactory<MyAppConfig, QWidget> MyAppConfigFactory;
+typedef KGenericFactory<MyAppConfig, TQWidget> MyAppConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory(
     "kcm_myappconfig" ) );
 
-MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args )
+MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &args )
   : TDECModule( MyAppConfigFactory::instance(), parent, args )
 {
   // create the pages GUI
@@ -191,10 +191,10 @@ for the first.
 To create a plugin page you need the following code:
 
 \code
-typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFactory;
+typedef KGenericFactory<MyAppPluginConfig, TQWidget> MyAppPluginConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFactory( "kcm_myapppluginconfig" ) );
 
-MyAppPluginConfig( QWidget * parent, const char *, const QStringList & args )
+MyAppPluginConfig( TQWidget * parent, const char *, const QStringList & args )
     : PluginPage( MyAppPluginConfigFactory::instance(), parent, args )
 {
     pluginSelector()->addPlugins( ... );

tdewidgets/README

@@ -11,7 +11,7 @@ $TDEDIR/lib/trinity/plugins . With the KDE build system nothing special
 (i.e. editing the plugin path) is needed, as uic will automatically be
 called with -L <path to the tdewidgets plugin> .
 
-This plugin uses the QWidget plugin API of Qt >= 3.0
+This plugin uses the TQWidget plugin API of Qt >= 3.0
 Don't expect it to work with any other versions of Qt.
 
 

tdewidgets/tests/test.widgets

@@ -173,7 +173,7 @@ Group=Input (KDE)
 
 [KURLLabel]
 ToolTip=URL Label (KDE)
-ConstructorArgs=("KURLLabel", QString::null, parent, name)
+ConstructorArgs=("KURLLabel", TQString::null, parent, name)
 Group=Display (KDE)
 
 [KURLComboRequester]