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

---
 .../sidebar/trees/history_module/history_module.cpp      | 16 ++++++++--------
 .../sidebar/trees/history_module/history_settings.cpp    |  6 +++---
 konqueror/sidebar/trees/history_module/kcmhistory.cpp    |  6 +++---
 konqueror/sidebar/trees/history_module/kcmhistory.h      |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'konqueror/sidebar/trees/history_module')

diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 71c1b5a44..30d96f060 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -56,8 +56,8 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
 
 
@@ -111,8 +111,8 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
 	++it;
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry("OpenGroups", openGroups);
     kc->sync();
 }
@@ -143,8 +143,8 @@ void KonqSidebarHistoryModule::slotCreateItems()
 	++it;
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     TQStringList openGroups = kc->readListEntry("OpenGroups");
     TQStringList::Iterator it2 = openGroups.begin();
     KonqSidebarHistoryGroupItem *group;
@@ -297,8 +297,8 @@ void KonqSidebarHistoryModule::sortingChanged()
 {
     m_topLevelItem->sort();
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
     kc->sync();
 }
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 3e8c8a5de..701f72776 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -42,7 +42,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings()
 
 void KonqSidebarHistorySettings::readSettings(bool global)
 {
-    KConfig *config;
+    TDEConfig *config;
     TQString oldgroup;
 
     if (global) {
@@ -50,7 +50,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
       oldgroup= config->group();
     }
     else
-      config = new KConfig("konquerorrc");
+      config = new TDEConfig("konquerorrc");
 
     config->setGroup("HistorySettings");
     m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
@@ -77,7 +77,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
 
 void KonqSidebarHistorySettings::applySettings()
 {
-    KConfig *config = new KConfig("konquerorrc");
+    TDEConfig *config = new TDEConfig("konquerorrc");
     config->setGroup("HistorySettings");
 
     config->writeEntry("Value youngerThan", m_valueYoungerThan );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index a1ef792d6..967616bd5 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -49,7 +49,7 @@ typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
 
 HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
-    : KCModule (KCMHistoryFactory::instance(), parent, name)
+    : TDECModule (KCMHistoryFactory::instance(), parent, name)
 {
     TDEGlobal::locale()->insertCatalogue("konqueror");
 
@@ -115,7 +115,7 @@ void HistorySidebarConfig::configChanged()
 
 void HistorySidebarConfig::load()
 {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("HistorySettings");
     dialog->spinExpire->setValue( config.readNumEntry( "Maximum age of History entries", 90) );
     dialog->spinEntries->setValue( config.readNumEntry( "Maximum of History entries", 500 ) );
@@ -147,7 +147,7 @@ void HistorySidebarConfig::save()
     TQ_UINT32 age   = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
     TQ_UINT32 count = dialog->spinEntries->value();
 
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("HistorySettings");
     config.writeEntry( "Maximum of History entries", count );
     config.writeEntry( "Maximum age of History entries", age );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 0e354af65..5731ae267 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -27,7 +27,7 @@ class KonqHistoryManager;
 class KonqSidebarHistorySettings;
 class KonqSidebarHistoryDlg;
 
-class HistorySidebarConfig : public KCModule
+class HistorySidebarConfig : public TDECModule
 {
   Q_OBJECT
 
-- 
cgit v1.2.1