Fix more classes which violate the rule-of-three

Also remove some empty destructors

Author: nyalldawson

python/analysis/interpolation/qgsgridfilewriter.sip

@@ -6,7 +6,6 @@ class QgsGridFileWriter
 
   public:
     QgsGridFileWriter( QgsInterpolator* i, const QString& outputPath, const QgsRectangle& extent, int nCols, int nRows, double cellSizeX, double cellSizeY );
-    ~QgsGridFileWriter();
 
     /** Writes the grid file.
      @param showProgressDialog shows a dialog with the possibility to cancel

python/analysis/network/qgsgraph.sip

@@ -91,8 +91,6 @@ class QgsGraph
   public:
     QgsGraph();
 
-    ~QgsGraph();
-
     // begin graph constructing methods
     /**
      * add vertex to a grap

python/analysis/openstreetmap/qgsosmdatabase.sip

@@ -77,6 +77,9 @@ class QgsOSMDatabase
     QString quotedIdentifier( QString id );
     QString quotedValue( QString value );
 
+  private:
+
+    QgsOSMDatabase( const QgsOSMDatabase& rh );
 };
 
 

python/analysis/raster/qgsalignraster.sip

@@ -39,6 +39,10 @@ class QgsAlignRaster
 
       //! Get raster value at the given coordinates (from the first band)
       double identify( double mx, double my );
+
+      private:
+        RasterInfo( const QgsAlignRaster::RasterInfo& rh );
+
     };
 
 

python/analysis/raster/qgsrastercalculator.sip

@@ -44,8 +44,6 @@ class QgsRasterCalculator
     QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
                          const QgsRectangle& outputExtent, const QgsCoordinateReferenceSystem& outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries );
 
-    ~QgsRasterCalculator();
-
     /** Starts the calculation and writes new raster
       @param p progress bar (or 0 if called from non-gui code)
       @return 0 in case of success*/

python/analysis/vector/qgspointsample.sip

@@ -8,7 +8,6 @@ class QgsPointSample
 %End
   public:
     QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, const QString& nPointsAttribute, const QString& minDistAttribute = QString() );
-    ~QgsPointSample();
 
     /** Starts calculation of random points
         @return 0 in case of success*/

python/analysis/vector/qgstransectsample.sip

@@ -20,7 +20,6 @@ class QgsTransectSample
                        DistanceUnits minDistUnits, QgsVectorLayer* baselineLayer, bool shareBaseline,
                        const QString& baselineStrataId, const QString& outputPointLayer, const QString& outputLineLayer, const QString& usedBaselineLayer,
                        double minTransectLength = 0.0, double baselineBufferDistance = -1.0, double baselineSimplificationTolerance = -1.0 );
-    ~QgsTransectSample();
 
     int createSample( QProgressDialog* pd );
 };

python/analysis/vector/qgszonalstatistics.sip

@@ -32,7 +32,6 @@ class QgsZonalStatistics
 
     QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1,
                         const QgsZonalStatistics::Statistics& stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean) );
-    ~QgsZonalStatistics();
 
     /** Starts the calculation
       @return 0 in case of success*/

python/core/auth/qgsauthconfig.sip

@@ -7,14 +7,10 @@ class QgsAuthMethodConfig
 
     QgsAuthMethodConfig( const QString& method = QString(), int version = 0 );
 
-    QgsAuthMethodConfig( const QgsAuthMethodConfig& methodconfig );
-
     bool operator==( const QgsAuthMethodConfig& other ) const;
 
     bool operator!=( const QgsAuthMethodConfig& other ) const;
 
-    ~QgsAuthMethodConfig();
-
     const QString id() const;
     void setId( const QString& id );
 
@@ -66,7 +62,6 @@ class QgsPkiBundle
     QgsPkiBundle( const QSslCertificate &clientCert = QSslCertificate(),
                   const QSslKey &clientKey = QSslKey(),
                   const QList<QSslCertificate> &caChain = QList<QSslCertificate>() );
-    ~QgsPkiBundle();
 
     static const QgsPkiBundle fromPemPaths( const QString &certPath,
                                             const QString &keyPath,
@@ -102,7 +97,6 @@ class QgsPkiConfigBundle
     QgsPkiConfigBundle( const QgsAuthMethodConfig& config,
                   const QSslCertificate& cert,
                   const QSslKey& certkey );
-    ~QgsPkiConfigBundle();
 
     bool isValid();
 

python/core/composer/qgscomposerlegendstyle.sip

@@ -22,7 +22,6 @@ class QgsComposerLegendStyle
       Right,
     };
     QgsComposerLegendStyle();
-    ~QgsComposerLegendStyle();
 
     QFont font() const;
     QFont & rfont();

python/core/effects/qgspainteffectregistry.sip

@@ -126,6 +126,8 @@ class QgsPaintEffectRegistry
     QgsPaintEffectRegistry();
     ~QgsPaintEffectRegistry();
 
+  private:
+    QgsPaintEffectRegistry( const QgsPaintEffectRegistry& rh );
 
 };
 

python/core/qgscrscache.sip

