From b3e8c0482f6f21bddbe36be5f4830848b8229235 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Sun, 30 Apr 2006 12:29:29 +0000 Subject: [PATCH] Deprecated QPalette calls svn path=/trunk/KDE/kdepim/; revision=535772 --- configuredialog.cpp | 4 ++-- headeritem.cpp | 2 +- kmatmlistview.cpp | 8 ++++---- kmcomposewin.cpp | 16 ++++++++-------- kmedit.cpp | 2 +- kmfolderseldlg.cpp | 4 ++-- kmfoldertree.cpp | 4 ++-- kmheaders.cpp | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configuredialog.cpp b/configuredialog.cpp index 4545cf238..d98eda74a 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -1762,9 +1762,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mRecycleColorCheck->setChecked( reader.readEntry( "RecycleQuoteColors", false ) ); static const QColor defaultColor[ numColorNames ] = { - kapp->palette().active().base(), // bg + kapp->palette().color( QPalette::Base ), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->palette().active().text(), // fg + kapp->palette().color( QPalette::Text ), // fg QColor( 0x00, 0x80, 0x00 ), // quoted l1 QColor( 0x00, 0x70, 0x00 ), // quoted l2 QColor( 0x00, 0x60, 0x00 ), // quoted l3 diff --git a/headeritem.cpp b/headeritem.cpp index 9b09247c5..28293f882 100644 --- a/headeritem.cpp +++ b/headeritem.cpp @@ -369,7 +369,7 @@ void HeaderItem::paintCell( QPainter * p, const QColorGroup & cg, MessageStatus status = mMsgBase->status(); QColorGroup _cg( cg ); - QColor c = _cg.text(); + QColor c = _cg.color( QPalette::Text ); QColor *color = const_cast( &headers->paintInfo()->colFore ); QFont font = p->font(); int weight = font.weight(); diff --git a/kmatmlistview.cpp b/kmatmlistview.cpp index eab6ec42a..13016f080 100644 --- a/kmatmlistview.cpp +++ b/kmatmlistview.cpp @@ -182,9 +182,9 @@ void KMAtmListViewItem::paintCell( QPainter * p, const QColorGroup & cg, QColor bg; if (isSelected()) - bg = cg.highlight(); + bg = cg.color( QPalette::Highlight ); else - bg = cg.base(); + bg = cg.color( QPalette::Base ); QPalette pal; pal.setColor( mCBCompress->backgroundRole(), bg ); @@ -214,9 +214,9 @@ void KMAtmListViewItem::paintCell( QPainter * p, const QColorGroup & cg, QColor bg; if (isSelected()) - bg = cg.highlight(); + bg = cg.color( QPalette::Highlight ); else - bg = cg.base(); + bg = cg.color( QPalette::Base ); QPalette pal; pal.setColor( cb->backgroundRole(), bg ); diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp index 476ee0cfc..2d521a721 100644 --- a/kmcomposewin.cpp +++ b/kmcomposewin.cpp @@ -538,8 +538,8 @@ bool KMComposeWin::event(QEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = QColor(kapp->palette().active().text()); - mBackColor = QColor(kapp->palette().active().base()); + mForeColor = QColor(kapp->palette().color( QPalette::Text )); + mBackColor = QColor(kapp->palette().color( QPalette::Base )); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -547,12 +547,12 @@ void KMComposeWin::readColorConfig(void) // Color setup mPalette = kapp->palette(); - QColorGroup cgrp = mPalette.active(); - cgrp.setColor( QColorGroup::Base, mBackColor); - cgrp.setColor( QColorGroup::Text, mForeColor); - mPalette.setDisabled(cgrp); - mPalette.setActive(cgrp); - mPalette.setInactive(cgrp); + mPalette.setColor( QPalette::Base, mBackColor ); + mPalette.setColor( QPalette::Text, mForeColor ); + # warning "FIXME: Do we need to call setDisabled/setActive/setInactive or are the setColor calls enough??" +// mPalette.setDisabled(cgrp); +// mPalette.setActive(cgrp); +// mPalette.setInactive(cgrp); mEdtFrom->setPalette(mPalette); mEdtReplyTo->setPalette(mPalette); diff --git a/kmedit.cpp b/kmedit.cpp index d980b05a7..10219ac0b 100644 --- a/kmedit.cpp +++ b/kmedit.cpp @@ -236,7 +236,7 @@ void KMEdit::initializeAutoSpellChecking() QColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp QColor defaultColor2( 0x00, 0x70, 0x00 ); QColor defaultColor3( 0x00, 0x60, 0x00 ); - QColor defaultForeground( kapp->palette().active().text() ); + QColor defaultForeground( kapp->palette().color( QPalette::Text ) ); QColor c = Qt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); diff --git a/kmfolderseldlg.cpp b/kmfolderseldlg.cpp index a569db3d8..850aff037 100644 --- a/kmfolderseldlg.cpp +++ b/kmfolderseldlg.cpp @@ -230,8 +230,8 @@ void SimpleFolderTree::slotContextMenuRequested( Q3ListViewItem *lvi, //----------------------------------------------------------------------------- void SimpleFolderTree::readColorConfig (void) { - QColor c1=QColor(kapp->palette().active().text()); - QColor c2=QColor(kapp->palette().active().base()); + QColor c1=QColor(kapp->palette().color( QPalette::Text )); + QColor c2=QColor(kapp->palette().color( QPalette::Base )); mPaintInfo.colFore = c1; mPaintInfo.colBack = c2; diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp index 4c697e6f8..80e3fff7e 100644 --- a/kmfoldertree.cpp +++ b/kmfoldertree.cpp @@ -416,9 +416,9 @@ void KMFolderTree::readColorConfig (void) { // Custom/System color support KConfigGroup conf( KMKernel::config(), "Reader" ); - QColor c1=QColor(kapp->palette().active().text()); + QColor c1=QColor(kapp->palette().color( QPalette::Text )); QColor c2=QColor("blue"); - QColor c4=QColor(kapp->palette().active().base()); + QColor c4=QColor(kapp->palette().color( QPalette::Base )); if (!conf.readEntry( "defaultColors", true ) ) { mPaintInfo.colFore = conf.readEntry( "ForegroundColor", diff --git a/kmheaders.cpp b/kmheaders.cpp index 8b24f4efb..fd3cf2c0c 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -392,10 +392,10 @@ void KMHeaders::readColorConfig (void) { // Custom/System colors KConfigGroup config( KMKernel::config(), "Reader" ); - QColor c1=QColor(kapp->palette().active().text()); + QColor c1=QColor(kapp->palette().color( QPalette::Text )); QColor c2=QColor("red"); QColor c3=QColor("blue"); - QColor c4=QColor(kapp->palette().active().base()); + QColor c4=QColor(kapp->palette().color( QPalette::Base )); QColor c5=QColor(0,0x7F,0); QColor c6=QColor(0,0x98,0); QColor c7=KGlobalSettings::alternateBackgroundColor();