summaryrefslogtreecommitdiffstats
path: root/ksplashml/themeengine/default
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/default
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/default')
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp4
-rw-r--r--ksplashml/themeengine/default/themelegacy.h4
2 files changed, 4 insertions, 4 deletions
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 );
};