fix build

qgis · Oct 3, 2019 · 7665451 · 7665451
1 parent aa99f89
commit 7665451
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/python/core/auto_generated/qgsvectorlayereditutils.sip.in b/python/core/auto_generated/qgsvectorlayereditutils.sip.in
@@ -190,7 +190,7 @@ Splits parts cut by the given line
          - QgsGeometry.SplitCannotSplitPoint
 %End
 
- QgsGeometry::OperationResult splitFeatures( const QgsPointSequence &splitLine, bool topologicalEditing = false ) /Deprecated/;
+ QgsGeometry::OperationResult splitFeatures( const QVector<QgsPointXY> &splitLine, bool topologicalEditing = false ) /Deprecated/;
 %Docstring
 Splits features cut by the given line
 

diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp
@@ -129,9 +129,9 @@ void QgsMapToolFillRing::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
     }
 
     QgsLineString ext( pointList );
-    QgsPolygon polygon;
-    polygon.setExteriorRing( ext.clone() );
-    g = QgsGeometry( qgis::make_unique< QgsPolygon >( polygon ) );
+    std::unique_ptr< QgsPolygon > polygon;
+    polygon->setExteriorRing( ext.clone() );
+    g = QgsGeometry( std::move( polygon ) );
   }
   else
   {

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1155,6 +1155,7 @@ bool QgsVectorLayer::deleteSelectedFeatures( int *deletedCount )
 static const QgsPointSequence vectorPointXY2pointSequence( const QVector<QgsPointXY> &points )
 {
   QgsPointSequence pts;
+  pts.reserve( points.size() );
   QVector<const QgsPointXY>::iterator it = points.constBegin();
   while ( it != points.constEnd() )
   {
@@ -1231,35 +1232,20 @@ QgsGeometry::OperationResult QgsVectorLayer::addRing( QgsCurve *ring, QgsFeature
 
 QgsGeometry::OperationResult QgsVectorLayer::addPart( const QList<QgsPointXY> &points )
 {
-  if ( !mValid || !mEditBuffer || !mDataProvider )
-    return QgsGeometry::OperationResult::LayerNotEditable;
-
-  //number of selected features must be 1
-
-  if ( mSelectedFeatureIds.empty() )
-  {
-    QgsDebugMsgLevel( QStringLiteral( "Number of selected features < 1" ), 3 );
-    return QgsGeometry::OperationResult::SelectionIsEmpty;
-  }
-  else if ( mSelectedFeatureIds.size() > 1 )
+  QgsPointSequence pts;
+  pts.reserve( points.size() );
+  for ( QList<QgsPointXY>::const_iterator it = points.constBegin(); it != points.constEnd() ; ++it )
   {
-    QgsDebugMsgLevel( QStringLiteral( "Number of selected features > 1" ), 3 );
-    return QgsGeometry::OperationResult::SelectionIsGreaterThanOne;
+    pts.append( QgsPoint( *it ) );
   }
-
-  QgsVectorLayerEditUtils utils( this );
-  QgsGeometry::OperationResult result = utils.addPart( points, *mSelectedFeatureIds.constBegin() );
-
-  if ( result == QgsGeometry::OperationResult::Success )
-    updateExtents();
-  return result;
+  return addPart( pts );
 }
 
 QgsGeometry::OperationResult QgsVectorLayer::addPart( const QVector<QgsPointXY> &points )
 {
-
   return addPart( vectorPointXY2pointSequence( points ) );
 }
+
 QgsGeometry::OperationResult QgsVectorLayer::addPart( const QgsPointSequence &points )
 {
   if ( !mValid || !mEditBuffer || !mDataProvider )

diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h
@@ -184,7 +184,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
      *  4 if there is a selection but no feature split
      * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY.
      */
-    Q_DECL_DEPRECATED QgsGeometry::OperationResult splitFeatures( const QgsPointSequence &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED;
+    Q_DECL_DEPRECATED QgsGeometry::OperationResult splitFeatures( const QVector<QgsPointXY> &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED;
 
     /**
      * Splits features cut by the given line