Mercurial > hg > svgui
diff layer/SingleColourLayer.cpp @ 1216:dc2af6616c83
Merge from branch 3.0-integration
| author | Chris Cannam |
|---|---|
| date | Fri, 13 Jan 2017 10:29:50 +0000 |
| parents | a5488775f880 |
| children | a34a2a25907c |
line wrap: on
line diff
--- a/layer/SingleColourLayer.cpp Fri Mar 04 12:23:31 2016 +0000 +++ b/layer/SingleColourLayer.cpp Fri Jan 13 10:29:50 2017 +0000 @@ -137,7 +137,7 @@ } void -SingleColourLayer::setDefaultColourFor(View *v) +SingleColourLayer::setDefaultColourFor(LayerGeometryProvider *v) { #ifdef DEBUG_COLOUR_SELECTION SVDEBUG << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << endl; @@ -244,19 +244,19 @@ } QColor -SingleColourLayer::getBackgroundQColor(View *v) const +SingleColourLayer::getBackgroundQColor(LayerGeometryProvider *v) const { return v->getBackground(); } QColor -SingleColourLayer::getForegroundQColor(View *v) const +SingleColourLayer::getForegroundQColor(LayerGeometryProvider *v) const { return v->getForeground(); } std::vector<QColor> -SingleColourLayer::getPartialShades(View *v) const +SingleColourLayer::getPartialShades(LayerGeometryProvider *v) const { std::vector<QColor> s; QColor base = getBaseQColor();