LaTeXFeatures.cpp: fix part of http://bugzilla.lyx.org/show_bug.cgi?id=5294 also...

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index e8caabe587d744a8792d94c7a35bccd39ed309c8..c2677736cd68713a7f964584b39ac958921f44f2 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -20,10 +20,12 @@
 
 #include "support/debug.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <ostream>
 
+using namespace std;
+
 namespace lyx {
 
 /*
@@ -37,7 +39,7 @@ namespace lyx {
  * the later change time is preserved.
  */
 
-bool Change::isSimilarTo(Change const & change)
+bool Change::isSimilarTo(Change const & change) const
 {
        if (type != change.type)
                return false;
@@ -49,6 +51,30 @@ bool Change::isSimilarTo(Change const & change)
 }
 
 
+ColorCode Change::color() const
+{
+       ColorCode color = Color_none;
+       switch (author % 5) {
+               case 0:
+                       color = Color_changedtextauthor1;
+                       break;
+               case 1:
+                       color = Color_changedtextauthor2;
+                       break;
+               case 2:
+                       color = Color_changedtextauthor3;
+                       break;
+               case 3:
+                       color = Color_changedtextauthor4;
+                       break;
+               case 4:
+                       color = Color_changedtextauthor5;
+                       break;
+       }
+       return color;
+}
+
+
 bool operator==(Change const & l, Change const & r)
 {
        if (l.type != r.type)
@@ -96,7 +122,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 {
        if (change.type != Change::UNCHANGED) {
                LYXERR(Debug::CHANGES, "setting change (type: " << change.type
-                       << ", author: " << change.author << ", time: " << change.changetime
+                       << ", author: " << change.author 
+                       << ", time: " << long(change.changetime)
                        << ") in range (" << start << ", " << end << ")");
        }
 
@@ -269,7 +296,7 @@ void Changes::merge()
                                << (it + 1)->range.end << ")");
 
                        (it + 1)->range.start = it->range.start;
-                       (it + 1)->change.changetime = std::max(it->change.changetime,
+                       (it + 1)->change.changetime = max(it->change.changetime,
                                                          (it + 1)->change.changetime);
                        table_.erase(it);
                        // start again
@@ -317,7 +344,7 @@ int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
 }
 
 
-void Changes::lyxMarkChange(std::ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, int & column,
                            Change const & old, Change const & change)
 {
        if (old == change)