summaryrefslogtreecommitdiffstats
path: root/kmail/encodingdetector.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kmail/encodingdetector.cpp
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables 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 d5ffd5dce..01a60d88c 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len)
case EncodingDetector::WesternEuropean:
if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
return true;
- else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml
+ else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for tdehtml
{
return setEncoding("iso-8859-15",AutoDetectedEncoding);
}