X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.cpp;h=126c8e5a168d66e2f2c7af06e104efdf437335f3;hb=eea79637c78bb9916031924eca7b305cfb8e83df;hp=4931c184bb1f76a5bed50dd8866177edc745d313;hpb=1f07a7f929d34b0d64d839d5d7963ed60e04b5a3;p=features.git

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 4931c184bb..126c8e5a16 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -21,7 +21,6 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "Color.h"
 #include "Lexer.h"
 #include "OutputParams.h"
 
@@ -97,8 +96,8 @@ void InsetBranch::setButtonLabel()
 	docstring s = _("Branch: ") + params_.branch;
 	if (!params_.branch.empty()) {
 		// FIXME UNICODE
-		Color_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
-		if (c == Color::none) {
+		ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+		if (c == Color_none) {
 			s = _("Undef: ") + s;
 		}
 	}
@@ -109,13 +108,13 @@ void InsetBranch::setButtonLabel()
 }
 
 
-Color_color InsetBranch::backgroundColor() const
+ColorCode InsetBranch::backgroundColor() const
 {
 	if (!params_.branch.empty()) {
 		// FIXME UNICODE
-		Color_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
-		if (c == Color::none) {
-			c = Color::error;
+		ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+		if (c == Color_none) {
+			c = Color_error;
 		}
 		return c;
 	} else