diff options
Diffstat (limited to 'src/base/Selection.cpp')
| -rw-r--r-- | src/base/Selection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/base/Selection.cpp b/src/base/Selection.cpp index 3402915..6e5ca2f 100644 --- a/src/base/Selection.cpp +++ b/src/base/Selection.cpp @@ -99,7 +99,7 @@ void EventSelection::addEvent(Event *e) timeT eventDuration = e->getDuration(); if (eventDuration == 0) eventDuration = 1; - if (tqcontains(e)) return; + if (contains(e)) return; if (e->getAbsoluteTime() < m_beginTime || !m_haveRealStartTime) { m_beginTime = e->getAbsoluteTime(); @@ -115,7 +115,7 @@ void EventSelection::addFromSelection(EventSelection *sel) { for (eventcontainer::iterator i = sel->getSegmentEvents().begin(); i != sel->getSegmentEvents().end(); ++i) { - if (!tqcontains(*i)) addEvent(*i); + if (!contains(*i)) addEvent(*i); } } @@ -134,7 +134,7 @@ void EventSelection::removeEvent(Event *e) } } -bool EventSelection::tqcontains(Event *e) const +bool EventSelection::contains(Event *e) const { std::pair<eventcontainer::const_iterator, eventcontainer::const_iterator> interval = m_segmentEvents.equal_range(e); @@ -148,7 +148,7 @@ bool EventSelection::tqcontains(Event *e) const return false; } -bool EventSelection::tqcontains(const std::string &type) const +bool EventSelection::contains(const std::string &type) const { for (eventcontainer::const_iterator i = m_segmentEvents.begin(); i != m_segmentEvents.end(); ++i) { @@ -173,13 +173,13 @@ EventSelection::getRanges() const while (j != k) { - for (j = i; j != k && tqcontains(*j); ++j); + for (j = i; j != k && contains(*j); ++j); if (j != i) { ranges.push_back(RangeList::value_type(i, j)); } - for (i = j; i != k && !tqcontains(*i); ++i); + for (i = j; i != k && !contains(*i); ++i); j = i; } @@ -210,7 +210,7 @@ EventSelection::getRangeTimes() const void EventSelection::eventRemoved(const Segment *s, Event *e) { - if (s == &m_originalSegment /*&& tqcontains(e)*/) { + if (s == &m_originalSegment /*&& contains(e)*/) { removeEvent(e); } } |