anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17683 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2007-04-01 15:09:08 +00:00
parent 284e9efab7
commit 1b591e71b2
4 changed files with 56 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BufferView.C
View File

@ -338,22 +338,18 @@ bool BufferView::update(Update::flags flags)
// causes screen update(), I reset last_inset_ to avoid such a problem. // causes screen update(), I reset last_inset_ to avoid such a problem.
last_inset_ = 0; last_inset_ = 0;
// This is close to a hot-path. // This is close to a hot-path.
if (lyxerr.debugging(Debug::DEBUG)) { LYXERR(Debug::DEBUG)
LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
<< BOOST_CURRENT_FUNCTION << "[fitcursor = " << (flags & Update::FitCursor)
<< "[fitcursor = " << (flags & Update::FitCursor) << ", forceupdate = " << (flags & Update::Force)
<< ", forceupdate = " << (flags & Update::Force) << ", singlepar = " << (flags & Update::SinglePar)
<< ", singlepar = " << (flags & Update::SinglePar) << "] buffer: " << buffer_ << endl;
<< "] buffer: " << buffer_ << endl;
}
// Check needed to survive LyX startup // Check needed to survive LyX startup
if (!buffer_) if (!buffer_)
return false; return false;
if (lyxerr.debugging(Debug::WORKAREA)) { LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
}
// Update macro store // Update macro store
buffer_->buildMacros(); buffer_->buildMacros();
@ -424,13 +420,11 @@ void BufferView::updateScrollbar()
offset_ref_ = 0; offset_ref_ = 0;
} }
if (lyxerr.debugging(Debug::GUI)) { LYXERR(Debug::GUI)
LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
<< BOOST_CURRENT_FUNCTION << " Updating scrollbar: height: " << t.paragraphs().size()
<< " Updating scrollbar: height: " << t.paragraphs().size() << " curr par: " << cursor_.bottom().pit()
<< " curr par: " << cursor_.bottom().pit() << " default height " << defaultRowHeight() << endl;
<< " default height " << defaultRowHeight() << endl;
}
// It would be better to fix the scrollbar to understand // It would be better to fix the scrollbar to understand
// values in [0..1] and divide everything by wh // values in [0..1] and divide everything by wh

27
src/DepTable.C
View File

@ -218,15 +218,14 @@ void DepTable::write(FileName const & f) const
DepList::const_iterator cit = deplist.begin(); DepList::const_iterator cit = deplist.begin();
DepList::const_iterator end = deplist.end(); DepList::const_iterator end = deplist.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
if (lyxerr.debugging(Debug::DEPEND)) { // Store the second (most recently calculated)
// Store the second (most recently calculated) // CRC value.
// CRC value. // The older one is effectively set to 0 upon re-load.
// The older one is effectively set to 0 upon re-load. LYXERR(Debug::DEPEND) << "Write dep: "
lyxerr << "Write dep: " << cit->second.crc_cur << ' '
<< cit->second.crc_cur << ' ' << cit->second.mtime_cur << ' '
<< cit->second.mtime_cur << ' ' << cit->first << endl;
<< cit->first << endl;
}
ofs << cit->second.crc_cur << ' ' ofs << cit->second.crc_cur << ' '
<< cit->second.mtime_cur << ' ' << cit->second.mtime_cur << ' '
<< cit->first << endl; << cit->first << endl;
@ -244,12 +243,10 @@ bool DepTable::read(FileName const & f)
while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) { while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
nome = ltrim(nome); nome = ltrim(nome);
if (lyxerr.debugging(Debug::DEPEND)) {
lyxerr << "Read dep: " LYXERR(Debug::DEPEND) << "Read dep: "
<< di.crc_cur << ' ' << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome << endl;
<< di.mtime_cur << ' '
<< nome << endl;
}
deplist[FileName(nome)] = di; deplist[FileName(nome)] = di;
} }
return deplist.size(); return deplist.size();

75
src/changes.C
View File

