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

---
 kicker/applets/launcher/configdlg.cpp     | 12 ++++++------
 kicker/applets/launcher/configdlg.h       |  4 ++--
 kicker/applets/launcher/quicklauncher.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kicker/applets/launcher')

diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index c35f0970c..94bb9c899 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "configdlgbase.h"
 
 ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
-                     int autoSize, KConfigDialog::DialogType dialogType,
+                     int autoSize, TDEConfigDialog::DialogType dialogType,
                      int dialogButtons) :
-    KConfigDialog(parent, name, config, dialogType, dialogButtons),
+    TDEConfigDialog(parent, name, config, dialogType, dialogButtons),
     m_settings(config),
     m_autoSize(autoSize)
 {
@@ -57,7 +57,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
 void ConfigDlg::updateSettings()
 {
     kdDebug() << "updateSettings" << endl;
-    KConfigDialog::updateSettings();
+    TDEConfigDialog::updateSettings();
     if (!hasChanged())
     {
         return;
@@ -76,7 +76,7 @@ void ConfigDlg::updateSettings()
 
 void ConfigDlg::updateWidgets()
 {
-    KConfigDialog::updateWidgets();
+    TDEConfigDialog::updateWidgets();
     if (m_settings->iconDim() == m_autoSize)
     {
         m_ui->iconDim->setEditText(i18n("Automatic"));
@@ -89,13 +89,13 @@ void ConfigDlg::updateWidgets()
 
 void ConfigDlg::updateWidgetsDefault()
 {
-    KConfigDialog::updateWidgetsDefault();
+    TDEConfigDialog::updateWidgetsDefault();
 }
 
 bool ConfigDlg::hasChanged()
 {
     return m_oldIconDimText != m_ui->iconDim->currentText() ||
-        KConfigDialog::hasChanged();
+        TDEConfigDialog::hasChanged();
 }
 
 #include "configdlg.moc"
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index ff35098d3..e5fdbe34b 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class ConfigDlgBase;
 class Prefs;
 
-class ConfigDlg : public KConfigDialog
+class ConfigDlg : public TDEConfigDialog
 {
     Q_OBJECT
 
 public:
     ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize,
-        KConfigDialog::DialogType dialogType, int dialogButtons);
+        TDEConfigDialog::DialogType dialogType, int dialogButtons);
 
 protected:
     virtual bool hasChanged();
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index ee72d58bb..e5658f1cb 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -833,7 +833,7 @@ public:
 void QuickLauncher::loadConfig()
 {
     DEBUGSTR << "QuickLauncher::loadConfig()" << endl << flush;
-    //KConfig *c = config();
+    //TDEConfig *c = config();
     //c->setGroup("General");
     setConserveSpace(m_settings->conserveSpace());
     setDragEnabled(m_settings->dragEnabled());
-- 
cgit v1.2.1