Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.

2 files changed, 3 insertions, 6 deletions

diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index c2e5355..eefeccc 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -53,6 +53,5 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
         layout-> addWidget ( l, i, 0 );
         
-        m_buttons [i] = new OColorButton ( this );
-        m_buttons [i]-> setColor ( colors [i] );
+        m_buttons [i] = new OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
     }
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index 255456c..7747da7 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -79,10 +79,8 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
         grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
 
-        m_menubtn = new OColorButton ( this );
-        m_menubtn-> setColor ( mcol );
+        m_menubtn = new OColorButton ( this, mcol );
         grid-> addWidget ( m_menubtn, 0, 2 );
 
-        m_textbtn = new OColorButton ( this );
-        m_textbtn-> setColor ( tcol );
+        m_textbtn = new OColorButton ( this, tcol );
         grid-> addWidget ( m_textbtn, 0, 5 );