X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=33209afbbb58b22c4e13d3fdd30c9d9eff9c4475;hb=3209e6604ef132c8488ad14719b29406899d8b00;hp=eadcae9a971caaa87b6cfd6ed2e7b19ade3a5228;hpb=e8a28c33c564784899ecd427c06d1fe8678bfc07;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index eadcae9a97..33209afbbb 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -17,6 +17,7 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Color.h"
 #include "Encoding.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -429,7 +430,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
 	int column = 0;
 
 	if (oldChange.type != Change::UNCHANGED) {
-		if (oldChange.type != Change::DELETED || runparams.ctObject != OutputParams::CT_OMITOBJECT) {
+		if (oldChange.type != Change::DELETED || runparams.ctObject != CtObject::OmitObject) {
 			// close \lyxadded or \lyxdeleted
 			os << '}';
 			column++;
@@ -446,13 +447,13 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
 
 	docstring macro_beg;
 	if (change.type == Change::DELETED) {
-		if (runparams.ctObject == OutputParams::CT_OMITOBJECT)
+		if (runparams.ctObject == CtObject::OmitObject)
 			return 0;
-		else if (runparams.ctObject == OutputParams::CT_OBJECT)
+		else if (runparams.ctObject == CtObject::Object)
 			macro_beg = from_ascii("\\lyxobjdeleted");
-		else if (runparams.ctObject == OutputParams::CT_DISPLAYOBJECT)
+		else if (runparams.ctObject == CtObject::DisplayObject)
 			macro_beg = from_ascii("\\lyxdisplayobjdeleted");
-		else if (runparams.ctObject == OutputParams::CT_UDISPLAYOBJECT)
+		else if (runparams.ctObject == CtObject::UDisplayObject)
 			macro_beg = from_ascii("\\lyxudisplayobjdeleted");
 		else {
 			macro_beg = from_ascii("\\lyxdeleted");
@@ -482,7 +483,7 @@ void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & co
 
 	column = 0;
 
-	size_t const buffer_id = bparams.authors().get(change.author).bufferId();
+	int const buffer_id = bparams.authors().get(change.author).bufferId();
 
 	switch (change.type) {
 		case Change::UNCHANGED: