summaryrefslogtreecommitdiffstats
path: root/kmail/kmmsgbase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmmsgbase.cpp')
-rw-r--r--kmail/kmmsgbase.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index 6a5a1057f..3cd4f658f 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -576,7 +576,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str)
if (_str.isEmpty()) return 0;
TQCString codec = _str;
KPIM::kAsciiToLower(codec.data());
- return KGlobal::charsets()->codecForName(codec);
+ return TDEGlobal::charsets()->codecForName(codec);
}
@@ -600,23 +600,23 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
//-----------------------------------------------------------------------------
TQStringList KMMsgBase::supportedEncodings(bool usAscii)
{
- TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames();
+ TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames();
TQStringList encodings;
TQMap<TQString,bool> mimeNames;
for (TQStringList::Iterator it = encodingNames.begin();
it != encodingNames.end(); it++)
{
- TQTextCodec *codec = KGlobal::charsets()->codecForName(*it);
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it);
TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it);
if (mimeNames.find(mimeName) == mimeNames.end())
{
- encodings.append(KGlobal::charsets()->languageForEncoding(*it)
+ encodings.append(TDEGlobal::charsets()->languageForEncoding(*it)
+ " ( " + mimeName + " )");
mimeNames.insert(mimeName, true);
}
}
encodings.sort();
- if (usAscii) encodings.prepend(KGlobal::charsets()
+ if (usAscii) encodings.prepend(TDEGlobal::charsets()
->languageForEncoding("us-ascii") + " ( us-ascii )");
return encodings;
}