diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:47 +0000 |
commit | 8f14fb0418241694e61cb35dda95fea6d9b7830d (patch) | |
tree | 73afdda59a8126db123133d64bab78a3503657dc /kdecore | |
parent | ffe8a83e053396df448e9413828527613ca3bd46 (diff) | |
download | tdelibs-8f14fb0418241694e61cb35dda95fea6d9b7830d.tar.gz tdelibs-8f14fb0418241694e61cb35dda95fea6d9b7830d.zip |
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1158447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore')
48 files changed, 92 insertions, 92 deletions
diff --git a/kdecore/kaccel.h b/kdecore/kaccel.h index c72730b6b..3d9dacf0a 100644 --- a/kdecore/kaccel.h +++ b/kdecore/kaccel.h @@ -25,8 +25,8 @@ #include <kstdaccel.h> #include "kdelibs_export.h" -class QPopupMenu; // for obsolete insertItem() methods below -class QWidget; +class TQPopupMenu; // for obsolete insertItem() methods below +class TQWidget; class KAccelAction; class KAccelActions; class KConfigBase; diff --git a/kdecore/kaccelaction.h b/kdecore/kaccelaction.h index 606bd3ccb..d55e4517c 100644 --- a/kdecore/kaccelaction.h +++ b/kdecore/kaccelaction.h @@ -29,7 +29,7 @@ class KAccelBase; -class QObject; +class TQObject; class KConfig; class KConfigBase; diff --git a/kdecore/kaccelbase.h b/kdecore/kaccelbase.h index 3f6797f79..07e3f4833 100644 --- a/kdecore/kaccelbase.h +++ b/kdecore/kaccelbase.h @@ -29,8 +29,8 @@ #include "kaccelaction.h" #include "kkeyserver.h" -class QPopupMenu; -class QWidget; +class TQPopupMenu; +class TQWidget; //---------------------------------------------------- diff --git a/kdecore/kaccelmanager.h b/kdecore/kaccelmanager.h index b4869f072..21655fd9c 100644 --- a/kdecore/kaccelmanager.h +++ b/kdecore/kaccelmanager.h @@ -22,8 +22,8 @@ #define __K_ACCELMANAGER_H__ -class QWidget; -class QString; +class TQWidget; +class TQString; #include <kdelibs_export.h> diff --git a/kdecore/kaccelmanager_private.h b/kdecore/kaccelmanager_private.h index e19b5a9a5..fbb5d1857 100644 --- a/kdecore/kaccelmanager_private.h +++ b/kdecore/kaccelmanager_private.h @@ -27,7 +27,7 @@ #include <tqvaluelist.h> #include <tqobject.h> -class QWidgetStack; +class TQWidgetStack; /** * A string class handling accelerators. @@ -119,7 +119,7 @@ public: }; -class QPopupMenu; +class TQPopupMenu; /** diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 678d36677..ed302875a 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -1525,7 +1525,7 @@ void KApplication::parseCommandLine( ) { const char *tmp = args->getOption("miniicon"); if (!aIconPixmap.pm.miniIcon) { - aIconPixmap.pm.miniIcon = new QPixmap; + aIconPixmap.pm.miniIcon = new TQPixmap; } *aIconPixmap.pm.miniIcon = SmallIcon(tmp); aMiniIconName = tmp; @@ -1535,12 +1535,12 @@ void KApplication::parseCommandLine( ) { const char *tmp = args->getOption("icon"); if (!aIconPixmap.pm.icon) { - aIconPixmap.pm.icon = new QPixmap; + aIconPixmap.pm.icon = new TQPixmap; } *aIconPixmap.pm.icon = DesktopIcon( tmp ); aIconName = tmp; if (!aIconPixmap.pm.miniIcon) { - aIconPixmap.pm.miniIcon = new QPixmap; + aIconPixmap.pm.miniIcon = new TQPixmap; } if (aIconPixmap.pm.miniIcon->isNull()) { @@ -1601,7 +1601,7 @@ TQString KApplication::geometryArgument() const TQPixmap KApplication::icon() const { if( !aIconPixmap.pm.icon) { - aIconPixmap.pm.icon = new QPixmap; + aIconPixmap.pm.icon = new TQPixmap; } if( aIconPixmap.pm.icon->isNull()) { *aIconPixmap.pm.icon = DesktopIcon( instanceName() ); @@ -1617,7 +1617,7 @@ TQString KApplication::iconName() const TQPixmap KApplication::miniIcon() const { if (!aIconPixmap.pm.miniIcon) { - aIconPixmap.pm.miniIcon = new QPixmap; + aIconPixmap.pm.miniIcon = new TQPixmap; } if (aIconPixmap.pm.miniIcon->isNull()) { *aIconPixmap.pm.miniIcon = SmallIcon( instanceName() ); @@ -2181,7 +2181,7 @@ void KApplication::installKDEPropertyMap() * Thanks. */ // TQSqlPropertyMap takes ownership of the new default map. - TQSqlPropertyMap *kdeMap = new QSqlPropertyMap; + TQSqlPropertyMap *kdeMap = new TQSqlPropertyMap; kdeMap->insert( "KColorButton", "color" ); kdeMap->insert( "KComboBox", "currentItem" ); kdeMap->insert( "KDatePicker", "date" ); diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h index b7433bc36..dd89de131 100644 --- a/kdecore/kapplication.h +++ b/kdecore/kapplication.h @@ -40,8 +40,8 @@ typedef void Display; #include <kinstance.h> struct _IceConn; -class QPopupMenu; -class QStrList; +class TQPopupMenu; +class TQStrList; class KSessionManaged; class KStyle; class KURL; diff --git a/kdecore/kcharsets.h b/kdecore/kcharsets.h index 7a92c1303..32c91148a 100644 --- a/kdecore/kcharsets.h +++ b/kdecore/kcharsets.h @@ -28,7 +28,7 @@ class KGlobal; class KCharsetsPrivate; -class QTextCodec; +class TQTextCodec; /** * Charset font and encoder/decoder handling. diff --git a/kdecore/kcheckaccelerators.h b/kdecore/kcheckaccelerators.h index 85a6f03f5..f6a5b7223 100644 --- a/kdecore/kcheckaccelerators.h +++ b/kdecore/kcheckaccelerators.h @@ -28,8 +28,8 @@ #include <tqstring.h> #include <tqtimer.h> -class QMenuData; -class QTextView; +class TQMenuData; +class TQTextView; #include "kdelibs_export.h" diff --git a/kdecore/kcmdlineargs.cpp b/kdecore/kcmdlineargs.cpp index 6a032f748..3e70156cd 100644 --- a/kdecore/kcmdlineargs.cpp +++ b/kdecore/kcmdlineargs.cpp @@ -83,7 +83,7 @@ protected: virtual TQDataStream& read( TQDataStream &s, TQPtrCollection::Item &item) { - TQCString *str = new QCString; + TQCString *str = new TQCString; s >> (*str); item = (void *)str; return s; diff --git a/kdecore/kcompletion.h b/kdecore/kcompletion.h index 11e973dc8..95198cdb0 100644 --- a/kdecore/kcompletion.h +++ b/kdecore/kcompletion.h @@ -37,7 +37,7 @@ class KCompletionPrivate; class KCompletionBasePrivate; class KCompletionMatchesWrapper; class KCompletionMatches; -class QPopupMenu; +class TQPopupMenu; /** * @short A generic class for completing QStrings diff --git a/kdecore/kconfig.h b/kdecore/kconfig.h index 4eb0ff84b..19ff09314 100644 --- a/kdecore/kconfig.h +++ b/kdecore/kconfig.h @@ -22,7 +22,7 @@ #ifndef _KCONFIG_H #define _KCONFIG_H -class QTimer; +class TQTimer; #include <tqvaluelist.h> diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h index 5521ef982..36b33cd47 100644 --- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h +++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h @@ -18,7 +18,7 @@ #include <kunittest/tester.h> -class QString; +class TQString; // change to SlotTester when it works class KConfigCompiler_Test : public KUnitTest::Tester diff --git a/kdecore/kconfigbackend.h b/kdecore/kconfigbackend.h index 145602e0f..3b2418330 100644 --- a/kdecore/kconfigbackend.h +++ b/kdecore/kconfigbackend.h @@ -28,7 +28,7 @@ #include <klocale.h> #include "kdelibs_export.h" -class QFile; +class TQFile; class KConfigBackEndPrivate; /** diff --git a/kdecore/kconfigdialogmanager.h b/kdecore/kconfigdialogmanager.h index ab4dd2476..d0b385b60 100644 --- a/kdecore/kconfigdialogmanager.h +++ b/kdecore/kconfigdialogmanager.h @@ -27,8 +27,8 @@ class KConfigSkeleton; class KConfigSkeletonItem; -class QWidget; -class QSqlPropertyMap; +class TQWidget; +class TQSqlPropertyMap; /** * @short Provides a means of automatically retrieving, diff --git a/kdecore/kdebug.h b/kdecore/kdebug.h index bc8a858f0..884545257 100644 --- a/kdecore/kdebug.h +++ b/kdecore/kdebug.h @@ -25,22 +25,22 @@ #include <tqstring.h> #include "kdelibs_export.h" -class QWidget; -class QDateTime; -class QDate; -class QTime; -class QPoint; -class QSize; -class QRect; -class QRegion; +class TQWidget; +class TQDateTime; +class TQDate; +class TQTime; +class TQPoint; +class TQSize; +class TQRect; +class TQRegion; class KURL; -class QStringList; -class QColor; -class QPen; -class QBrush; -class QVariant; +class TQStringList; +class TQColor; +class TQPen; +class TQBrush; +class TQVariant; template <class T> -class QValueList; +class TQValueList; class kdbgstream; class kndbgstream; diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h index ed3dbfc3e..7bc93618c 100644 --- a/kdecore/kextsock.h +++ b/kdecore/kextsock.h @@ -37,7 +37,7 @@ struct addrinfo; struct kde_addrinfo; class KAddressInfo; /* our abstraction of it */ -class QSocketNotifier; +class TQSocketNotifier; /* * This is extending QIODevice's error codes diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h index 14bf26d32..c00279e1b 100644 --- a/kdecore/kglobal.h +++ b/kdecore/kglobal.h @@ -30,7 +30,7 @@ class KStandardDirs; class KStaticDeleterBase; class KStaticDeleterList; class KStringDict; -class QString; +class TQString; /** * Access to the KDE global objects. diff --git a/kdecore/kglobalaccel.h b/kdecore/kglobalaccel.h index 9ef9c9fa7..33dd5e37b 100644 --- a/kdecore/kglobalaccel.h +++ b/kdecore/kglobalaccel.h @@ -23,8 +23,8 @@ #include <tqobject.h> #include <kshortcut.h> -class QPopupMenu; -class QWidget; +class TQPopupMenu; +class TQWidget; class KAccelAction; class KAccelActions; class KConfigBase; diff --git a/kdecore/kiconeffect.h b/kdecore/kiconeffect.h index c0eba9c69..b5f84cc20 100644 --- a/kdecore/kiconeffect.h +++ b/kdecore/kiconeffect.h @@ -19,7 +19,7 @@ #include <tqrect.h> #include "kdelibs_export.h" -class QWidget; +class TQWidget; class KIconEffectPrivate; diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h index f502eefc5..bb11183db 100644 --- a/kdecore/kinstance.h +++ b/kdecore/kinstance.h @@ -23,7 +23,7 @@ class KAboutData; class KConfig; class KIconLoader; class KCharsets; -class QFont; +class TQFont; class KInstancePrivate; class KMimeSourceFactory; class KSharedConfig; diff --git a/kdecore/klibloader.h b/kdecore/klibloader.h index 27fc2becc..b1a1bc330 100644 --- a/kdecore/klibloader.h +++ b/kdecore/klibloader.h @@ -28,7 +28,7 @@ #include <stdlib.h> // For backwards compatibility class KInstance; -class QTimer; +class TQTimer; class KLibrary; class KLibFactory; class KLibFactoryPrivate; diff --git a/kdecore/klocale.h b/kdecore/klocale.h index ca665152a..bab4c4adb 100644 --- a/kdecore/klocale.h +++ b/kdecore/klocale.h @@ -25,11 +25,11 @@ #include <tqstring.h> #include <kdelibs_export.h> -class QStringList; -class QTextCodec; -class QDate; -class QTime; -class QDateTime; +class TQStringList; +class TQTextCodec; +class TQDate; +class TQTime; +class TQDateTime; class KGlobal; class KConfig; diff --git a/kdecore/kprocctrl.h b/kdecore/kprocctrl.h index 3af87fff5..69182a344 100644 --- a/kdecore/kprocctrl.h +++ b/kdecore/kprocctrl.h @@ -24,7 +24,7 @@ #include "kprocess.h" -class QSocketNotifier; +class TQSocketNotifier; /** * @short Used internally by KProcess diff --git a/kdecore/kprocess.h b/kdecore/kprocess.h index cb64dda81..320a2d1b7 100644 --- a/kdecore/kprocess.h +++ b/kdecore/kprocess.h @@ -29,7 +29,7 @@ #include <tqobject.h> #include "kdelibs_export.h" -class QSocketNotifier; +class TQSocketNotifier; class KProcessPrivate; class KPty; diff --git a/kdecore/kprocio.h b/kdecore/kprocio.h index 1cd397deb..8661699a7 100644 --- a/kdecore/kprocio.h +++ b/kdecore/kprocio.h @@ -24,7 +24,7 @@ #include "kdelibs_export.h" class KProcIOPrivate; -class QTextCodec; +class TQTextCodec; /** * KProcIO diff --git a/kdecore/krandomsequence.h b/kdecore/krandomsequence.h index 877df7a1c..383eee9ce 100644 --- a/kdecore/krandomsequence.h +++ b/kdecore/krandomsequence.h @@ -21,7 +21,7 @@ #include "kdelibs_export.h" class KRandomSequencePrivate; -class QGList; +class TQGList; /** * A class to create a pseudo-random sequence * diff --git a/kdecore/kshortcut.h b/kdecore/kshortcut.h index ec36cfa93..7d62a0041 100644 --- a/kdecore/kshortcut.h +++ b/kdecore/kshortcut.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include "kdelibs_export.h" -class QKeyEvent; +class TQKeyEvent; class KKeyNative; /** diff --git a/kdecore/kshortcutlist.h b/kdecore/kshortcutlist.h index 47339c93c..4896bc30a 100644 --- a/kdecore/kshortcutlist.h +++ b/kdecore/kshortcutlist.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include "kdelibs_export.h" -class QVariant; +class TQVariant; class KConfigBase; class KInstance; class KKeySequence; diff --git a/kdecore/kshortcutmenu.h b/kdecore/kshortcutmenu.h index 3be542a13..10f486094 100644 --- a/kdecore/kshortcutmenu.h +++ b/kdecore/kshortcutmenu.h @@ -25,7 +25,7 @@ #include "kshortcut.h" -class QLabel; +class TQLabel; class KAccelActions; diff --git a/kdecore/ksock.h b/kdecore/ksock.h index ab8b8828d..8f2c9280c 100644 --- a/kdecore/ksock.h +++ b/kdecore/ksock.h @@ -40,7 +40,7 @@ #include <sys/un.h> #include <netinet/in.h> -class QSocketNotifier; +class TQSocketNotifier; #ifdef KSOCK_NO_BROKEN // This is here for compatibility with old applications still using the constants diff --git a/kdecore/kstdaccel.h b/kdecore/kstdaccel.h index af102d063..9f379b210 100644 --- a/kdecore/kstdaccel.h +++ b/kdecore/kstdaccel.h @@ -24,7 +24,7 @@ #include <kshortcut.h> #include "kdelibs_export.h" -class QKeyEvent; +class TQKeyEvent; class KAccelActions; /** diff --git a/kdecore/ksycoca.h b/kdecore/ksycoca.h index 408c48234..8cbe6eb67 100644 --- a/kdecore/ksycoca.h +++ b/kdecore/ksycoca.h @@ -25,7 +25,7 @@ #include "ksycocatype.h" #include <kdelibs_export.h> -class QDataStream; +class TQDataStream; class KSycocaPrivate; class KSycocaFactory; class KSycocaFactoryList; diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h index fc06dcc3b..5f6f11bbd 100644 --- a/kdecore/ksycocaentry.h +++ b/kdecore/ksycocaentry.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <ksharedptr.h> -class QDataStream; +class TQDataStream; /** * Base class for all Sycoca entries. diff --git a/kdecore/ksycocafactory.h b/kdecore/ksycocafactory.h index b7def5369..536da2864 100644 --- a/kdecore/ksycocafactory.h +++ b/kdecore/ksycocafactory.h @@ -25,8 +25,8 @@ #include <tqdict.h> #include <tqptrlist.h> class KSycoca; -class QStringList; -class QString; +class TQStringList; +class TQString; class KSycocaDict; class KSycocaResourceList; diff --git a/kdecore/ktempdir.h b/kdecore/ktempdir.h index 7f47276ab..491a14c4c 100644 --- a/kdecore/ktempdir.h +++ b/kdecore/ktempdir.h @@ -25,7 +25,7 @@ #include <errno.h> #include "kdelibs_export.h" -class QDir; +class TQDir; class KTempDirPrivate; /** diff --git a/kdecore/ktempfile.h b/kdecore/ktempfile.h index bba2d6442..5b18bf779 100644 --- a/kdecore/ktempfile.h +++ b/kdecore/ktempfile.h @@ -25,9 +25,9 @@ #include <errno.h> #include "kdelibs_export.h" -class QFile; -class QTextStream; -class QDataStream; +class TQFile; +class TQTextStream; +class TQDataStream; class KSaveFile; class KTempFilePrivate; diff --git a/kdecore/kurl.h b/kdecore/kurl.h index 62c4861ff..86c7aa169 100644 --- a/kdecore/kurl.h +++ b/kdecore/kurl.h @@ -24,9 +24,9 @@ #include <tqvaluelist.h> #include "kdelibs_export.h" -class QUrl; -class QStringList; -template <typename K, typename V> class QMap; +class TQUrl; +class TQStringList; +template <typename K, typename V> class TQMap; class KURLPrivate; diff --git a/kdecore/kurldrag.h b/kdecore/kurldrag.h index f69161985..fd911dfb7 100644 --- a/kdecore/kurldrag.h +++ b/kdecore/kurldrag.h @@ -24,7 +24,7 @@ #include <tqdragobject.h> #include <kurl.h> #include "kdelibs_export.h" -class QMimeSource; +class TQMimeSource; class KURLDragPrivate; /** diff --git a/kdecore/kuser.h b/kdecore/kuser.h index ac8a1ac0c..5c43b6b69 100644 --- a/kdecore/kuser.h +++ b/kdecore/kuser.h @@ -25,11 +25,11 @@ #include "ksharedptr.h" class KUserGroup; -class QString; -class QStringList; +class TQString; +class TQStringList; class KUserPrivate; struct passwd; -template <class T> class QValueList; +template <class T> class TQValueList; /** * @short Represents a user on your system diff --git a/kdecore/kxmessages.h b/kdecore/kxmessages.h index 8c71679fe..256b69f91 100644 --- a/kdecore/kxmessages.h +++ b/kdecore/kxmessages.h @@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE. #ifdef Q_WS_X11 #include <X11/X.h> -class QString; +class TQString; class KXMessagesPrivate; /** diff --git a/kdecore/network/kiobuffer.h b/kdecore/network/kiobuffer.h index 2fc5b49e3..839899b18 100644 --- a/kdecore/network/kiobuffer.h +++ b/kdecore/network/kiobuffer.h @@ -29,7 +29,7 @@ #include <kdelibs_export.h> -class QIODevice; +class TQIODevice; /** * @class KIOBufferBase kiobuffer.h kiobuffer.h diff --git a/kdecore/network/kresolver.h b/kdecore/network/kresolver.h index cfc1226a5..5b66f362c 100644 --- a/kdecore/network/kresolver.h +++ b/kdecore/network/kresolver.h @@ -35,9 +35,9 @@ //////////////////////// // Forward declarations struct sockaddr; -class QString; -class QCString; -class QStrList; +class TQString; +class TQCString; +class TQStrList; ////////////////// // Our definitions diff --git a/kdecore/network/kresolverworkerbase.h b/kdecore/network/kresolverworkerbase.h index 9c2728cdf..4dee33239 100644 --- a/kdecore/network/kresolverworkerbase.h +++ b/kdecore/network/kresolverworkerbase.h @@ -28,8 +28,8 @@ #include "kresolver.h" // forward declarations -class QString; -template <class T> class QValueList; +class TQString; +template <class T> class TQValueList; namespace KNetwork { diff --git a/kdecore/network/ksocketbase.h b/kdecore/network/ksocketbase.h index e416c8e93..5ef298847 100644 --- a/kdecore/network/ksocketbase.h +++ b/kdecore/network/ksocketbase.h @@ -75,7 +75,7 @@ #define IO_SocketCreateError (IO_UnspecifiedError+4) #define IO_BindError (IO_UnspecifiedError+5) -class QMutex; +class TQMutex; namespace KNetwork { diff --git a/kdecore/network/ksrvresolverworker_p.h b/kdecore/network/ksrvresolverworker_p.h index 7022df826..90074214f 100644 --- a/kdecore/network/ksrvresolverworker_p.h +++ b/kdecore/network/ksrvresolverworker_p.h @@ -28,7 +28,7 @@ #include "kresolver.h" #include "kresolverworkerbase.h" -class QCustomEvent; +class TQCustomEvent; namespace KNetwork { diff --git a/kdecore/svgicons/ksvgiconpainter.h b/kdecore/svgicons/ksvgiconpainter.h index 9061e5570..9ba44d2cf 100644 --- a/kdecore/svgicons/ksvgiconpainter.h +++ b/kdecore/svgicons/ksvgiconpainter.h @@ -24,11 +24,11 @@ #include <libart_lgpl/art_render.h> #include <libart_lgpl/art_render_gradient.h> -class QImage; -class QColor; -class QWMatrix; -class QDomElement; -class QPointArray; +class TQImage; +class TQColor; +class TQWMatrix; +class TQDomElement; +class TQPointArray; class KDECORE_EXPORT KSVGIconPainter { diff --git a/kdecore/tests/klocaletest.h b/kdecore/tests/klocaletest.h index ad24a75cd..f88cfc901 100644 --- a/kdecore/tests/klocaletest.h +++ b/kdecore/tests/klocaletest.h @@ -5,7 +5,7 @@ #include <tqwidget.h> -class QLabel; +class TQLabel; /** test: a small test program for KLocale */ |