X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormColorpicker.h;h=8c335f39c81730e09274a8821e5e5abd00ca59be;hb=d5443737342903de489d527802cd2cdd38987d74;hp=316fa79bbcb021a83e65b33d2eeae33de7ded733;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/frontends/xforms/FormColorpicker.h b/src/frontends/xforms/FormColorpicker.h
index 316fa79bbc..8c335f39c8 100644
--- a/src/frontends/xforms/FormColorpicker.h
+++ b/src/frontends/xforms/FormColorpicker.h
@@ -15,19 +15,18 @@
 #include "Color.h"
 #include "forms_fwd.h"
 
-#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 #include <X11/Xlib.h> // for Pixmap
 
+namespace lyx {
+namespace frontend {
 
-class Tooltips;
 class FD_colorpicker;
 class FD_colorpicker_rgb;
 class FD_colorpicker_hsv;
+class Tooltips;
 
-
-class FormColorpicker
-{
+class FormColorpicker {
 public:
 	FormColorpicker();
 	~FormColorpicker();
@@ -36,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
@@ -70,10 +69,10 @@ private:
 	int minh_;
 
 	/// The title displayed by the Window Manager.
-	string title_;
+	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 ;-)
@@ -86,4 +85,7 @@ private:
 	boost::scoped_ptr<FD_colorpicker_hsv> hsv_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // FORMCOLORPICKER_H