Mercurial > hg > svcore

comparison data/model/IntervalModel.h @ 608:d7f3dfe6f9a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* solaris build fixes
author Chris Cannam
date Thu, 10 Sep 2009 18:44:45 +0000
parents 6441b31b37ac
children b1dc68507e46
comparison
equal deleted inserted replaced
607:a67651386253 608:d7f3dfe6f9a4
132 QMutex &mutex(I::m_mutex); 132 QMutex &mutex(I::m_mutex);
133 QMutexLocker locker(&mutex); 133 QMutexLocker locker(&mutex);
134 134
135 PointType endPoint(end); 135 PointType endPoint(end);
136 136
137 typename I::PointListIterator endItr = I::m_points.upper_bound(endPoint); 137 typename I::PointListConstIterator endItr = I::m_points.upper_bound(endPoint);
138 138
139 if (endItr != I::m_points.end()) ++endItr; 139 if (endItr != I::m_points.end()) ++endItr;
140 if (endItr != I::m_points.end()) ++endItr; 140 if (endItr != I::m_points.end()) ++endItr;
141 141
142 typename I::PointList rv; 142 typename I::PointList rv;
143 143
144 for (typename I::PointListIterator i = endItr; i != I::m_points.begin(); ) { 144 for (typename I::PointListConstIterator i = endItr; i != I::m_points.begin(); ) {
145 --i; 145 --i;
146 if (i->frame < start) { 146 if (i->frame < start) {
147 if (i->frame + long(i->duration) >= start) { 147 if (i->frame + long(i->duration) >= start) {
148 rv.insert(*i); 148 rv.insert(*i);
149 } 149 }
169 long start = (frame / I::m_resolution) * I::m_resolution; 169 long start = (frame / I::m_resolution) * I::m_resolution;
170 long end = start + I::m_resolution; 170 long end = start + I::m_resolution;
171 171
172 PointType endPoint(end); 172 PointType endPoint(end);
173 173
174 typename I::PointListIterator endItr = I::m_points.upper_bound(endPoint); 174 typename I::PointListConstIterator endItr = I::m_points.upper_bound(endPoint);
175 175
176 typename I::PointList rv; 176 typename I::PointList rv;
177 177
178 for (typename I::PointListIterator i = endItr; i != I::m_points.begin(); ) { 178 for (typename I::PointListConstIterator i = endItr; i != I::m_points.begin(); ) {
179 --i; 179 --i;
180 if (i->frame < start) { 180 if (i->frame < start) {
181 if (i->frame + long(i->duration) >= start) { 181 if (i->frame + long(i->duration) >= start) {
182 rv.insert(*i); 182 rv.insert(*i);
183 } 183 }