From 569e6589a5e96aa9535024785cdf0b235074e1d6 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 28 Dec 2008 12:53:45 +0000 Subject: [PATCH] Remove QT3_SUPPORT svn path=/trunk/KDE/kdebase/workspace/; revision=902437 --- clients/oxygen/CMakeLists.txt | 2 -- clients/oxygen/oxygenbutton.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index f2f885895d..41e641d1ca 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) - add_subdirectory( config ) ########### next target ############### diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp index 2af4394ff0..76a5079bfa 100644 --- a/clients/oxygen/oxygenbutton.cpp +++ b/clients/oxygen/oxygenbutton.cpp @@ -216,7 +216,7 @@ void OxygenButton::paintEvent(QPaintEvent *) if(client_.maximizeMode() == OxygenClient::MaximizeRestore) painter.translate(0,-1); - QColor bg = helper_.backgroundTopColor(pal.window()); + QColor bg = helper_.backgroundTopColor(pal.window().color()); color = buttonDetailColor(pal); if(status_ == Oxygen::Hovered || status_ == Oxygen::Pressed) { @@ -226,7 +226,7 @@ void OxygenButton::paintEvent(QPaintEvent *) color = KColorScheme(pal.currentColorGroup()).decoration(KColorScheme::HoverColor).color(); } QLinearGradient lg = helper_.decoGradient(QRect(4,4,13,13), color); - painter.drawPixmap(0, 0, helper_.windecoButton(pal.window(), status_ == Oxygen::Pressed)); + painter.drawPixmap(0, 0, helper_.windecoButton(pal.window().color(), status_ == Oxygen::Pressed)); if (client_.isActive()) { painter.setRenderHints(QPainter::Antialiasing);