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/objkstheme.h | |
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/objkstheme.h')
-rw-r--r-- | ksplashml/themeengine/objkstheme.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 4d88276ba..34ea2fdf1 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -17,7 +17,7 @@ #include <tqstring.h> #include <tqstringlist.h> -class KConfig; +class TDEConfig; /** * @short Theme reader. * A Theme is read in from the file @@ -37,7 +37,7 @@ public: TQString theme() const { return( mActiveTheme ); } TQString themeEngine() const { return( mThemeEngine ); } - KConfig *themeConfig() const { return( mThemeConfig ); } + TDEConfig *themeConfig() const { return( mThemeConfig ); } TQString themeDir() const { return( mThemeDir ); } bool loColor() const { return( mLoColor ); } bool testing() const { return( mTesting ); } @@ -50,11 +50,11 @@ public: protected: bool loadThemeRc( const TQString&, bool ); bool loadLocalConfig( const TQString&, bool ); - bool loadKConfig( KConfig *, const TQString&, bool ); + bool loadTDEConfig( TDEConfig *, const TQString&, bool ); private: TQString mActiveTheme, mThemeDir; - KConfig *mThemeConfig; + TDEConfig *mThemeConfig; int mXineramaScreen; bool mLoColor, mTesting, mManagedMode; |