diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/background/bgsettings.cpp | |
| 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 'kcontrol/background/bgsettings.cpp')
| -rw-r--r-- | kcontrol/background/bgsettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index d51995299..7bc17a215 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -415,7 +415,7 @@ TQStringList KBackgroundProgram::list() /**** KBackgroundSettings ****/ -KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config) +KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config) : KBackgroundPattern(), KBackgroundProgram() { @@ -501,7 +501,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou else configname.sprintf("kdesktop-screen-%drc", screen_number); - m_pConfig = new KConfig(configname, false, false); + m_pConfig = new TDEConfig(configname, false, false); m_bDeleteConfig = true; } else { m_pConfig = config; @@ -1065,7 +1065,7 @@ void KBackgroundSettings::setEnabled(const bool enable) /**** TDEGlobalBackgroundSettings ****/ -TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config) +TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(TDEConfig *_config) { m_pConfig = _config; |