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

---
 twin/lib/kdecoration_p.cpp         | 2 +-
 twin/lib/kdecoration_p.h           | 4 ++--
 twin/lib/kdecoration_plugins_p.cpp | 4 ++--
 twin/lib/kdecoration_plugins_p.h   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'twin/lib')

diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index fbf35c285..66d886aec 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -63,7 +63,7 @@ void KDecorationOptionsPrivate::defaultKWinSettings()
     OpMaxButtonLeftClick = HMaximizeOp;
     }
 
-unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
+unsigned long KDecorationOptionsPrivate::updateKWinSettings( TDEConfig* config )
     {
     unsigned long changed = 0;
     TQString old_group = config->group();
diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h
index 58f386c9b..2634ea140 100644
--- a/twin/lib/kdecoration_p.h
+++ b/twin/lib/kdecoration_p.h
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqwidget.h>
 #include <tqvaluelist.h>
 
-class KConfig;
+class TDEConfig;
 
 class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
     {
@@ -41,7 +41,7 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
         KDecorationOptionsPrivate();
         virtual ~KDecorationOptionsPrivate();
         void defaultKWinSettings(); // shared implementation
-        unsigned long updateKWinSettings( KConfig* ); // shared implementation
+        unsigned long updateKWinSettings( TDEConfig* ); // shared implementation
         BorderSize findPreferredBorderSize( BorderSize size, TQValueList< BorderSize > ) const; // shared implementation
 
         TQColor colors[NUM_COLORS*2];
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index b680170c3..e6c6cfe36 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kdecorationfactory.h"
 
-KDecorationPlugins::KDecorationPlugins( KConfig* cfg )
+KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg )
     :   create_ptr( NULL ),
         library( NULL ),
         fact( NULL ),
@@ -95,7 +95,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
     {
     if( nameStr.isEmpty())
         {
-        KConfigGroupSaver saver( config, "Style" );
+        TDEConfigGroupSaver saver( config, "Style" );
         nameStr = config->readEntry("PluginLib", defaultPlugin );
         }
     // make sure people can switch between HEAD and twin_iii branch
diff --git a/twin/lib/kdecoration_plugins_p.h b/twin/lib/kdecoration_plugins_p.h
index 81dbb6b68..e45f5b674 100644
--- a/twin/lib/kdecoration_plugins_p.h
+++ b/twin/lib/kdecoration_plugins_p.h
@@ -37,7 +37,7 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration.h"
 
 class KLibrary;
-class KConfig;
+class TDEConfig;
 class KDecoration;
 class KDecorationBridge;
 class KDecorationFactory;
@@ -46,7 +46,7 @@ class KWIN_EXPORT KDecorationPlugins
     : public KDecorationProvides
     {
     public:
-        KDecorationPlugins( KConfig* cfg );
+        KDecorationPlugins( TDEConfig* cfg );
         virtual ~KDecorationPlugins();
         bool loadPlugin( TQString name );
         void destroyPreviousPlugin();
@@ -64,7 +64,7 @@ class KWIN_EXPORT KDecorationPlugins
         KLibrary *old_library;
         KDecorationFactory* old_fact;
         TQString pluginStr;
-        KConfig* config;
+        TDEConfig* config;
     };
 
 /*
-- 
cgit v1.2.1