Mercurial > hg > svgui
diff layer/SingleColourLayer.cpp @ 1324:13d9b422f7fe zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:31 +0100 |
parents | a34a2a25907c |
children | c8a6fd3f9dff |
line wrap: on
line diff
--- a/layer/SingleColourLayer.cpp Mon Dec 12 15:18:52 2016 +0000 +++ b/layer/SingleColourLayer.cpp Mon Sep 17 13:51:31 2018 +0100 @@ -103,7 +103,7 @@ val = m_colour; } else { - val = Layer::getPropertyRangeAndValue(name, min, max, deflt); + val = Layer::getPropertyRangeAndValue(name, min, max, deflt); } return val; @@ -111,7 +111,7 @@ QString SingleColourLayer::getPropertyValueLabel(const PropertyName &name, - int value) const + int value) const { if (name == "Colour") { ColourDatabase *db = ColourDatabase::getInstance(); @@ -283,7 +283,7 @@ s += QString("colourName=\"%1\" " "colour=\"%2\" " "darkBackground=\"%3\" ") - .arg(colourName) + .arg(colourName) .arg(colourSpec) .arg(darkbg);