* FORMAT

[features.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index a579144a7a1f875b8e6fb60bfb22043017d8d582..33209afbbb58b22c4e13d3fdd30c9d9eff9c4475 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -17,8 +17,8 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Color.h"
 #include "Encoding.h"
-#include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -430,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++;
@@ -447,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");
@@ -503,7 +503,7 @@ void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & co
 }
 
 
-void Changes::checkAuthors(AuthorList const & authorList)
+void Changes::checkAuthors(AuthorList const & authorList) const
 {
        for (ChangeRange const & cr : table_)
                if (cr.change.type != Change::UNCHANGED)
@@ -588,7 +588,7 @@ void Change::paintCue(PainterInfo & pi, double const x1, double const y1,
                return;
        case INSERTED: {
                if (!lyxrc.ct_additions_underlined)
-                       break;
+                       return;
                pi.pain.line(int(x1), int(y2) + 1, int(x2), int(y2) + 1,
                             color(), Painter::line_solid,
                             pi.base.solidLineThickness());