diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /libkmime/kmime_content.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkmime/kmime_content.cpp')
| -rw-r--r-- | libkmime/kmime_content.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp index 5dead52af..20862496d 100644 --- a/libkmime/kmime_content.cpp +++ b/libkmime/kmime_content.cpp @@ -416,7 +416,7 @@ void Content::decodedText(TQString &s, bool trimText, return; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); s=codec->toUnicode(b_ody.data(), b_ody.length()); @@ -442,7 +442,7 @@ void Content::decodedText(TQStringList &l, bool trimText, TQString unicode; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); unicode=codec->toUnicode(b_ody.data(), b_ody.length()); @@ -464,11 +464,11 @@ void Content::decodedText(TQStringList &l, bool trimText, void Content::fromUnicodeString(const TQString &s) { bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); if(!ok) { // no suitable codec found => try local settings and hope the best ;-) - codec=KGlobal::locale()->codecForEncoding(); - TQCString chset=KGlobal::locale()->encoding(); + codec=TDEGlobal::locale()->codecForEncoding(); + TQCString chset=TDEGlobal::locale()->encoding(); contentType()->setCharset(chset); } |