God damn tabular dual head :-/

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index ea99b7fc6d71f6b27afd2a738dd9d5a8be5a2402..7b711172ecaa84aaf4fd97c551495aa7120386b2 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -14,17 +14,17 @@
 #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"
 
-using std::abs;
-using std::endl;
-using std::string;
-using std::max;
+#include "support/lassert.h"
+
+#include <ostream>
+
+using namespace std;
 
 namespace lyx {
 
@@ -97,9 +97,10 @@ void Changes::set(Change const & change, pos_type const pos)
 void Changes::set(Change const & change, pos_type const start, pos_type const end)
 {
        if (change.type != Change::UNCHANGED) {
-               LYXERR(Debug::CHANGES) << "setting change (type: " << change.type
-                       << ", author: " << change.author << ", time: " << change.changetime
-                       << ") in range (" << start << ", " << end << ")" << endl;
+               LYXERR(Debug::CHANGES, "setting change (type: " << change.type
+                       << ", author: " << change.author 
+                       << ", time: " << long(change.changetime)
+                       << ") in range (" << start << ", " << end << ")");
        }
 
        Range const newRange(start, end);
@@ -117,14 +118,14 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
                        pos_type oldEnd = it->range.end;
                        it->range.end = start;
 
-                       LYXERR(Debug::CHANGES) << "  cutting tail of type " << it->change.type
+                       LYXERR(Debug::CHANGES, "  cutting tail of type " << it->change.type
                                << " resulting in range (" << it->range.start << ", "
-                               << it->range.end << ")" << endl;
+                               << it->range.end << ")");
 
                        ++it;
                        if (oldEnd >= end) {
-                               LYXERR(Debug::CHANGES) << "  inserting tail in range ("
-                                       << end << ", " << oldEnd << ")" << endl;
+                               LYXERR(Debug::CHANGES, "  inserting tail in range ("
+                                       << end << ", " << oldEnd << ")");
                                it = table_.insert(it, ChangeRange((it-1)->change, Range(end, oldEnd)));
                        }
                        continue;
@@ -134,7 +135,7 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
        }
 
        if (change.type != Change::UNCHANGED) {
-               LYXERR(Debug::CHANGES) << "  inserting change" << endl;
+               LYXERR(Debug::CHANGES, "  inserting change");
                it = table_.insert(it, ChangeRange(change, Range(start, end)));
                ++it;
        }
@@ -142,8 +143,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
        for (; it != table_.end(); ) {
                // new change 'contains' existing change
                if (newRange.contains(it->range)) {
-                       LYXERR(Debug::CHANGES) << "  removing subrange ("
-                               << it->range.start << ", " << it->range.end << ")" << endl;
+                       LYXERR(Debug::CHANGES, "  removing subrange ("
+                               << it->range.start << ", " << it->range.end << ")");
                        it = table_.erase(it);
                        continue;
                }
@@ -154,9 +155,9 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 
                // new change intersects with existing change
                it->range.start = end;
-               LYXERR(Debug::CHANGES) << "  cutting head of type "
+               LYXERR(Debug::CHANGES, "  cutting head of type "
                        << it->change.type << " resulting in range ("
-                       << end << ", " << it->range.end << ")" << endl;
+                       << end << ", " << it->range.end << ")");
                break; // no need for another iteration
        }
 
@@ -166,7 +167,7 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 
 void Changes::erase(pos_type const pos)
 {
-       LYXERR(Debug::CHANGES) << "Erasing change at position " << pos << endl;
+       LYXERR(Debug::CHANGES, "Erasing change at position " << pos);
 
        ChangeTable::iterator it = table_.begin();
        ChangeTable::iterator end = table_.end();
@@ -187,8 +188,8 @@ void Changes::erase(pos_type const pos)
 void Changes::insert(Change const & change, lyx::pos_type pos)
 {
        if (change.type != Change::UNCHANGED) {
-               LYXERR(Debug::CHANGES) << "Inserting change of type " << change.type
-                       << " at position " << pos << endl;
+               LYXERR(Debug::CHANGES, "Inserting change of type " << change.type
+                       << " at position " << pos);
        }
 
        ChangeTable::iterator it = table_.begin();
@@ -231,10 +232,10 @@ bool Changes::isChanged(pos_type const start, pos_type const end) const
 
        for (; it != itend; ++it) {
                if (it->range.intersects(Range(start, end))) {
-                       LYXERR(Debug::CHANGES) << "found intersection of range ("
+                       LYXERR(Debug::CHANGES, "found intersection of range ("
                                << start << ", " << end << ") with ("
                                << it->range.start << ", " << it->range.end
-                               << ") of type " << it->change.type << endl;
+                               << ") of type " << it->change.type);
                        return true;
                }
        }
@@ -247,13 +248,13 @@ void Changes::merge()
        ChangeTable::iterator it = table_.begin();
 
        while (it != table_.end()) {
-               LYXERR(Debug::CHANGES) << "found change of type " << it->change.type
+               LYXERR(Debug::CHANGES, "found change of type " << it->change.type
                        << " and range (" << it->range.start << ", " << it->range.end
-                       << ")" << endl;
+                       << ")");
 
                if (it->range.start == it->range.end) {
-                       LYXERR(Debug::CHANGES) << "removing empty range for pos "
-                               << it->range.start << endl;
+                       LYXERR(Debug::CHANGES, "removing empty range for pos "
+                               << it->range.start);
 
                        table_.erase(it);
                        // start again
@@ -264,10 +265,11 @@ void Changes::merge()
                if (it + 1 == table_.end())
                        break;
 
-               if (it->change.isSimilarTo((it + 1)->change) && it->range.end == (it + 1)->range.start) {
-                       LYXERR(Debug::CHANGES) << "merging ranges (" << it->range.start << ", "
+               if (it->change.isSimilarTo((it + 1)->change)
+                   && it->range.end == (it + 1)->range.start) {
+                       LYXERR(Debug::CHANGES, "merging ranges (" << it->range.start << ", "
                                << it->range.end << ") and (" << (it + 1)->range.start << ", "
-                               << (it + 1)->range.end << ")" << endl;
+                               << (it + 1)->range.end << ")");
 
                        (it + 1)->range.start = it->range.start;
                        (it + 1)->change.changetime = max(it->change.changetime,
@@ -318,7 +320,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)