Skip to content

Commit 3b0486c

Browse files
m-kuhnm-kuhn
committedOct 5, 2016
Followup 722fdef: fix grass plugin build
·
ltr-3_40final-3_0_0
1 parent 9242d22 commit 3b0486c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎src/plugins/grass/qgsgrasseditrenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void QgsGrassEditRenderer::stopRender( QgsRenderContext& context )
173173
mMarkerRenderer->stopRender( context );
174174
}
175175

176-
QList<QString> QgsGrassEditRenderer::usedAttributes()
176+
QSet<QString> QgsGrassEditRenderer::usedAttributes()
177177
{
178178
return mLineRenderer->usedAttributes();
179179
}

‎src/plugins/grass/qgsgrasseditrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class QgsGrassEditRenderer : public QgsFeatureRenderer
3838

3939
virtual void stopRender( QgsRenderContext& context ) override;
4040

41-
virtual QList<QString> usedAttributes() override;
41+
virtual QSet<QString> usedAttributes() override;
4242

4343
virtual QgsFeatureRenderer* clone() const override;
4444

3 commit comments

Comments
 (3)

nirvn commented on Oct 6, 2016

@nirvn
nirvn
on Oct 6, 2016
Contributor

@m-kuhn , I ge the following error while attempting to build master:

In file included from /home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrassplugin.cpp:23:0:
/home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrasseditrenderer.h:41:27: error: ‘virtual QSet<QString> QgsGrassEditRenderer::usedAttributes()’ marked ‘override’, but does not override
     virtual QSet<QString> usedAttributes() override;
                           ^~~~~~~~~~~~~~
In file included from /home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrasseditrenderer.cpp:30:0:
/home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrasseditrenderer.h:41:27: error: ‘virtual QSet<QString> QgsGrassEditRenderer::usedAttributes()’ marked ‘override’, but does not override
     virtual QSet<QString> usedAttributes() override;
                           ^~~~~~~~~~~~~~
/home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrasseditrenderer.cpp: In member function ‘virtual QgsFeatureRenderer* QgsGrassEditRenderer::clone() const’:
/home/webmaster/dev/cpp/QGIS/src/plugins/grass/qgsgrasseditrenderer.cpp:183:54: error: invalid new-expression of abstract class type ‘QgsGrassEditRenderer’
   QgsGrassEditRenderer* r = new QgsGrassEditRenderer();
                                                      ^

m-kuhn commented on Oct 6, 2016

@m-kuhn
m-kuhn
on Oct 6, 2016
MemberAuthor

Does it help if you change it to

virtual QSet<QString> usedAttributes() const override;

I was working on plain text files since I don't use grass.

nirvn commented on Oct 6, 2016

@nirvn
nirvn
on Oct 6, 2016
Contributor

@m-kuhn , it not only helps, it actually works :)

Please sign in to comment.