Build and review fixes

wonder-sk · wonder-sk · commit b508bf7f1c7f · 2017-10-26T11:28:17.000+02:00
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -14,6 +14,7 @@
 %Include qgsmapmouseevent.sip
 %Include qgsmaptip.sip
 %Include qgsrubberband.sip
+%Include qgssnapindicator.sip
 %Include qgstablewidgetitem.sip
 %Include qgsuserinputdockwidget.sip
 %Include qgsbrowserdockwidget.sip
@@ -188,7 +189,6 @@
 %Include qgssearchquerybuilder.sip
 %Include qgsshortcutsmanager.sip
 %Include qgsslider.sip
-%Include qgssnapindicator.sip
 %Include qgsstatusbar.sip
 %Include qgssublayersdialog.sip
 %Include qgssubstitutionlistwidget.sip
diff --git a/python/gui/qgssnapindicator.sip b/python/gui/qgssnapindicator.sip
@@ -48,6 +48,12 @@ Returns whether the snapping indicator is visible
  :rtype: bool
 %End
 
+  private:
+    QgsSnapIndicator( const QgsSnapIndicator &rh );
+    QgsSnapIndicator &operator=( const QgsSnapIndicator & );
+%Docstring
+ :rtype: QgsSnapIndicator
+%End
 };
 
 /************************************************************************
diff --git a/src/gui/qgssnapindicator.cpp b/src/gui/qgssnapindicator.cpp
@@ -28,9 +28,8 @@ QgsSnapIndicator::QgsSnapIndicator( QgsMapCanvas *canvas )
 {
 }
 
-QgsSnapIndicator::~QgsSnapIndicator()
-{
-}
+QgsSnapIndicator::~QgsSnapIndicator() = default;
+
 
 void QgsSnapIndicator::setMatch( const QgsPointLocator::Match &match )
 {
diff --git a/src/gui/qgssnapindicator.h b/src/gui/qgssnapindicator.h
@@ -47,6 +47,13 @@ class GUI_EXPORT QgsSnapIndicator
     bool isVisible() const;
 
   private:
+    Q_DISABLE_COPY( QgsSnapIndicator )
+
+#ifdef SIP_RUN
+    QgsSnapIndicator( const QgsSnapIndicator &rh );
+    QgsSnapIndicator &operator=( const QgsSnapIndicator & );
+#endif
+
     QgsMapCanvas *mCanvas;
     QgsPointLocator::Match mMatch;
     std::unique_ptr<QgsVertexMarker> mSnappingMarker;

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,8 @@ QgsSnapIndicator::QgsSnapIndicator( QgsMapCanvas *canvas )`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
`31`		`-QgsSnapIndicator::~QgsSnapIndicator()`
`32`		`-{`
`33`		`-}`
	`31`	`+QgsSnapIndicator::~QgsSnapIndicator() = default;`
	`32`	`+`
`34`	`33`
`35`	`34`	`void QgsSnapIndicator::setMatch( const QgsPointLocator::Match &match )`
`36`	`35`	`{`