diff options
Diffstat (limited to 'tdecore/kcharsets.cpp')
| -rw-r--r-- | tdecore/kcharsets.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 52cf87849..23786c53e 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -21,10 +21,10 @@ #include "kqiodevicegzip_p.h" #include "kentities.c" -#include <kapplication.h> -#include <kglobal.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdeapplication.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <tqfontinfo.h> #include <tqstrlist.h> @@ -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")); + TDEConfigGroupSaver 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 |