[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/widget
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-09-15 13:56:11
Message-ID: 20100915135611.847BDAC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1175661 by staniek:

remove Qt3 warnings related to QPalette


 M  +3 -3      kexiscrollview.cpp  


--- trunk/koffice/kexi/widget/kexiscrollview.cpp #1175660:1175661
@@ -64,8 +64,8 @@
     QPalette pal(viewport()->palette());
     pal.setBrush(viewport()->backgroundRole(), pal.brush(QPalette::Mid));
     viewport()->setPalette(pal);
-    QColor fc = palette().active().foreground(),
-                bc = viewport()->paletteBackgroundColor();
+    const QColor fc = palette().color(QPalette::WindowText);
+    const QColor bc = viewport()->palette().color(QPalette::Window);
     m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
 // m_helpColor = QColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3,
 //  (fc.blue()+bc.blue()*2)/3);
@@ -331,7 +331,7 @@
     pixmap = QPixmap(txtw, txth);
     if (!pixmap.isNull()) {
         //create pixmap once
-        pixmap.fill(viewport()->paletteBackgroundColor());
+        pixmap.fill(viewport()->palette().color(QPalette::Window));
         QPainter pb(&pixmap);
         pb.initFrom(this);
         pb.setPen(m_helpColor);
[prev in list] [next in list] [prev in thread] [next in thread]