From 5863ef46cf5e92d3c9ba7435ec730ba586a898fb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 19 Jul 2023 16:58:15 +0900 Subject: [PATCH] Drop compatibility code for TQPalette Signed-off-by: Michele Calgaro --- kaddressbook/views/kaddressbookcardview.cpp | 24 ++++++++++----------- korganizer/komonthview.cpp | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9c6b55e1..9f169e24 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -185,18 +185,18 @@ void KAddressBookCardView::readConfig( TDEConfig *config ) // costum colors? if ( config->readBoolEntry( "EnableCustomColors", false ) ) { TQPalette p( mCardView->palette() ); - TQColor c = p.color( TQPalette::Normal, TQColorGroup::Base ); - p.setColor( TQPalette::Normal, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Text ); - p.setColor( TQPalette::Normal, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Button ); - p.setColor( TQPalette::Normal, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::ButtonText ); - p.setColor( TQPalette::Normal, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Highlight ); - p.setColor( TQPalette::Normal, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::HighlightedText ); - p.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); + TQColor c = p.color( TQPalette::Active, TQColorGroup::Base ); + p.setColor( TQPalette::Active, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Text ); + p.setColor( TQPalette::Active, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Button ); + p.setColor( TQPalette::Active, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::ButtonText ); + p.setColor( TQPalette::Active, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Highlight ); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::HighlightedText ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); mCardView->viewport()->setPalette( p ); } else { // needed if turned off during a session. diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ab61181c..440bc10d 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -259,7 +259,7 @@ void MonthViewItem::paint( TQPainter *p ) } if ( !bgColor.isValid() ) { - bgColor = palette().color( TQPalette::Normal, + bgColor = palette().color( TQPalette::Active, sel ? TQColorGroup::Highlight : TQColorGroup::Background ); } @@ -286,7 +286,7 @@ void MonthViewItem::paint( TQPainter *p ) } if ( !frameColor.isValid() ) { - frameColor = palette().color( TQPalette::Normal, + frameColor = palette().color( TQPalette::Active, sel ? TQColorGroup::Highlight : TQColorGroup::Foreground ); } else {