sipify qgsoverlayanalyzer and qgsnewmemorylayer

python/analysis/vector/qgsoverlayanalyzer.sip

@@ -1,24 +1,46 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/vector/qgsoverlayanalyzer.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
 
-/** \ingroup analysis
- * The Qgis class provides vector overlay analysis functions
- */
 
 class QgsOverlayAnalyzer
 {
-%TypeHeaderCode
+%Docstring
-#include <qgsoverlayanalyzer.h>
+ The QGis class provides vector overlay analysis functions
 %End
 
+%TypeHeaderCode
+#include "qgsoverlayanalyzer.h"
+%End
   public:
 
-    /** Perform an intersection on two input vector layers and write output to a new shape file
+    bool intersection( QgsVectorLayer *layerA, QgsVectorLayer *layerB,
-      @param layerA input vector layer
+                       const QString &shapefileName, bool onlySelectedFeatures = false,
-      @param layerB input vector layer
+                       QProgressDialog *p = 0 );
-      @param shapefileName path to the output shp
+%Docstring
-      @param onlySelectedFeatures if true, only selected features are considered, else all the features
+ Perform an intersection on two input vector layers and write output to a new shape file
-      @param p progress dialog (or 0 if no progress dialog is to be shown)
+\param layerA input vector layer
-      */
+\param layerB input vector layer
-    bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB,
+\param shapefileName path to the output shp
-                       const QString& shapefileName, bool onlySelectedFeatures = false,
+\param onlySelectedFeatures if true, only selected features are considered, else all the features
-                       QProgressDialog* p = 0 );
+\param p progress dialog (or 0 if no progress dialog is to be shown)
+ :rtype: bool
+%End
+
 };
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/vector/qgsoverlayanalyzer.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/auto_sip.blacklist

@@ -356,7 +356,6 @@ gui/qgsmessagebar.sip
 gui/qgsmessagebaritem.sip
 gui/qgsmessageviewer.sip
 gui/qgsnewhttpconnection.sip
-gui/qgsnewmemorylayerdialog.sip
 gui/qgsnewnamedialog.sip
 gui/qgsnewvectorlayerdialog.sip
 gui/qgsnewgeopackagelayerdialog.sip
@@ -505,7 +504,6 @@ gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
 gui/layertree/qgslayertreeview.sip
 analysis/vector/qgsgeometryanalyzer.sip
 analysis/vector/qgsgeometrysnapper.sip
-analysis/vector/qgsoverlayanalyzer.sip
 analysis/vector/qgspointsample.sip
 analysis/vector/qgstransectsample.sip
 analysis/vector/qgszonalstatistics.sip

python/gui/qgsnewmemorylayerdialog.sip

@@ -1,27 +1,66 @@
-class QgsNewMemoryLayerDialog : QDialog
+/************************************************************************
-{
+ * This file has been generated automatically from                      *
-%TypeHeaderCode
+ *                                                                      *
-#include <qgsnewmemorylayerdialog.h>
+ * src/gui/qgsnewmemorylayerdialog.h                                    *
-%End
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
 
+
+
+
+class QgsNewMemoryLayerDialog: QDialog
+{
+
+%TypeHeaderCode
+#include "qgsnewmemorylayerdialog.h"
+%End
   public:
 
-    /** Runs the dialoag and creates a new memory layer
+    static QgsVectorLayer *runAndCreateLayer( QWidget *parent = 0, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );
-     * @param parent parent widget
+%Docstring
-     * @returns new memory layer
+ Runs the dialog and creates a new memory layer
-     */
+ \param parent parent widget
-    static QgsVectorLayer* runAndCreateLayer( QWidget* parent = 0 );
+ \param defaultCrs default layer CRS to show in dialog
+ :return: new memory layer
+ :rtype: QgsVectorLayer
+%End
 
-    QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
+    QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsNewMemoryLayerDialog();
 
-    /** Returns the selected geometry type*/
     QgsWkbTypes::Type selectedType() const;
+%Docstring
+Returns the selected geometry type
+ :rtype: QgsWkbTypes.Type
+%End
 
     void setCrs( const QgsCoordinateReferenceSystem &crs );
-    QgsCoordinateReferenceSystem crs() const;
+%Docstring
+ Sets the ``crs`` value for the new layer in the dialog.
+.. versionadded:: 3.0
+.. seealso:: crs()
+%End
+
+    QgsCoordinateReferenceSystem crs() const;
+%Docstring
+ Returns the selected CRS for the new layer.
+.. seealso:: setCrs()
+ :rtype: QgsCoordinateReferenceSystem
+%End
 
-    /** Returns the layer name*/
     QString layerName() const;
+%Docstring
+Returns the layer name
+ :rtype: str
+%End
 
 };
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgsnewmemorylayerdialog.h                                    *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

src/gui/qgsnewmemorylayerdialog.h

@@ -33,14 +33,14 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
 
   public:
 
-    /** Runs the dialoag and creates a new memory layer
+    /** Runs the dialog and creates a new memory layer
      * \param parent parent widget
      * \param defaultCrs default layer CRS to show in dialog
      * \returns new memory layer
      */
     static QgsVectorLayer *runAndCreateLayer( QWidget *parent = nullptr, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );
 
-    QgsNewMemoryLayerDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsNewMemoryLayerDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsNewMemoryLayerDialog();
 
     //! Returns the selected geometry type