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/redmond/main.cpp         | 2 +-
 ksplashml/themeengine/redmond/themeredmond.cpp | 6 +++---
 ksplashml/themeengine/redmond/themeredmond.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ksplashml/themeengine/redmond')

diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp
index 3f4dc0124..7b4a6bb2e 100644
--- a/ksplashml/themeengine/redmond/main.cpp
+++ b/ksplashml/themeengine/redmond/main.cpp
@@ -20,7 +20,7 @@
 
 extern "C"
 {
-  ThemeEngineConfig *KsThemeConfig( TQWidget *parent, KConfig *config )
+  ThemeEngineConfig *KsThemeConfig( TQWidget *parent, TDEConfig *config )
   {
     return new CfgRedmond( parent, config );
   }
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 5e5bf1031..0328c0365 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -41,7 +41,7 @@
 
 K_EXPORT_COMPONENT_FACTORY( ksplashredmond, KGenericFactory<ThemeRedmond>( "ksplash" ) )
 
-CfgRedmond::CfgRedmond( TQWidget *p, KConfig *c )
+CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c )
   :ThemeEngineConfig( p, c )
 {
   TQVBox *vbox = new TQVBox( this );
@@ -195,7 +195,7 @@ void ThemeRedmond::_initUi()
     const int fUserOnly   = fUserFirst+1;
 
     int faceSource = fAdminOnly;
-    KConfig *tdmconfig = new KConfig("tdm/tdmrc", true);
+    TDEConfig *tdmconfig = new TDEConfig("tdm/tdmrc", true);
     tdmconfig->setGroup("X-*-Greeter");
     TQString userPicsDir = tdmconfig->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
     TQString fs = tdmconfig->readEntry( "FaceSource" );
@@ -313,7 +313,7 @@ void ThemeRedmond::_readSettings()
 
   if( !mTheme )
     return;
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if( !cfg )
     return;
 
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index 6f8cc1550..c2ce0a6f3 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -25,7 +25,7 @@ class CfgRedmond: public ThemeEngineConfig
 {
   Q_OBJECT
 public:
-  CfgRedmond( TQWidget *, KConfig * );
+  CfgRedmond( TQWidget *, TDEConfig * );
 
 protected:
   TQCheckBox *mShowUsername;
-- 
cgit v1.2.1