From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:49:30 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kmail/encodingdetector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kmail/encodingdetector.cpp')

diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index 06537981..d5ffd5dc 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;
     }
-- 
cgit v1.2.3