summaryrefslogtreecommitdiffstats
path: root/ksplashml/themeengine/unified
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /ksplashml/themeengine/unified
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/themeengine/unified')
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp4
-rw-r--r--ksplashml/themeengine/unified/themeunified.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 1e86054f7..21c899adc 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -32,7 +32,7 @@
#include "themeunified.h"
#include "themeunified.moc"
-UnifiedConfig::UnifiedConfig( TQWidget *parent, KConfig *config )
+UnifiedConfig::UnifiedConfig( TQWidget *parent, TDEConfig *config )
:ThemeEngineConfig( parent, config )
{
mConfig->setGroup( TQString("KSplash Theme: Default") );
@@ -91,7 +91,7 @@ void ThemeUnified::_readSettings()
if( !mTheme )
return;
- KConfig *cfg = mTheme->themeConfig();
+ TDEConfig *cfg = mTheme->themeConfig();
if( !cfg )
return;
diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h
index a8f9e12e2..cd6a1d1ca 100644
--- a/ksplashml/themeengine/unified/themeunified.h
+++ b/ksplashml/themeengine/unified/themeunified.h
@@ -30,7 +30,7 @@ class UnifiedConfig: public ThemeEngineConfig
{
Q_OBJECT
public:
- UnifiedConfig( TQWidget *, KConfig * );
+ UnifiedConfig( TQWidget *, TDEConfig * );
void save();
protected:
TQCheckBox *mAlwaysShow;
@@ -47,7 +47,7 @@ public:
ThemeUnified( TQWidget *, const char *, const TQStringList& );
virtual ~ThemeUnified();
- inline const UnifiedConfig *config( TQWidget *p, KConfig *c )
+ inline const UnifiedConfig *config( TQWidget *p, TDEConfig *c )
{
return new UnifiedConfig( p, c );
};