X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=f415aecce6aa2d1e64f6b77d4f61355c6f6f0c11;hb=eea79637c78bb9916031924eca7b305cfb8e83df;hp=698a8f294b8b846ed15e5f4f9f78538a5c64f774;hpb=1f07a7f929d34b0d64d839d5d7963ed60e04b5a3;p=features.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 698a8f294b..f415aecce6 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -22,11 +22,11 @@
 #include "LyXRC.h"
 
 #include "debug.h"
+#include "Color.h"
 #include "Converter.h"
 #include "Format.h"
 #include "gettext.h"
 #include "Session.h"
-#include "Color.h"
 #include "Lexer.h"
 #include "Font.h"
 #include "Mover.h"
@@ -820,11 +820,11 @@ int LyXRC::read(Lexer & lexrc)
 				break;
 			}
 
-			Color::color const col =
+			ColorCode const col =
 				lcolor.getFromLyXName(lyx_name);
-			if (col == Color::none ||
-			    col == Color::inherit ||
-			    col == Color::ignore)
+			if (col == Color_none ||
+			    col == Color_inherit ||
+			    col == Color_ignore)
 				break;
 
 			if (!lcolor.setColor(col, x11_name)) {
@@ -1696,8 +1696,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		   << "#\n\n";
 
 	case RC_SET_COLOR:
-		for (int i = 0; i < Color::ignore; ++i) {
-			Color::color lc = static_cast<Color::color>(i);
+		for (int i = 0; i < Color_ignore; ++i) {
+			ColorCode lc = static_cast<ColorCode>(i);
 
 			string const col(lcolor.getX11Name(lc));
 			if (ignore_system_lyxrc ||