Tiny clean-ups.

[lyx.git] / src / frontends / xforms / Color.C

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 49d1cd0408ade0e924c107ce30df1501e0998782..fdb6ed963b7d84066bd8fc99e1970dd034695f8c 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -14,6 +14,8 @@
 
 #include "lyx_forms.h"
 
+#include "LColor.h"
+
 #include "support/std_sstream.h"
 
 #include <cmath>
@@ -30,6 +32,7 @@ using std::setw;
 
 using std::istringstream;
 using std::ostringstream;
+using std::string;
 
 
 namespace {
@@ -48,7 +51,7 @@ int hexstrToInt(string const & str)
 
 
 
-bool getRGBColor(LColor::color col,
+bool getRGBColor(LColor_color col,
                 unsigned int & r, unsigned int & g, unsigned int & b)
 {
        string const name = lcolor.getX11Name(col);
@@ -79,7 +82,7 @@ string const X11hexname(RGBColor const & col)
             << setw(2) << col.g
             << setw(2) << col.b;
 
-       return STRCONV(ostr.str());
+       return ostr.str();
 }