summaryrefslogtreecommitdiffstats
path: root/kdecore/kglobal.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
commitffe8a83e053396df448e9413828527613ca3bd46 (patch)
treea73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /kdecore/kglobal.cpp
parent682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff)
downloadtdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz
tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kglobal.cpp')
-rw-r--r--kdecore/kglobal.cpp32
1 files changed, 16 insertions, 16 deletions
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 <qglobal.h>
-#include <qdict.h>
-#include <qptrlist.h>
+#include <tqglobal.h>
+#include <tqdict.h>
+#include <tqptrlist.h>
#include "kglobal.h"
#include <kapplication.h>
@@ -38,7 +38,7 @@
#include <kinstance.h>
#include "kstaticdeleter.h"
-#include <qfont.h>
+#include <tqfont.h>
#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<QString>
+class KStringDict : public TQDict<TQString>
{
public:
- KStringDict() : QDict<QString>(139) { }
+ KStringDict() : TQDict<TQString>(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<KStaticDeleterBase>
+class KStaticDeleterList: public TQPtrList<KStaticDeleterBase>
{
public:
KStaticDeleterList() { }