[plasma-desktop] kcms/colors: Fix build

Luca Beltrame lbeltrame at kde.org
Wed Jul 13 05:27:12 UTC 2016


Git commit afc4f3281649bbecd8cd9667781d5df69c6d4925 by Luca Beltrame.
Committed on 13/07/2016 at 05:24.
Pushed by lbeltrame into branch 'master'.

Fix build

Comment out failing lines, which are referring to non-existent bits in
the UI file. This is a stop-gap solution.

*Please* check that things build before adjusting UI files. The code may
be referring to them, and if not adjusted, it will break.

CCMAIL: kainz.a at gmail.com
CCMAIL: plasma-devel at kde.org

M  +4    -4    kcms/colors/colorscm.cpp
M  +1    -0    kcms/colors/colorscm.h

http://commits.kde.org/plasma-desktop/afc4f3281649bbecd8cd9667781d5df69c6d4925

diff --git a/kcms/colors/colorscm.cpp b/kcms/colors/colorscm.cpp
index 80c01b1..b79b6e7 100644
--- a/kcms/colors/colorscm.cpp
+++ b/kcms/colors/colorscm.cpp
@@ -170,7 +170,7 @@ void KColorCm::updatePreviews()
 {
     schemePreview->setPalette(m_config);
     colorPreview->setPalette(m_config);
-    setPreview->setPalette(m_config, (KColorScheme::ColorSet)(colorSet->currentIndex() - 1));
+    // setPreview->setPalette(m_config, (KColorScheme::ColorSet)(colorSet->currentIndex() - 1));
     inactivePreview->setPalette(m_config, QPalette::Inactive);
     disabledPreview->setPalette(m_config, QPalette::Disabled);
 }
@@ -868,7 +868,7 @@ void KColorCm::updateColorTable()
     {
         // common colors is selected
         stackColors->setCurrentIndex(0);
-        stackPreview->setCurrentIndex(0);
+        // stackPreview->setCurrentIndex(0);
 
         KColorButton * button;
         foreach (button, m_commonColorButtons)
@@ -915,9 +915,9 @@ void KColorCm::updateColorTable()
     else
     {
         // a real color set is selected
-        setPreview->setPalette(m_config, (KColorScheme::ColorSet)currentSet);
+        // setPreview->setPalette(m_config, (KColorScheme::ColorSet)currentSet);
         stackColors->setCurrentIndex(1);
-        stackPreview->setCurrentIndex(1);
+        // stackPreview->setCurrentIndex(1);
 
         for (int i = KColorScheme::NormalBackground; i <= KColorScheme::AlternateBackground; ++i)
         {
diff --git a/kcms/colors/colorscm.h b/kcms/colors/colorscm.h
index 0aeee88..12254ba 100644
--- a/kcms/colors/colorscm.h
+++ b/kcms/colors/colorscm.h
@@ -22,6 +22,7 @@
 #define __COLORSCM_H__
 
 #include <KCModule>
+#include <KColorScheme>
 
 #include "ui_colorsettings.h"
 


More information about the Plasma-devel mailing list