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/menuext/konq-profiles/konqy_menu.cpp |  2 +-
 kicker/menuext/konsole/konsole_mnu.cpp      |  2 +-
 kicker/menuext/tom/tom.cc                   | 12 ++++++------
 kicker/menuext/tom/tom.h                    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kicker/menuext')

diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index ea7668c8a..a3c076741 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -63,7 +63,7 @@ void KonquerorProfilesMenu::initialize()
    for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt )
    {
       TQFileInfo info( *pIt );
-      TQString profileName = KIO::decodeFileName( info.baseName() );
+      TQString profileName = TDEIO::decodeFileName( info.baseName() );
       TQString niceName=profileName;
       KSimpleConfig cfg( *pIt, true );
       if ( cfg.hasGroup( "Profile" ) )
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 16e11a039..dbaa1e434 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -205,7 +205,7 @@ void KonsoleMenu::initialize()
     for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
     {
         TQFileInfo info(*pIt);
-        TQString profileName = KIO::decodeFileName(info.baseName());
+        TQString profileName = TDEIO::decodeFileName(info.baseName());
         TQString niceName = profileName;
         KSimpleConfig cfg(*pIt, true);
         if (cfg.hasGroup("Profile"))
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 5ab089f0d..19ff376f4 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name)
     setCaption(i18n("Task-Oriented Menu"));
 
     // KMenu legacy: support some menu config options
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("menus");
     m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false);
     if (m_detailedTaskEntries)
@@ -244,7 +244,7 @@ void TOM::initializeRecentDocs()
     }
 }
 
-int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
+int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
 {
     if (!config.hasGroup("General"))
     {
@@ -452,7 +452,7 @@ void TOM::initialize()
 
         for (; eIt != eEnd; ++eIt )
         {
-            KConfig config(*dIt + *eIt);
+            TDEConfig config(*dIt + *eIt);
             appendTaskGroup(config);
         }
     }
@@ -476,7 +476,7 @@ void TOM::initialize()
 
     if (!destinationsConfig.isEmpty() && TQFile::exists(destinationsConfig))
     {
-        KConfig config(destinationsConfig);
+        TDEConfig config(destinationsConfig);
         numDests = appendTaskGroup(config, false);
     }
 
@@ -516,7 +516,7 @@ void TOM::initialize()
     }
 
 
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     TQStringList menu_ext = config->readListEntry("Extensions");
     if (!menu_ext.isEmpty())
     {
@@ -628,7 +628,7 @@ void TOM::removeTask()
  *
 bool TOM::loadSidePixmap()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   TQColor color = palette().active().highlight();
   TQImage image;
 
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index b42feb536..e4b8cc884 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -66,7 +66,7 @@ class TOM : public KPanelMenu
     protected:
         void reload();
 
-        int  appendTaskGroup(KConfig& config, bool inSubMenu = true );
+        int  appendTaskGroup(TDEConfig& config, bool inSubMenu = true );
         void initializeRecentApps(TQPopupMenu* menu);
         //int  insertTOMTitle(TQPopupMenu* menu, const TQString &text, int id = -1, int index = -1);
 
-- 
cgit v1.2.3