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 /kcontrol/colors/colorscm.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/colors/colorscm.cpp')
-rw-r--r-- | kcontrol/colors/colorscm.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 041be096d..8bf7607ce 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -308,7 +308,7 @@ void KColorScheme::load() } void KColorScheme::load( bool useDefaults ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setReadDefaults( useDefaults ); config->setGroup("KDE"); sCurrentScheme = config->readEntry("colorScheme"); @@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults ) void KColorScheme::save() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "General" ); cfg->writeEntry("background", cs->back, true, true); cfg->writeEntry("selectBackground", cs->select, true, true); @@ -560,7 +560,7 @@ void KColorScheme::slotAdd() } else { - sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc"; + sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc"; KSimpleConfig *config = new KSimpleConfig(sFile); config->setGroup( "Color Scheme"); config->writeEntry("Name", sName); @@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col) // of course if ( selection == CSM_Standard_background && color(CSM_Alternate_background) == - KGlobalSettings::calculateAlternateBackgroundColor( + TDEGlobalSettings::calculateAlternateBackgroundColor( color(CSM_Standard_background) ) ) { color(CSM_Alternate_background) = - KGlobalSettings::calculateAlternateBackgroundColor( col ); + TDEGlobalSettings::calculateAlternateBackgroundColor( col ); } color(selection) = col; @@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index ) if (index == 0) { // Current scheme - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("General"); } else { // Open scheme file @@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index ) cs->buttonTxt = config->readColorEntry( "buttonForeground", &black ); cs->link = config->readColorEntry( "linkColor", &link ); cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink ); - TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window); + TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window); cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate ); if (index == 0) @@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames() nSysSchemes = 2; // Global + local schemes - TQStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true); // And add them |