From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Sun, 1 Apr 2007 15:09:08 +0000 (+0000)
Subject: remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the... 
X-Git-Tag: 1.6.10~10378
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1b591e71b28b6102ee9163fc638878c11358b3c5;p=features.git

remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the output is actually needed


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17683 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/BufferView.C b/src/BufferView.C
index f090343379..8a10db7bba 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -338,22 +338,18 @@ bool BufferView::update(Update::flags flags)
 	// causes screen update(), I reset last_inset_ to avoid such a problem.
 	last_inset_ = 0;
 	// This is close to a hot-path.
-	if (lyxerr.debugging(Debug::DEBUG)) {
-		LYXERR(Debug::DEBUG)
-			<< BOOST_CURRENT_FUNCTION
-			<< "[fitcursor = " << (flags & Update::FitCursor)
-			<< ", forceupdate = " << (flags & Update::Force)
-			<< ", singlepar = " << (flags & Update::SinglePar)
-			<< "]  buffer: " << buffer_ << endl;
-	}
+	LYXERR(Debug::DEBUG)
+		<< BOOST_CURRENT_FUNCTION
+		<< "[fitcursor = " << (flags & Update::FitCursor)
+		<< ", forceupdate = " << (flags & Update::Force)
+		<< ", singlepar = " << (flags & Update::SinglePar)
+		<< "]  buffer: " << buffer_ << endl;
 
 	// Check needed to survive LyX startup
 	if (!buffer_)
 		return false;
 
-	if (lyxerr.debugging(Debug::WORKAREA)) {
-		LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
-	}
+	LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
 
 	// Update macro store
 	buffer_->buildMacros();
@@ -424,13 +420,11 @@ void BufferView::updateScrollbar()
 		offset_ref_ = 0;
 	}
 
-	if (lyxerr.debugging(Debug::GUI)) {
-		LYXERR(Debug::GUI)
-			<< BOOST_CURRENT_FUNCTION
-			<< " Updating scrollbar: height: " << t.paragraphs().size()
-			<< " curr par: " << cursor_.bottom().pit()
-			<< " default height " << defaultRowHeight() << endl;
-	}
+	LYXERR(Debug::GUI)
+		<< BOOST_CURRENT_FUNCTION
+		<< " Updating scrollbar: height: " << t.paragraphs().size()
+		<< " curr par: " << cursor_.bottom().pit()
+		<< " default height " << defaultRowHeight() << endl;
 
 	// It would be better to fix the scrollbar to understand
 	// values in [0..1] and divide everything by wh
diff --git a/src/DepTable.C b/src/DepTable.C
index 5c08e1e129..a638dfd98f 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -218,15 +218,14 @@ void DepTable::write(FileName const & f) const
 	DepList::const_iterator cit = deplist.begin();
 	DepList::const_iterator end = deplist.end();
 	for (; cit != end; ++cit) {
-		if (lyxerr.debugging(Debug::DEPEND)) {
-			// Store the second (most recently calculated)
-			// CRC value.
-			// The older one is effectively set to 0 upon re-load.
-			lyxerr << "Write dep: "
-			       << cit->second.crc_cur << ' '
-			       << cit->second.mtime_cur << ' '
-			       << cit->first << endl;
-		}
+		// Store the second (most recently calculated)
+		// CRC value.
+		// The older one is effectively set to 0 upon re-load.
+		LYXERR(Debug::DEPEND) << "Write dep: "
+		       << cit->second.crc_cur << ' '
+		       << cit->second.mtime_cur << ' '
+		       << cit->first << endl;
+
 		ofs << cit->second.crc_cur << ' '
 		    << cit->second.mtime_cur << ' '
 		    << cit->first << endl;
@@ -244,12 +243,10 @@ bool DepTable::read(FileName const & f)
 
 	while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
 		nome = ltrim(nome);
-		if (lyxerr.debugging(Debug::DEPEND)) {
-			lyxerr << "Read dep: "
-			       << di.crc_cur << ' '
-			       << di.mtime_cur << ' '
-			       << nome << endl;
-		}
+
+		LYXERR(Debug::DEPEND) << "Read dep: "
+		       << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome << endl;
+
 		deplist[FileName(nome)] = di;
 	}
 	return deplist.size();
diff --git a/src/changes.C b/src/changes.C
index a7956df9f2..4c3ca6d977 100644
--- 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);
diff --git a/src/text.C b/src/text.C
index 80cf983ff3..d2826eb0cd 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1444,11 +1444,9 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
 		return;
 	}
 
-	if (lyxerr.debugging(Debug::DEBUG)) {
-		LYXERR(Debug::DEBUG) << " y1: " << y1 << " y2: " << y2
-			   << "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width()
-			<< endl;
-	}
+	LYXERR(Debug::DEBUG) << " y1: " << y1 << " y2: " << y2
+		<< "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width()
+		<< endl;
 
 	// paint upper rectangle
 	pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,