deprecated-- KColorScheme __comp_ctor fixes

svn path=/trunk/KDE/kdebase/apps/; revision=709395

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index e4669442ccc231519181581a4d8d0bba1c8a0f3a..3e03ef5719adbf2d6fa441544069d32847217acd 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -386,7 +386,7 @@ void ColumnWidget::paintEvent(QPaintEvent* event)
             QPainter painter(viewport());
             painter.save();
 
-            QColor color = KColorScheme(KColorScheme::View).foreground();
+            QColor color = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
             color.setAlpha(32);
             painter.setPen(Qt::NoPen);
             painter.setBrush(color);
@@ -433,7 +433,7 @@ void ColumnWidget::selectionChanged(const QItemSelection& selected, const QItemS
 
 void ColumnWidget::activate()
 {
-    const QColor bgColor = KColorScheme(KColorScheme::View).background();
+    const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     QPalette palette = viewport()->palette();
     palette.setColor(viewport()->backgroundRole(), bgColor);
     viewport()->setPalette(palette);
@@ -443,8 +443,8 @@ void ColumnWidget::activate()
 
 void ColumnWidget::deactivate()
 {
-    QColor bgColor = KColorScheme(KColorScheme::View).background();
-    const QColor fgColor = KColorScheme(KColorScheme::View).foreground();
+    QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    const QColor fgColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
     bgColor = KColorUtils::mix(bgColor, fgColor, 0.04);
 
     QPalette palette = viewport()->palette();

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 7339b82272f37cf6653045323aa5c4ce98748aea..d145597caa7736fc234e44f4ccbe9b7d621e9f4a 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -911,7 +911,7 @@ void DolphinView::applyCutItemEffect()
 
 void DolphinView::updateViewportColor()
 {
-    QColor color = KColorScheme(KColorScheme::View).background();
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     if (m_active) {
         emit urlChanged(url()); // Hmm, this is a hack; the url hasn't really changed.
         emit selectionChanged(selectedItems());

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index da5c66e2f183b9f1343120d3443a9ba45f8aa073..d55380294869f41d755881ae44f77c6420a55aee 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -59,7 +59,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     // create 'Icon Size' group including slider and preview
     QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), main);
 
-    const QColor iconBackgroundColor = KColorScheme(KColorScheme::View).background();
+    const QColor iconBackgroundColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
 
     KHBox* iconSizeHBox = new KHBox(iconSizeBox);
     iconSizeHBox->setSpacing(spacing);

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index fd2c2abd9c03295f26cfb0f7d342c2342d18797f..8f5f2096e33704bc3945dbc9a785000aa8f4f422 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -139,7 +139,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 
     // draw background
     QColor backgroundColor = palette().brush(QPalette::Background).color();
-    QColor foregroundColor = KColorScheme(KColorScheme::View).foreground();
+    QColor foregroundColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
     if (m_illumination > 0) {
         // TODO: are there foreground and background colors available for
         // "error messages"?

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 117d63f166919ee760fdf4b20896a578698335dd..84436813608728d4af814adc631e949c338aab02 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -75,7 +75,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
     frameColor.setAlpha(128);
     painter.setPen(frameColor);
 
-    const QColor backgrColor = KColorScheme(KColorScheme::View).background();
+    const QColor backgrColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     painter.setBrush(backgrColor);
 
     painter.drawRect(QRect(0, barTop + 1 , barWidth - widthDec, barHeight));
@@ -104,7 +104,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
     }
 
     // draw text
-    painter.setPen(KColorScheme(KColorScheme::View).foreground());
+    painter.setPen(KColorScheme(QPalette::Active, KColorScheme::View).foreground().color());
     painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
                      Qt::AlignCenter | Qt::TextWordWrap,
                      text);
@@ -164,7 +164,7 @@ void StatusBarSpaceInfo::refresh()
 
 QColor StatusBarSpaceInfo::progressColor(const QColor& bgColor) const
 {
-    QColor color = KColorScheme(KColorScheme::Button).background();
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::Button).background().color();
 
     // assure that enough contrast is given between the background color
     // and the progressbar color