Mercurial > hg > svcore
comparison data/model/RangeSummarisableTimeValueModel.h @ 1365:3382d914e110
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Fri, 13 Jan 2017 10:29:44 +0000 |
parents | 54af1e21705c |
children | 2a06e4bc1c41 |
comparison
equal
deleted
inserted
replaced
1272:6a7ea3bd0e10 | 1365:3382d914e110 |
---|---|
11 published by the Free Software Foundation; either version 2 of the | 11 published by the Free Software Foundation; either version 2 of the |
12 License, or (at your option) any later version. See the file | 12 License, or (at your option) any later version. See the file |
13 COPYING included with this distribution for more information. | 13 COPYING included with this distribution for more information. |
14 */ | 14 */ |
15 | 15 |
16 #ifndef _RANGE_SUMMARISABLE_TIME_VALUE_MODEL_H_ | 16 #ifndef SV_RANGE_SUMMARISABLE_TIME_VALUE_MODEL_H |
17 #define _RANGE_SUMMARISABLE_TIME_VALUE_MODEL_H_ | 17 #define SV_RANGE_SUMMARISABLE_TIME_VALUE_MODEL_H |
18 | 18 |
19 #include <QObject> | 19 #include <QObject> |
20 | 20 |
21 #include "DenseTimeValueModel.h" | 21 #include "DenseTimeValueModel.h" |
22 #include "base/ZoomConstraint.h" | 22 #include "base/ZoomConstraint.h" |