diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /libkmime/kmime_header_parsing.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_header_parsing.cpp')
-rw-r--r-- | libkmime/kmime_header_parsing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 32099f29e..70d0b657d 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -208,7 +208,7 @@ bool parseEncodedWord( const char* & scursor, const char * const send, // try if there's a (text)codec for the charset found: bool matchOK = false; TQTextCodec - *textCodec = KGlobal::charsets()->codecForName( maybeCharset, matchOK ); + *textCodec = TDEGlobal::charsets()->codecForName( maybeCharset, matchOK ); if ( !matchOK || !textCodec ) { KMIME_WARN_UNKNOWN(Charset,maybeCharset); @@ -1250,7 +1250,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, // bool matchOK = false; - textcodec = KGlobal::charsets()->codecForName( charset, matchOK ); + textcodec = TDEGlobal::charsets()->codecForName( charset, matchOK ); if ( !matchOK ) { textcodec = 0; KMIME_WARN_UNKNOWN(Charset,charset); |