diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /libkonq/konq_settings.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_settings.cc')
| -rw-r--r-- | libkonq/konq_settings.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index edde3c3fc..3d67c6798 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -48,7 +48,7 @@ KonqFMSettings * KonqFMSettings::settings() { if (!s_pSettings) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cgs(config, "FMSettings"); s_pSettings = new KonqFMSettings(config); } @@ -60,7 +60,7 @@ void KonqFMSettings::reparseConfiguration() { if (s_pSettings) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cgs(config, "FMSettings"); s_pSettings->init( config ); } @@ -82,9 +82,9 @@ void KonqFMSettings::init( KConfig * config ) // Fonts and colors m_standardFont = config->readFontEntry( "StandardFont" ); - m_normalTextColor = KGlobalSettings::textColor(); + m_normalTextColor = TDEGlobalSettings::textColor(); m_normalTextColor = config->readColorEntry( "NormalTextColor", &m_normalTextColor ); - m_highlightedTextColor = KGlobalSettings::highlightedTextColor(); + m_highlightedTextColor = TDEGlobalSettings::highlightedTextColor(); m_highlightedTextColor = config->readColorEntry( "HighlightedTextColor", &m_highlightedTextColor ); m_itemTextBackground = config->readColorEntry( "ItemTextBackground" ); |