@@ -26,7 +26,6 @@ class QgsCRSCache
 
   public:
     static QgsCRSCache* instance();
-    ~QgsCRSCache();
     /** Returns the CRS for authid, e.g. 'EPSG:4326' (or an invalid CRS in case of error)*/
     const QgsCoordinateReferenceSystem& crsByAuthId( const QString& authid );
     const QgsCoordinateReferenceSystem& crsByEpsgId( long epsg );

python/core/qgsexpression.sip

@@ -478,7 +478,6 @@ class QgsExpression
     {
       public:
         Interval( int seconds = 0 );
-        ~Interval();
         double years();
         double months();
         double weeks();

python/core/qgsfeaturestore.sip

@@ -7,15 +7,9 @@ class QgsFeatureStore
     //! Constructor
     QgsFeatureStore();
 
-    //! Constructor
-    QgsFeatureStore( const QgsFeatureStore &rhs );
-
     //! Constructor
     QgsFeatureStore( const QgsFields& fields, const QgsCoordinateReferenceSystem& crs );
 
-    //! Destructor
-    ~QgsFeatureStore();
-
     /** Get fields list */
     QgsFields& fields();
 

python/core/qgsgeometrycache.sip

@@ -5,7 +5,6 @@ class QgsGeometryCache
 %End
   public:
     QgsGeometryCache();
-    ~QgsGeometryCache();
 
     QgsGeometryMap& cachedGeometries();
 

python/core/qgsgmlschema.sip

@@ -7,8 +7,6 @@ class QgsGmlFeatureClass
     QgsGmlFeatureClass();
     QgsGmlFeatureClass( const QString& name, const QString& path );
 
-    ~QgsGmlFeatureClass();
-
     QList<QgsField> & fields();
 
     int fieldIndex( const QString & name );

python/core/qgslabelattributes.sip

@@ -11,8 +11,6 @@ public:
      */
     QgsLabelAttributes( bool def = true );
 
-    ~QgsLabelAttributes();
-
     /* Units type */
     enum Units
     {

python/core/qgsmaptopixel.sip

@@ -18,8 +18,7 @@ class QgsMapToPixel
     * @param xmin Minimum x value of the map canvas
     */
     QgsMapToPixel( double mapUnitsPerPixel = 0, double height = 0, double ymin = 0, double xmin = 0 );
-    //! destructor
-    ~QgsMapToPixel();
+
     /** Transform the point from map (world) coordinates to device coordinates
     * @param p Point to transform
     * @return QgsPoint in device coordinates

python/core/qgsscalecalculator.sip

@@ -21,9 +21,6 @@ class QgsScaleCalculator
     QgsScaleCalculator( double dpi = 0,
                         QGis::UnitType mapUnits = QGis::Meters );
 
-    //! Destructor
-    ~QgsScaleCalculator();
-
     /**
      * Set the dpi to be used in scale calculations
      * @param dpi Dots per inch of monitor resolution

python/core/qgssnapper.sip

@@ -74,8 +74,6 @@ class QgsSnapper
 
     explicit QgsSnapper( const QgsMapSettings& mapSettings );
 
-    ~QgsSnapper();
-
     /** Does the snapping operation
      @param startPoint the start point for snapping (in pixel coordinates)
      @param snappingResult the list where the results are inserted (everything in map coordinate system)

python/core/raster/qgsrasterdrawer.sip

@@ -5,7 +5,6 @@ class QgsRasterDrawer
 %End
   public:
     QgsRasterDrawer( QgsRasterIterator *iterator );
-    ~QgsRasterDrawer();
 
     void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
 

python/core/raster/qgsrasterfilewriter.sip

@@ -25,7 +25,6 @@ class QgsRasterFileWriter
     };
 
     QgsRasterFileWriter( const QString& outputUrl );
-    ~QgsRasterFileWriter();
 
     /** Write raster file
         @param pipe raster pipe

python/core/raster/qgsrasteriterator.sip

@@ -6,7 +6,6 @@ class QgsRasterIterator
   public:
 
     QgsRasterIterator( QgsRasterInterface* input );
-    ~QgsRasterIterator();
 
     /** Start reading of raster band. Raster data can then be retrieved by calling readNextRasterPart until it returns false.
       @param bandNumber number of raster band to read

python/core/raster/qgsrasterrange.sip

@@ -17,8 +17,6 @@ class QgsRasterRange
      */
     QgsRasterRange( double theMin, double theMax );
 
-    ~QgsRasterRange();
-
     double min() const;
     double max() const;
 

python/core/symbology-ng/qgsrendererv2registry.sip

@@ -84,4 +84,9 @@ class QgsRendererV2Registry
     //! protected constructor
     QgsRendererV2Registry();
     ~QgsRendererV2Registry();
+
+  private:
+
+    QgsRendererV2Registry( const QgsRendererV2Registry& rh );
+
 };

python/core/symbology-ng/qgsrulebasedrendererv2.sip

@@ -38,6 +38,9 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
       ~RenderLevel();
       int zIndex;
       QList<QgsRuleBasedRendererV2::RenderJob*> jobs;
+
+      RenderLevel( const QgsRuleBasedRendererV2::RenderLevel& other );
+
     };
 
     // rendering queue: a list of rendering levels

