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

---
 ksplashml/themeengine/standard/themestandard.cpp | 2 +-
 ksplashml/themeengine/standard/themestandard.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ksplashml/themeengine/standard')

diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index a7c41692f..26c47eea0 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -135,7 +135,7 @@ void ThemeStandard::_readSettings()
   if ( !mTheme )
     return;
 
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if ( !cfg )
     return;
 
diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h
index 2e5d1aeb0..a1fb61ccf 100644
--- a/ksplashml/themeengine/standard/themestandard.h
+++ b/ksplashml/themeengine/standard/themestandard.h
@@ -45,7 +45,7 @@ class ThemeStandard: public ThemeEngine
   Q_OBJECT
 public:
   ThemeStandard( TQWidget *, const char*, const TQStringList& );
-  //inline const ThemeEngineConfig *config( TQWidget *p, KConfig *kc ) { return 0L; }
+  //inline const ThemeEngineConfig *config( TQWidget *p, TDEConfig *kc ) { return 0L; }
 
 public slots:
   inline void slotUpdateProgress( int i )
-- 
cgit v1.2.1