diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /ksplashml/themeengine/standard | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/themeengine/standard')
| -rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/standard/themestandard.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 ) |