From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kglobal.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kdecore/kglobal.cpp') diff --git a/kdecore/kglobal.cpp b/kdecore/kglobal.cpp index 188e8f447..b886d8d7f 100644 --- a/kdecore/kglobal.cpp +++ b/kdecore/kglobal.cpp @@ -22,9 +22,9 @@ * Generated: Sat May 1 02:08:43 EST 1999 */ -#include -#include -#include +#include +#include +#include #include "kglobal.h" #include @@ -38,7 +38,7 @@ #include #include "kstaticdeleter.h" -#include +#include #ifndef NDEBUG #define MYASSERT(x) if (!x) \ @@ -115,51 +115,51 @@ void KGlobal::setActiveInstance(KInstance *i) { _activeInstance = i; if (i && _locale) - _locale->setActiveCatalogue(QString::fromUtf8(i->instanceName())); + _locale->setActiveCatalogue(TQString::fromUtf8(i->instanceName())); } /** * Create a static QString * * To be used inside functions(!) like: - * static const QString &myString = KGlobal::staticQString("myText"); + * static const TQString &myString = KGlobal::staticQString("myText"); */ -const QString & +const TQString & KGlobal::staticQString(const char *str) { - return staticQString(QString::fromLatin1(str)); + return staticQString(TQString::fromLatin1(str)); } -class KStringDict : public QDict +class KStringDict : public TQDict { public: - KStringDict() : QDict(139) { } + KStringDict() : TQDict(139) { } }; /** * Create a static QString * * To be used inside functions(!) like: - * static const QString &myString = KGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = KGlobal::staticQString(i18n("My Text")); */ -const QString & -KGlobal::staticQString(const QString &str) +const TQString & +KGlobal::staticQString(const TQString &str) { if (!_stringDict) { _stringDict = new KStringDict; _stringDict->setAutoDelete( true ); kglobal_init(); } - QString *result = _stringDict->find(str); + TQString *result = _stringDict->find(str); if (!result) { - result = new QString(str); + result = new TQString(str); _stringDict->insert(str, result); } return *result; } -class KStaticDeleterList: public QPtrList +class KStaticDeleterList: public TQPtrList { public: KStaticDeleterList() { } -- cgit v1.2.1