mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-12 22:14:35 +00:00
Uniform naming of functions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30865 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
27a0ac410f
commit
b86942b4f4
@ -256,7 +256,7 @@ Change const & Changes::lookup(pos_type const pos) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool Changes::isFullyDeleted(pos_type start, pos_type end) const
|
bool Changes::isDeleted(pos_type start, pos_type end) const
|
||||||
{
|
{
|
||||||
ChangeTable::const_iterator it = table_.begin();
|
ChangeTable::const_iterator it = table_.begin();
|
||||||
ChangeTable::const_iterator const itend = table_.end();
|
ChangeTable::const_iterator const itend = table_.end();
|
||||||
|
@ -97,7 +97,7 @@ public:
|
|||||||
bool isChanged(pos_type start, pos_type end) const;
|
bool isChanged(pos_type start, pos_type end) const;
|
||||||
|
|
||||||
/// return true if the whole range is deleted
|
/// return true if the whole range is deleted
|
||||||
bool isFullyDeleted(pos_type const start, pos_type const end) const;
|
bool isDeleted(pos_type start, pos_type end) const;
|
||||||
|
|
||||||
/// output latex to mark a transition between two change types
|
/// output latex to mark a transition between two change types
|
||||||
/// returns length of text outputted
|
/// returns length of text outputted
|
||||||
|
@ -288,12 +288,12 @@ void Paragraph::addChangesToToc(DocIterator const & cdit,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool Paragraph::isFullyDeleted(pos_type start, pos_type end) const
|
bool Paragraph::isDeleted(pos_type start, pos_type end) const
|
||||||
{
|
{
|
||||||
LASSERT(start >= 0 && start <= size(), /**/);
|
LASSERT(start >= 0 && start <= size(), /**/);
|
||||||
LASSERT(end > start && end <= size() + 1, /**/);
|
LASSERT(end > start && end <= size() + 1, /**/);
|
||||||
|
|
||||||
return d->changes_.isFullyDeleted(start, end);
|
return d->changes_.isDeleted(start, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ public:
|
|||||||
/// is there a deletion at the given pos ?
|
/// is there a deletion at the given pos ?
|
||||||
bool isDeleted(pos_type pos) const;
|
bool isDeleted(pos_type pos) const;
|
||||||
/// is the whole paragraph deleted ?
|
/// is the whole paragraph deleted ?
|
||||||
bool isFullyDeleted(pos_type start, pos_type end) const;
|
bool isDeleted(pos_type start, pos_type end) const;
|
||||||
|
|
||||||
/// will the paragraph be physically merged with the next
|
/// will the paragraph be physically merged with the next
|
||||||
/// one if the imaginary end-of-par character is logically deleted?
|
/// one if the imaginary end-of-par character is logically deleted?
|
||||||
|
@ -338,7 +338,7 @@ bool isFullyDeleted(ParagraphList const & pars)
|
|||||||
// check all paragraphs
|
// check all paragraphs
|
||||||
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
for (pit_type pit = 0; pit < pars_size; ++pit) {
|
||||||
if (!pars[pit].empty()) // prevent assertion failure
|
if (!pars[pit].empty()) // prevent assertion failure
|
||||||
if (!pars[pit].isFullyDeleted(0, pars[pit].size()))
|
if (!pars[pit].isDeleted(0, pars[pit].size()))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user