Skip to content
Permalink
Browse files
Use =default, =delete where possible
  • Loading branch information
nyalldawson committed Nov 11, 2017
1 parent bcd9071 commit 2e6d125a6f28871215df9e19585d961e2333141c
Show file tree
Hide file tree
Showing 120 changed files with 181 additions and 281 deletions.
@@ -93,7 +93,6 @@ class QgsImageOperation

struct DistanceTransformProperties
{
DistanceTransformProperties();

bool shadeExterior;
%Docstring
@@ -25,8 +25,14 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter
struct ValueRelationItem
{
ValueRelationItem( const QVariant &key, const QString &value );
%Docstring
Constructor for ValueRelationItem
%End

ValueRelationItem();
%Docstring
Constructor for ValueRelationItem
%End

QVariant key;
QString value;
@@ -24,6 +24,9 @@ class QgsDartMeasurement
};

QgsDartMeasurement();
%Docstring
Constructor for QgsDartMeasurement
%End

QgsDartMeasurement( const QString &name, Type type, const QString &value );

@@ -319,6 +319,9 @@ class QgsDiagramSettings
};

QgsDiagramSettings();
%Docstring
Constructor for QgsDiagramSettings
%End

bool enabled;
QFont font;
@@ -29,6 +29,9 @@ class QgsEditFormConfig
struct GroupData
{
GroupData();
%Docstring
Constructor for GroupData
%End
GroupData( const QString &name, const QList<QString> &fields );
QString mName;
QList<QString> mFields;
@@ -37,6 +40,9 @@ class QgsEditFormConfig
struct TabData
{
TabData();
%Docstring
Constructor for TabData
%End
TabData( const QString &name, const QList<QString> &fields, const QList<QgsEditFormConfig::GroupData> &groups );
QString mName;
QList<QString> mFields;
@@ -27,6 +27,9 @@ class QgsEditorWidgetSetup
%End

QgsEditorWidgetSetup();
%Docstring
Constructor for QgsEditorWidgetSetup
%End

QString type() const;
%Docstring
@@ -27,6 +27,9 @@ class QgsErrorMessage
};

QgsErrorMessage();
%Docstring
Constructor for QgsErrorMessage
%End

QgsErrorMessage( const QString &message, const QString &tag = QString(), const QString &file = QString(), const QString &function = QString(), int line = 0 );
%Docstring
@@ -345,6 +345,9 @@ class QgsExpressionContext
public:

QgsExpressionContext();
%Docstring
Constructor for QgsExpressionContext
%End

explicit QgsExpressionContext( const QList<QgsExpressionContextScope *> &scopes /Transfer/ );
%Docstring
@@ -20,7 +20,11 @@ class QgsLabelPosition
%End
public:
QgsLabelPosition( int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );

QgsLabelPosition();
%Docstring
Constructor for QgsLabelPosition
%End

int featureId;
double rotation;
@@ -107,6 +107,9 @@ There are two possibilities how to use this class:
struct MetaData
{
MetaData();
%Docstring
Constructor for MetaData
%End

MetaData( const QString &longName, const QString &trLongName, const QString &glob, const QString &ext, const QMap<QString, QgsVectorFileWriter::Option *> &driverOptions, const QMap<QString, QgsVectorFileWriter::Option *> &layerOptions, const QString &compulsoryEncoding = QString() );

@@ -249,6 +249,9 @@ Signals emitted after committing changes
protected:

QgsVectorLayerEditBuffer();
%Docstring
Constructor for QgsVectorLayerEditBuffer
%End

void updateFields( QgsFields &fields );

@@ -36,6 +36,9 @@ class QgsVectorLayerUtils
public:

QgsDuplicateFeatureContext();
%Docstring
Constructor for QgsDuplicateFeatureContext
%End

QList<QgsVectorLayer *> layers() const;
%Docstring
@@ -404,6 +404,7 @@ class QgsSymbolRenderContext
\param mapUnitScale
%End


QgsRenderContext &renderContext();
%Docstring
:rtype: QgsRenderContext
@@ -39,6 +39,9 @@ class QgsAttributeEditorContext
};

QgsAttributeEditorContext();
%Docstring
Constructor for QgsAttributeEditorContext
%End

QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, FormMode formMode );

@@ -32,6 +32,9 @@ class QgsIdentifyMenu : QMenu
struct ActionData
{
ActionData();
%Docstring
Constructor for ActionData
%End

ActionData( QgsMapLayer *layer, QgsMapLayerAction *mapLayerAction = 0 );

@@ -20,8 +20,6 @@ class QgsLongLongValidator : QValidator

QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );

~QgsLongLongValidator();

virtual QValidator::State validate( QString &input, int & ) const;

