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.cpp | |
| 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.cpp')
| -rw-r--r-- | tdecore/kcharsets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 52cf87849..a732bf266 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -535,7 +535,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const return codec; // cache hit, return if (n.isEmpty()) { - codec = KGlobal::locale()->codecForEncoding(); + codec = TDEGlobal::locale()->codecForEncoding(); d->codecForNameDict.replace("->locale<-", codec); return codec; } @@ -572,8 +572,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const TQString dir; { - KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" ); - dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); + KConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" ); + dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); } // these are codecs not included in Qt. They can be build up if the corresponding charmap |