summaryrefslogtreecommitdiffstats
path: root/kmail/encodingdetector.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kmail/encodingdetector.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/encodingdetector.cpp')
-rw-r--r--kmail/encodingdetector.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index 06537981b..d5ffd5dce 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -863,7 +863,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t
if(enc=="visual")
enc="iso8859-8";
bool b;
- codec = KGlobal::charsets()->codecForName(enc, b);
+ codec = TDEGlobal::charsets()->codecForName(enc, b);
if (!b)
return false;
}