Merge branch 'master' into feature/pkey

[kdenlive] / src / choosecolorwidget.h

diff --git a/src/choosecolorwidget.h b/src/choosecolorwidget.h
index 3f4179488a0f2116c6ffcec76f97d010aebf9145..303c4a4e1aff52fa30f80025e8cc84690e5d37c2 100644 (file)
--- a/src/choosecolorwidget.h
+++ b/src/choosecolorwidget.h
@@ -40,7 +40,7 @@ public:
     * @param text (optional) What the color will be used for
     * @param color (optional) initial color 
     * @param alphaEnabled (optional) Should transparent colors be enabled */
-    ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0);
+    explicit ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0);
 
     /** @brief Gets the choosen color. */
     QString getColor();
@@ -56,6 +56,8 @@ signals:
     /** @brief Emitted whenever a different color was choosen. */
     void modified();
     void displayMessage(const QString&, int);
+    /** @brief When user wants to pick a color, it's better to disable filter so we get proper color values. */
+    void disableCurrentFilter(bool);
 };
 
 #endif