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/tools/decobenchmark/main.cpp    | 2 +-
 twin/tools/decobenchmark/preview.cpp | 2 +-
 twin/tools/decobenchmark/preview.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'twin/tools')

diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 8115c3534..db625ba15 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -49,7 +49,7 @@ DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests,
 		m_tests(tests),
 		m_count(count)
 {
-	KConfig twinConfig("twinrc");
+	TDEConfig twinConfig("twinrc");
 	twinConfig.setGroup("Style");
 
 	plugins = new KDecorationPreviewPlugins( &twinConfig );
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 2accb7644..ece91c734 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -397,7 +397,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
 
 unsigned long KDecorationPreviewOptions::updateSettings()
 {
-    KConfig cfg( "twinrc", true );
+    TDEConfig cfg( "twinrc", true );
     unsigned long changed = 0;
     changed |= d->updateKWinSettings( &cfg );
 
diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h
index 9f2445036..2138c51b7 100644
--- a/twin/tools/decobenchmark/preview.h
+++ b/twin/tools/decobenchmark/preview.h
@@ -125,11 +125,11 @@ class KDecorationPreviewPlugins
     : public KDecorationPlugins
     {
     public:
-        KDecorationPreviewPlugins( KConfig* cfg );
+        KDecorationPreviewPlugins( TDEConfig* cfg );
         virtual bool provides( Requirement );
     };
 
-inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( KConfig* cfg )
+inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( TDEConfig* cfg )
     : KDecorationPlugins( cfg )
     {
     }
-- 
cgit v1.2.1