rename LColor into Color

[features.git] / src / frontends / controllers / ControlCharacter.cpp

diff --git a/src/frontends/controllers/ControlCharacter.cpp b/src/frontends/controllers/ControlCharacter.cpp
index 5bf15563071d5b00279832fc0febe8444ca8d303..b5dd7fe67a0a1c14eae0057df6158d3b5d4f9695 100644 (file)
--- a/src/frontends/controllers/ControlCharacter.cpp
+++ b/src/frontends/controllers/ControlCharacter.cpp
@@ -13,12 +13,12 @@
 #include "ControlCharacter.h"
 #include "ButtonController.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "bufferview_funcs.h"
-#include "funcrequest.h"
-#include "language.h"
-#include "LColor.h"
+#include "FuncRequest.h"
+#include "Language.h"
+#include "Color.h"
 
 using lyx::bv_funcs::font2string;
 using std::string;
@@ -44,7 +44,7 @@ bool ControlCharacter::initialiseParams(string const &)
            getShape()    != LyXFont::IGNORE_SHAPE  ||
            getSize()     != LyXFont::IGNORE_SIZE ||
            getBar()      != IGNORE ||
-           getColor()    != LColor::ignore ||
+           getColor()    != Color::ignore ||
            font_->language() != ignore_language)
                dialog().bc().valid();
 
@@ -178,29 +178,29 @@ void ControlCharacter::setBar(FONT_STATE val)
 }
 
 
-LColor_color ControlCharacter::getColor() const
+Color_color ControlCharacter::getColor() const
 {
        if (!font_.get())
-               return LColor::ignore;
+               return Color::ignore;
 
        return font_->color();
 }
 
 
-void ControlCharacter::setColor(LColor_color val)
+void ControlCharacter::setColor(Color_color val)
 {
        switch (val) {
-       case LColor::ignore:
-       case LColor::none:
-       case LColor::black:
-       case LColor::white:
-       case LColor::red:
-       case LColor::green:
-       case LColor::blue:
-       case LColor::cyan:
-       case LColor::magenta:
-       case LColor::yellow:
-       case LColor::inherit:
+       case Color::ignore:
+       case Color::none:
+       case Color::black:
+       case Color::white:
+       case Color::red:
+       case Color::green:
+       case Color::blue:
+       case Color::cyan:
+       case Color::magenta:
+       case Color::yellow:
+       case Color::inherit:
                font_->setColor(val);
                break;
        default: