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 /libkonq/konq_settings.cc | |
| 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 'libkonq/konq_settings.cc')
| -rw-r--r-- | libkonq/konq_settings.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index 3d67c6798..aef17475b 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -48,8 +48,8 @@ KonqFMSettings * KonqFMSettings::settings() { if (!s_pSettings) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cgs(config, "FMSettings"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cgs(config, "FMSettings"); s_pSettings = new KonqFMSettings(config); } return s_pSettings; @@ -60,13 +60,13 @@ void KonqFMSettings::reparseConfiguration() { if (s_pSettings) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cgs(config, "FMSettings"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cgs(config, "FMSettings"); s_pSettings->init( config ); } } -KonqFMSettings::KonqFMSettings( KConfig * config ) +KonqFMSettings::KonqFMSettings( TDEConfig * config ) { d = new KonqFMSettingsPrivate; init( config ); @@ -77,7 +77,7 @@ KonqFMSettings::~KonqFMSettings() delete d; } -void KonqFMSettings::init( KConfig * config ) +void KonqFMSettings::init( TDEConfig * config ) { // Fonts and colors m_standardFont = config->readFontEntry( "StandardFont" ); |