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/default/themelegacy.cpp | 4 ++--
 ksplashml/themeengine/default/themelegacy.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ksplashml/themeengine/default')

diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index de8aac2b5..39839cca6 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -31,7 +31,7 @@
 #include "themelegacy.h"
 #include "themelegacy.moc"
 
-DefaultConfig::DefaultConfig( TQWidget *parent, KConfig *config )
+DefaultConfig::DefaultConfig( TQWidget *parent, TDEConfig *config )
     :ThemeEngineConfig( parent, config )
 {
   mConfig->setGroup( TQString("KSplash Theme: Default") );
@@ -200,7 +200,7 @@ void ThemeDefault::_readSettings()
   if( !mTheme )
     return;
 
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if( !cfg )
     return;
 
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 852425414..0f73e80c1 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -28,7 +28,7 @@ class DefaultConfig: public ThemeEngineConfig
 {
   Q_OBJECT
 public:
-  DefaultConfig( TQWidget *, KConfig * );
+  DefaultConfig( TQWidget *, TDEConfig * );
   void save();
 protected:
   TQCheckBox *mFlash, *mAlwaysShow;
@@ -45,7 +45,7 @@ public:
   ThemeDefault( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeDefault();
 
-  inline const DefaultConfig *config( TQWidget *p, KConfig *c )
+  inline const DefaultConfig *config( TQWidget *p, TDEConfig *c )
   {
     return new DefaultConfig( p, c );
   };
-- 
cgit v1.2.3