From: Arto Hytönen <amthpublic@gmail.com>
Date: Mon, 3 Sep 2007 18:50:34 +0000 (+0000)
Subject: KGlobalSettings -> KColorScheme deprecated--
X-Git-Tag: v3.94.0~82
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=99946ecca0d0c641a67dccd9b12a57cada0aa29b;p=libqmvoc.git

KGlobalSettings -> KColorScheme deprecated--

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=708062
---

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index b68f9c3..9ae3416 100644
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -46,6 +46,7 @@
 #include <kdebug.h>
 #include <kmenu.h>
 #include <knotification.h>
+#include <kcolorscheme.h>
 #include <QApplication>
 #include <QPainter>
 #include <Q3Dict>
@@ -139,7 +140,7 @@ ExtDateTable::ExtDateTable(QWidget *parent, ExtDate date_, const char* name, Qt:
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
   QPalette pal = viewport()->palette();
-  pal.setColor(viewport()->backgroundRole(), KGlobalSettings::baseColor());
+  pal.setColor(viewport()->backgroundRole(), KColorScheme(QPalette::Active, KColorScheme::View).background().color());
   viewport()->setPalette(pal);
   setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
@@ -673,7 +674,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
   // enable to find drawing failures:
   // setTableFlags(Tbl_clipCellPainting);
   QPalette pal = viewport()->palette();
-  pal.setColor(viewport()->backgroundRole(), KGlobalSettings::baseColor());  // for consistency with the datepicker
+  pal.setColor(viewport()->backgroundRole(), KColorScheme(QPalette::Active, KColorScheme::View).background().color());  // for consistency with the datepicker
   viewport()->setPalette(pal);
   // ----- find the preferred size
   //       (this is slow, possibly, but unfortunately it is needed here):
@@ -705,7 +706,7 @@ ExtDateInternalMonthPicker::getResult() const
 void
 ExtDateInternalMonthPicker::setupPainter(QPainter *p)
 {
-  p->setPen(KGlobalSettings::textColor());
+  p->setPen(KColorScheme(QPalette::Active, KColorScheme::View).foreground().color());
 }
 
 void