rename LColor into Color

[features.git] / src / insets / InsetFloat.cpp

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 74c08f770e3d4f5a3d7e387dbff7ed2e17d7ab41..e7126066a69b4be28f7e41a40c2aed88835ae077 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -13,22 +13,22 @@
 
 #include "InsetFloat.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "Cursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
+#include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
-#include "lyxlex.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "Color.h"
+#include "Lexer.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "TocBackend.h"
 
 #include "support/lstrings.h"
@@ -122,7 +122,7 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        font.decSize();
-       font.setColor(LColor::collapsable);
+       font.setColor(Color::collapsable);
        setLabelFont(font);
        params_.type = type;
        setInsetName(from_utf8(type));
@@ -135,7 +135,7 @@ InsetFloat::~InsetFloat()
 }
 
 
-void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -171,7 +171,7 @@ void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-bool InsetFloat::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
@@ -206,7 +206,7 @@ void InsetFloatParams::write(ostream & os) const
 }
 
 
-void InsetFloatParams::read(LyXLex & lex)
+void InsetFloatParams::read(Lexer & lex)
 {
        string token;
        lex >> token;
@@ -244,7 +244,7 @@ void InsetFloat::write(Buffer const & buf, ostream & os) const
 }
 
 
-void InsetFloat::read(Buffer const & buf, LyXLex & lex)
+void InsetFloat::read(Buffer const & buf, Lexer & lex)
 {
        params_.read(lex);
        wide(params_.wide, buf.params());
@@ -433,7 +433,7 @@ void InsetFloatMailer::string2params(string const & in,
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;