@ -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) 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 LYXERR(Debug::CHANGES) << "setting change (type: " << change.type
<< ", author: " << change.author << ", time: " << change.changetime << ", author: " << change.author << ", time: " << change.changetime
<< ") in range (" << start << ", " << end << ")" << endl; << ") 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) { if (it->range.end > start) {
pos_type oldEnd = it->range.end; pos_type oldEnd = it->range.end;
it->range.end = start; it->range.end = start;
if (lyxerr.debugging(Debug::CHANGES)) {
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 << ", " << " resulting in range (" << it->range.start << ", "
<< it->range.end << ")" << endl; << it->range.end << ")" << endl;
}
++it; ++it;
if (oldEnd >= end) { if (oldEnd >= end) {
if (lyxerr.debugging(Debug::CHANGES)) { LYXERR(Debug::CHANGES) << " inserting tail in range ("
LYXERR(Debug::CHANGES) << " inserting tail in range (" << end << ", " << oldEnd << ")" << endl;
<< end << ", " << oldEnd << ")" << endl;
}
it = table_.insert(it, ChangeRange((it-1)->change, Range(end, oldEnd))); it = table_.insert(it, ChangeRange((it-1)->change, Range(end, oldEnd)));
} }
continue; 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 (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 = table_.insert(it, ChangeRange(change, Range(start, end)));
++it; ++it;
} }
@ -149,10 +145,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
for (; it != table_.end(); ) { for (; it != table_.end(); ) {
// new change 'contains' existing change // new change 'contains' existing change
if (newRange.contains(it->range)) { if (newRange.contains(it->range)) {
if (lyxerr.debugging(Debug::CHANGES)) { LYXERR(Debug::CHANGES) << " removing subrange ("
LYXERR(Debug::CHANGES) << " removing subrange (" << it->range.start << ", " << it->range.end << ")" << endl;
<< it->range.start << ", " << it->range.end << ")" << endl;
}
it = table_.erase(it); it = table_.erase(it);
continue; 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 // new change intersects with existing change
it->range.start = end; it->range.start = end;
if (lyxerr.debugging(Debug::CHANGES)) { LYXERR(Debug::CHANGES) << " cutting head of type "
LYXERR(Debug::CHANGES) << " cutting head of type " << it->change.type << " resulting in range ("
<< it->change.type << " resulting in range (" << end << ", " << it->range.end << ")" << endl;
<< end << ", " << it->range.end << ")" << endl;
}
break; // no need for another iteration 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) 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 it = table_.begin();
ChangeTable::iterator end = table_.end(); 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) 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 LYXERR(Debug::CHANGES) << "Inserting change of type " << change.type
<< " at position " << pos << endl; << " at position " << pos << endl;
} }
@ -249,12 +239,10 @@ bool Changes::isChanged(pos_type const start, pos_type const end) const
for (; it != itend; ++it) { for (; it != itend; ++it) {
if (it->range.intersects(Range(start, end))) { if (it->range.intersects(Range(start, end))) {
if (lyxerr.debugging(Debug::CHANGES)) { LYXERR(Debug::CHANGES) << "found intersection of range ("
LYXERR(Debug::CHANGES) << "found intersection of range (" << start << ", " << end << ") with ("
<< start << ", " << end << ") with (" << it->range.start << ", " << it->range.end
<< it->range.start << ", " << it->range.end << ") of type " << it->change.type << endl;
<< ") of type " << it->change.type << endl;
}
return true; return true;
} }
} }
@ -267,17 +255,13 @@ void Changes::merge()
ChangeTable::iterator it = table_.begin(); ChangeTable::iterator it = table_.begin();
while (it != table_.end()) { while (it != table_.end()) {
if (lyxerr.debugging(Debug::CHANGES)) { 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
<< " and range (" << it->range.start << ", " << it->range.end << ")" << endl;
<< ")" << endl;
}
if (it->range.start == it->range.end) { if (it->range.start == it->range.end) {
if (lyxerr.debugging(Debug::CHANGES)) { LYXERR(Debug::CHANGES) << "removing empty range for pos "
LYXERR(Debug::CHANGES) << "removing empty range for pos " << it->range.start << endl;
<< it->range.start << endl;
}
table_.erase(it); table_.erase(it);
// start again // start again
@ -289,11 +273,10 @@ void Changes::merge()
break; break;
if (it->change.isSimilarTo((it + 1)->change) && it->range.end == (it + 1)->range.start) { 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 << ", "
LYXERR(Debug::CHANGES) << "merging ranges (" << it->range.start << ", " << it->range.end << ") and (" << (it + 1)->range.start << ", "
<< it->range.end << ") and (" << (it + 1)->range.start << ", " << (it + 1)->range.end << ")" << endl;
<< (it + 1)->range.end << ")" << endl;
}
(it + 1)->range.start = it->range.start; (it + 1)->range.start = it->range.start;
(it + 1)->change.changetime = max(it->change.changetime, (it + 1)->change.changetime = max(it->change.changetime,
(it + 1)->change.changetime); (it + 1)->change.changetime);

8
src/text.C
View File

@ -1444,11 +1444,9 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
return; return;
} }
if (lyxerr.debugging(Debug::DEBUG)) { LYXERR(Debug::DEBUG) << " y1: " << y1 << " y2: " << y2
LYXERR(Debug::DEBUG) << " y1: " << y1 << " y2: " << y2 << "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width()
<< "X1:" << X1 << " x2: " << X2 << " wid: " << tm.width() << endl;
<< endl;
}
// paint upper rectangle // paint upper rectangle
pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1, pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,