Change the semantics of 'none' and 'auto' viewers/editors: 'none' means now

[lyx.git] / src / frontends / xforms / FormColorpicker.h

diff --git a/src/frontends/xforms/FormColorpicker.h b/src/frontends/xforms/FormColorpicker.h
index ab5980988793fec2bb9c4a94ce7d4bc572c458da..8c335f39c81730e09274a8821e5e5abd00ca59be 100644 (file)
--- a/src/frontends/xforms/FormColorpicker.h
+++ b/src/frontends/xforms/FormColorpicker.h
@@ -35,7 +35,7 @@ public:
            a color is chosen (or the dialog is closed).
            \param color the color used to initialise the dialog.
         */
-       RGBColor const & requestColor(RGBColor const & color);
+       lyx::RGBColor const & requestColor(lyx::RGBColor const & color);
 
        /** Input callback function.
         *  Invoked only by the xforms callback interface
@@ -71,8 +71,8 @@ private:
        /// The title displayed by the Window Manager.
        std::string title_;
 
-       RGBColor input_color_;
-       RGBColor color_;
+       lyx::RGBColor input_color_;
+       lyx::RGBColor color_;
        bool finished_;
 
        /// Passed to the window manager to give a pretty little symbol ;-)