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_plugins_p.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'twin/lib/kdecoration_plugins_p.cpp')

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
-- 
cgit v1.2.1