Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index edb334378d55d58e589c410e21062e494ece38e5..fdb6ed963b7d84066bd8fc99e1970dd034695f8c 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -12,16 +12,15 @@
 
 #include "Color.h"
 
-#include "support/LAssert.h"
-
 #include "lyx_forms.h"
 
+#include "LColor.h"
+
 #include "support/std_sstream.h"
 
 #include <cmath>
 #include <iomanip>
 
-namespace support = lyx::support;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::floor;
@@ -33,6 +32,7 @@ using std::setw;
 
 using std::istringstream;
 using std::ostringstream;
+using std::string;
 
 
 namespace {
@@ -51,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);
@@ -82,14 +82,14 @@ string const X11hexname(RGBColor const & col)
             << setw(2) << col.g
             << setw(2) << col.b;
 
-       return STRCONV(ostr.str());
+       return ostr.str();
 }
 
 
 RGBColor::RGBColor(string const & x11hexname)
-       : r(0), g(0), b(0) 
+       : r(0), g(0), b(0)
 {
-       support::Assert(x11hexname.size() == 7 && x11hexname[0] == '#');
+       BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#');
        r = hexstrToInt(x11hexname.substr(1,2));
        g = hexstrToInt(x11hexname.substr(3,2));
        b = hexstrToInt(x11hexname.substr(5,2));