summaryrefslogtreecommitdiffstats
path: root/amarok/src/playerwindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:24 -0600
commitc9f212164b08f3ff5b8f82c78361791da6ea5366 (patch)
treed24f8609cb998ab5b023a59347592f05da7046ff /amarok/src/playerwindow.cpp
parent700293d44659f7b108533d99bcc3ce5c08d6c64e (diff)
downloadamarok-c9f212164b08f3ff5b8f82c78361791da6ea5366.tar.gz
amarok-c9f212164b08f3ff5b8f82c78361791da6ea5366.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/playerwindow.cpp')
-rw-r--r--amarok/src/playerwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 7cd3590e..3bbd14f3 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -440,7 +440,7 @@ void PlayerWidget::determineAmarokColors() //static
(!AmarokConfig::schemeKDE()
? AmarokConfig::playlistWindowBgColor()
- : KGlobalSettings::highlightColor()
+ : TDEGlobalSettings::highlightColor()
).getHsv( &hue, &s, &v );
using namespace Amarok::ColorScheme;
@@ -455,7 +455,7 @@ void PlayerWidget::determineAmarokColors() //static
//TODO schemes that have totally different active/inactive decoration colours need to be catered for too!
if ( AmarokConfig::schemeKDE() ) {
int h;
- KGlobalSettings::activeTitleColor().getHsv( &h, &s, &v );
+ TDEGlobalSettings::activeTitleColor().getHsv( &h, &s, &v );
if( TQABS( hue - h ) > 120 )
hue = h;
}