sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[sipify] fix false virtual methods

Browse Source
This commit is contained in:
Denis Rouzaud 2017-06-08 07:28:36 +02:00
parent 0591225fbc
commit 41ceed3d77
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/qgsdataitem.sip
View File

@ -509,8 +509,7 @@ Check if the given path is hidden from the browser model
public slots:
virtual void childrenCreated();
virtual void directoryChanged();
void directoryChanged();
protected:
void init();

3
python/core/qgsgeometryvalidator.sip
View File

@ -24,8 +24,7 @@ class QgsGeometryValidator : QThread
virtual void run();
virtual void stop();
void stop();
static void validateGeometry( const QgsGeometry *g, QList<QgsGeometry::Error> &errors /Out/, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
%Docstring

6
python/core/symbology-ng/qgssinglesymbolrenderer.sip
View File

@ -35,6 +35,12 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer
virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
static QgsFeatureRenderer *createFromSld( QDomElement &element, QgsWkbTypes::GeometryType geomType );
<<<<<<< Updated upstream
=======
%Docstring
:rtype: QgsFeatureRenderer
%End
>>>>>>> Stashed changes
virtual QgsFeatureRenderer::Capabilities capabilities();
virtual QgsSymbolList symbols( QgsRenderContext &context );

6
python/gui/qgscollapsiblegroupbox.sip
View File

@ -212,8 +212,10 @@ Returns the name of the setting group in which the collapsed state will be saved
void init();
virtual void showEvent( QShowEvent *event );
virtual QString saveKey() const;
QString saveKey() const;
%Docstring
:rtype: str
%End
};

4
scripts/sipify.pl
View File

@ -714,6 +714,7 @@ while ($LINE_IDX < $LINE_COUNT){
elsif ( $LINE !~ m/^(\s*)virtual\b(.*)$/ ){
#sip often requires the virtual keyword to be present, or it chokes on covariant return types
#in overridden methods
dbg_info('adding virtual keyword for overriden method');
$LINE =~ s/^(\s*?)\b(.*)$/$1virtual $2\n/;
}
}
@ -833,6 +834,9 @@ while ($LINE_IDX < $LINE_COUNT){
$RETURN_TYPE = '';
$IS_OVERRIDE = 0;
}
else {
$IS_OVERRIDE = 0;
}
}
write_header_footer();