comparison data/model/IntervalModel.cpp @ 190:61681a2bc1e6

keep MIN and MAX compatibility (VC and linux compilation)
author lbajardsilogic
date Tue, 27 Nov 2007 13:26:04 +0000
parents a8dcc1ca82c4
children ff8187498612
comparison
equal deleted inserted replaced
189:6a31322cd9ed 190:61681a2bc1e6
195 195
196 void 196 void
197 IntervalModel::changeInterval(TimeIntervalPtr ti, long start, long end, float value, const QString& label) 197 IntervalModel::changeInterval(TimeIntervalPtr ti, long start, long end, float value, const QString& label)
198 { 198 {
199 199
200 long startMin = min(start, ti->start()); 200 long startMin = MIN(start, ti->start());
201 long endMax = max(end, ti->end()); 201 long endMax = MAX(end, ti->end());
202 202
203 { 203 {
204 QMutexLocker locker(&m_mutex); 204 QMutexLocker locker(&m_mutex);
205 205
206 if (label != ti->label()) 206 if (label != ti->label())