Tiny clean-ups.

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

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index 343922c5857f48842555b2777f92b812481f566d..ac4da0db5043977d62b2419636bd9f6653de9298 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -10,27 +10,30 @@
 
 #include <config.h>
 
-
 #include "ColorHandler.h"
-#include "LColor.h"
-#include "gettext.h"
+
 #include "debug.h"
+#include "gettext.h"
+#include "LColor.h"
 
-#include <boost/scoped_array.hpp>
-#include "support/tostr.h"
 #include "support/lstrings.h"
+#include "support/tostr.h"
+
+#include "lyx_forms.h"
+
+#include <boost/scoped_array.hpp>
 
 #include <cmath>
 
-using namespace lyx::support;
+using lyx::support::bformat;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::pow;
 #endif
 
 using std::endl;
+using std::string;
 
-#include "lyx_forms.h"
 
 namespace {
 
@@ -53,7 +56,7 @@ LyXColorHandler::LyXColorHandler()
 
        colormap = fl_state[fl_get_vclass()].colormap;
        // Clear the GC cache
-       for (int i = 0; i < colorGCcache.size(); ++i) {
+       for (string::size_type i = 0; i < colorGCcache.size(); ++i) {
                colorGCcache[i] = 0;
        }
 }
@@ -75,7 +78,7 @@ LyXColorHandler::~LyXColorHandler()
 }
 
 
-unsigned long LyXColorHandler::colorPixel(LColor::color c)
+unsigned long LyXColorHandler::colorPixel(LColor_color c)
 {
        XGCValues val;
        XGetGCValues(display, getGCForeground(c), GCForeground, &val);
@@ -158,10 +161,10 @@ GC LyXColorHandler::getGCForeground(string const & s)
        return XCreateGC(display, drawable,
                                           GCForeground | GCFunction, &val);
 }
-               
+
 // Gets GC according to color
 // Uses caching
-GC LyXColorHandler::getGCForeground(LColor::color c)
+GC LyXColorHandler::getGCForeground(LColor_color c)
 {
        if (static_cast<unsigned>(c) >= colorGCcache.size()) {
                colorGCcache.resize(c + 1, 0);
@@ -186,7 +189,7 @@ GC LyXColorHandler::getGCForeground(LColor::color c)
 
 // Gets GC for line
 GC LyXColorHandler::getGCLinepars(Painter::line_style ls,
-                                 Painter::line_width lw, LColor::color c)
+                                 Painter::line_width lw, LColor_color c)
 {
        //if (lyxerr.debugging()) {
        //      lyxerr << "Painter drawable: " << drawable() << endl;
@@ -232,7 +235,7 @@ GC LyXColorHandler::getGCLinepars(Painter::line_style ls,
 
 
 // update GC cache after color redefinition
-void LyXColorHandler::updateColor (LColor::color c)
+void LyXColorHandler::updateColor (LColor_color c)
 {
        // color GC cache
        GC gc = colorGCcache[c];