#include <config.h>
#include "Changes.h"
-#include "debug.h"
#include "Author.h"
#include "BufferParams.h"
#include "LaTeXFeatures.h"
-#include <boost/assert.hpp>
+#include "support/debug.h"
+
+#include "support/lassert.h"
#include <ostream>
+using namespace std;
+
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;
}
+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)
{
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 << ")");
}
<< (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
}
-void Changes::lyxMarkChange(std::ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, int & column,
Change const & old, Change const & change)
{
if (old == change)