add GuiView parent to QToc for proper memory management.

[lyx.git] / src / changes.C

diff --git a/src/changes.C b/src/changes.C
index a7956df9f2dc746ff6439d8a2d39afd567b36ea6..4c3ca6d9776b1e357391bb41121d31e8ce263994 100644 (file)
--- a/src/changes.C
+++ b/src/changes.C
@@ -99,7 +99,7 @@ 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.debugging(Debug::CHANGES)) {
+       if (change.type != Change::UNCHANGED) {
                LYXERR(Debug::CHANGES) << "setting change (type: " << change.type
                        << ", author: " << change.author << ", time: " << change.changetime
                        << ") in range (" << start << ", " << end << ")" << endl;
@@ -119,17 +119,15 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
                if (it->range.end > start) {
                        pos_type oldEnd = it->range.end;
                        it->range.end = start;
-                       if (lyxerr.debugging(Debug::CHANGES)) {
-                               LYXERR(Debug::CHANGES) << "  cutting tail of type " << it->change.type
-                                       << " resulting in range (" << it->range.start << ", "
-                                       << it->range.end << ")" << endl;
-                       }
+
+                       LYXERR(Debug::CHANGES) << "  cutting tail of type " << it->change.type
+                               << " resulting in range (" << it->range.start << ", "
+                               << it->range.end << ")" << endl;
+
                        ++it;
                        if (oldEnd >= end) {
-                               if (lyxerr.debugging(Debug::CHANGES)) {
-                                       LYXERR(Debug::CHANGES) << "  inserting tail in range ("
-                                               << end << ", " << oldEnd << ")" << endl;
-                               }
+                               LYXERR(Debug::CHANGES) << "  inserting tail in range ("
+                                       << end << ", " << oldEnd << ")" << endl;
                                it = table_.insert(it, ChangeRange((it-1)->change, Range(end, oldEnd)));
                        }
                        continue;
@@ -139,9 +137,7 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
        }
 
        if (change.type != Change::UNCHANGED) {
-               if (lyxerr.debugging(Debug::CHANGES)) {
-                       LYXERR(Debug::CHANGES) << "  inserting change" << endl;
-               }
+               LYXERR(Debug::CHANGES) << "  inserting change" << endl;
                it = table_.insert(it, ChangeRange(change, Range(start, end)));
                ++it;
        }
@@ -149,10 +145,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)) {
-                       if (lyxerr.debugging(Debug::CHANGES)) {
-                               LYXERR(Debug::CHANGES) << "  removing subrange ("
-                                       << it->range.start << ", " << it->range.end << ")" << endl;
-                       }
+                       LYXERR(Debug::CHANGES) << "  removing subrange ("
+                               << it->range.start << ", " << it->range.end << ")" << endl;
                        it = table_.erase(it);
                        continue;
                }
@@ -164,11 +158,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;
-               if (lyxerr.debugging(Debug::CHANGES)) {
-                       LYXERR(Debug::CHANGES) << "  cutting head of type "
-                               << it->change.type << " resulting in range ("
-                               << end << ", " << it->range.end << ")" << endl;
-               }
+               LYXERR(Debug::CHANGES) << "  cutting head of type "
+                       << it->change.type << " resulting in range ("
+                       << end << ", " << it->range.end << ")" << endl;
                break; // no need for another iteration
        }
 
@@ -178,9 +170,7 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 
 void Changes::erase(pos_type const pos)
 {
-       if (lyxerr.debugging(Debug::CHANGES)) {
-               LYXERR(Debug::CHANGES) << "Erasing change at position " << pos << endl;
-       }
+       LYXERR(Debug::CHANGES) << "Erasing change at position " << pos << endl;
 
        ChangeTable::iterator it = table_.begin();
        ChangeTable::iterator end = table_.end();
@@ -202,7 +192,7 @@ void Changes::erase(pos_type const pos)
 
 void Changes::insert(Change const & change, lyx::pos_type pos)
 {
-       if (change.type != Change::UNCHANGED && lyxerr.debugging(Debug::CHANGES)) {
+       if (change.type != Change::UNCHANGED) {
                LYXERR(Debug::CHANGES) << "Inserting change of type " << change.type
                        << " at position " << pos << endl;
        }
@@ -249,12 +239,10 @@ bool Changes::isChanged(pos_type const start, pos_type const end) const
 
        for (; it != itend; ++it) {
                if (it->range.intersects(Range(start, end))) {
-                       if (lyxerr.debugging(Debug::CHANGES)) {
-                               LYXERR(Debug::CHANGES) << "found intersection of range ("
-                                       << start << ", " << end << ") with ("
-                                       << it->range.start << ", " << it->range.end
-                                       << ") of type " << it->change.type << endl;
-                       }
+                       LYXERR(Debug::CHANGES) << "found intersection of range ("
+                               << start << ", " << end << ") with ("
+                               << it->range.start << ", " << it->range.end
+                               << ") of type " << it->change.type << endl;
                        return true;
                }
        }
@@ -267,17 +255,13 @@ void Changes::merge()
        ChangeTable::iterator it = table_.begin();
 
        while (it != table_.end()) {
-               if (lyxerr.debugging(Debug::CHANGES)) {
-                       LYXERR(Debug::CHANGES) << "found change of type " << it->change.type
-                               << " and range (" << it->range.start << ", " << it->range.end
-                               << ")" << endl;
-               }
+               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) {
-                       if (lyxerr.debugging(Debug::CHANGES)) {
-                               LYXERR(Debug::CHANGES) << "removing empty range for pos "
-                                       << it->range.start << endl;
-                       }
+                       LYXERR(Debug::CHANGES) << "removing empty range for pos "
+                               << it->range.start << endl;
 
                        table_.erase(it);
                        // start again
@@ -289,11 +273,10 @@ void Changes::merge()
                        break;
 
                if (it->change.isSimilarTo((it + 1)->change) && it->range.end == (it + 1)->range.start) {
-                       if (lyxerr.debugging(Debug::CHANGES)) {
-                               LYXERR(Debug::CHANGES) << "merging ranges (" << it->range.start << ", "
-                                       << it->range.end << ") and (" << (it + 1)->range.start << ", "
-                                       << (it + 1)->range.end << ")" << endl;
-                       }
+                       LYXERR(Debug::CHANGES) << "merging ranges (" << it->range.start << ", "
+                               << it->range.end << ") and (" << (it + 1)->range.start << ", "
+                               << (it + 1)->range.end << ")" << endl;
+
                        (it + 1)->range.start = it->range.start;
                        (it + 1)->change.changetime = max(it->change.changetime,
                                                          (it + 1)->change.changetime);