Fix classes which violate rule of three, by implementing required

copy/= operators or making them private This revealed (and fixes) some issues, including a potential crash using server access control (refs #13919), and a potential crash with diagrams
qgis · Jan 22, 2016 · 752f6bd · 752f6bd
1 parent a16535a
commit 752f6bd
Show file tree

Hide file tree

Showing 78 changed files with 324 additions and 75 deletions.
diff --git a/python/analysis/raster/qgsrastercalcnode.sip b/python/analysis/raster/qgsrastercalcnode.sip
@@ -71,4 +71,9 @@ class QgsRasterCalcNode
     // bool calculate( QMap<QString, QgsRasterMatrix*>& rasterData, QgsRasterMatrix& result ) const /Deprecated/;
 
     static QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg ) /Factory/;
+
+  private:
+
+    QgsRasterCalcNode( const QgsRasterCalcNode& rh );
+
 };
diff --git a/python/analysis/raster/qgsrelief.sip b/python/analysis/raster/qgsrelief.sip
@@ -35,4 +35,8 @@ class QgsRelief
 
     /** Write frequency of elevation values to file for manual inspection*/
     bool exportFrequencyDistributionToCsv( const QString& file );
+
+  private:
+
+    QgsRelief( const QgsRelief& rh );
 };
diff --git a/python/core/gps/qgsgpsconnectionregistry.sip b/python/core/gps/qgsgpsconnectionregistry.sip
@@ -17,4 +17,8 @@ class QgsGPSConnectionRegistry {
 
   protected:
     QgsGPSConnectionRegistry();
+
+  private:
+
+    QgsGPSConnectionRegistry( const QgsGPSConnectionRegistry& rh );
 };
diff --git a/python/core/qgscrscache.sip b/python/core/qgscrscache.sip
@@ -12,6 +12,10 @@ class QgsCoordinateTransformCache
     const QgsCoordinateTransform* transform( const QString& srcAuthId, const QString& destAuthId, int srcDatumTransform = -1, int destDatumTransform = -1 );
     /** Removes transformations where a changed crs is involved from the cache*/
     void invalidateCrs( const QString& crsAuthId );
+
+  private:
+
+    QgsCoordinateTransformCache( const QgsCoordinateTransformCache& rh );
 };
 
 class QgsCRSCache
@@ -31,4 +35,5 @@ class QgsCRSCache
 
   protected:
     QgsCRSCache();
+
 };
diff --git a/python/core/qgsdataitemproviderregistry.sip b/python/core/qgsdataitemproviderregistry.sip
@@ -21,5 +21,6 @@ class QgsDataItemProviderRegistry
 
   private:
     QgsDataItemProviderRegistry();
+    QgsDataItemProviderRegistry( const QgsDataItemProviderRegistry& rh );
 
 };
diff --git a/python/core/qgsdiagramrendererv2.sip b/python/core/qgsdiagramrendererv2.sip
@@ -24,6 +24,7 @@ struct QgsDiagramLayerSettings
     };
 
     QgsDiagramLayerSettings();
+    QgsDiagramLayerSettings( const QgsDiagramLayerSettings& rh );
 
     ~QgsDiagramLayerSettings();
 

diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -632,6 +632,10 @@ class QgsExpression
         //protected:
         QgsExpression::Node* mWhenExp;
         QgsExpression::Node* mThenExp;
+
+      private:
+        WhenThen( const QgsExpression::WhenThen& rh );
+
     };
 
     class NodeCondition : QgsExpression::Node

diff --git a/python/core/qgslabel.sip b/python/core/qgslabel.sip
@@ -104,4 +104,5 @@ class QgsLabel
 
   private:
     QgsLabel (); // pretend that constructor is private for now
+    QgsLabel( const QgsLabel& rh );
 };
diff --git a/python/core/qgslabelsearchtree.sip b/python/core/qgslabelsearchtree.sip
@@ -28,4 +28,8 @@ class QgsLabelSearchTree
      * @note not available in python bindings
      */
     // bool insertLabel( LabelPosition* labelPos, int featureId, const QString& layerName, bool diagram = false, bool pinned = false );
+
+  private:
+
+    QgsLabelSearchTree( const QgsLabelSearchTree& rh );
 };
diff --git a/python/core/qgspluginlayerregistry.sip b/python/core/qgspluginlayerregistry.sip
@@ -64,4 +64,6 @@ class QgsPluginLayerRegistry
 
     /** Private since instance() creates it */
     QgsPluginLayerRegistry();
+    QgsPluginLayerRegistry( const QgsPluginLayerRegistry& rh );
+
 };
diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip
@@ -8,6 +8,7 @@ class QgsRenderContext
 
   public:
     QgsRenderContext();
