#include <boost/assert.hpp>
+using lyx::pos_type;
using std::endl;
-using lyx::pos_type;
+using std::string;
bool operator==(Change const & l, Change const & r)
}
-bool Changes::Range::contains(pos_type pos) const
+bool Changes::Range::contains(pos_type const pos) const
{
return pos >= start && pos < end;
}
-bool Changes::Range::loose_contains(pos_type pos) const
+bool Changes::Range::loose_contains(pos_type const pos) const
{
return pos >= start && pos <= end;
}
}
-Changes::Changes(Change::Type type)
+Changes::Changes(Change::Type const type)
: empty_type_(type)
{
}
}
-void Changes::record(Change change, pos_type pos)
+void Changes::record(Change const change, pos_type const pos)
{
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "record " << change.type
}
-void Changes::set(Change change, pos_type pos)
+void Changes::set(Change const change, pos_type const pos)
{
set(change, pos, pos + 1);
}
-void Changes::set(Change::Type type, pos_type pos)
+void Changes::set(Change::Type const type, pos_type const pos)
{
set(type, pos, pos + 1);
}
-void Changes::set(Change::Type type, pos_type start, pos_type end)
+void Changes::set(Change::Type const type,
+ pos_type const start, pos_type const end)
{
set(Change(type), start, end);
}
-void Changes::set(Change change, pos_type start, pos_type end)
+void Changes::set(Change const change,
+ pos_type const start, pos_type const end)
{
ChangeTable::iterator it = table_.begin();
}
it = table_.begin();
- ChangeTable::iterator itend = table_.end();
+ ChangeTable::iterator const itend = table_.end();
// find a super-range
for (; it != itend; ++it) {
}
-void Changes::erase(pos_type pos)
+void Changes::erase(pos_type const pos)
{
ChangeTable::iterator it = table_.begin();
ChangeTable::iterator end = table_.end();
}
-void Changes::del(Change change, ChangeTable::size_type pos)
+void Changes::del(Change const change, ChangeTable::size_type const pos)
{
// this case happens when building from .lyx
if (table_.empty()) {
}
-void Changes::add(Change change, ChangeTable::size_type pos)
+void Changes::add(Change const change, ChangeTable::size_type const pos)
{
ChangeTable::iterator it = table_.begin();
ChangeTable::iterator end = table_.end();
}
-Change const Changes::lookupFull(pos_type pos) const
+Change const Changes::lookupFull(pos_type const pos) const
{
if (!table_.size()) {
if (lyxerr.debugging(Debug::CHANGES))
}
ChangeTable::const_iterator it = table_.begin();
- ChangeTable::const_iterator end = table_.end();
+ ChangeTable::const_iterator const end = table_.end();
for (; it != end; ++it) {
if (it->range.contains(pos))
}
check();
- BOOST_ASSERT(false);
+ BOOST_ASSERT(false && "missing changes for pos");
return Change(Change::UNCHANGED);
}
-Change::Type Changes::lookup(pos_type pos) const
+Change::Type Changes::lookup(pos_type const pos) const
{
if (!table_.size()) {
if (lyxerr.debugging(Debug::CHANGES))
}
check();
- BOOST_ASSERT(0);
+ BOOST_ASSERT(false && "missing changes for pos");
return Change::UNCHANGED;
}
-bool Changes::isChange(pos_type start, pos_type end) const
+bool Changes::isChange(pos_type const start, pos_type const end) const
{
if (!table_.size()) {
if (lyxerr.debugging(Debug::CHANGES))
}
ChangeTable::const_iterator it = table_.begin();
- ChangeTable::const_iterator itend = table_.end();
+ ChangeTable::const_iterator const itend = table_.end();
for (; it != itend; ++it) {
if (lyxerr.debugging(Debug::CHANGES)) {
}
-bool Changes::isChangeEdited(lyx::pos_type start, lyx::pos_type end) const
+bool Changes::isChangeEdited(lyx::pos_type const start,
+ lyx::pos_type const end) const
{
if (!table_.size()) {
if (lyxerr.debugging(Debug::CHANGES))
}
ChangeTable::const_iterator it = table_.begin();
- ChangeTable::const_iterator itend = table_.end();
+ ChangeTable::const_iterator const itend = table_.end();
for (; it != itend; ++it) {
if (it->range.intersects(Range(start, end ? end - 1 : 0))
ChangeTable::const_iterator it = table_.begin();
ChangeTable::const_iterator end = table_.end();
- bool dont_assert(true);
+ bool dont_assert = true;
lyxerr[Debug::CHANGES] << "Changelist:" << endl;
for (; it != end; ++it) {
}
-int Changes::latexMarkChange(std::ostream & os, Change::Type old, Change::Type change)
+int Changes::latexMarkChange(std::ostream & os,
+ Change::Type const old, Change::Type const change,
+ bool const & output)
{
- if (old == change)
+ if (!output || old == change)
return 0;
string const start("\\changestart{}");
}
-void Changes::lyxMarkChange(std::ostream & os, int & column, lyx::time_type curtime,
- Change const & old, Change const & change)
+void Changes::lyxMarkChange(std::ostream & os, int & column,
+ lyx::time_type const curtime,
+ Change const & old, Change const & change)
{
if (old == change)
return;
break;
case Change::DELETED: {
- lyx::time_type t(change.changetime);
+ lyx::time_type t = change.changetime;
if (!t)
t = curtime;
os << "\n\\change_deleted " << change.author
break;
}
- case Change::INSERTED:
- lyx::time_type t(change.changetime);
+ case Change::INSERTED: {
+ lyx::time_type t = change.changetime;
if (!t)
t = curtime;
os << "\n\\change_inserted " << change.author
<< " " << t << "\n";
break;
}
+ }
}