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

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

17 files changed, 46 insertions, 46 deletions

diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 2834c86a2..fa44f5329 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/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:
diff --git a/tdeio/kssl/ksslcertificate.cpp b/tdeio/kssl/ksslcertificate.cpp
index edf877496..774553939 100644
--- a/tdeio/kssl/ksslcertificate.cpp
+++ b/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
diff --git a/tdeio/kssl/ksslcsessioncache.cpp b/tdeio/kssl/ksslcsessioncache.cpp
index d39638717..fc7ed0145 100644
--- a/tdeio/kssl/ksslcsessioncache.cpp
+++ b/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;
diff --git a/tdeio/kssl/ksslsession.cpp b/tdeio/kssl/ksslsession.cpp
index 3c80233f1..7d597146a 100644
--- a/tdeio/kssl/ksslsession.cpp
+++ b/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);
diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index 58a817e83..d709401fa 100644
--- a/tdeio/kssl/ksslutils.h
+++ b/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
diff --git a/tdeio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp
index b1f2fee82..6891d37a7 100644
--- a/tdeio/misc/kpac/script.cpp
+++ b/tdeio/misc/kpac/script.cpp
@@ -447,11 +447,11 @@ namespace KPAC
 	  throw Error( "No such function FindProxyForURL" );
 
         KURL cleanUrl = url;
-        cleanUrl.setPass(QString());
-        cleanUrl.setUser(QString());
+        cleanUrl.setPass(TQString());
+        cleanUrl.setUser(TQString());
         if (cleanUrl.protocol().lower() == "https") {
-            cleanUrl.setPath(QString());
-            cleanUrl.setQuery(QString());
+            cleanUrl.setPath(TQString());
+            cleanUrl.setQuery(TQString());
         }
 
 	Object thisObj;
diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index 8c4ffcb30..3d00b4c1a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.h
+++ b/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:
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index c646c13cd..7d7669569 100644
--- a/tdeio/tdefile/NOTES
+++ b/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
diff --git a/tdeio/tdefile/images.h b/tdeio/tdefile/images.h
index f544e2f0a..0e9298383 100644
--- a/tdeio/tdefile/images.h
+++ b/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 )
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index 0a1ccbfbc..9727716c3 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/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
diff --git a/tdeio/tdeio/kacl.cpp b/tdeio/tdeio/kacl.cpp
index fcf3cc13f..b62ac5438 100644
--- a/tdeio/tdeio/kacl.cpp
+++ b/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 );
diff --git a/tdeio/tdeio/kacl.h b/tdeio/tdeio/kacl.h
index f581f7a8e..3b96f8dfb 100644
--- a/tdeio/tdeio/kacl.h
+++ b/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. */
 
diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h
index 655b1e3d1..b36d1ffb2 100644
--- a/tdeio/tdeio/kmimetyperesolver.h
+++ b/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.
  */
diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h
index 450a5ca45..eb9ab9116 100644
--- a/tdeio/tdeio/kscan.h
+++ b/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 );
diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index dfc686821..3c6861c15 100644
--- a/tdeio/tdeio/kurifilter.h
+++ b/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.
diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index 08649ae1d..e0371c7dd 100644
--- a/tdeio/tdeio/tdefilemetainfo.h
+++ b/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;
 
diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index ed0a63ed9..45e4d1dda 100644
--- a/tdeio/tests/dataprotocoltest.cpp
+++ b/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