Mercurial > hg > svgui
diff layer/SingleColourLayer.h @ 1324:13d9b422f7fe zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:31 +0100 |
parents | 1d7921b1852f |
children | a18e78b9c78b |
line wrap: on
line diff
--- a/layer/SingleColourLayer.h Mon Dec 12 15:18:52 2016 +0000 +++ b/layer/SingleColourLayer.h Mon Sep 17 13:51:31 2018 +0100 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _SINGLE_COLOUR_LAYER_H_ -#define _SINGLE_COLOUR_LAYER_H_ +#ifndef SV_SINGLE_COLOUR_LAYER_H +#define SV_SINGLE_COLOUR_LAYER_H #include "Layer.h" #include <QColor> @@ -62,7 +62,7 @@ virtual int getPropertyRangeAndValue(const PropertyName &, int *min, int *max, int *deflt) const; virtual QString getPropertyValueLabel(const PropertyName &, - int value) const; + int value) const; virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; virtual void setProperty(const PropertyName &, int value);