diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
commit | 452dc1bc85da499f67d6cacd130263377552c631 (patch) | |
tree | bd859131120b044fd19fcb847e18a2e74ee9a923 /kdecore/kglobalsettings.cpp | |
parent | 25a5b3950e013d67b68f091cdfac27eb1ad0debc (diff) | |
download | tdelibs-452dc1bc85da499f67d6cacd130263377552c631.tar.gz tdelibs-452dc1bc85da499f67d6cacd130263377552c631.zip |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kglobalsettings.cpp')
-rw-r--r-- | kdecore/kglobalsettings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index f78377cfe..6d2a487d4 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -69,7 +69,7 @@ TQFont *KGlobalSettings::_menuFont = 0; TQFont *KGlobalSettings::_windowTitleFont = 0; TQFont *KGlobalSettings::_taskbarFont = 0; TQFont *KGlobalSettings::_largeFont = 0; -TQColor *KGlobalSettings::_kde34Blue = 0; +TQColor *KGlobalSettings::_trinity4Blue = 0; TQColor *KGlobalSettings::_inactiveBackground = 0; TQColor *KGlobalSettings::_inactiveForeground = 0; TQColor *KGlobalSettings::_activeBackground = 0; @@ -194,7 +194,7 @@ TQColor KGlobalSettings::toolBarHighlightColor() { initColors(); KConfigGroup g( KGlobal::config(), "Toolbar style" ); - return g.readColorEntry("HighlightColor", _kde34Blue); + return g.readColorEntry("HighlightColor", _trinity4Blue); } TQColor KGlobalSettings::inactiveTitleColor() @@ -566,11 +566,11 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an void KGlobalSettings::initColors() { - if (!_kde34Blue) { + if (!_trinity4Blue) { if (TQPixmap::defaultDepth() > 8) - _kde34Blue = new TQColor(103,141,178); + _trinity4Blue = new TQColor(103,141,178); else - _kde34Blue = new TQColor(0, 0, 192); + _trinity4Blue = new TQColor(0, 0, 192); } if (!alternateColor) alternateColor = new TQColor(237, 244, 249); |