+    QgsRenderContext( const QgsRenderContext& rh );
     ~QgsRenderContext();
 
     //! Enumeration of flags that affect rendering operations

diff --git a/python/core/qgssimplifymethod.sip b/python/core/qgssimplifymethod.sip
@@ -18,8 +18,6 @@ class QgsSimplifyMethod
 
     //! construct a default method
     QgsSimplifyMethod();
-    //! copy constructor
-    QgsSimplifyMethod( const QgsSimplifyMethod& rh );
 
     //! Sets the simplification type
     void setMethodType( MethodType methodType );

diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -261,4 +261,8 @@ class QgsVectorFileWriter
   protected:
     //! @note not available in python bindings
     // OGRGeometryH createEmptyGeometry( QGis::WkbType wkbType );
+
+  private:
+
+    QgsVectorFileWriter( const QgsVectorFileWriter& rh );
 };
diff --git a/python/core/qgsvectorlayerimport.sip b/python/core/qgsvectorlayerimport.sip
@@ -76,4 +76,8 @@ class QProgressDialog;
 
     /** Create index */
     bool createSpatialIndex();
+
+  private:
+
+    QgsVectorLayerImport( const QgsVectorLayerImport& rh );
 };
diff --git a/python/core/raster/qgsrasterpipe.sip b/python/core/raster/qgsrasterpipe.sip
@@ -24,7 +24,8 @@ class QgsRasterPipe
     };
 
     QgsRasterPipe();
-    QgsRasterPipe( const QgsRasterPipe& thePipe );
+    //made private for python bindings
+    //QgsRasterPipe( const QgsRasterPipe& thePipe );
 
     ~QgsRasterPipe();
 
@@ -80,4 +81,8 @@ class QgsRasterPipe
     QgsRasterProjector * projector() const;
     QgsRasterNuller * nuller() const;
 
+  private:
+
+    QgsRasterPipe( const QgsRasterPipe& thePipe );
+
 };
diff --git a/python/core/raster/qgsrastershader.sip b/python/core/raster/qgsrastershader.sip
@@ -47,4 +47,8 @@ class QgsRasterShader
     void writeXML( QDomDocument& doc, QDomElement& parent ) const;
 
     void readXML( const QDomElement& elem );
+
+  private:
+
+    QgsRasterShader( const QgsRasterShader& rh );
 };
diff --git a/python/core/symbology-ng/qgscptcityarchive.sip b/python/core/symbology-ng/qgscptcityarchive.sip
@@ -36,6 +36,10 @@ class QgsCptCityArchive
     // items
     QVector< QgsCptCityDataItem* > rootItems() const;
     QVector< QgsCptCityDataItem* > selectionItems() const;
+
+  private:
+
+    QgsCptCityArchive( const QgsCptCityArchive& rh );
 };
 
 /** Base class for all items in the model */

diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -306,6 +306,11 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
       protected:
         void initFilter();
+
+      private:
+
+        Rule( const QgsRuleBasedRendererV2::Rule& rh );
+
     };
 
     /////

diff --git a/python/core/symbology-ng/qgssvgcache.sip b/python/core/symbology-ng/qgssvgcache.sip
@@ -48,6 +48,10 @@ class QgsSvgCacheEntry
     bool operator==( const QgsSvgCacheEntry& other ) const;
     /** Return memory usage in bytes*/
     int dataSize() const;
+
+  private:
+
+    QgsSvgCacheEntry( const QgsSvgCacheEntry& rh );
 };
 
 /** A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
@@ -195,4 +199,5 @@ class QgsSvgCache : QObject
 
     //Removes entry from the ordered list (but does not delete the entry itself)
     void takeEntryFromList( QgsSvgCacheEntry* entry );
+
 };
diff --git a/python/core/symbology-ng/qgssymbolv2.sip b/python/core/symbology-ng/qgssymbolv2.sip
@@ -305,6 +305,10 @@ class QgsSymbolV2RenderContext
      * @param contextScope An expression scope for details about this symbol
      */
     void setExpressionContextScope( QgsExpressionContextScope* contextScope /Transfer/);
+
+  private:
+
+     QgsSymbolV2RenderContext( const QgsSymbolV2RenderContext& rh );
 };
 
 

diff --git a/python/gui/qgsmapcanvassnapper.sip b/python/gui/qgsmapcanvassnapper.sip
@@ -42,4 +42,8 @@ class QgsMapCanvasSnapper
     int snapToBackgroundLayers( const QPoint& p, QList<QgsSnappingResult>& results /Out/, const QList<QgsPoint>& excludePoints = QList<QgsPoint>() );
 
     void setMapCanvas( QgsMapCanvas* canvas );
+
+  private:
+
+    QgsMapCanvasSnapper( const QgsMapCanvasSnapper& rh );
 };