void setBottom( qint64 bottom );
@@ -47,6 +47,9 @@ after selecting a point, performs the identification:
struct IdentifyResult
{
IdentifyResult();
%Docstring
Constructor for IdentifyResult
%End

IdentifyResult( QgsMapLayer *layer, const QgsFeature &feature, const QMap< QString, QString > &derivedAttributes );
IdentifyResult( QgsMapLayer *layer, const QString &label, const QMap< QString, QString > &attributes, const QMap< QString, QString > &derivedAttributes );
@@ -25,8 +25,6 @@ class QgsSublayersDialog : QDialog

struct LayerDefinition
{
LayerDefinition();

int layerId;
QString layerName; //!< Name of the layer (not necessarily unique)
int count;
@@ -22,6 +22,7 @@ class QgsBufferServerResponse: QgsServerResponse

QgsBufferServerResponse();


virtual void setHeader( const QString &key, const QString &value );

%Docstring
@@ -141,8 +141,6 @@ class PlaneVertexBufferFunctor : public QBufferDataGenerator
, mHeightMap( heightMap )
{}

~PlaneVertexBufferFunctor() {}

QByteArray operator()() final
{
return createPlaneVertexData( mResolution, mSkirtHeight, mHeightMap );
@@ -175,8 +173,6 @@ class PlaneIndexBufferFunctor : public QBufferDataGenerator
: mResolution( resolution )
{}

~PlaneIndexBufferFunctor() {}

QByteArray operator()() final
{
return createPlaneIndexData( mResolution );
@@ -57,10 +57,6 @@ QgsDemTerrainTileLoader::QgsDemTerrainTileLoader( QgsTerrainEntity *terrain, Qgs
mSkirtHeight = generator->skirtHeight();
}

QgsDemTerrainTileLoader::~QgsDemTerrainTileLoader()
{
}

Qt3DCore::QEntity *QgsDemTerrainTileLoader::createEntity( Qt3DCore::QEntity *parent )
{
QgsTerrainTileEntity *entity = new QgsTerrainTileEntity;
@@ -49,7 +49,6 @@ class QgsDemTerrainTileLoader : public QgsTerrainTileLoader
public:
//! Constructs loader for the given chunk node
QgsDemTerrainTileLoader( QgsTerrainEntity *terrain, QgsChunkNode *node );
~QgsDemTerrainTileLoader();

virtual Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent );

@@ -92,11 +92,6 @@ Qt3DCore::QEntity *FlatTerrainChunkLoader::createEntity( Qt3DCore::QEntity *pare

// ---------------


QgsFlatTerrainGenerator::QgsFlatTerrainGenerator()
{
}

QgsChunkLoader *QgsFlatTerrainGenerator::createChunkLoader( QgsChunkNode *node ) const
{
return new FlatTerrainChunkLoader( mTerrain, node );
@@ -33,7 +33,7 @@ class _3D_EXPORT QgsFlatTerrainGenerator : public QgsTerrainGenerator
{
public:
//! Creates flat terrain generator object
QgsFlatTerrainGenerator();
QgsFlatTerrainGenerator() = default;

virtual QgsChunkLoader *createChunkLoader( QgsChunkNode *node ) const override SIP_FACTORY;

@@ -76,11 +76,6 @@ QgsTerrainTextureImage::QgsTerrainTextureImage( const QImage &image, const QgsRe
{
}


QgsTerrainTextureImage::~QgsTerrainTextureImage()
{
}

Qt3DRender::QTextureImageDataGeneratorPtr QgsTerrainTextureImage::dataGenerator() const
{
return Qt3DRender::QTextureImageDataGeneratorPtr( new TerrainTextureImageDataGenerator( mExtent, mDebugText, mImage, mVersion ) );
@@ -47,7 +47,6 @@ class QgsTerrainTextureImage : public Qt3DRender::QAbstractTextureImage
public:
//! Constructs the object with given image and map extent
QgsTerrainTextureImage( const QImage &image, const QgsRectangle &extent, const QString &debugText, Qt3DCore::QNode *parent = nullptr );
~QgsTerrainTextureImage();

virtual Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override;

@@ -38,7 +38,6 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
//! Constructor, par is a pointer to the parent, controlpoly a controlpolygon
Bezier3D( ParametricLine *par, QVector<QgsPoint *> *controlpoly );

virtual ~Bezier3D();
//! Do not use this method, since a Bezier curve does not consist of other curves
virtual void add( ParametricLine *pl SIP_TRANSFER ) override;
//! Calculates the first derivative and assigns it to v
@@ -83,11 +82,6 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp
mDegree = mControlPoly->count() - 1;
}

inline Bezier3D::~Bezier3D()
{

}

//----------------------------------------------invalid methods add and remove (because of inheritance from ParametricLine)

inline void Bezier3D::add( ParametricLine *pl )