diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kcharsets.h | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kcharsets.h')
| -rw-r--r-- | tdecore/kcharsets.h | 6 |
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(); |