Deprecated QPalette calls

svn path=/trunk/KDE/kdepim/; revision=535772

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

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<QColor *>( &headers->paintInfo()->colFore );
   QFont font = p->font();
   int weight = font.weight();

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 );

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);

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" );

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;

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",

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();