From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:30:47 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 8 ++++----
 konqueror/remoteencodingplugin/kremoteencodingplugin.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'konqueror/remoteencodingplugin')

diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index a927f37e0..9ae297285 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -135,7 +135,7 @@ KRemoteEncodingPlugin::updateMenu()
   for (unsigned i =  0; i < m_menu->popupMenu()->count(); i++)
     m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false);
 
-  TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
+  TQString charset = TDEIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
 							 DATA_KEY);
   if (!charset.isEmpty())
     {
@@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow()
 void
 KRemoteEncodingPlugin::slotItemSelected(int id)
 {
-  KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
+  TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
   TQString host = m_currentURL.host();
 
   if (!m_menu->popupMenu()->isItemChecked(id))
@@ -188,7 +188,7 @@ KRemoteEncodingPlugin::slotDefault()
 {
   // We have no choice but delete all higher domain level
   // settings here since it affects what will be matched.
-  KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
+  TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
 
   TQStringList partList = TQStringList::split('.', m_currentURL.host(), false);
   if (!partList.isEmpty())
@@ -248,7 +248,7 @@ KRemoteEncodingPlugin::updateBrowser()
     {
       TQCString rtype;
       TQByteArray rdata;
-      client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)",
+      client->call( *it, "TDEIO::Scheduler", "reparseSlaveConfiguration(TQString)",
 	       data, rtype, rdata);
     }
   delete client;
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index b518da326..d663baf6c 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -27,7 +27,7 @@
 #include <kparts/plugin.h>
 
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 class KonqDirPart;
 
 class KRemoteEncodingPlugin: public KParts::Plugin
-- 
cgit v1.2.3