diff --git a/python/server/qgswcsprojectparser.sip b/python/server/qgswcsprojectparser.sip
@@ -34,5 +34,8 @@ class QgsWCSProjectParser
     void describeCoverage( const QString& aCoveName, QDomElement& parentElement, QDomDocument& doc ) const;
     QList<QgsMapLayer*> mapLayerFromCoverage( const QString& cName, bool useCache = true ) const;
 
+  private:
+
+    QgsWCSProjectParser( const QgsWCSProjectParser& rh );
 };
 
diff --git a/python/server/qgswfsprojectparser.sip b/python/server/qgswfsprojectparser.sip
@@ -44,4 +44,8 @@ class QgsWFSProjectParser
     QSet<QString> wfstInsertLayers() const;
     QSet<QString> wfstDeleteLayers() const;
 
+  private:
+
+    QgsWFSProjectParser( const QgsWFSProjectParser& rh );
+
 };
diff --git a/src/analysis/raster/qgsrastercalcnode.h b/src/analysis/raster/qgsrastercalcnode.h
@@ -103,6 +103,9 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
     QString mRasterName;
     QgsRasterMatrix* mMatrix;
     Operator mOperator;
+
+    QgsRasterCalcNode( const QgsRasterCalcNode& rh );
+    QgsRasterCalcNode& operator=( const QgsRasterCalcNode& rh );
 };
 
 

diff --git a/src/analysis/raster/qgsrelief.h b/src/analysis/raster/qgsrelief.h
@@ -116,6 +116,9 @@ class ANALYSIS_EXPORT QgsRelief
       @param b y value for x=0
      */
     bool calculateRegression( const QList< QPair < int, double > >& input, double& a, double& b );
+
+    QgsRelief( const QgsRelief& rh );
+    QgsRelief& operator=( const QgsRelief& rh );
 };
 
 #endif // QGSRELIEF_H
diff --git a/src/app/nodetool/qgsvertexentry.h b/src/app/nodetool/qgsvertexentry.h
@@ -51,6 +51,11 @@ class QgsVertexEntry
     void placeMarker();
 
     void setSelected( bool selected = true );
+
+  private:
+
+    QgsVertexEntry( const QgsVertexEntry& rh );
+    QgsVertexEntry& operator=( const QgsVertexEntry& rh );
 };
 
 #endif
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -105,6 +105,9 @@ class APP_EXPORT QgsIdentifyPlotCurve
 
   private:
     QwtPlotCurve* mPlotCurve;
+
+    QgsIdentifyPlotCurve( const QgsIdentifyPlotCurve& rh );
+    QgsIdentifyPlotCurve& operator=( const QgsIdentifyPlotCurve& rh );
 };
 
 class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdentifyResultsBase

diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
@@ -118,7 +118,7 @@ void QgsTextDiagram::renderDiagram( const QgsFeature& feature, QgsRenderContext&
   double baseX = position.x();
   double baseY = position.y() - h;
 
-  QList<QPointF> textPositions; //midpoints for text placement
+  QVector<QPointF> textPositions; //midpoints for text placement
   int nCategories = s.categoryAttributes.size();
   for ( int i = 0; i < nCategories; ++i )
   {

diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -95,6 +95,11 @@ class GEOSInit
     {
       finishGEOS_r( ctxt );
     }
+
+  private:
+
+    GEOSInit( const GEOSInit& rh );
+    GEOSInit& operator=( const GEOSInit& rh );
 };
 
 static GEOSInit geosinit;

diff --git a/src/core/gps/qgsgpsconnectionregistry.h b/src/core/gps/qgsgpsconnectionregistry.h
@@ -44,6 +44,11 @@ class CORE_EXPORT QgsGPSConnectionRegistry
     static QgsGPSConnectionRegistry* mInstance;
 
     QSet<QgsGPSConnection*> mConnections;
+
+  private:
+
+    QgsGPSConnectionRegistry( const QgsGPSConnectionRegistry& rh );
+    QgsGPSConnectionRegistry& operator=( const QgsGPSConnectionRegistry& rh );
 };
 
 #endif // QGSGPSCONNECTIONREGISTRY_H
diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -73,6 +73,10 @@ namespace pal
       double label_height;
       int char_num;
       CharacterInfo* char_info;
+    private:
+
+      LabelInfo( const LabelInfo& rh );
+      LabelInfo& operator=( const LabelInfo& rh );
   };
 
   class LabelPosition;

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -261,7 +261,7 @@ inline void ( *cast_to_fptr( void *p ) )()
 //
 // return a string representation of a double
 //
-inline QString qgsDoubleToString( const double &a, const int &precision = 17 )
+inline QString qgsDoubleToString( double a, int precision = 17 )
 {
   if ( precision )
     return QString::number( a, 'f', precision ).remove( QRegExp( "\\.?0+$" ) );