summaryrefslogtreecommitdiff
path: root/kmime/kmime_header_parsing.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-26 11:02:49 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-26 11:02:49 (GMT)
commitdb6eb28e9626dd78156b9c6fc17bc0c65ff2f6ca (patch)
tree3a6daf4a5ab5052a24ec18f404b028233c0ae8ba /kmime/kmime_header_parsing.cpp
parent76178c821932ada88863877e9652056a84cb1018 (diff)
downloadlibcalendaring-db6eb28e9626dd78156b9c6fc17bc0c65ff2f6ca.tar.gz
and kmime builds as well
Diffstat (limited to 'kmime/kmime_header_parsing.cpp')
-rw-r--r--kmime/kmime_header_parsing.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmime/kmime_header_parsing.cpp b/kmime/kmime_header_parsing.cpp
index 200e79f..6c530e2 100644
--- a/kmime/kmime_header_parsing.cpp
+++ b/kmime/kmime_header_parsing.cpp
@@ -366,12 +366,12 @@ bool parseEncodedWord( const char* &scursor, const char * const send,
bool matchOK = false;
QTextCodec *textCodec = 0;
if ( forceCS || maybeCharset.isEmpty() ) {
- textCodec = KCharsets::charsets()->codecForName( QLatin1String( defaultCS ), matchOK );
+ textCodec = KGlobal::charsets()->codecForName( QLatin1String( defaultCS ), matchOK );
usedCS = cachedCharset( defaultCS );
} else {
- textCodec = KCharsets::charsets()->codecForName( QLatin1String( maybeCharset ), matchOK );
+ textCodec = KGlobal::charsets()->codecForName( QLatin1String( maybeCharset ), matchOK );
if ( !matchOK ) { //no suitable codec found => use default charset
- textCodec = KCharsets::charsets()->codecForName( QLatin1String( defaultCS ), matchOK );
+ textCodec = KGlobal::charsets()->codecForName( QLatin1String( defaultCS ), matchOK );
usedCS = cachedCharset( defaultCS );
} else {
usedCS = cachedCharset( maybeCharset );
@@ -1591,7 +1591,7 @@ static void decodeRFC2231Value( Codec* &rfc2231Codec,
//
bool matchOK = false;
- textcodec = KCharsets::charsets()->codecForName( QLatin1String( charset ), matchOK );
+ textcodec = KGlobal::charsets()->codecForName( QLatin1String( charset ), matchOK );
if ( !matchOK ) {
textcodec = 0;
KMIME_WARN_UNKNOWN( Charset, charset );