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

---
 konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'konqueror/remoteencodingplugin')

diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index edaacf1dd..a927f37e0 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -77,7 +77,7 @@ KRemoteEncodingPlugin::loadSettings()
 {
   m_loaded = true;
 
-  m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames();
+  m_encodingDescriptions = TDEGlobal::charsets()->descriptiveEncodingNames();
 
   fillMenu();
 }
@@ -172,7 +172,7 @@ KRemoteEncodingPlugin::slotItemSelected(int id)
 
   if (!m_menu->popupMenu()->isItemChecked(id))
     {
-      TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
+      TQString charset = TDEGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
 
       config.setGroup(host);
       config.writeEntry(DATA_KEY, charset);
-- 
cgit v1.2.1