comparison layer/SingleColourLayer.h @ 1317:c2fa7bb1eca9 import-audio-data

Merge from default branch
author Chris Cannam
date Tue, 04 Sep 2018 13:19:32 +0100
parents 1d7921b1852f
children a18e78b9c78b
comparison
equal deleted inserted replaced
1312:fcc1f45f7bd5 1317:c2fa7bb1eca9
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 _SINGLE_COLOUR_LAYER_H_ 16 #ifndef SV_SINGLE_COLOUR_LAYER_H
17 #define _SINGLE_COLOUR_LAYER_H_ 17 #define SV_SINGLE_COLOUR_LAYER_H
18 18
19 #include "Layer.h" 19 #include "Layer.h"
20 #include <QColor> 20 #include <QColor>
21 #include <vector> 21 #include <vector>
22 #include <map> 22 #include <map>