[sipify] fix false virtual methods

python/core/qgsdataitem.sip

@@ -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();

python/core/qgsgeometryvalidator.sip

@@ -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

python/core/symbology-ng/qgssinglesymbolrenderer.sip

@@ -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 );

python/gui/qgscollapsiblegroupbox.sip

@@ -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
 
 
 };

scripts/sipify.pl

@@ -714,6 +714,7 @@ sub detect_comment_block{
             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 @@ sub detect_comment_block{
         $RETURN_TYPE = '';
         $IS_OVERRIDE = 0;
     }
+    else {
+        $IS_OVERRIDE = 0;
+    }
 }
 write_header_footer();