summaryrefslogtreecommitdiffstats
path: root/tdecore/klocale.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/klocale.h
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/klocale.h')
-rw-r--r--tdecore/klocale.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index ce9dad46b..42619afd4 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -31,7 +31,7 @@ class TQDate;
class TQTime;
class TQDateTime;
-class KGlobal;
+class TDEGlobal;
class KConfig;
class KConfigBase;
class KLocalePrivate;
@@ -123,7 +123,7 @@ inline TQString tr2i18n(const char* message, const char* =0) {
*/
class TDECORE_EXPORT KLocale
{
- friend class KGlobal; // for initInstance()
+ friend class TDEGlobal; // for initInstance()
public:
/**
* Constructs a KLocale with the given catalog name.
@@ -1173,7 +1173,7 @@ private:
protected:
/**
- * @internal Creates a KLocale object for KGlobal and inits the locale
+ * @internal Creates a KLocale object for TDEGlobal and inits the locale
* pointer.
*/
static void initInstance();