python/core/symbology-ng/qgssymbollayerv2registry.sip

@@ -78,4 +78,9 @@ class QgsSymbolLayerV2Registry
   protected:
     QgsSymbolLayerV2Registry();
     ~QgsSymbolLayerV2Registry();
+
+  private:
+
+    QgsSymbolLayerV2Registry( const QgsSymbolLayerV2Registry& rh );
+
 };

python/gui/qgsdetaileditemdata.sip

@@ -6,7 +6,6 @@ class QgsDetailedItemData
 
   public:
     QgsDetailedItemData();
-    ~QgsDetailedItemData();
     void setTitle( const QString& theTitle );
     void setDetail( const QString& theDetail );
     void setCategory( const QString& theCategory );

src/analysis/interpolation/qgsgridfilewriter.cpp

@@ -44,11 +44,6 @@ QgsGridFileWriter::QgsGridFileWriter()
 
 }
 
-QgsGridFileWriter::~QgsGridFileWriter()
-{
-
-}
-
 int QgsGridFileWriter::writeFile( bool showProgressDialog )
 {
   QFile outputFile( mOutputFilePath );

src/analysis/interpolation/qgsgridfilewriter.h

@@ -30,7 +30,6 @@ class ANALYSIS_EXPORT QgsGridFileWriter
 {
   public:
     QgsGridFileWriter( QgsInterpolator* i, const QString& outputPath, const QgsRectangle& extent, int nCols, int nRows, double cellSizeX, double cellSizeY );
-    ~QgsGridFileWriter();
 
     /** Writes the grid file.
      @param showProgressDialog shows a dialog with the possibility to cancel

src/analysis/network/qgsgraph.cpp

@@ -20,12 +20,6 @@ QgsGraph::QgsGraph()
 {
 }
 
-
-QgsGraph::~QgsGraph()
-{
-
-}
-
 int QgsGraph::addVertex( const QgsPoint& pt )
 {
   mGraphVertexes.append( QgsGraphVertex( pt ) );

src/analysis/network/qgsgraph.h

@@ -133,8 +133,6 @@ class ANALYSIS_EXPORT QgsGraph
   public:
     QgsGraph();
 
-    ~QgsGraph();
-
     // begin graph constructing methods
     /**
      * add vertex to a grap

src/analysis/openstreetmap/qgsosmdatabase.h

@@ -119,6 +119,9 @@ class ANALYSIS_EXPORT QgsOSMDatabase
     sqlite3_stmt* mStmtWayNode;
     sqlite3_stmt* mStmtWayNodePoints;
     sqlite3_stmt* mStmtWayTags;
+
+    QgsOSMDatabase( const QgsOSMDatabase& rh );
+    QgsOSMDatabase& operator=( const QgsOSMDatabase& rh );
 };
 
 
@@ -163,6 +166,8 @@ class ANALYSIS_EXPORT QgsOSMWayIterator
 
     sqlite3_stmt* mStmt;
 
+  private:
+
     friend class QgsOSMDatabase;
 };
 

src/analysis/raster/qgsalignraster.h

@@ -84,6 +84,11 @@ class ANALYSIS_EXPORT QgsAlignRaster
       //! number of raster's bands
       int mBandCnt;
 
+    private:
+
+      RasterInfo( const RasterInfo& rh );
+      RasterInfo& operator=( const RasterInfo& rh );
+
       friend class QgsAlignRaster;
     };
 

src/analysis/raster/qgsrastercalculator.cpp

@@ -61,11 +61,6 @@ QgsRasterCalculator::QgsRasterCalculator( const QString& formulaString, const QS
 {
 }
 
-
-QgsRasterCalculator::~QgsRasterCalculator()
-{
-}
-
 int QgsRasterCalculator::processCalculation( QProgressDialog* p )
 {
   //prepare search string / tree

src/analysis/raster/qgsrastercalculator.h

@@ -67,8 +67,6 @@ class ANALYSIS_EXPORT QgsRasterCalculator
     QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
                          const QgsRectangle& outputExtent, const QgsCoordinateReferenceSystem& outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries );
 
-    ~QgsRasterCalculator();
-
     /** Starts the calculation and writes new raster
       @param p progress bar (or 0 if called from non-gui code)
       @return 0 in case of success*/

src/analysis/vector/qgspointsample.cpp

@@ -18,10 +18,6 @@ QgsPointSample::QgsPointSample()
 {
 }
 
-QgsPointSample::~QgsPointSample()
-{
-}
-
 int QgsPointSample::createRandomPoints( QProgressDialog* pd )
 {
   Q_UNUSED( pd );

src/analysis/vector/qgspointsample.h

@@ -16,7 +16,6 @@ class ANALYSIS_EXPORT QgsPointSample
 {
   public:
     QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, const QString& nPointsAttribute, const QString& minDistAttribute = QString() );
-    ~QgsPointSample();
 
     /** Starts calculation of random points
         @return 0 in case of success*/