summaryrefslogtreecommitdiffstats
path: root/tdecore/kcharsets.h
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/kcharsets.h
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kcharsets.h')
-rw-r--r--tdecore/kcharsets.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index 2816e4fcd..da96643ff 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include "tdelibs_export.h"
-class KGlobal;
+class TDEGlobal;
class KCharsetsPrivate;
class TQTextCodec;
@@ -42,11 +42,11 @@ class TQTextCodec;
*/
class TDECORE_EXPORT KCharsets
{
- friend class KGlobal;
+ friend class TDEGlobal;
protected:
/** Protected constructor. If you need the kcharsets object, use
- KGlobal::charsets() instead.
+ TDEGlobal::charsets() instead.
*/
KCharsets();