diff --git a/python/analysis/vector/qgszonalstatistics.sip b/python/analysis/vector/qgszonalstatistics.sip index a443d8d21925..fbf6d25a910d 100644 --- a/python/analysis/vector/qgszonalstatistics.sip +++ b/python/analysis/vector/qgszonalstatistics.sip @@ -31,7 +31,7 @@ class QgsZonalStatistics typedef QFlags Statistics; 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::Statistics stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean) ); /** Starts the calculation @return 0 in case of success*/ diff --git a/python/core/auth/qgsauthmethod.sip b/python/core/auth/qgsauthmethod.sip index f6fa2aeb1e5d..0620817c9870 100644 --- a/python/core/auth/qgsauthmethod.sip +++ b/python/core/auth/qgsauthmethod.sip @@ -105,7 +105,7 @@ class QgsAuthMethod : QObject void setVersion( int version ); /** Set the support expansions (points in providers where the authentication is injected) of the auth method */ - void setExpansions( const QgsAuthMethod::Expansions& expansions ); + void setExpansions( QgsAuthMethod::Expansions expansions ); /** Set list of data providers this auth method supports */ void setDataProviders( const QStringList& dataproviders ); }; diff --git a/python/core/composer/qgscomposermapgrid.sip b/python/core/composer/qgscomposermapgrid.sip index a3f1ff13a93b..4ba811d54024 100644 --- a/python/core/composer/qgscomposermapgrid.sip +++ b/python/core/composer/qgscomposermapgrid.sip @@ -684,7 +684,7 @@ class QgsComposerMapGrid : QgsComposerMapItem * @see frameSideFlags * @see testFrameSideFlag */ - void setFrameSideFlags( const FrameSideFlags& flags ); + void setFrameSideFlags( FrameSideFlags flags ); /** Sets whether the grid frame is drawn for a certain side of the map item. * @param flag flag for grid frame side diff --git a/python/core/composer/qgscomposernodesitem.sip b/python/core/composer/qgscomposernodesitem.sip index 5b9db2309809..922a1a4e95a0 100644 --- a/python/core/composer/qgscomposernodesitem.sip +++ b/python/core/composer/qgscomposernodesitem.sip @@ -5,8 +5,8 @@ class QgsComposerNodesItem: QgsComposerItem %End public: - QgsComposerNodesItem( QString mTagName, QgsComposition* c ); - QgsComposerNodesItem( QString mTagName, QPolygonF polygon, QgsComposition* c ); + QgsComposerNodesItem( const QString& mTagName, QgsComposition* c ); + QgsComposerNodesItem( const QString& mTagName, const QPolygonF& polygon, QgsComposition* c ); ~QgsComposerNodesItem(); /** Add a node in current shape. @@ -16,7 +16,7 @@ class QgsComposerNodesItem: QgsComposerItem * true. Typically, if this flag is true, the new node has to be nearest * than radius to the shape to be added. */ - bool addNode( const QPointF &pt, const bool checkArea = true, const double radius = 10 ); + bool addNode( QPointF pt, const bool checkArea = true, const double radius = 10 ); /** Set a tag to indicate if we want to draw or not the shape's nodes. * @param display @@ -27,7 +27,7 @@ class QgsComposerNodesItem: QgsComposerItem * @param index the index of the node to move * @param node is the new position in scene coordinate */ - bool moveNode( const int index, const QPointF &node ); + bool moveNode( const int index, QPointF node ); /** \brief Reimplementation of QCanvasItem::paint - draw on canvas */ void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget ); @@ -85,7 +85,7 @@ class QgsComposerNodesItem: QgsComposerItem protected: /** Method called in addNode. */ - virtual bool _addNode( const int nodeIndex, const QPointF &newPoint, const double radius ) = 0; + virtual bool _addNode( const int nodeIndex, QPointF newPoint, const double radius ) = 0; /** Method called in removeNode. */ virtual bool _removeNode( const int nodeIndex ) = 0; @@ -104,7 +104,7 @@ class QgsComposerNodesItem: QgsComposerItem void rescaleToFitBoundingBox(); /** Compute an euclidian distance between 2 nodes. */ - double computeDistance(const QPointF &pt1, const QPointF &pt2) const; + double computeDistance( QPointF pt1, QPointF pt2) const; /** Update the current scene rectangle for this item. */ void updateSceneRect(); diff --git a/python/core/composer/qgscomposerpolygon.sip b/python/core/composer/qgscomposerpolygon.sip index 58542acbb46d..51aa140626ae 100644 --- a/python/core/composer/qgscomposerpolygon.sip +++ b/python/core/composer/qgscomposerpolygon.sip @@ -6,7 +6,7 @@ class QgsComposerPolygon: QgsComposerNodesItem public: QgsComposerPolygon( QgsComposition* c ); - QgsComposerPolygon( QPolygonF polygon, QgsComposition* c ); + QgsComposerPolygon( const QPolygonF& polygon, QgsComposition* c ); ~QgsComposerPolygon(); /** Overridden to return shape name */ @@ -23,7 +23,7 @@ class QgsComposerPolygon: QgsComposerNodesItem protected: - bool _addNode( const int indexPoint, const QPointF &newPoint, const double radius ); + bool _addNode( const int indexPoint, QPointF newPoint, const double radius ); bool _removeNode( const int indexPoint ); diff --git a/python/core/composer/qgscomposerpolyline.sip b/python/core/composer/qgscomposerpolyline.sip index 5b6e2849bb5f..af37a6f9ece5 100644 --- a/python/core/composer/qgscomposerpolyline.sip +++ b/python/core/composer/qgscomposerpolyline.sip @@ -6,7 +6,7 @@ class QgsComposerPolyline: QgsComposerNodesItem public: QgsComposerPolyline( QgsComposition* c ); - QgsComposerPolyline( QPolygonF polyline, QgsComposition* c ); + QgsComposerPolyline( const QPolygonF& polyline, QgsComposition* c ); ~QgsComposerPolyline(); /** Overridden to return shape name */ @@ -23,7 +23,7 @@ class QgsComposerPolyline: QgsComposerNodesItem protected: - bool _addNode( const int indexPoint, const QPointF &newPoint, const double radius ); + bool _addNode( const int indexPoint, QPointF newPoint, const double radius ); bool _removeNode( const int indexPoint ); diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip index 2905c851bac3..f6483a8ad64e 100644 --- a/python/core/dxf/qgsdxfexport.sip +++ b/python/core/dxf/qgsdxfexport.sip @@ -301,6 +301,6 @@ class QgsDxfExport * @param fid id of feature * @param layer dxf layer of feature */ - void registerDxfLayer( QString layerId, QgsFeatureId fid, QString layer ); + void registerDxfLayer( const QString& layerId, QgsFeatureId fid, const QString& layer ); }; diff --git a/python/core/layertree/qgslayertreemodel.sip b/python/core/layertree/qgslayertreemodel.sip index f5ea1064db0f..8454f5214023 100644 --- a/python/core/layertree/qgslayertreemodel.sip +++ b/python/core/layertree/qgslayertreemodel.sip @@ -65,7 +65,7 @@ class QgsLayerTreeModel : QAbstractItemModel typedef QFlags Flags; //! Set OR-ed combination of model flags - void setFlags( const Flags& f ); + void setFlags( Flags f ); //! Enable or disable a model flag void setFlag( Flag f, bool on = true ); //! Return OR-ed combination of model flags diff --git a/python/core/qgsattributetableconfig.sip b/python/core/qgsattributetableconfig.sip index 9c7290ff98e8..b3521a13715a 100644 --- a/python/core/qgsattributetableconfig.sip +++ b/python/core/qgsattributetableconfig.sip @@ -107,7 +107,7 @@ class QgsAttributeTableConfig /** * Set the style of the action widget */ - void setActionWidgetStyle( const ActionWidgetStyle& actionWidgetStyle ); + void setActionWidgetStyle( ActionWidgetStyle actionWidgetStyle ); /** * Serialize to XML on layer save @@ -165,5 +165,5 @@ class QgsAttributeTableConfig * Set the sort order * @note Added in 2.16 */ - void setSortOrder( const Qt::SortOrder& sortOrder ); + void setSortOrder( Qt::SortOrder sortOrder ); }; diff --git a/python/core/qgsdataitem.sip b/python/core/qgsdataitem.sip index 6c6c5cd46ff5..421c50b34567 100644 --- a/python/core/qgsdataitem.sip +++ b/python/core/qgsdataitem.sip @@ -160,12 +160,12 @@ class QgsDataItem : QObject typedef QFlags Capabilities; // This will _write_ selected crs in data source - virtual bool setCrs( QgsCoordinateReferenceSystem crs ); + virtual bool setCrs( const QgsCoordinateReferenceSystem& crs ); // ### QGIS 3 - rename to capabilities() virtual Capabilities capabilities2() const; - virtual void setCapabilities( const Capabilities& capabilities ); + virtual void setCapabilities( Capabilities capabilities ); // static methods @@ -208,7 +208,7 @@ class QgsDataItem : QObject protected: virtual void populate( const QVector& children ); - virtual void refresh( QVector children ); + virtual void refresh( const QVector& children ); /** The item is scheduled to be deleted. E.g. if deleteLater() is called when * item is in Populating state (createChildren() running in another thread), * the deferredDelete() returns true and item will be deleted once Populating finished. @@ -378,7 +378,7 @@ class QgsDirectoryItem : QgsDataCollectionItem // static QVector mLibraries; /** Check if the given path is hidden from the browser model */ - static bool hiddenPath( QString path ); + static bool hiddenPath( const QString& path ); public slots: virtual void childrenCreated(); @@ -482,7 +482,7 @@ class QgsZipItem : QgsDataCollectionItem static QString vsiPrefix( const QString& uri ); - static QgsDataItem* itemFromPath( QgsDataItem* parent, QString path, QString name ) /Factory/; + static QgsDataItem* itemFromPath( QgsDataItem* parent, const QString& path, const QString& name ) /Factory/; //! @note available in python as itemFromFilePath static QgsDataItem* itemFromPath( QgsDataItem* parent, const QString& filePath, const QString& name, const QString& path ) /Factory,PyName=itemFromFilePath/; diff --git a/python/core/qgsdatetimestatisticalsummary.sip b/python/core/qgsdatetimestatisticalsummary.sip index 3bb9b9472820..23cb010e56d0 100644 --- a/python/core/qgsdatetimestatisticalsummary.sip +++ b/python/core/qgsdatetimestatisticalsummary.sip @@ -34,7 +34,7 @@ class QgsDateTimeStatisticalSummary /** Constructor for QgsDateTimeStatisticalSummary * @param stats flags for statistics to calculate */ - QgsDateTimeStatisticalSummary( const QgsDateTimeStatisticalSummary::Statistics& stats = All ); + QgsDateTimeStatisticalSummary( QgsDateTimeStatisticalSummary::Statistics stats = All ); /** Returns flags which specify which statistics will be calculated. Some statistics * are always calculated (eg count). @@ -47,7 +47,7 @@ class QgsDateTimeStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const Statistics& stats ); + void setStatistics( Statistics stats ); /** Resets the calculated values */ diff --git a/python/core/qgsinterval.sip b/python/core/qgsinterval.sip index 59d39ef449d9..b0f05df84954 100644 --- a/python/core/qgsinterval.sip +++ b/python/core/qgsinterval.sip @@ -124,7 +124,7 @@ class QgsInterval */ void setValid( bool valid ); - bool operator==( const QgsInterval& other ) const; + bool operator==( QgsInterval other ) const; /** Converts a string to an interval * @param string string to parse diff --git a/python/core/qgsmaplayerdependency.sip b/python/core/qgsmaplayerdependency.sip index 262914275b82..0d7548d19bfd 100644 --- a/python/core/qgsmaplayerdependency.sip +++ b/python/core/qgsmaplayerdependency.sip @@ -19,7 +19,7 @@ class QgsMapLayerDependency }; //! Standard constructor - QgsMapLayerDependency( QString layerId, Type type = DataDependency, Origin origin = FromUser ); + QgsMapLayerDependency( const QString& layerId, Type type = DataDependency, Origin origin = FromUser ); //! Return the dependency type Type type() const; diff --git a/python/core/qgsmaplayerproxymodel.sip b/python/core/qgsmaplayerproxymodel.sip index 14deaa7f31e5..37aee2888122 100644 --- a/python/core/qgsmaplayerproxymodel.sip +++ b/python/core/qgsmaplayerproxymodel.sip @@ -41,7 +41,7 @@ class QgsMapLayerProxyModel : QSortFilterProxyModel * @param filters are Filter flags * @note added in 2.3 */ - QgsMapLayerProxyModel* setFilters( const Filters& filters ); + QgsMapLayerProxyModel* setFilters( Filters filters ); const Filters& filters() const; //! offer the possibility to except some layers to be listed diff --git a/python/core/qgsmaprenderercustompainterjob.sip b/python/core/qgsmaprenderercustompainterjob.sip index a5ed1985e821..7320f3bb42d4 100644 --- a/python/core/qgsmaprenderercustompainterjob.sip +++ b/python/core/qgsmaprenderercustompainterjob.sip @@ -38,7 +38,7 @@ class QgsMapRendererCustomPainterJob : QgsMapRendererJob * Ideally the "wait for finished" method should not be used at all. The code triggering * rendering should not need to actively wait for rendering to finish. */ - void waitForFinishedWithEventLoop( const QEventLoop::ProcessEventsFlags& flags = QEventLoop::AllEvents ); + void waitForFinishedWithEventLoop( QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents ); /** * Render the map synchronously in this thread. The function does not return until the map diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip index b98c530b2559..bdf3975209d3 100644 --- a/python/core/qgsmapsettings.sip +++ b/python/core/qgsmapsettings.sip @@ -122,7 +122,7 @@ class QgsMapSettings typedef QFlags Flags; //! Set combination of flags that will be used for rendering - void setFlags( const Flags& flags ); + void setFlags( Flags flags ); //! Enable or disable a particular flag (other flags are not affected) void setFlag( Flag flag, bool on = true ); //! Return combination of flags used for rendering diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip index e2b6c704d50a..73a1f294321d 100644 --- a/python/core/qgsproject.sip +++ b/python/core/qgsproject.sip @@ -336,7 +336,7 @@ class QgsProject : QObject /** * Set a list of layers which should not be taken into account on map identification */ - void setNonIdentifiableLayers( QList layers ); + void setNonIdentifiableLayers( const QList& layers ); /** * Set a list of layers which should not be taken into account on map identification diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip index 510e142403d3..16a083a71a0d 100644 --- a/python/core/qgsrendercontext.sip +++ b/python/core/qgsrendercontext.sip @@ -30,7 +30,7 @@ class QgsRenderContext /** Set combination of flags that will be used for rendering. * @note added in QGIS 2.14 */ - void setFlags( const QgsRenderContext::Flags& flags ); + void setFlags( QgsRenderContext::Flags flags ); /** Enable or disable a particular flag (other flags are not affected) * @note added in QGIS 2.14 diff --git a/python/core/qgssnappingconfig.sip b/python/core/qgssnappingconfig.sip index f6987f7b37c6..aec9f3e5daef 100644 --- a/python/core/qgssnappingconfig.sip +++ b/python/core/qgssnappingconfig.sip @@ -176,7 +176,7 @@ class QgsSnappingConfig QgsSnappingConfig::IndividualLayerSettings individualLayerSettings( QgsVectorLayer* vl ) const; //! set individual layer snappings settings (applied if mode is AdvancedConfiguration) - void setIndividualLayerSettings( QgsVectorLayer* vl, QgsSnappingConfig::IndividualLayerSettings individualLayerSettings ); + void setIndividualLayerSettings( QgsVectorLayer* vl, const QgsSnappingConfig::IndividualLayerSettings& individualLayerSettings ); /** * Compare this configuration to other. diff --git a/python/core/qgssqlstatement.sip b/python/core/qgssqlstatement.sip index 29b2a08e8c70..dfe84bd75c26 100644 --- a/python/core/qgssqlstatement.sip +++ b/python/core/qgssqlstatement.sip @@ -113,7 +113,7 @@ class QgsSQLStatement * otherwise the original string. * @see quotedString(), quotedIdentifier() */ - static QString quotedIdentifierIfNeeded( QString name ); + static QString quotedIdentifierIfNeeded( const QString& name ); /** Remove double quotes from an identifier. * @see quotedIdentifier() @@ -340,7 +340,7 @@ class QgsSQLStatement class NodeFunction : QgsSQLStatement::Node { public: - NodeFunction( QString name, QgsSQLStatement::NodeList* args /Transfer/ ); + NodeFunction( const QString name, QgsSQLStatement::NodeList* args /Transfer/ ); ~NodeFunction(); /** Return function name */ @@ -474,7 +474,7 @@ class QgsSQLStatement { public: NodeJoin( QgsSQLStatement::NodeTableDef* tabledef /Transfer/, QgsSQLStatement::Node* onExpr /Transfer/, QgsSQLStatement::JoinType type ); - NodeJoin( QgsSQLStatement::NodeTableDef* tabledef /Transfer/, QList usingColumns, QgsSQLStatement::JoinType type ); + NodeJoin( QgsSQLStatement::NodeTableDef* tabledef /Transfer/, const QList& usingColumns, QgsSQLStatement::JoinType type ); /** Table definition */ QgsSQLStatement::NodeTableDef* tableDef() const; @@ -525,13 +525,13 @@ class QgsSQLStatement NodeSelect( QList tableList /Transfer/, QList columns /Transfer/, bool distinct ); /** Set joins */ - void setJoins( QList joins /Transfer/ ); + void setJoins( const QList& joins /Transfer/ ); /** Append a join */ void appendJoin( QgsSQLStatement::NodeJoin* join /Transfer/ ); /** Set where clause */ void setWhere( QgsSQLStatement::Node* where /Transfer/ ); /** Set order by columns */ - void setOrderBy( QList orderBy /Transfer/ ); + void setOrderBy( const QList& orderBy /Transfer/ ); /** Return the list of tables */ QList tables() const; diff --git a/python/core/qgsstatisticalsummary.sip b/python/core/qgsstatisticalsummary.sip index 0f9c08139877..1c6b66846ebc 100644 --- a/python/core/qgsstatisticalsummary.sip +++ b/python/core/qgsstatisticalsummary.sip @@ -44,7 +44,7 @@ class QgsStatisticalSummary /** Constructor for QgsStatisticalSummary * @param stats flags for statistics to calculate */ - QgsStatisticalSummary( const QgsStatisticalSummary::Statistics& stats = QgsStatisticalSummary::All ); + QgsStatisticalSummary( QgsStatisticalSummary::Statistics stats = QgsStatisticalSummary::All ); virtual ~QgsStatisticalSummary(); @@ -59,7 +59,7 @@ class QgsStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const QgsStatisticalSummary::Statistics& stats ); + void setStatistics( QgsStatisticalSummary::Statistics stats ); /** Resets the calculated values */ diff --git a/python/core/qgsstringstatisticalsummary.sip b/python/core/qgsstringstatisticalsummary.sip index 80b2fe6a1240..b7831d99be6c 100644 --- a/python/core/qgsstringstatisticalsummary.sip +++ b/python/core/qgsstringstatisticalsummary.sip @@ -38,7 +38,7 @@ class QgsStringStatisticalSummary /** Constructor for QgsStringStatistics * @param stats flags for statistics to calculate */ - QgsStringStatisticalSummary( const QgsStringStatisticalSummary::Statistics& stats = All ); + QgsStringStatisticalSummary( QgsStringStatisticalSummary::Statistics stats = All ); /** Returns flags which specify which statistics will be calculated. Some statistics * are always calculated (eg count). @@ -51,7 +51,7 @@ class QgsStringStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const Statistics& stats ); + void setStatistics( Statistics stats ); /** Resets the calculated values */ diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip index 085a3e5ce680..024ca1ed376e 100644 --- a/python/core/qgsvectorfilewriter.sip +++ b/python/core/qgsvectorfilewriter.sip @@ -208,7 +208,7 @@ class QgsVectorFileWriter QgsWkbTypes::Type overrideGeometryType = QgsWkbTypes::Unknown, bool forceMulti = false, bool includeZ = false, - QgsAttributeList attributes = QgsAttributeList(), + const QgsAttributeList& attributes = QgsAttributeList(), FieldValueConverter* fieldValueConverter = nullptr ); @@ -253,7 +253,7 @@ class QgsVectorFileWriter QgsWkbTypes::Type overrideGeometryType = QgsWkbTypes::Unknown, bool forceMulti = false, bool includeZ = false, - QgsAttributeList attributes = QgsAttributeList(), + const QgsAttributeList& attributes = QgsAttributeList(), FieldValueConverter* fieldValueConverter = nullptr ); diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip index 8f26c1eebcba..eb99679ae4a9 100644 --- a/python/core/qgsvectorlayer.sip +++ b/python/core/qgsvectorlayer.sip @@ -547,7 +547,7 @@ class QgsVectorLayer : QgsMapLayer * @see deselect(QgsFeatureId) * @see selectByExpression() */ - void modifySelection( QgsFeatureIds selectIds, QgsFeatureIds deselectIds ); + void modifySelection( const QgsFeatureIds& selectIds, const QgsFeatureIds& deselectIds ); /** Select not selected features and deselect selected ones */ void invertSelection(); @@ -728,7 +728,7 @@ class QgsVectorLayer : QgsMapLayer */ bool writeStyle( QDomNode& node, QDomDocument& doc, QString& errorMessage ) const; - bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, QgsStringMap& props ) const; + bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, const QgsStringMap& props ) const; bool readSld( const QDomNode& node, QString& errorMessage ); /** diff --git a/python/core/qgsvectorlayereditbuffer.sip b/python/core/qgsvectorlayereditbuffer.sip index 2d3efea8f65f..21ebf22416b5 100644 --- a/python/core/qgsvectorlayereditbuffer.sip +++ b/python/core/qgsvectorlayereditbuffer.sip @@ -31,7 +31,7 @@ class QgsVectorLayerEditBuffer : QObject virtual bool deleteFeatures( const QgsFeatureIds& fid ); /** Change feature's geometry */ - virtual bool changeGeometry( QgsFeatureId fid, QgsGeometry geom ); + virtual bool changeGeometry( QgsFeatureId fid, const QgsGeometry& geom ); /** Changed an attribute value (but does not commit it) */ virtual bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue = QVariant() ); diff --git a/python/core/qgsvectorlayereditpassthrough.sip b/python/core/qgsvectorlayereditpassthrough.sip index e8caae1178a8..0f6170f52398 100644 --- a/python/core/qgsvectorlayereditpassthrough.sip +++ b/python/core/qgsvectorlayereditpassthrough.sip @@ -10,7 +10,7 @@ class QgsVectorLayerEditPassthrough : QgsVectorLayerEditBuffer bool addFeatures( QgsFeatureList& features ); bool deleteFeature( QgsFeatureId fid ); bool deleteFeatures( const QgsFeatureIds& fids ); - bool changeGeometry( QgsFeatureId fid, QgsGeometry geom ); + bool changeGeometry( QgsFeatureId fid, const QgsGeometry& geom ); bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue = QVariant() ); bool addAttribute( const QgsField &field ); bool deleteAttribute( int attr ); diff --git a/python/core/qgsvectorlayerundocommand.sip b/python/core/qgsvectorlayerundocommand.sip index acaa00fe65bf..087294eda844 100644 --- a/python/core/qgsvectorlayerundocommand.sip +++ b/python/core/qgsvectorlayerundocommand.sip @@ -87,7 +87,7 @@ class QgsVectorLayerUndoCommandChangeGeometry : QgsVectorLayerUndoCommand * @param fid feature ID of feature to modify geometry of * @param newGeom new geometry for feature */ - QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer /Transfer/, QgsFeatureId fid, QgsGeometry newGeom ); + QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer /Transfer/, QgsFeatureId fid, const QgsGeometry& newGeom ); ~QgsVectorLayerUndoCommandChangeGeometry(); virtual void undo(); diff --git a/python/core/qgsvectorsimplifymethod.sip b/python/core/qgsvectorsimplifymethod.sip index ddd4007e0694..985ecfb54219 100644 --- a/python/core/qgsvectorsimplifymethod.sip +++ b/python/core/qgsvectorsimplifymethod.sip @@ -25,7 +25,7 @@ class QgsVectorSimplifyMethod typedef QFlags SimplifyHints; /** Sets the simplification hints of the vector layer managed */ - void setSimplifyHints( const QFlags& simplifyHints ); + void setSimplifyHints( QFlags simplifyHints ); /** Gets the simplification hints of the vector layer managed */ QFlags simplifyHints() const; @@ -38,7 +38,7 @@ class QgsVectorSimplifyMethod }; /** Sets the local simplification algorithm of the vector layer managed */ - void setSimplifyAlgorithm( const SimplifyAlgorithm& simplifyAlgorithm ); + void setSimplifyAlgorithm( SimplifyAlgorithm simplifyAlgorithm ); /** Gets the local simplification algorithm of the vector layer managed */ SimplifyAlgorithm simplifyAlgorithm() const; diff --git a/python/core/raster/qgsrasterdataprovider.sip b/python/core/raster/qgsrasterdataprovider.sip index 702304c941ce..162e489d12ee 100644 --- a/python/core/raster/qgsrasterdataprovider.sip +++ b/python/core/raster/qgsrasterdataprovider.sip @@ -168,7 +168,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface * ACTUALLY exists you need to look at the existsFlag member in each struct stored in the * list. */ - virtual QList buildPyramidList( QList overviewList = QList() ); + virtual QList buildPyramidList( const QList& overviewList = QList() ); /** \brief Returns true if raster has at least one populated histogram. */ bool hasPyramids(); diff --git a/python/core/raster/qgsrasterfilewriter.sip b/python/core/raster/qgsrasterfilewriter.sip index 6095802c2cab..e17e79bbc714 100644 --- a/python/core/raster/qgsrasterfilewriter.sip +++ b/python/core/raster/qgsrasterfilewriter.sip @@ -36,7 +36,7 @@ class QgsRasterFileWriter @param outputExtent extent to output @param crs crs to reproject to @param p dialog to show progress in */ - WriterError writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, QgsRectangle outputExtent, + WriterError writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, const QgsRectangle& outputExtent, const QgsCoordinateReferenceSystem& crs, QProgressDialog* p = 0 ); void setOutputFormat( const QString& format ); diff --git a/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip b/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip index f7b143b602d4..f173a3cbc833 100644 --- a/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip +++ b/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip @@ -28,7 +28,7 @@ class QgsRendererCategory // debugging QString dump() const; - void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const; + void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props ) const; protected: diff --git a/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip b/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip index c9f7d6de4395..4f99ab69130a 100644 --- a/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip +++ b/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip @@ -36,7 +36,7 @@ class QgsRendererRange * @param firstRange set to true if the range is the first range, where the lower value uses a <= test * rather than a < test. */ - void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props, bool firstRange = false ) const; + void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props, bool firstRange = false ) const; protected: // for cpy+swap idiom diff --git a/python/core/symbology-ng/qgspointdistancerenderer.sip b/python/core/symbology-ng/qgspointdistancerenderer.sip index 761c0df5dfde..40aa1a058307 100644 --- a/python/core/symbology-ng/qgspointdistancerenderer.sip +++ b/python/core/symbology-ng/qgspointdistancerenderer.sip @@ -48,7 +48,7 @@ class QgsPointDistanceRenderer : QgsFeatureRenderer */ QgsPointDistanceRenderer( const QString& rendererName, const QString& labelAttributeName = QString() ); - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const; bool renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool selected = false, bool drawVertexMarker = false ); virtual QSet usedAttributes() const; virtual Capabilities capabilities(); diff --git a/python/core/symbology-ng/qgsrulebasedrenderer.sip b/python/core/symbology-ng/qgsrulebasedrenderer.sip index e65197fb3645..db08d84fa628 100644 --- a/python/core/symbology-ng/qgsrulebasedrenderer.sip +++ b/python/core/symbology-ng/qgsrulebasedrenderer.sip @@ -195,7 +195,7 @@ class QgsRuleBasedRenderer : QgsFeatureRenderer //! clone this rule, return new instance QgsRuleBasedRenderer::Rule* clone() const /Factory/; - void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ); + void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props ); static QgsRuleBasedRenderer::Rule* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) /Factory/; QDomElement save( QDomDocument& doc, QgsSymbolMap& symbolMap ); diff --git a/python/core/symbology-ng/qgssymbollayerutils.sip b/python/core/symbology-ng/qgssymbollayerutils.sip index af1a78f2b35e..9bc5a63029d0 100644 --- a/python/core/symbology-ng/qgssymbollayerutils.sip +++ b/python/core/symbology-ng/qgssymbollayerutils.sip @@ -447,7 +447,7 @@ class QgsSymbolLayerUtils * returns a copy of the original point * @note added in 3.0 */ - static QPointF rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) /PyName=rescalePointUom/; + static QPointF rescaleUom( QPointF point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) /PyName=rescalePointUom/; /** Rescales the given array based on the uomScale found in the props, if any is found, otherwise * returns a copy of the original point diff --git a/python/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip b/python/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip index efc30be0f364..0b7679cbb8e4 100644 --- a/python/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip +++ b/python/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip @@ -33,7 +33,7 @@ class QgsRelationReferenceSearchWidgetWrapper : QgsSearchWidgetWrapper public slots: //! Called when current value of search widget changes - void onValueChanged( QVariant value ); + void onValueChanged( const QVariant& value ); protected slots: void setExpression( QString exp ); diff --git a/python/gui/qgsdatadefinedbutton.sip b/python/gui/qgsdatadefinedbutton.sip index 290e91400ea9..350e07b99801 100644 --- a/python/gui/qgsdatadefinedbutton.sip +++ b/python/gui/qgsdatadefinedbutton.sip @@ -62,7 +62,7 @@ class QgsDataDefinedButton : QToolButton QgsDataDefinedButton( QWidget* parent /TransferThis/ = 0, const QgsVectorLayer* vl = 0, const QgsDataDefined* datadefined = 0, - const DataTypes& datatypes = AnyType, + DataTypes datatypes = AnyType, const QString& description = QString() ); ~QgsDataDefinedButton(); @@ -76,7 +76,7 @@ class QgsDataDefinedButton : QToolButton */ void init( const QgsVectorLayer* vl, const QgsDataDefined* datadefined = 0, - const DataTypes& datatypes = AnyType, + DataTypes datatypes = AnyType, const QString& description = QString() ); QMap< QString, QString > definedProperty() const; diff --git a/python/gui/qgsdialog.sip b/python/gui/qgsdialog.sip index dd0c8e7936ff..2f32a44e3645 100644 --- a/python/gui/qgsdialog.sip +++ b/python/gui/qgsdialog.sip @@ -9,7 +9,7 @@ class QgsDialog : QDialog public: QgsDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags, - const QDialogButtonBox::StandardButtons& buttons = QDialogButtonBox::Close, + QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close, Qt::Orientation orientation = Qt::Horizontal ); ~QgsDialog(); diff --git a/python/gui/qgsexternalresourcewidget.sip b/python/gui/qgsexternalresourcewidget.sip index 9a81c771c3f3..70809ce186d7 100644 --- a/python/gui/qgsexternalresourcewidget.sip +++ b/python/gui/qgsexternalresourcewidget.sip @@ -69,7 +69,7 @@ class QgsExternalResourceWidget : QWidget * Configures if paths are handled absolute or relative and if relative, * which should be the base path. */ - void setRelativeStorage( const QgsFileWidget::RelativeStorage& relativeStorage ); + void setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage ); /** diff --git a/python/gui/qgsfieldcombobox.sip b/python/gui/qgsfieldcombobox.sip index 79b85c80b61d..b967b37d22db 100644 --- a/python/gui/qgsfieldcombobox.sip +++ b/python/gui/qgsfieldcombobox.sip @@ -20,7 +20,7 @@ class QgsFieldComboBox : QComboBox explicit QgsFieldComboBox( QWidget *parent /TransferThis/ = 0 ); //! setFilters allows fitering according to the type of field - void setFilters( const QgsFieldProxyModel::Filters& filters ); + void setFilters( QgsFieldProxyModel::Filters filters ); //! currently used filter on list of fields QgsFieldProxyModel::Filters filters() const; diff --git a/python/gui/qgsfieldexpressionwidget.sip b/python/gui/qgsfieldexpressionwidget.sip index ecd6ec5431d4..7b9f1fdc8ddb 100644 --- a/python/gui/qgsfieldexpressionwidget.sip +++ b/python/gui/qgsfieldexpressionwidget.sip @@ -18,7 +18,7 @@ class QgsFieldExpressionWidget : QWidget const QString expressionDialogTitle(); //! setFilters allows fitering according to the type of field - void setFilters( const QgsFieldProxyModel::Filters& filters ); + void setFilters( QgsFieldProxyModel::Filters filters ); void setLeftHandButtonStyle( bool isLeft ); diff --git a/python/gui/qgsfieldproxymodel.sip b/python/gui/qgsfieldproxymodel.sip index 3fcef8a56c7b..078b917c10b8 100644 --- a/python/gui/qgsfieldproxymodel.sip +++ b/python/gui/qgsfieldproxymodel.sip @@ -40,7 +40,7 @@ class QgsFieldProxyModel : QSortFilterProxyModel * @param filters are Filter flags * @see filters() */ - QgsFieldProxyModel* setFilters( const Filters& filters ); + QgsFieldProxyModel* setFilters( Filters filters ); /** Returns the filters controlling displayed fields. * @see setFilters() diff --git a/python/gui/qgsmaplayeractionregistry.sip b/python/gui/qgsmaplayeractionregistry.sip index d77f72243111..8212acc70f7e 100644 --- a/python/gui/qgsmaplayeractionregistry.sip +++ b/python/gui/qgsmaplayeractionregistry.sip @@ -16,13 +16,13 @@ class QgsMapLayerAction : QAction //! Creates a map layer action which can run on any layer //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatiblity reasons. - QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run only on a specific layer - QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, QgsMapLayer* layer, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, QgsMapLayer* layer, Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run on a specific type of layer - QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, QgsMapLayer::LayerType layerType, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, QgsMapLayer::LayerType layerType, Targets targets = AllActions, const QIcon& icon = QIcon() ); ~QgsMapLayerAction(); @@ -39,7 +39,7 @@ class QgsMapLayerAction : QAction void triggerForLayer( QgsMapLayer* layer ); /** Define the targets of the action */ - void setTargets( const Targets& targets ); + void setTargets( Targets targets ); /** Return availibity of action */ const Targets& targets() const; @@ -73,7 +73,7 @@ class QgsMapLayerActionRegistry : QObject void addMapLayerAction( QgsMapLayerAction * action ); /** Returns the map layer actions which can run on the specified layer*/ - QList mapLayerActions( QgsMapLayer* layer, const QgsMapLayerAction::Targets& targets = QgsMapLayerAction::AllActions ); + QList mapLayerActions( QgsMapLayer* layer, QgsMapLayerAction::Targets targets = QgsMapLayerAction::AllActions ); /** Removes a map layer action from the registry*/ bool removeMapLayerAction( QgsMapLayerAction *action ); diff --git a/python/gui/qgsmaplayerconfigwidgetfactory.sip b/python/gui/qgsmaplayerconfigwidgetfactory.sip index 06fd96421989..be44d53ceeb8 100644 --- a/python/gui/qgsmaplayerconfigwidgetfactory.sip +++ b/python/gui/qgsmaplayerconfigwidgetfactory.sip @@ -14,7 +14,7 @@ class QgsMapLayerConfigWidgetFactory QgsMapLayerConfigWidgetFactory(); /** Constructor */ - QgsMapLayerConfigWidgetFactory( QString title, QIcon icon ); + QgsMapLayerConfigWidgetFactory( const QString& title, const QIcon& icon ); /** Destructor */ virtual ~QgsMapLayerConfigWidgetFactory(); diff --git a/python/gui/qgsmaptoolcapture.sip b/python/gui/qgsmaptoolcapture.sip index 869c91b4b268..7ebd3a50d063 100644 --- a/python/gui/qgsmaptoolcapture.sip +++ b/python/gui/qgsmaptoolcapture.sip @@ -94,7 +94,7 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing * @return 0 in case of success, 1 if not applicable (CRS mismatch), 2 in case of failure * @note added in 2.14 */ - int fetchLayerPoint( QgsPointLocator::Match match, QgsPointV2& layerPoint ); + int fetchLayerPoint( const QgsPointLocator::Match& match, QgsPointV2& layerPoint ); /** Adds a point to the rubber band (in map coordinates) and to the capture list (in layer coordinates) * @return 0 in case of success, 1 if current layer is not a vector layer, 2 if coordinate transformation failed @@ -106,7 +106,7 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing * @param match Data about the snapping match. Can be an invalid match, if point not snapped. * @note added in 2.14 */ - int addVertex( const QgsPoint& mapPoint, QgsPointLocator::Match match ); + int addVertex( const QgsPoint& mapPoint, const QgsPointLocator::Match& match ); /** Removes the last vertex from mRubberBand and mCaptureList*/ void undo(); diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip index f0fc3ac551aa..4ea75faa6a8e 100644 --- a/python/gui/qgsmaptoolidentify.sip +++ b/python/gui/qgsmaptoolidentify.sip @@ -78,7 +78,7 @@ class QgsMapToolIdentify : QgsMapTool @param mode Identification mode. Can use Qgis default settings or a defined mode. @param layerType Only performs identification in a certain type of layers (raster, vector). Default value is AllLayers. @return a list of IdentifyResult*/ - QList identify( int x, int y, IdentifyMode mode, const LayerType& layerType = AllLayers ); + QList identify( int x, int y, IdentifyMode mode, LayerType layerType = AllLayers ); //! return a pointer to the identify menu which will be used in layer selection mode //! this menu can also be customized @@ -102,10 +102,10 @@ class QgsMapToolIdentify : QgsMapTool @param layerList Performs the identification within the given list of layers. @param layerType Only performs identification in a certain type of layers (raster, vector). @return a list of IdentifyResult*/ - QList identify( int x, int y, IdentifyMode mode, const QList& layerList, const LayerType& layerType = AllLayers ); + QList identify( int x, int y, IdentifyMode mode, const QList& layerList, LayerType layerType = AllLayers ); /** Call the right method depending on layer type */ - bool identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, const LayerType& layerType = AllLayers ); + bool identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, LayerType layerType = AllLayers ); bool identifyRasterLayer( QList *results, QgsRasterLayer *layer, QgsPoint point, const QgsRectangle& viewExtent, double mapUnitsPerPixel ); bool identifyVectorLayer( QList *results, QgsVectorLayer *layer, const QgsPoint& point ); diff --git a/python/gui/qgspanelwidget.sip b/python/gui/qgspanelwidget.sip index d019ab452754..dfa12e34052d 100644 --- a/python/gui/qgspanelwidget.sip +++ b/python/gui/qgspanelwidget.sip @@ -17,7 +17,7 @@ class QgsPanelWidget : public QWidget * Set the title of the panel when shown in the interface. * @param panelTitle The panel title. */ - void setPanelTitle( QString panelTitle ); + void setPanelTitle( const QString& panelTitle ); /** * The title of the panel. @@ -32,7 +32,7 @@ class QgsPanelWidget : public QWidget * Use this method if you have children widgets that need to show a panel to the user. * @param panels A list of panel widgets to connect. */ - void connectChildPanels( QList panels ); + void connectChildPanels( const QList& panels ); /** * Connect the given sub panel widgets showPanel signals to this current panels diff --git a/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip b/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip index 4f7520c3fc17..646a6a212c8e 100644 --- a/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip +++ b/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip @@ -84,7 +84,7 @@ class QgsRendererPropertiesDialog : QDialog * @param widgets The list of widgets to check. * @param slot The slot to connect to the signals. */ - void connectValueChanged( QList widgets, const char *slot ); + void connectValueChanged( const QList& widgets, const char *slot ); //! Reimplements dialog keyPress event so we can ignore it diff --git a/python/gui/symbology-ng/qgssvgselectorwidget.sip b/python/gui/symbology-ng/qgssvgselectorwidget.sip index 24cf2659c86b..6af783d20607 100644 --- a/python/gui/symbology-ng/qgssvgselectorwidget.sip +++ b/python/gui/symbology-ng/qgssvgselectorwidget.sip @@ -63,7 +63,7 @@ class QgsSvgSelectorDialog : QDialog %End public: QgsSvgSelectorDialog( QWidget* parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags, - const QDialogButtonBox::StandardButtons& buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok, + QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok, Qt::Orientation orientation = Qt::Horizontal ); ~QgsSvgSelectorDialog(); diff --git a/python/server/qgsrequesthandler.sip b/python/server/qgsrequesthandler.sip index 71eaab397256..0d50c00761c5 100644 --- a/python/server/qgsrequesthandler.sip +++ b/python/server/qgsrequesthandler.sip @@ -43,7 +43,7 @@ class QgsRequestHandler // virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) = 0; /** Allow plugins to return a QgsMapServiceException*/ - virtual void setServiceException( QgsMapServiceException ex /Transfer/ ) = 0; + virtual void setServiceException( const QgsMapServiceException& ex /Transfer/ ) = 0; //! @note not available in Python bindings // virtual void setXmlResponse( const QDomDocument& doc ) = 0; diff --git a/python/server/qgswmserver.sip b/python/server/qgswmserver.sip index 087a81ae1ed1..9d0393e582bf 100644 --- a/python/server/qgswmserver.sip +++ b/python/server/qgswmserver.sip @@ -67,7 +67,7 @@ class QgsWmsServer: public QgsOWSServer /** Returns an XML file with the capabilities description (as described in the WMS specs) @param version WMS version (1.1.1 or 1.3.0) @param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/ - QDomDocument getCapabilities( QString version = "1.3.0", bool fullProjectInformation = false ); + QDomDocument getCapabilities( const QString& version = "1.3.0", bool fullProjectInformation = false ); QDomDocument getContext(); /** Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip index 4b919e73143c..f195e4837f29 100644 --- a/python/server/qgswmsprojectparser.sip +++ b/python/server/qgswmsprojectparser.sip @@ -126,7 +126,7 @@ class QgsWmsProjectParser : public QgsWmsConfigParser const QDomElement &legendElem, const QMap &layerMap, const QStringList &nonIdentifiableLayers, - QString version, //1.1.1 or 1.3.0 + const QString& version, //1.1.1 or 1.3.0 bool fullProjectSettings, QHash &idNameMap, QStringList &layerIDList ) const; diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp index 99f0b331509b..2b0eb65e2b52 100644 --- a/src/analysis/vector/qgszonalstatistics.cpp +++ b/src/analysis/vector/qgszonalstatistics.cpp @@ -34,7 +34,7 @@ #define TO8F(x) QFile::encodeName( x ).constData() #endif -QgsZonalStatistics::QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix, int rasterBand, const Statistics& stats ) +QgsZonalStatistics::QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix, int rasterBand, Statistics stats ) : mRasterFilePath( rasterFile ) , mRasterBand( rasterBand ) , mPolygonLayer( polygonLayer ) diff --git a/src/analysis/vector/qgszonalstatistics.h b/src/analysis/vector/qgszonalstatistics.h index 281c844e7f0e..eee210f98939 100644 --- a/src/analysis/vector/qgszonalstatistics.h +++ b/src/analysis/vector/qgszonalstatistics.h @@ -53,7 +53,7 @@ class ANALYSIS_EXPORT QgsZonalStatistics Q_DECLARE_FLAGS( Statistics, Statistic ) QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1, - const Statistics& stats = Statistics( Count | Sum | Mean ) ); + QgsZonalStatistics::Statistics stats = Statistics( Count | Sum | Mean ) ); /** Starts the calculation @return 0 in case of success*/ diff --git a/src/app/main.cpp b/src/app/main.cpp index d2c699dda20d..1a53e6964224 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -103,7 +103,7 @@ typedef SInt32 SRefCon; /** Print usage text */ -void usage( QString appName ) +void usage( const QString& appName ) { QStringList msg; diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp index c9d0ac680e7d..62a93d575322 100644 --- a/src/app/nodetool/qgsselectedfeature.cpp +++ b/src/app/nodetool/qgsselectedfeature.cpp @@ -474,7 +474,7 @@ void QgsSelectedFeature::invertVertexSelection( int vertexNr ) emit selectionChanged(); } -void QgsSelectedFeature::invertVertexSelection( QVector vertexIndices ) +void QgsSelectedFeature::invertVertexSelection( const QVector& vertexIndices ) { Q_FOREACH ( int index, vertexIndices ) { diff --git a/src/app/nodetool/qgsselectedfeature.h b/src/app/nodetool/qgsselectedfeature.h index 14f5d635bbdb..e404f4a78d8a 100644 --- a/src/app/nodetool/qgsselectedfeature.h +++ b/src/app/nodetool/qgsselectedfeature.h @@ -92,7 +92,7 @@ class QgsSelectedFeature: public QObject * Inverts selection of a set of vertices at once. * @param vertexIndices list of vertex indices to invert whether or not they are selected */ - void invertVertexSelection( QVector vertexIndices ); + void invertVertexSelection( const QVector &vertexIndices ); /** * Tells if vertex is selected diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 23816e300987..99fb5d606774 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -3724,7 +3724,7 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt } // QgisApp::addVectorLayer() // present a dialog to choose zipitem layers -bool QgisApp::askUserForZipItemLayers( QString path ) +bool QgisApp::askUserForZipItemLayers( const QString& path ) { bool ok = false; QVector childItems; @@ -6238,7 +6238,7 @@ void QgisApp::saveAsLayerDefinition() class QgisAppFieldValueConverter : public QgsVectorFileWriter::FieldValueConverter { public: - QgisAppFieldValueConverter( QgsVectorLayer* vl, QgsAttributeList attributesAsDisplayedValues ); + QgisAppFieldValueConverter( QgsVectorLayer* vl, const QgsAttributeList &attributesAsDisplayedValues ); virtual QgsField fieldDefinition( const QgsField& field ) override; @@ -6249,7 +6249,7 @@ class QgisAppFieldValueConverter : public QgsVectorFileWriter::FieldValueConvert QgsAttributeList mAttributesAsDisplayedValues; }; -QgisAppFieldValueConverter::QgisAppFieldValueConverter( QgsVectorLayer* vl, QgsAttributeList attributesAsDisplayedValues ) +QgisAppFieldValueConverter::QgisAppFieldValueConverter( QgsVectorLayer* vl, const QgsAttributeList& attributesAsDisplayedValues ) : mLayer( vl ) , mAttributesAsDisplayedValues( attributesAsDisplayedValues ) { diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 232dc43c65ae..26b15e59b467 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -1400,7 +1400,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow /** This method will open a dialog so the user can select GDAL sublayers to load * @returns true if any items were loaded */ - bool askUserForZipItemLayers( QString path ); + bool askUserForZipItemLayers( const QString &path ); /** This method will open a dialog so the user can select GDAL sublayers to load */ void askUserForGDALSublayers( QgsRasterLayer *layer ); diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp index 833153b04011..3cce7de4c89a 100644 --- a/src/app/qgsfieldsproperties.cpp +++ b/src/app/qgsfieldsproperties.cpp @@ -1056,7 +1056,7 @@ QStringList DragList::mimeTypes() const return QStringList() << QLatin1String( "application/x-qgsattributetabledesignerelement" ); } -QMimeData* DragList::mimeData( const QList items ) const +QMimeData* DragList::mimeData( const QList items ) const { if ( items.count() <= 0 ) return nullptr; @@ -1446,7 +1446,7 @@ QgsFieldsProperties::RelationEditorConfiguration QgsFieldsProperties::DesignerTr return mRelationEditorConfiguration; } -void QgsFieldsProperties::DesignerTreeItemData::setRelationEditorConfiguration( const QgsFieldsProperties::RelationEditorConfiguration& relationEditorConfiguration ) +void QgsFieldsProperties::DesignerTreeItemData::setRelationEditorConfiguration( QgsFieldsProperties::RelationEditorConfiguration relationEditorConfiguration ) { mRelationEditorConfiguration = relationEditorConfiguration; } diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h index 6e63d45ca1b4..71b04d3bb3c7 100644 --- a/src/app/qgsfieldsproperties.h +++ b/src/app/qgsfieldsproperties.h @@ -98,7 +98,7 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope void setVisibilityExpression( const QgsOptionalExpression& visibilityExpression ); RelationEditorConfiguration relationEditorConfiguration() const; - void setRelationEditorConfiguration( const RelationEditorConfiguration& relationEditorConfiguration ); + void setRelationEditorConfiguration( RelationEditorConfiguration relationEditorConfiguration ); private: Type mType; @@ -272,7 +272,7 @@ class DragList : public QTableWidget protected: virtual QStringList mimeTypes() const override; - virtual QMimeData* mimeData( const QList items ) const override; + virtual QMimeData* mimeData( const QList items ) const override; }; /** diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp index 9b16629bb295..512be828600d 100644 --- a/src/app/qgslabelinggui.cpp +++ b/src/app/qgslabelinggui.cpp @@ -503,7 +503,7 @@ void QgsLabelingGui::setDockMode( bool enabled ) mDockMode = enabled; } -void QgsLabelingGui::connectValueChanged( QList widgets, const char *slot ) +void QgsLabelingGui::connectValueChanged( const QList& widgets, const char *slot ) { Q_FOREACH ( QWidget* widget, widgets ) { diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h index 058c71fe1138..e0a7cba5ae75 100644 --- a/src/app/qgslabelinggui.h +++ b/src/app/qgslabelinggui.h @@ -53,7 +53,7 @@ class APP_EXPORT QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase public slots: void setLayer( QgsMapLayer* layer ); void setDockMode( bool enabled ); - void connectValueChanged( QList widgets, const char* slot ); + void connectValueChanged( const QList &widgets, const char* slot ); void init(); void collapseSample( bool collapse ); diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp index 27c170dadff6..078f21080a1b 100644 --- a/src/app/qgslayerstylingwidget.cpp +++ b/src/app/qgslayerstylingwidget.cpp @@ -45,7 +45,7 @@ #include "qgsruntimeprofiler.h" -QgsLayerStylingWidget::QgsLayerStylingWidget( QgsMapCanvas* canvas, QList pages, QWidget *parent ) +QgsLayerStylingWidget::QgsLayerStylingWidget( QgsMapCanvas* canvas, const QList& pages, QWidget *parent ) : QWidget( parent ) , mNotSupportedPage( 0 ) , mLayerPage( 1 ) @@ -94,7 +94,7 @@ QgsLayerStylingWidget::~QgsLayerStylingWidget() delete mStyleManagerFactory; } -void QgsLayerStylingWidget::setPageFactories( QList factories ) +void QgsLayerStylingWidget::setPageFactories( const QList& factories ) { mPageFactories = factories; // Always append the style manager factory at the bottom of the list diff --git a/src/app/qgslayerstylingwidget.h b/src/app/qgslayerstylingwidget.h index 7725b9435ea8..1ab3332d77d6 100644 --- a/src/app/qgslayerstylingwidget.h +++ b/src/app/qgslayerstylingwidget.h @@ -85,11 +85,11 @@ class APP_EXPORT QgsLayerStylingWidget : public QWidget, private Ui::QgsLayerSty History, }; - QgsLayerStylingWidget( QgsMapCanvas *canvas, QList pages, QWidget *parent = 0 ); + QgsLayerStylingWidget( QgsMapCanvas *canvas, const QList &pages, QWidget *parent = 0 ); ~QgsLayerStylingWidget(); QgsMapLayer* layer() { return mCurrentLayer; } - void setPageFactories( QList factories ); + void setPageFactories( const QList &factories ); /** Sets whether updates of the styling widget are blocked. This can be called to prevent * the widget being refreshed multiple times when a batch of layer style changes are diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp index b5e3d491e821..1b2e7d17a195 100644 --- a/src/app/qgsmeasuretool.cpp +++ b/src/app/qgsmeasuretool.cpp @@ -285,7 +285,7 @@ void QgsMeasureTool::addPoint( const QgsPoint &point ) } -QgsPoint QgsMeasureTool::snapPoint( const QPoint& p ) +QgsPoint QgsMeasureTool::snapPoint( QPoint p ) { QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToMap( p ); return m.isValid() ? m.point() : mCanvas->getCoordinateTransform()->toMapCoordinates( p ); diff --git a/src/app/qgsmeasuretool.h b/src/app/qgsmeasuretool.h index a1327d14cb5a..72900357bc87 100644 --- a/src/app/qgsmeasuretool.h +++ b/src/app/qgsmeasuretool.h @@ -103,7 +103,7 @@ class APP_EXPORT QgsMeasureTool : public QgsMapTool //! Returns the snapped (map) coordinate //@param p (pixel) coordinate - QgsPoint snapPoint( const QPoint& p ); + QgsPoint snapPoint( QPoint p ); /** Removes the last vertex from mRubberBand*/ void undo(); diff --git a/src/core/auth/qgsauthmethod.h b/src/core/auth/qgsauthmethod.h index c4030f3d342e..f40e592140bd 100644 --- a/src/core/auth/qgsauthmethod.h +++ b/src/core/auth/qgsauthmethod.h @@ -156,7 +156,7 @@ class CORE_EXPORT QgsAuthMethod : public QObject void setVersion( int version ) { mVersion = version; } /** Set the support expansions (points in providers where the authentication is injected) of the auth method */ - void setExpansions( const QgsAuthMethod::Expansions& expansions ) { mExpansions = expansions; } + void setExpansions( QgsAuthMethod::Expansions expansions ) { mExpansions = expansions; } /** Set list of data providers this auth method supports */ void setDataProviders( const QStringList& dataproviders ) { mDataProviders = dataproviders; } diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp index 3ab48ea021cb..230d53743d56 100644 --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp @@ -1076,7 +1076,7 @@ void QgsComposerMapGrid::drawCoordinateAnnotations( QPainter* p, const QList< QP } } -void QgsComposerMapGrid::drawCoordinateAnnotation( QPainter* p, QPointF pos, QString annotationString, const AnnotationCoordinate coordinateType, GridExtension* extension ) const +void QgsComposerMapGrid::drawCoordinateAnnotation( QPainter* p, QPointF pos, const QString& annotationString, const AnnotationCoordinate coordinateType, GridExtension* extension ) const { if ( !mComposerMap ) { @@ -2188,7 +2188,7 @@ void QgsComposerMapGrid::setAnnotationDirection( const QgsComposerMapGrid::Annot } } -void QgsComposerMapGrid::setFrameSideFlags( const FrameSideFlags& flags ) +void QgsComposerMapGrid::setFrameSideFlags( FrameSideFlags flags ) { mGridFrameSides = flags; } diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h index 74aea6553a2b..b65c88f86522 100644 --- a/src/core/composer/qgscomposermapgrid.h +++ b/src/core/composer/qgscomposermapgrid.h @@ -715,7 +715,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem * @see frameSideFlags * @see testFrameSideFlag */ - void setFrameSideFlags( const FrameSideFlags& flags ); + void setFrameSideFlags( QgsComposerMapGrid::FrameSideFlags flags ); /** Sets whether the grid frame is drawn for a certain side of the map item. * @param flag flag for grid frame side @@ -962,7 +962,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Draw an annotation. If optional extension argument is specified, nothing will be drawn and instead * the extension of the annotation outside of the map frame will be stored in this variable. */ - void drawCoordinateAnnotation( QPainter* p, QPointF pos, QString annotationString, const AnnotationCoordinate coordinateType, GridExtension* extension = nullptr ) const; + void drawCoordinateAnnotation( QPainter* p, QPointF pos, const QString &annotationString, const AnnotationCoordinate coordinateType, GridExtension* extension = nullptr ) const; /** Draws a single annotation * @param p drawing painter diff --git a/src/core/composer/qgscomposernodesitem.cpp b/src/core/composer/qgscomposernodesitem.cpp index 6fe0e1a6de68..bc175e85583d 100644 --- a/src/core/composer/qgscomposernodesitem.cpp +++ b/src/core/composer/qgscomposernodesitem.cpp @@ -23,7 +23,7 @@ #include #include -QgsComposerNodesItem::QgsComposerNodesItem( QString tagName, +QgsComposerNodesItem::QgsComposerNodesItem( const QString& tagName, QgsComposition* c ) : QgsComposerItem( c ) , mTagName( tagName ) @@ -32,8 +32,8 @@ QgsComposerNodesItem::QgsComposerNodesItem( QString tagName, { } -QgsComposerNodesItem::QgsComposerNodesItem( QString tagName, - QPolygonF polygon, +QgsComposerNodesItem::QgsComposerNodesItem( const QString& tagName, + const QPolygonF& polygon, QgsComposition* c ) : QgsComposerItem( c ) , mTagName( tagName ) @@ -51,13 +51,13 @@ QgsComposerNodesItem::~QgsComposerNodesItem() { } -double QgsComposerNodesItem::computeDistance( const QPointF &pt1, - const QPointF &pt2 ) const +double QgsComposerNodesItem::computeDistance( QPointF pt1, + QPointF pt2 ) const { return sqrt( pow( pt1.x() - pt2.x(), 2 ) + pow( pt1.y() - pt2.y(), 2 ) ); } -bool QgsComposerNodesItem::addNode( const QPointF &pt, +bool QgsComposerNodesItem::addNode( QPointF pt, const bool checkArea, const double radius ) { @@ -260,7 +260,7 @@ bool QgsComposerNodesItem::removeNode( const int index ) return rc; } -bool QgsComposerNodesItem::moveNode( const int index, const QPointF &pt ) +bool QgsComposerNodesItem::moveNode( const int index, QPointF pt ) { bool rc( false ); diff --git a/src/core/composer/qgscomposernodesitem.h b/src/core/composer/qgscomposernodesitem.h index 4c295051837e..05a68034ca55 100644 --- a/src/core/composer/qgscomposernodesitem.h +++ b/src/core/composer/qgscomposernodesitem.h @@ -36,14 +36,14 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem * @param mTagName tag used in XML file * @param c parent composition */ - QgsComposerNodesItem( QString mTagName, QgsComposition* c ); + QgsComposerNodesItem( const QString &mTagName, QgsComposition* c ); /** Constructor * @param mTagName tag used in XML file * @param polygon nodes of the shape * @param c parent composition */ - QgsComposerNodesItem( QString mTagName, QPolygonF polygon, QgsComposition* c ); + QgsComposerNodesItem( const QString &mTagName, const QPolygonF &polygon, QgsComposition* c ); /** Destructor */ ~QgsComposerNodesItem(); @@ -55,7 +55,7 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem * true. Typically, if this flag is true, the new node has to be nearest * than radius to the shape to be added. */ - bool addNode( const QPointF &pt, const bool checkArea = true, const double radius = 10 ); + bool addNode( QPointF pt, const bool checkArea = true, const double radius = 10 ); /** Set a tag to indicate if we want to draw or not the shape's nodes. * @param display @@ -66,7 +66,7 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem * @param index the index of the node to move * @param node is the new position in scene coordinate */ - bool moveNode( const int index, const QPointF &node ); + bool moveNode( const int index, QPointF node ); /** \brief Reimplementation of QCanvasItem::paint - draw on canvas */ void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget ) override; @@ -127,7 +127,7 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem QPolygonF mPolygon; /** Method called in addNode. */ - virtual bool _addNode( const int nodeIndex, const QPointF &newNode, const double radius ) = 0; + virtual bool _addNode( const int nodeIndex, QPointF newNode, const double radius ) = 0; /** Method called in removeNode. */ virtual bool _removeNode( const int nodeIndex ) = 0; @@ -146,7 +146,7 @@ class CORE_EXPORT QgsComposerNodesItem: public QgsComposerItem void rescaleToFitBoundingBox(); /** Compute an euclidian distance between 2 nodes. */ - double computeDistance( const QPointF &pt1, const QPointF &pt2 ) const; + double computeDistance( QPointF pt1, QPointF pt2 ) const; /** Update the current scene rectangle for this item. */ void updateSceneRect(); diff --git a/src/core/composer/qgscomposerpolygon.cpp b/src/core/composer/qgscomposerpolygon.cpp index d376af4252f4..c0f87faafba0 100644 --- a/src/core/composer/qgscomposerpolygon.cpp +++ b/src/core/composer/qgscomposerpolygon.cpp @@ -29,7 +29,7 @@ QgsComposerPolygon::QgsComposerPolygon( QgsComposition* c ) createDefaultPolygonStyleSymbol(); } -QgsComposerPolygon::QgsComposerPolygon( QPolygonF polygon, QgsComposition* c ) +QgsComposerPolygon::QgsComposerPolygon( const QPolygonF& polygon, QgsComposition* c ) : QgsComposerNodesItem( "ComposerPolygon", polygon, c ) , mPolygonStyleSymbol( nullptr ) { @@ -41,7 +41,7 @@ QgsComposerPolygon::~QgsComposerPolygon() } bool QgsComposerPolygon::_addNode( const int indexPoint, - const QPointF &newPoint, + QPointF newPoint, const double radius ) { Q_UNUSED( radius ); diff --git a/src/core/composer/qgscomposerpolygon.h b/src/core/composer/qgscomposerpolygon.h index ea157a4fb37e..e6d027447285 100644 --- a/src/core/composer/qgscomposerpolygon.h +++ b/src/core/composer/qgscomposerpolygon.h @@ -43,7 +43,7 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem * @param polygon nodes of the shape * @param c parent composition */ - QgsComposerPolygon( QPolygonF polygon, QgsComposition* c ); + QgsComposerPolygon( const QPolygonF &polygon, QgsComposition* c ); /** Destructor */ ~QgsComposerPolygon(); @@ -67,7 +67,7 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem /** Add the node newPoint at the given position according to some * criteres. */ - bool _addNode( const int indexPoint, const QPointF &newPoint, const double radius ) override; + bool _addNode( const int indexPoint, QPointF newPoint, const double radius ) override; bool _removeNode( const int nodeIndex ) override; diff --git a/src/core/composer/qgscomposerpolyline.cpp b/src/core/composer/qgscomposerpolyline.cpp index 5749bf08fbc9..21491d1a9077 100644 --- a/src/core/composer/qgscomposerpolyline.cpp +++ b/src/core/composer/qgscomposerpolyline.cpp @@ -29,7 +29,7 @@ QgsComposerPolyline::QgsComposerPolyline( QgsComposition* c ) createDefaultPolylineStyleSymbol(); } -QgsComposerPolyline::QgsComposerPolyline( QPolygonF polyline, QgsComposition* c ) +QgsComposerPolyline::QgsComposerPolyline( const QPolygonF& polyline, QgsComposition* c ) : QgsComposerNodesItem( "ComposerPolyline", polyline, c ) , mPolylineStyleSymbol( nullptr ) { @@ -41,7 +41,7 @@ QgsComposerPolyline::~QgsComposerPolyline() } bool QgsComposerPolyline::_addNode( const int indexPoint, - const QPointF &newPoint, + QPointF newPoint, const double radius ) { const double distStart = computeDistance( newPoint, mPolygon[0] ); diff --git a/src/core/composer/qgscomposerpolyline.h b/src/core/composer/qgscomposerpolyline.h index d9472f17c79d..c9c03ea4abd8 100644 --- a/src/core/composer/qgscomposerpolyline.h +++ b/src/core/composer/qgscomposerpolyline.h @@ -42,7 +42,7 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem * @param polyline nodes of the shape * @param c parent composition */ - QgsComposerPolyline( QPolygonF polyline, QgsComposition* c ); + QgsComposerPolyline( const QPolygonF &polyline, QgsComposition* c ); /** Destructor */ ~QgsComposerPolyline(); @@ -66,7 +66,7 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem /** Add the node newPoint at the given position according to some * criteres. */ - bool _addNode( const int indexPoint, const QPointF &newPoint, const double radius ) override; + bool _addNode( const int indexPoint, QPointF newPoint, const double radius ) override; bool _removeNode( const int nodeIndex ) override; diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index 4c1d20920c36..ec17ee2cacb2 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -4242,7 +4242,7 @@ QString QgsDxfExport::layerName( QgsVectorLayer *vl ) const return mLayerTitleAsName && !vl->title().isEmpty() ? vl->title() : vl->name(); } -void QgsDxfExport::drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings ) +void QgsDxfExport::drawLabel( const QString& layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings ) { Q_UNUSED( context ); @@ -4379,7 +4379,7 @@ void QgsDxfExport::drawLabel( QString layerId, QgsRenderContext& context, pal::L } -void QgsDxfExport::registerDxfLayer( QString layerId, QgsFeatureId fid, QString layerName ) +void QgsDxfExport::registerDxfLayer( const QString& layerId, QgsFeatureId fid, const QString& layerName ) { if ( !mDxfLayerNames.contains( layerId ) ) mDxfLayerNames[ layerId ] = QMap(); diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h index 18707e11061a..77004fd30126 100644 --- a/src/core/dxf/qgsdxfexport.h +++ b/src/core/dxf/qgsdxfexport.h @@ -318,14 +318,14 @@ class CORE_EXPORT QgsDxfExport * @param settings label settings * @note not available in Python bindings */ - void drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings ); + void drawLabel( const QString &layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings ); /** Register name of layer for feature * @param layerId id of layer * @param fid id of feature * @param layer dxf layer of feature */ - void registerDxfLayer( QString layerId, QgsFeatureId fid, QString layer ); + void registerDxfLayer( const QString &layerId, QgsFeatureId fid, const QString &layer ); private: QList< QPair > mLayers; diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp index a378980f09a1..2885dd9bc050 100644 --- a/src/core/geometry/qgsgeometryutils.cpp +++ b/src/core/geometry/qgsgeometryutils.cpp @@ -90,7 +90,7 @@ QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometry& geom, con return minDistPoint; } -double QgsGeometryUtils::distanceToVertex( const QgsAbstractGeometry &geom, const QgsVertexId &id ) +double QgsGeometryUtils::distanceToVertex( const QgsAbstractGeometry &geom, QgsVertexId id ) { double currentDist = 0; QgsVertexId vertexId; diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h index 146ab23f11f8..412b790add07 100644 --- a/src/core/geometry/qgsgeometryutils.h +++ b/src/core/geometry/qgsgeometryutils.h @@ -47,7 +47,7 @@ class CORE_EXPORT QgsGeometryUtils * @returns distance to vertex (following geometry) * @note added in QGIS 2.16 */ - static double distanceToVertex( const QgsAbstractGeometry& geom, const QgsVertexId& id ); + static double distanceToVertex( const QgsAbstractGeometry& geom, QgsVertexId id ); /** Retrieves the vertices which are before and after the interpolated point at a specified distance along a linestring * (or polygon boundary). diff --git a/src/core/geometry/qgsgeos.h b/src/core/geometry/qgsgeos.h index 55979012b2a2..1bd5a229a2a8 100644 --- a/src/core/geometry/qgsgeos.h +++ b/src/core/geometry/qgsgeos.h @@ -207,7 +207,7 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine /// @cond PRIVATE -class GEOSException +class GEOSException // clazy:exclude=rule-of-three { public: explicit GEOSException( const QString& theMsg ) diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp index 3d325dfc0963..8f2dc19d2b86 100644 --- a/src/core/layertree/qgslayertreemodel.cpp +++ b/src/core/layertree/qgslayertreemodel.cpp @@ -1065,7 +1065,7 @@ bool QgsLayerTreeModel::removeRows( int row, int count, const QModelIndex& paren return false; } -void QgsLayerTreeModel::setFlags( const QgsLayerTreeModel::Flags& f ) +void QgsLayerTreeModel::setFlags( QgsLayerTreeModel::Flags f ) { mFlags = f; } diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h index 7095803cd257..575e1875a47b 100644 --- a/src/core/layertree/qgslayertreemodel.h +++ b/src/core/layertree/qgslayertreemodel.h @@ -91,7 +91,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel Q_DECLARE_FLAGS( Flags, Flag ) //! Set OR-ed combination of model flags - void setFlags( const QgsLayerTreeModel::Flags& f ); + void setFlags( QgsLayerTreeModel::Flags f ); //! Enable or disable a model flag void setFlag( Flag f, bool on = true ); //! Return OR-ed combination of model flags diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h index b91ca6e9aabd..b3a7105fa8d6 100644 --- a/src/core/pal/layer.h +++ b/src/core/pal/layer.h @@ -113,7 +113,7 @@ namespace pal * @param flags arrangement flags * @see arrangementFlags */ - void setArrangementFlags( const LineArrangementFlags& flags ) { mArrangementFlags = flags; } + void setArrangementFlags( LineArrangementFlags flags ) { mArrangementFlags = flags; } /** * \brief Sets whether the layer is currently active. diff --git a/src/core/qgsattributetableconfig.cpp b/src/core/qgsattributetableconfig.cpp index 4ccd15d54718..5752bf5b2b00 100644 --- a/src/core/qgsattributetableconfig.cpp +++ b/src/core/qgsattributetableconfig.cpp @@ -130,7 +130,7 @@ QgsAttributeTableConfig::ActionWidgetStyle QgsAttributeTableConfig::actionWidget return mActionWidgetStyle; } -void QgsAttributeTableConfig::setActionWidgetStyle( const ActionWidgetStyle& actionWidgetStyle ) +void QgsAttributeTableConfig::setActionWidgetStyle( ActionWidgetStyle actionWidgetStyle ) { mActionWidgetStyle = actionWidgetStyle; } @@ -240,7 +240,7 @@ Qt::SortOrder QgsAttributeTableConfig::sortOrder() const return mSortOrder; } -void QgsAttributeTableConfig::setSortOrder( const Qt::SortOrder& sortOrder ) +void QgsAttributeTableConfig::setSortOrder( Qt::SortOrder sortOrder ) { mSortOrder = sortOrder; } diff --git a/src/core/qgsattributetableconfig.h b/src/core/qgsattributetableconfig.h index 3897100bb2e6..d2fb4608b5e2 100644 --- a/src/core/qgsattributetableconfig.h +++ b/src/core/qgsattributetableconfig.h @@ -120,7 +120,7 @@ class CORE_EXPORT QgsAttributeTableConfig /** * Set the style of the action widget */ - void setActionWidgetStyle( const ActionWidgetStyle& actionWidgetStyle ); + void setActionWidgetStyle( ActionWidgetStyle actionWidgetStyle ); /** * Serialize to XML on layer save @@ -178,7 +178,7 @@ class CORE_EXPORT QgsAttributeTableConfig * Set the sort order * @note Added in 2.16 */ - void setSortOrder( const Qt::SortOrder& sortOrder ); + void setSortOrder( Qt::SortOrder sortOrder ); /** * Compare this configuration to other. diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp index dbd132998765..f481e80f2897 100644 --- a/src/core/qgsdataitem.cpp +++ b/src/core/qgsdataitem.cpp @@ -438,7 +438,7 @@ void QgsDataItem::refresh() } } -void QgsDataItem::refresh( QVector children ) +void QgsDataItem::refresh( const QVector& children ) { QgsDebugMsgLevel( "mPath = " + mPath, 2 ); @@ -896,7 +896,7 @@ void QgsDirectoryItem::directoryChanged() } } -bool QgsDirectoryItem::hiddenPath( QString path ) +bool QgsDirectoryItem::hiddenPath( const QString& path ) { QSettings settings; QStringList hiddenItems = settings.value( "/browser/hiddenPaths", @@ -1417,7 +1417,7 @@ QVector QgsZipItem::createChildren() return children; } -QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QString name ) +QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, const QString& path, const QString& name ) { return itemFromPath( parent, path, name, path ); } diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index 52ce2a9ac91b..1fafb8afeffa 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -187,13 +187,13 @@ class CORE_EXPORT QgsDataItem : public QObject Q_DECLARE_FLAGS( Capabilities, Capability ) // This will _write_ selected crs in data source - virtual bool setCrs( QgsCoordinateReferenceSystem crs ) + virtual bool setCrs( const QgsCoordinateReferenceSystem& crs ) { Q_UNUSED( crs ); return false; } // ### QGIS 3 - rename to capabilities() virtual Capabilities capabilities2() const { return mCapabilities; } - virtual void setCapabilities( const Capabilities& capabilities ) { mCapabilities = capabilities; } + virtual void setCapabilities( Capabilities capabilities ) { mCapabilities = capabilities; } // static methods @@ -236,7 +236,7 @@ class CORE_EXPORT QgsDataItem : public QObject protected: virtual void populate( const QVector& children ); - virtual void refresh( QVector children ); + virtual void refresh( const QVector &children ); /** The item is scheduled to be deleted. E.g. if deleteLater() is called when * item is in Populating state (createChildren() running in another thread), * the deferredDelete() returns true and item will be deleted once Populating finished. @@ -440,7 +440,7 @@ class CORE_EXPORT QgsDirectoryItem : public QgsDataCollectionItem virtual QWidget *paramWidget() override; /** Check if the given path is hidden from the browser model */ - static bool hiddenPath( QString path ); + static bool hiddenPath( const QString &path ); public slots: virtual void childrenCreated() override; @@ -555,7 +555,7 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem static QString vsiPrefix( const QString& uri ) { return qgsVsiPrefix( uri ); } - static QgsDataItem* itemFromPath( QgsDataItem* parent, QString path, QString name ); + static QgsDataItem* itemFromPath( QgsDataItem* parent, const QString &path, const QString &name ); //! @note available in python as itemFromFilePath static QgsDataItem* itemFromPath( QgsDataItem* parent, const QString& filePath, const QString& name, const QString& path ); diff --git a/src/core/qgsdatetimestatisticalsummary.cpp b/src/core/qgsdatetimestatisticalsummary.cpp index 00b00f72d31c..65c357700a02 100644 --- a/src/core/qgsdatetimestatisticalsummary.cpp +++ b/src/core/qgsdatetimestatisticalsummary.cpp @@ -28,7 +28,7 @@ * See details in QEP #17 ****************************************************************************/ -QgsDateTimeStatisticalSummary::QgsDateTimeStatisticalSummary( const QgsDateTimeStatisticalSummary::Statistics& stats ) +QgsDateTimeStatisticalSummary::QgsDateTimeStatisticalSummary( QgsDateTimeStatisticalSummary::Statistics stats ) : mStatistics( stats ) { reset(); diff --git a/src/core/qgsdatetimestatisticalsummary.h b/src/core/qgsdatetimestatisticalsummary.h index ce787c7f9e1a..e2979125b3a2 100644 --- a/src/core/qgsdatetimestatisticalsummary.h +++ b/src/core/qgsdatetimestatisticalsummary.h @@ -60,7 +60,7 @@ class CORE_EXPORT QgsDateTimeStatisticalSummary /** Constructor for QgsDateTimeStatisticalSummary * @param stats flags for statistics to calculate */ - QgsDateTimeStatisticalSummary( const QgsDateTimeStatisticalSummary::Statistics& stats = All ); + QgsDateTimeStatisticalSummary( QgsDateTimeStatisticalSummary::Statistics stats = All ); /** Returns flags which specify which statistics will be calculated. Some statistics * are always calculated (eg count). @@ -73,7 +73,7 @@ class CORE_EXPORT QgsDateTimeStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const Statistics& stats ) { mStatistics = stats; } + void setStatistics( Statistics stats ) { mStatistics = stats; } /** Resets the calculated values */ diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp index 8c010d7358c7..f0f2a7259c31 100644 --- a/src/core/qgsfeaturerequest.cpp +++ b/src/core/qgsfeaturerequest.cpp @@ -40,7 +40,7 @@ QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid ) { } -QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids ) +QgsFeatureRequest::QgsFeatureRequest( const QgsFeatureIds& fids ) : mFilter( FilterFids ) , mFilterFid( -1 ) , mFilterFids( fids ) @@ -182,7 +182,7 @@ QgsFeatureRequest& QgsFeatureRequest::setLimit( long limit ) return *this; } -QgsFeatureRequest& QgsFeatureRequest::setFlags( const QgsFeatureRequest::Flags& flags ) +QgsFeatureRequest& QgsFeatureRequest::setFlags( QgsFeatureRequest::Flags flags ) { mFlags = flags; return *this; diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h index 7c8d0a128ad1..bba2cc1075e3 100644 --- a/src/core/qgsfeaturerequest.h +++ b/src/core/qgsfeaturerequest.h @@ -228,7 +228,7 @@ class CORE_EXPORT QgsFeatureRequest //! construct a request with feature ID filter explicit QgsFeatureRequest( QgsFeatureId fid ); //! construct a request with feature ID filter - explicit QgsFeatureRequest( QgsFeatureIds fids ); + explicit QgsFeatureRequest( const QgsFeatureIds &fids ); //! construct a request with rectangle filter explicit QgsFeatureRequest( const QgsRectangle& rect ); //! construct a request with a filter expression @@ -362,7 +362,7 @@ class CORE_EXPORT QgsFeatureRequest long limit() const { return mLimit; } //! Set flags that affect how features will be fetched - QgsFeatureRequest& setFlags( const QgsFeatureRequest::Flags& flags ); + QgsFeatureRequest& setFlags( QgsFeatureRequest::Flags flags ); const Flags& flags() const { return mFlags; } //! Set a subset of attributes that will be fetched. Empty list means that all attributes are used. diff --git a/src/core/qgsfields.h b/src/core/qgsfields.h index 7be72c736048..8fc6891d1597 100644 --- a/src/core/qgsfields.h +++ b/src/core/qgsfields.h @@ -205,12 +205,12 @@ class CORE_EXPORT QgsFields inline QgsField& operator*() const { return d->field; } inline QgsField* operator->() const { return &d->field; } inline QgsField& operator[]( difference_type j ) const { return d[j].field; } - inline bool operator==( const iterator &o ) const noexcept { return d == o.d; } - inline bool operator!=( const iterator &o ) const noexcept { return d != o.d; } - inline bool operator<( const iterator& other ) const noexcept { return d < other.d; } - inline bool operator<=( const iterator& other ) const noexcept { return d <= other.d; } - inline bool operator>( const iterator& other ) const noexcept { return d > other.d; } - inline bool operator>=( const iterator& other ) const noexcept { return d >= other.d; } + inline bool operator==( const iterator &o ) const noexcept { return d == o.d; } // clazy:exclude=function-args-by-value + inline bool operator!=( const iterator &o ) const noexcept { return d != o.d; } // clazy:exclude=function-args-by-value + inline bool operator<( const iterator& other ) const noexcept { return d < other.d; } // clazy:exclude=function-args-by-value + inline bool operator<=( const iterator& other ) const noexcept { return d <= other.d; } // clazy:exclude=function-args-by-value + inline bool operator>( const iterator& other ) const noexcept { return d > other.d; } // clazy:exclude=function-args-by-value + inline bool operator>=( const iterator& other ) const noexcept { return d >= other.d; } // clazy:exclude=function-args-by-value inline iterator& operator++() { ++d; return *this; } inline iterator operator++( int ) { QgsFields::Field* n = d; ++d; return n; } @@ -224,7 +224,7 @@ class CORE_EXPORT QgsFields }; friend class iterator; - class const_iterator + class const_iterator // clazy:exclude=rule-of-three { public: const QgsFields::Field* d; @@ -238,7 +238,7 @@ class CORE_EXPORT QgsFields : d( f ) {} inline const_iterator( const const_iterator &o ) : d( o.d ) {} - inline explicit const_iterator( const iterator &o ) + inline explicit const_iterator( const iterator &o ) // clazy:exclude=function-args-by-value : d( o.d ) {} inline const QgsField& operator*() const { return d->field; } inline const QgsField* operator->() const { return &d->field; } @@ -257,7 +257,7 @@ class CORE_EXPORT QgsFields inline const_iterator& operator-=( difference_type j ) { d -= j; return *this; } inline const_iterator operator+( difference_type j ) const { return const_iterator( d + j ); } inline const_iterator operator-( difference_type j ) const { return const_iterator( d -j ); } - inline int operator-( const_iterator j ) const { return int( d - j.d ); } + inline int operator-( const_iterator j ) const { return int( d - j.d ); } // clazy:exclude=function-args-by-ref }; friend class const_iterator; ///@endcond diff --git a/src/core/qgsinterval.cpp b/src/core/qgsinterval.cpp index 13047da3277f..30152c327c33 100644 --- a/src/core/qgsinterval.cpp +++ b/src/core/qgsinterval.cpp @@ -39,7 +39,7 @@ QgsInterval::QgsInterval( double seconds ) , mValid( true ) { } -bool QgsInterval::operator==( const QgsInterval& other ) const +bool QgsInterval::operator==( QgsInterval other ) const { if ( !mValid && !other.mValid ) return true; @@ -125,18 +125,18 @@ QgsInterval operator-( const QDateTime& dt1, const QDateTime& dt2 ) return QgsInterval( mSeconds / 1000.0 ); } -QDateTime operator+( const QDateTime& start, const QgsInterval& interval ) +QDateTime operator+( const QDateTime& start, QgsInterval interval ) { return start.addMSecs( static_cast( interval.seconds() * 1000.0 ) ); } -QgsInterval operator-( const QDate& date1, const QDate& date2 ) +QgsInterval operator-( QDate date1, QDate date2 ) { qint64 seconds = static_cast< qint64 >( date2.daysTo( date1 ) ) * 24 * 60 * 60; return QgsInterval( seconds ); } -QgsInterval operator-( const QTime& time1, const QTime& time2 ) +QgsInterval operator-( QTime time1, QTime time2 ) { qint64 mSeconds = time2.msecsTo( time1 ); return QgsInterval( mSeconds / 1000.0 ); diff --git a/src/core/qgsinterval.h b/src/core/qgsinterval.h index 291a2a5b9e2e..5e11cd3b2c43 100644 --- a/src/core/qgsinterval.h +++ b/src/core/qgsinterval.h @@ -147,7 +147,7 @@ class CORE_EXPORT QgsInterval */ void setValid( bool valid ) { mValid = valid; } - bool operator==( const QgsInterval& other ) const; + bool operator==( QgsInterval other ) const; /** Converts a string to an interval * @param string string to parse @@ -186,7 +186,7 @@ QgsInterval CORE_EXPORT operator-( const QDateTime& datetime1, const QDateTime& * @note added in QGIS 2.16 * @note not available in Python bindings */ -QgsInterval CORE_EXPORT operator-( const QDate& date1, const QDate& date2 ); +QgsInterval CORE_EXPORT operator-( QDate date1, QDate date2 ); /** Returns the interval between two times. * @param time1 start time @@ -194,7 +194,7 @@ QgsInterval CORE_EXPORT operator-( const QDate& date1, const QDate& date2 ); * @note added in QGIS 2.16 * @note not available in Python bindings */ -QgsInterval CORE_EXPORT operator-( const QTime& time1, const QTime& time2 ); +QgsInterval CORE_EXPORT operator-( QTime time1, QTime time2 ); /** Adds an interval to a datetime * @param start initial datetime diff --git a/src/core/qgslabelingengine.h b/src/core/qgslabelingengine.h index 030e0f74ee9a..04bce0eea4ce 100644 --- a/src/core/qgslabelingengine.h +++ b/src/core/qgslabelingengine.h @@ -197,7 +197,7 @@ class CORE_EXPORT QgsLabelingEngine QgsLabelingResults* results() const { return mResults; } //! Set flags of the labeling engine - void setFlags( const Flags& flags ) { mFlags = flags; } + void setFlags( Flags flags ) { mFlags = flags; } //! Get flags of the labeling engine Flags flags() const { return mFlags; } //! Test whether a particular flag is enabled diff --git a/src/core/qgsmaplayerdependency.h b/src/core/qgsmaplayerdependency.h index c66842e0f67e..0f77cbb86766 100644 --- a/src/core/qgsmaplayerdependency.h +++ b/src/core/qgsmaplayerdependency.h @@ -48,7 +48,7 @@ class CORE_EXPORT QgsMapLayerDependency }; //! Standard constructor - QgsMapLayerDependency( QString layerId, Type type = DataDependency, Origin origin = FromUser ) : + QgsMapLayerDependency( const QString& layerId, Type type = DataDependency, Origin origin = FromUser ) : mType( type ), mOrigin( origin ), mLayerId( layerId ) diff --git a/src/core/qgsmaplayerproxymodel.cpp b/src/core/qgsmaplayerproxymodel.cpp index a93d0599f16f..4372e58560f0 100644 --- a/src/core/qgsmaplayerproxymodel.cpp +++ b/src/core/qgsmaplayerproxymodel.cpp @@ -32,7 +32,7 @@ QgsMapLayerProxyModel::QgsMapLayerProxyModel( QObject *parent ) sort( 0 ); } -QgsMapLayerProxyModel *QgsMapLayerProxyModel::setFilters( const Filters& filters ) +QgsMapLayerProxyModel *QgsMapLayerProxyModel::setFilters( Filters filters ) { mFilters = filters; invalidateFilter(); diff --git a/src/core/qgsmaplayerproxymodel.h b/src/core/qgsmaplayerproxymodel.h index d15b2c5474f6..6835606205d6 100644 --- a/src/core/qgsmaplayerproxymodel.h +++ b/src/core/qgsmaplayerproxymodel.h @@ -67,7 +67,7 @@ class CORE_EXPORT QgsMapLayerProxyModel : public QSortFilterProxyModel * @param filters are Filter flags * @note added in 2.3 */ - QgsMapLayerProxyModel* setFilters( const QgsMapLayerProxyModel::Filters& filters ); + QgsMapLayerProxyModel* setFilters( QgsMapLayerProxyModel::Filters filters ); const Filters& filters() const { return mFilters; } //! offer the possibility to except some layers to be listed diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp index 67e07bac74d7..8222ce4ef907 100644 --- a/src/core/qgsmaprenderercustompainterjob.cpp +++ b/src/core/qgsmaprenderercustompainterjob.cpp @@ -173,7 +173,7 @@ QgsLabelingResults* QgsMapRendererCustomPainterJob::takeLabelingResults() } -void QgsMapRendererCustomPainterJob::waitForFinishedWithEventLoop( const QEventLoop::ProcessEventsFlags& flags ) +void QgsMapRendererCustomPainterJob::waitForFinishedWithEventLoop( QEventLoop::ProcessEventsFlags flags ) { QEventLoop loop; connect( &mFutureWatcher, SIGNAL( finished() ), &loop, SLOT( quit() ) ); diff --git a/src/core/qgsmaprenderercustompainterjob.h b/src/core/qgsmaprenderercustompainterjob.h index 4f84b3c3df17..01387dd12ad4 100644 --- a/src/core/qgsmaprenderercustompainterjob.h +++ b/src/core/qgsmaprenderercustompainterjob.h @@ -57,7 +57,7 @@ class CORE_EXPORT QgsMapRendererCustomPainterJob : public QgsMapRendererJob * Ideally the "wait for finished" method should not be used at all. The code triggering * rendering should not need to actively wait for rendering to finish. */ - void waitForFinishedWithEventLoop( const QEventLoop::ProcessEventsFlags& flags = QEventLoop::AllEvents ); + void waitForFinishedWithEventLoop( QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents ); /** * Render the map synchronously in this thread. The function does not return until the map diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp index 3441bf51d17c..ad521dcbcaa0 100644 --- a/src/core/qgsmapsettings.cpp +++ b/src/core/qgsmapsettings.cpp @@ -305,7 +305,7 @@ void QgsMapSettings::setMapUnits( QgsUnitTypes::DistanceUnit u ) updateDerived(); } -void QgsMapSettings::setFlags( const QgsMapSettings::Flags& flags ) +void QgsMapSettings::setFlags( QgsMapSettings::Flags flags ) { mFlags = flags; } diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h index 452c391ab2cd..06e5624caa9e 100644 --- a/src/core/qgsmapsettings.h +++ b/src/core/qgsmapsettings.h @@ -171,7 +171,7 @@ class CORE_EXPORT QgsMapSettings Q_DECLARE_FLAGS( Flags, Flag ) //! Set combination of flags that will be used for rendering - void setFlags( const QgsMapSettings::Flags& flags ); + void setFlags( QgsMapSettings::Flags flags ); //! Enable or disable a particular flag (other flags are not affected) void setFlag( Flag flag, bool on = true ); //! Return combination of flags used for rendering diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp index 795f84e76c9e..7b27b2debde4 100644 --- a/src/core/qgsproject.cpp +++ b/src/core/qgsproject.cpp @@ -2126,7 +2126,7 @@ QgsMapThemeCollection* QgsProject::mapThemeCollection() return mMapThemeCollection.data(); } -void QgsProject::setNonIdentifiableLayers( QList layers ) +void QgsProject::setNonIdentifiableLayers( const QList& layers ) { QStringList currentLayers = nonIdentifiableLayers(); diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h index f6c23f164a14..d8d06aca731c 100644 --- a/src/core/qgsproject.h +++ b/src/core/qgsproject.h @@ -398,7 +398,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera /** * Set a list of layers which should not be taken into account on map identification */ - void setNonIdentifiableLayers( QList layers ); + void setNonIdentifiableLayers( const QList &layers ); /** * Set a list of layers which should not be taken into account on map identification diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp index 8a6957adc8e9..914c839242df 100644 --- a/src/core/qgsrendercontext.cpp +++ b/src/core/qgsrendercontext.cpp @@ -91,7 +91,7 @@ QgsRenderContext::~QgsRenderContext() mFeatureFilterProvider = nullptr; } -void QgsRenderContext::setFlags( const QgsRenderContext::Flags& flags ) +void QgsRenderContext::setFlags( QgsRenderContext::Flags flags ) { mFlags = flags; } diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h index c3d91c236848..5c24c994a69a 100644 --- a/src/core/qgsrendercontext.h +++ b/src/core/qgsrendercontext.h @@ -72,7 +72,7 @@ class CORE_EXPORT QgsRenderContext /** Set combination of flags that will be used for rendering. * @note added in QGIS 2.14 */ - void setFlags( const QgsRenderContext::Flags& flags ); + void setFlags( QgsRenderContext::Flags flags ); /** Enable or disable a particular flag (other flags are not affected) * @note added in QGIS 2.14 diff --git a/src/core/qgssnappingconfig.cpp b/src/core/qgssnappingconfig.cpp index 3ffbaa6903c5..c09a4a52e455 100644 --- a/src/core/qgssnappingconfig.cpp +++ b/src/core/qgssnappingconfig.cpp @@ -266,7 +266,7 @@ QgsSnappingConfig::IndividualLayerSettings QgsSnappingConfig::individualLayerSet } } -void QgsSnappingConfig::setIndividualLayerSettings( QgsVectorLayer* vl, IndividualLayerSettings individualLayerSettings ) +void QgsSnappingConfig::setIndividualLayerSettings( QgsVectorLayer* vl, const IndividualLayerSettings& individualLayerSettings ) { if ( !vl || mIndividualLayerSettings.value( vl ) == individualLayerSettings ) { diff --git a/src/core/qgssnappingconfig.h b/src/core/qgssnappingconfig.h index f9639ea884a2..1143ebfcdae4 100644 --- a/src/core/qgssnappingconfig.h +++ b/src/core/qgssnappingconfig.h @@ -167,7 +167,7 @@ class CORE_EXPORT QgsSnappingConfig QgsSnappingConfig::IndividualLayerSettings individualLayerSettings( QgsVectorLayer* vl ) const; //! set individual layer snappings settings (applied if mode is AdvancedConfiguration) - void setIndividualLayerSettings( QgsVectorLayer* vl, QgsSnappingConfig::IndividualLayerSettings individualLayerSettings ); + void setIndividualLayerSettings( QgsVectorLayer* vl, const IndividualLayerSettings &individualLayerSettings ); /** * Compare this configuration to other. diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp index f478404fe34b..86c0198479aa 100644 --- a/src/core/qgssnappingutils.cpp +++ b/src/core/qgssnappingutils.cpp @@ -531,7 +531,7 @@ QgsCoordinateReferenceSystem QgsSnappingUtils::destinationCrs() const return mMapSettings.hasCrsTransformEnabled() ? mMapSettings.destinationCrs() : QgsCoordinateReferenceSystem(); } -void QgsSnappingUtils::onIndividualLayerSettingsChanged( const QHash layerSettings ) +void QgsSnappingUtils::onIndividualLayerSettingsChanged( const QHash& layerSettings ) { mLayers.clear(); diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h index c968d7e965e7..72d53a3e8ab1 100644 --- a/src/core/qgssnappingutils.h +++ b/src/core/qgssnappingutils.h @@ -177,7 +177,7 @@ class CORE_EXPORT QgsSnappingUtils : public QObject virtual void prepareIndexProgress( int index ) { Q_UNUSED( index ); } private: - void onIndividualLayerSettingsChanged( const QHash layerSettings ); + void onIndividualLayerSettingsChanged( const QHash &layerSettings ); //! Get destination CRS from map settings, or an invalid CRS if projections are disabled QgsCoordinateReferenceSystem destinationCrs() const; diff --git a/src/core/qgssqlexpressioncompiler.cpp b/src/core/qgssqlexpressioncompiler.cpp index 9cba8b2fe73b..fd1dfaac885f 100644 --- a/src/core/qgssqlexpressioncompiler.cpp +++ b/src/core/qgssqlexpressioncompiler.cpp @@ -15,7 +15,7 @@ #include "qgssqlexpressioncompiler.h" -QgsSqlExpressionCompiler::QgsSqlExpressionCompiler( const QgsFields& fields, const Flags& flags ) +QgsSqlExpressionCompiler::QgsSqlExpressionCompiler( const QgsFields& fields, Flags flags ) : mResult( None ) , mFields( fields ) , mFlags( flags ) diff --git a/src/core/qgssqlexpressioncompiler.h b/src/core/qgssqlexpressioncompiler.h index 5b9bf5f62d1e..5a083626816e 100644 --- a/src/core/qgssqlexpressioncompiler.h +++ b/src/core/qgssqlexpressioncompiler.h @@ -58,7 +58,7 @@ class CORE_EXPORT QgsSqlExpressionCompiler * @param fields fields from provider * @param flags flags which control how expression is compiled */ - explicit QgsSqlExpressionCompiler( const QgsFields& fields, const Flags& flags = Flags() ); + explicit QgsSqlExpressionCompiler( const QgsFields& fields, QgsSqlExpressionCompiler::Flags flags = Flags() ); virtual ~QgsSqlExpressionCompiler(); /** Compiles an expression and returns the result of the compilation. diff --git a/src/core/qgssqlstatement.cpp b/src/core/qgssqlstatement.cpp index 0d761267ad9a..a117983e257e 100644 --- a/src/core/qgssqlstatement.cpp +++ b/src/core/qgssqlstatement.cpp @@ -71,7 +71,7 @@ QString QgsSQLStatement::quotedIdentifier( QString name ) return QString( "\"%1\"" ).arg( name.replace( '\"', "\"\"" ) ); } -QString QgsSQLStatement::quotedIdentifierIfNeeded( QString name ) +QString QgsSQLStatement::quotedIdentifierIfNeeded( const QString& name ) { // This might not be complete, but it must be at least what we recognize static const char* const reservedKeyWords[] = diff --git a/src/core/qgssqlstatement.h b/src/core/qgssqlstatement.h index 2a7f2f9f2228..0fdbc5532f0c 100644 --- a/src/core/qgssqlstatement.h +++ b/src/core/qgssqlstatement.h @@ -83,7 +83,7 @@ class CORE_EXPORT QgsSQLStatement * otherwise the original string. * @see quotedString(), quotedIdentifier() */ - static QString quotedIdentifierIfNeeded( QString name ); + static QString quotedIdentifierIfNeeded( const QString &name ); /** Remove double quotes from an identifier. * @see quotedIdentifier() @@ -403,7 +403,7 @@ class CORE_EXPORT QgsSQLStatement { public: /** Constructor */ - NodeFunction( QString name, NodeList* args ) : mName( name ), mArgs( args ) {} + NodeFunction( const QString& name, NodeList* args ) : mName( name ), mArgs( args ) {} virtual ~NodeFunction() { delete mArgs; } /** Return function name */ @@ -579,7 +579,7 @@ class CORE_EXPORT QgsSQLStatement /** Constructor with table definition, ON expression */ NodeJoin( NodeTableDef* tabledef, Node* onExpr, JoinType type ) : mTableDef( tabledef ), mOnExpr( onExpr ), mType( type ) {} /** Constructor with table definition and USING columns */ - NodeJoin( NodeTableDef* tabledef, QList usingColumns, JoinType type ) : mTableDef( tabledef ), mOnExpr( nullptr ), mUsingColumns( usingColumns ), mType( type ) {} + NodeJoin( NodeTableDef* tabledef, const QList& usingColumns, JoinType type ) : mTableDef( tabledef ), mOnExpr( nullptr ), mUsingColumns( usingColumns ), mType( type ) {} virtual ~NodeJoin() { delete mTableDef; delete mOnExpr; } /** Table definition */ @@ -643,17 +643,17 @@ class CORE_EXPORT QgsSQLStatement { public: /** Constructor */ - NodeSelect( QList tableList, QList columns, bool distinct ) : mTableList( tableList ), mColumns( columns ), mDistinct( distinct ), mWhere( nullptr ) {} + NodeSelect( const QList& tableList, const QList& columns, bool distinct ) : mTableList( tableList ), mColumns( columns ), mDistinct( distinct ), mWhere( nullptr ) {} virtual ~NodeSelect() { qDeleteAll( mTableList ); qDeleteAll( mColumns ); qDeleteAll( mJoins ); delete mWhere; qDeleteAll( mOrderBy ); } /** Set joins */ - void setJoins( QList joins ) { qDeleteAll( mJoins ); mJoins = joins; } + void setJoins( const QList& joins ) { qDeleteAll( mJoins ); mJoins = joins; } /** Append a join */ void appendJoin( NodeJoin* join ) { mJoins.append( join ); } /** Set where clause */ void setWhere( Node* where ) { delete mWhere; mWhere = where; } /** Set order by columns */ - void setOrderBy( QList orderBy ) { qDeleteAll( mOrderBy ); mOrderBy = orderBy; } + void setOrderBy( const QList& orderBy ) { qDeleteAll( mOrderBy ); mOrderBy = orderBy; } /** Return the list of tables */ QList tables() const { return mTableList; } diff --git a/src/core/qgssqlstatementparser.yy b/src/core/qgssqlstatementparser.yy index 45711be2b72b..32291ccb63b5 100644 --- a/src/core/qgssqlstatementparser.yy +++ b/src/core/qgssqlstatementparser.yy @@ -68,9 +68,9 @@ struct sqlstatement_parser_context void setWhere( QgsSQLStatement::Node* whereExp ) { this->whereExp = whereExp; } - void setJoins( QList joinList ) { this->joinList = joinList; } + void setJoins( const QList& joinList ) { this->joinList = joinList; } - void setOrderBy( QList orderByList ) { this->orderByList = orderByList; } + void setOrderBy( const QList& orderByList ) { this->orderByList = orderByList; } }; #define scanner parser_ctx->flex_scanner diff --git a/src/core/qgsstatisticalsummary.cpp b/src/core/qgsstatisticalsummary.cpp index 6a31d02129a3..b478cae55c05 100644 --- a/src/core/qgsstatisticalsummary.cpp +++ b/src/core/qgsstatisticalsummary.cpp @@ -25,7 +25,7 @@ * See details in QEP #17 ****************************************************************************/ -QgsStatisticalSummary::QgsStatisticalSummary( const Statistics& stats ) +QgsStatisticalSummary::QgsStatisticalSummary( Statistics stats ) : mStatistics( stats ) { reset(); diff --git a/src/core/qgsstatisticalsummary.h b/src/core/qgsstatisticalsummary.h index e0bf0acaff15..5232cb4dc466 100644 --- a/src/core/qgsstatisticalsummary.h +++ b/src/core/qgsstatisticalsummary.h @@ -67,7 +67,7 @@ class CORE_EXPORT QgsStatisticalSummary /** Constructor for QgsStatisticalSummary * @param stats flags for statistics to calculate */ - QgsStatisticalSummary( const QgsStatisticalSummary::Statistics& stats = All ); + QgsStatisticalSummary( QgsStatisticalSummary::Statistics stats = All ); virtual ~QgsStatisticalSummary(); @@ -82,7 +82,7 @@ class CORE_EXPORT QgsStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const Statistics& stats ) { mStatistics = stats; } + void setStatistics( Statistics stats ) { mStatistics = stats; } /** Resets the calculated values */ diff --git a/src/core/qgsstringstatisticalsummary.cpp b/src/core/qgsstringstatisticalsummary.cpp index 3ee36e39ddf1..f49e4be7c41b 100644 --- a/src/core/qgsstringstatisticalsummary.cpp +++ b/src/core/qgsstringstatisticalsummary.cpp @@ -27,7 +27,7 @@ * See details in QEP #17 ****************************************************************************/ -QgsStringStatisticalSummary::QgsStringStatisticalSummary( const QgsStringStatisticalSummary::Statistics& stats ) +QgsStringStatisticalSummary::QgsStringStatisticalSummary( QgsStringStatisticalSummary::Statistics stats ) : mStatistics( stats ) { reset(); diff --git a/src/core/qgsstringstatisticalsummary.h b/src/core/qgsstringstatisticalsummary.h index e78e7cd82d69..3e46d9cefde1 100644 --- a/src/core/qgsstringstatisticalsummary.h +++ b/src/core/qgsstringstatisticalsummary.h @@ -58,7 +58,7 @@ class CORE_EXPORT QgsStringStatisticalSummary /** Constructor for QgsStringStatistics * @param stats flags for statistics to calculate */ - QgsStringStatisticalSummary( const QgsStringStatisticalSummary::Statistics& stats = All ); + QgsStringStatisticalSummary( QgsStringStatisticalSummary::Statistics stats = All ); /** Returns flags which specify which statistics will be calculated. Some statistics * are always calculated (eg count). @@ -71,7 +71,7 @@ class CORE_EXPORT QgsStringStatisticalSummary * @param stats flags for statistics to calculate * @see statistics */ - void setStatistics( const Statistics& stats ) { mStatistics = stats; } + void setStatistics( Statistics stats ) { mStatistics = stats; } /** Resets the calculated values */ diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index 5f3ad5d69bc1..6d64b22723ab 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -2216,7 +2216,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer, QgsWkbTypes::Type overrideGeometryType, bool forceMulti, bool includeZ, - QgsAttributeList attributes, + const QgsAttributeList& attributes, FieldValueConverter* fieldValueConverter ) { QgsCoordinateTransform ct; @@ -2250,7 +2250,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe QgsWkbTypes::Type overrideGeometryType, bool forceMulti, bool includeZ, - QgsAttributeList attributes, + const QgsAttributeList& attributes, FieldValueConverter* fieldValueConverter ) { SaveVectorOptions options; diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index 99b618782802..21f045970fa6 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -277,7 +277,7 @@ class CORE_EXPORT QgsVectorFileWriter QgsWkbTypes::Type overrideGeometryType = QgsWkbTypes::Unknown, bool forceMulti = false, bool includeZ = false, - QgsAttributeList attributes = QgsAttributeList(), + const QgsAttributeList &attributes = QgsAttributeList(), FieldValueConverter* fieldValueConverter = nullptr ); @@ -322,7 +322,7 @@ class CORE_EXPORT QgsVectorFileWriter QgsWkbTypes::Type overrideGeometryType = QgsWkbTypes::Unknown, bool forceMulti = false, bool includeZ = false, - QgsAttributeList attributes = QgsAttributeList(), + const QgsAttributeList &attributes = QgsAttributeList(), FieldValueConverter* fieldValueConverter = nullptr ); diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 605872645860..e9f36394db5d 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -397,7 +397,7 @@ void QgsVectorLayer::selectByIds( const QgsFeatureIds& ids, QgsVectorLayer::Sele emit selectionChanged( newSelection, deselectedFeatures, true ); } -void QgsVectorLayer::modifySelection( QgsFeatureIds selectIds, QgsFeatureIds deselectIds ) +void QgsVectorLayer::modifySelection( const QgsFeatureIds &selectIds, const QgsFeatureIds& deselectIds ) { QgsFeatureIds intersectingIds = selectIds & deselectIds; if ( !intersectingIds.isEmpty() ) @@ -2053,7 +2053,7 @@ bool QgsVectorLayer::writeSld( QDomNode& node, QDomDocument& doc, QString& error return writeSld( node, doc, errorMessage, QgsStringMap() ); } -bool QgsVectorLayer::writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, QgsStringMap props ) const +bool QgsVectorLayer::writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, const QgsStringMap& props ) const { Q_UNUSED( errorMessage ); diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 450f837c9b6d..3e87a374930a 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -640,7 +640,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * @see deselect(QgsFeatureId) * @see selectByExpression() */ - void modifySelection( QgsFeatureIds selectIds, QgsFeatureIds deselectIds ); + void modifySelection( const QgsFeatureIds& selectIds, const QgsFeatureIds &deselectIds ); /** Select not selected features and deselect selected ones */ void invertSelection(); @@ -831,7 +831,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * @param props a open ended set of properties that can drive/inform the SLD encoding * @return true in case of success */ - bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, QgsStringMap props = QgsStringMap() ) const; + bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, const QgsStringMap &props = QgsStringMap() ) const; bool readSld( const QDomNode& node, QString& errorMessage ) override; diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp index 387de922bccc..c424545af714 100644 --- a/src/core/qgsvectorlayereditbuffer.cpp +++ b/src/core/qgsvectorlayereditbuffer.cpp @@ -191,7 +191,7 @@ bool QgsVectorLayerEditBuffer::deleteFeatures( const QgsFeatureIds& fids ) } -bool QgsVectorLayerEditBuffer::changeGeometry( QgsFeatureId fid, QgsGeometry geom ) +bool QgsVectorLayerEditBuffer::changeGeometry( QgsFeatureId fid, const QgsGeometry& geom ) { if ( !L->hasGeometryType() ) { diff --git a/src/core/qgsvectorlayereditbuffer.h b/src/core/qgsvectorlayereditbuffer.h index 4c91678278c1..31107dbf8ba2 100644 --- a/src/core/qgsvectorlayereditbuffer.h +++ b/src/core/qgsvectorlayereditbuffer.h @@ -58,7 +58,7 @@ class CORE_EXPORT QgsVectorLayerEditBuffer : public QObject virtual bool deleteFeatures( const QgsFeatureIds& fid ); /** Change feature's geometry */ - virtual bool changeGeometry( QgsFeatureId fid, QgsGeometry geom ); + virtual bool changeGeometry( QgsFeatureId fid, const QgsGeometry &geom ); /** Changed an attribute value (but does not commit it) */ virtual bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue = QVariant() ); diff --git a/src/core/qgsvectorlayereditpassthrough.cpp b/src/core/qgsvectorlayereditpassthrough.cpp index a03632854979..d9869e7ab1a5 100644 --- a/src/core/qgsvectorlayereditpassthrough.cpp +++ b/src/core/qgsvectorlayereditpassthrough.cpp @@ -81,7 +81,7 @@ bool QgsVectorLayerEditPassthrough::deleteFeatures( const QgsFeatureIds& fids ) return false; } -bool QgsVectorLayerEditPassthrough::changeGeometry( QgsFeatureId fid, QgsGeometry geom ) +bool QgsVectorLayerEditPassthrough::changeGeometry( QgsFeatureId fid, const QgsGeometry& geom ) { QgsGeometryMap geomMap; geomMap.insert( fid, geom ); diff --git a/src/core/qgsvectorlayereditpassthrough.h b/src/core/qgsvectorlayereditpassthrough.h index 21568a1d6eeb..72f19a25a361 100644 --- a/src/core/qgsvectorlayereditpassthrough.h +++ b/src/core/qgsvectorlayereditpassthrough.h @@ -32,7 +32,7 @@ class CORE_EXPORT QgsVectorLayerEditPassthrough : public QgsVectorLayerEditBuffe bool addFeatures( QgsFeatureList& features ) override; bool deleteFeature( QgsFeatureId fid ) override; bool deleteFeatures( const QgsFeatureIds& fids ) override; - bool changeGeometry( QgsFeatureId fid, QgsGeometry geom ) override; + bool changeGeometry( QgsFeatureId fid, const QgsGeometry &geom ) override; bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue = QVariant() ) override; bool addAttribute( const QgsField &field ) override; bool deleteAttribute( int attr ) override; diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp index b3d4c099744a..aa3ca05b5ded 100644 --- a/src/core/qgsvectorlayerjoinbuffer.cpp +++ b/src/core/qgsvectorlayerjoinbuffer.cpp @@ -350,6 +350,7 @@ void QgsVectorLayerJoinBuffer::readXml( const QDomNode& layer_node ) { QStringList* fieldNames = new QStringList; QDomNodeList fieldNodes = infoElem.elementsByTagName( "field" ); + fieldNames->reserve( fieldNodes.count() ); for ( int i = 0; i < fieldNodes.count(); ++i ) *fieldNames << fieldNodes.at( i ).toElement().attribute( "name" ); info.setJoinFieldNamesSubset( fieldNames ); diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp index 448dce4548a1..1cd16859a012 100644 --- a/src/core/qgsvectorlayerundocommand.cpp +++ b/src/core/qgsvectorlayerundocommand.cpp @@ -112,7 +112,7 @@ void QgsVectorLayerUndoCommandDeleteFeature::redo() -QgsVectorLayerUndoCommandChangeGeometry::QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, QgsGeometry newGeom ) +QgsVectorLayerUndoCommandChangeGeometry::QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, const QgsGeometry& newGeom ) : QgsVectorLayerUndoCommand( buffer ) , mFid( fid ) , mNewGeom( newGeom ) diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h index c4daee3f17e0..8b3051fa890b 100644 --- a/src/core/qgsvectorlayerundocommand.h +++ b/src/core/qgsvectorlayerundocommand.h @@ -121,7 +121,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLaye * @param fid feature ID of feature to modify geometry of * @param newGeom new geometry for feature */ - QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, QgsGeometry newGeom ); + QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, const QgsGeometry &newGeom ); ~QgsVectorLayerUndoCommandChangeGeometry(); virtual void undo() override; diff --git a/src/core/qgsvectorsimplifymethod.h b/src/core/qgsvectorsimplifymethod.h index 433b390ab1dd..7851eefea2c2 100644 --- a/src/core/qgsvectorsimplifymethod.h +++ b/src/core/qgsvectorsimplifymethod.h @@ -39,7 +39,7 @@ class CORE_EXPORT QgsVectorSimplifyMethod Q_DECLARE_FLAGS( SimplifyHints, SimplifyHint ) /** Sets the simplification hints of the vector layer managed */ - void setSimplifyHints( const SimplifyHints& simplifyHints ) { mSimplifyHints = simplifyHints; } + void setSimplifyHints( SimplifyHints simplifyHints ) { mSimplifyHints = simplifyHints; } /** Gets the simplification hints of the vector layer managed */ inline SimplifyHints simplifyHints() const { return mSimplifyHints; } @@ -52,7 +52,7 @@ class CORE_EXPORT QgsVectorSimplifyMethod }; /** Sets the local simplification algorithm of the vector layer managed */ - void setSimplifyAlgorithm( const SimplifyAlgorithm& simplifyAlgorithm ) { mSimplifyAlgorithm = simplifyAlgorithm; } + void setSimplifyAlgorithm( SimplifyAlgorithm simplifyAlgorithm ) { mSimplifyAlgorithm = simplifyAlgorithm; } /** Gets the local simplification algorithm of the vector layer managed */ inline SimplifyAlgorithm simplifyAlgorithm() const { return mSimplifyAlgorithm; } diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h index 135ecfdbb481..35cd0c194195 100644 --- a/src/core/raster/qgsrasterdataprovider.h +++ b/src/core/raster/qgsrasterdataprovider.h @@ -286,7 +286,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast * ACTUALLY exists you need to look at the existsFlag member in each struct stored in the * list. */ - virtual QList buildPyramidList( QList overviewList = QList() ) + virtual QList buildPyramidList( QList overviewList = QList() ) // clazy:exclude=function-args-by-ref { Q_UNUSED( overviewList ); return QList(); } /** \brief Returns true if raster has at least one populated histogram. */ diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp index 5c348bcba9a4..4b09674c006e 100644 --- a/src/core/raster/qgsrasterfilewriter.cpp +++ b/src/core/raster/qgsrasterfilewriter.cpp @@ -62,7 +62,7 @@ QgsRasterFileWriter::QgsRasterFileWriter() } -QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, QgsRectangle outputExtent, +QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, const QgsRectangle& outputExtent, const QgsCoordinateReferenceSystem& crs, QProgressDialog* progressDialog ) { QgsDebugMsgLevel( "Entered", 4 ); diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h index e21c0523fb87..98b469775abe 100644 --- a/src/core/raster/qgsrasterfilewriter.h +++ b/src/core/raster/qgsrasterfilewriter.h @@ -61,7 +61,7 @@ class CORE_EXPORT QgsRasterFileWriter @param outputExtent extent to output @param crs crs to reproject to @param p dialog to show progress in */ - WriterError writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, QgsRectangle outputExtent, + WriterError writeRaster( const QgsRasterPipe* pipe, int nCols, int nRows, const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem& crs, QProgressDialog* p = nullptr ); void setOutputFormat( const QString& format ) { mOutputFormat = format; } diff --git a/src/core/symbology-ng/qgsarrowsymbollayer.cpp b/src/core/symbology-ng/qgsarrowsymbollayer.cpp index 7cf36afdf732..eaae0d157048 100644 --- a/src/core/symbology-ng/qgsarrowsymbollayer.cpp +++ b/src/core/symbology-ng/qgsarrowsymbollayer.cpp @@ -200,7 +200,7 @@ void QgsArrowSymbolLayer::stopRender( QgsSymbolRenderContext& context ) mSymbol->stopRender( context.renderContext() ); } -inline qreal euclidian_distance( const QPointF& po, const QPointF& pd ) +inline qreal euclidian_distance( QPointF po, QPointF pd ) { return sqrt(( po.x() - pd.x() ) * ( po.x() - pd.x() ) + ( po.y() - pd.y() ) * ( po.y() - pd.y() ) ); } @@ -343,7 +343,7 @@ inline qreal clampAngle( qreal a ) * Compute the circumscribed circle from three points * @return false if the three points are colinear */ -bool pointsToCircle( const QPointF& a, const QPointF& b, const QPointF& c, QPointF& center, qreal& radius ) +bool pointsToCircle( QPointF a, QPointF b, QPointF c, QPointF& center, qreal& radius ) { qreal cx, cy; @@ -385,13 +385,13 @@ bool pointsToCircle( const QPointF& a, const QPointF& b, const QPointF& c, QPoin return true; } -QPointF circlePoint( const QPointF& center, qreal radius, qreal angle ) +QPointF circlePoint( QPointF center, qreal radius, qreal angle ) { // Y is oriented downward return QPointF( cos( -angle ) * radius + center.x(), sin( -angle ) * radius + center.y() ); } -void pathArcTo( QPainterPath& path, const QPointF& circleCenter, qreal circleRadius, qreal angle_o, qreal angle_d, int direction ) +void pathArcTo( QPainterPath& path, QPointF circleCenter, qreal circleRadius, qreal angle_o, qreal angle_d, int direction ) { QRectF circleRect( circleCenter - QPointF( circleRadius, circleRadius ), circleCenter + QPointF( circleRadius, circleRadius ) ); if ( direction == 1 ) @@ -411,7 +411,7 @@ void pathArcTo( QPainterPath& path, const QPointF& circleCenter, qreal circleRad } // Draw a "spiral" arc defined by circle arcs around a center, a start and an end radius -void spiralArcTo( QPainterPath& path, const QPointF& center, qreal startAngle, qreal startRadius, qreal endAngle, qreal endRadius, int direction ) +void spiralArcTo( QPainterPath& path, QPointF center, qreal startAngle, qreal startRadius, qreal endAngle, qreal endRadius, int direction ) { // start point QPointF A = circlePoint( center, startRadius, startAngle ); diff --git a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp index 19617dc7c09e..6c3cd44c8632 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp +++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp @@ -480,14 +480,15 @@ QgsCategorizedSymbolRenderer* QgsCategorizedSymbolRenderer::clone() const return r; } -void QgsCategorizedSymbolRenderer::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const +void QgsCategorizedSymbolRenderer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const { - props[ "attribute" ] = mAttrName; + QgsStringMap newProps = props; + newProps[ "attribute" ] = mAttrName; // create a Rule for each range for ( QgsCategoryList::const_iterator it = mCategories.constBegin(); it != mCategories.constEnd(); ++it ) { - QgsStringMap catProps( props ); + QgsStringMap catProps( newProps ); it->toSld( doc, element, catProps ); } } diff --git a/src/core/symbology-ng/qgscategorizedsymbolrenderer.h b/src/core/symbology-ng/qgscategorizedsymbolrenderer.h index 37302a87342c..4921c92bcf6a 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrenderer.h +++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.h @@ -89,7 +89,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer virtual QSet usedAttributes() const override; virtual QString dump() const override; virtual QgsCategorizedSymbolRenderer* clone() const override; - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const override; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const override; virtual Capabilities capabilities() override { return SymbolLevels | Filter; } virtual QString filter( const QgsFields& fields = QgsFields() ) override; virtual QgsSymbolList symbols( QgsRenderContext& context ) override; diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp index fb312469269b..3d5d0236bf9a 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp +++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp @@ -510,16 +510,17 @@ QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::clone() const return r; } -void QgsGraduatedSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const +void QgsGraduatedSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap &props ) const { - props[ "attribute" ] = mAttrName; - props[ "method" ] = graduatedMethodStr( mGraduatedMethod ); + QgsStringMap newProps = props; + newProps[ "attribute" ] = mAttrName; + newProps[ "method" ] = graduatedMethodStr( mGraduatedMethod ); // create a Rule for each range bool first = true; for ( QgsRangeList::const_iterator it = mRanges.constBegin(); it != mRanges.constEnd(); ++it ) { - QgsStringMap catProps( props ); + QgsStringMap catProps( newProps ); it->toSld( doc, element, catProps, first ); first = false; } diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h index 8876567dd3b2..66caf437d9c0 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h +++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h @@ -143,7 +143,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer virtual QSet usedAttributes() const override; virtual QString dump() const override; virtual QgsGraduatedSymbolRenderer* clone() const override; - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const override; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const override; virtual Capabilities capabilities() override { return SymbolLevels | Filter; } virtual QgsSymbolList symbols( QgsRenderContext &context ) override; diff --git a/src/core/symbology-ng/qgspointdistancerenderer.cpp b/src/core/symbology-ng/qgspointdistancerenderer.cpp index c046417b9448..4a7086e1c6d6 100644 --- a/src/core/symbology-ng/qgspointdistancerenderer.cpp +++ b/src/core/symbology-ng/qgspointdistancerenderer.cpp @@ -44,7 +44,7 @@ QgsPointDistanceRenderer::QgsPointDistanceRenderer( const QString& rendererName, mRenderer.reset( QgsFeatureRenderer::defaultRenderer( QgsWkbTypes::PointGeometry ) ); } -void QgsPointDistanceRenderer::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const +void QgsPointDistanceRenderer::toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap &props ) const { mRenderer->toSld( doc, element, props ); } diff --git a/src/core/symbology-ng/qgspointdistancerenderer.h b/src/core/symbology-ng/qgspointdistancerenderer.h index 758a9ebf7c9f..21f34ae67d3f 100644 --- a/src/core/symbology-ng/qgspointdistancerenderer.h +++ b/src/core/symbology-ng/qgspointdistancerenderer.h @@ -74,7 +74,7 @@ class CORE_EXPORT QgsPointDistanceRenderer: public QgsFeatureRenderer */ QgsPointDistanceRenderer( const QString& rendererName, const QString& labelAttributeName = QString() ); - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const override; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const override; bool renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool selected = false, bool drawVertexMarker = false ) override; virtual QSet usedAttributes() const override; virtual Capabilities capabilities() override; diff --git a/src/core/symbology-ng/qgsrenderer.cpp b/src/core/symbology-ng/qgsrenderer.cpp index c3258fbf9852..bae700e784bb 100644 --- a/src/core/symbology-ng/qgsrenderer.cpp +++ b/src/core/symbology-ng/qgsrenderer.cpp @@ -258,7 +258,7 @@ QgsFeatureRenderer* QgsFeatureRenderer::loadSld( const QDomNode &node, QgsWkbTyp return r; } -QDomElement QgsFeatureRenderer::writeSld( QDomDocument& doc, const QString& styleName, QgsStringMap props ) const +QDomElement QgsFeatureRenderer::writeSld( QDomDocument& doc, const QString& styleName, const QgsStringMap& props ) const { QDomElement userStyleElem = doc.createElement( "UserStyle" ); diff --git a/src/core/symbology-ng/qgsrenderer.h b/src/core/symbology-ng/qgsrenderer.h index b333413a82df..4d4e7d70cb3a 100644 --- a/src/core/symbology-ng/qgsrenderer.h +++ b/src/core/symbology-ng/qgsrenderer.h @@ -225,7 +225,7 @@ class CORE_EXPORT QgsFeatureRenderer //! create the SLD UserStyle element following the SLD v1.1 specs with the given name //! @note added in 2.8 - virtual QDomElement writeSld( QDomDocument& doc, const QString& styleName, QgsStringMap props = QgsStringMap() ) const; + virtual QDomElement writeSld( QDomDocument& doc, const QString& styleName, const QgsStringMap &props = QgsStringMap() ) const; /** Create a new renderer according to the information contained in * the UserStyle element of a SLD style document @@ -240,7 +240,7 @@ class CORE_EXPORT QgsFeatureRenderer static QgsFeatureRenderer* loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ); //! used from subclasses to create SLD Rule elements following SLD v1.1 specs - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const { element.appendChild( doc.createComment( QString( "FeatureRendererV2 %1 not implemented yet" ).arg( type() ) ) ); ( void ) props; // warning avoidance diff --git a/src/core/symbology-ng/qgsrulebasedrenderer.cpp b/src/core/symbology-ng/qgsrulebasedrenderer.cpp index db7b25c6c137..9cddfdb5199f 100644 --- a/src/core/symbology-ng/qgsrulebasedrenderer.cpp +++ b/src/core/symbology-ng/qgsrulebasedrenderer.cpp @@ -940,7 +940,7 @@ QgsRuleBasedRenderer* QgsRuleBasedRenderer::clone() const return r; } -void QgsRuleBasedRenderer::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const +void QgsRuleBasedRenderer::toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap &props ) const { mRootRule->toSld( doc, element, props ); } diff --git a/src/core/symbology-ng/qgsrulebasedrenderer.h b/src/core/symbology-ng/qgsrulebasedrenderer.h index 6739c1c3e985..e7e299939abf 100644 --- a/src/core/symbology-ng/qgsrulebasedrenderer.h +++ b/src/core/symbology-ng/qgsrulebasedrenderer.h @@ -427,7 +427,7 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer virtual QgsRuleBasedRenderer* clone() const override; - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const override; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const override; static QgsFeatureRenderer* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ); diff --git a/src/core/symbology-ng/qgssinglesymbolrenderer.cpp b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp index dcd9e6c7b21a..a697c27418ef 100644 --- a/src/core/symbology-ng/qgssinglesymbolrenderer.cpp +++ b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp @@ -104,8 +104,10 @@ QgsSingleSymbolRenderer* QgsSingleSymbolRenderer::clone() const return r; } -void QgsSingleSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const +void QgsSingleSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap &props ) const { + QgsStringMap newProps = props; + QDomElement ruleElem = doc.createElement( "se:Rule" ); element.appendChild( ruleElem ); @@ -113,9 +115,9 @@ void QgsSingleSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element, Qg nameElem.appendChild( doc.createTextNode( "Single symbol" ) ); ruleElem.appendChild( nameElem ); - QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, props ); + QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, newProps ); - if ( mSymbol.data() ) mSymbol->toSld( doc, ruleElem, props ); + if ( mSymbol.data() ) mSymbol->toSld( doc, ruleElem, newProps ); } QgsSymbolList QgsSingleSymbolRenderer::symbols( QgsRenderContext &context ) diff --git a/src/core/symbology-ng/qgssinglesymbolrenderer.h b/src/core/symbology-ng/qgssinglesymbolrenderer.h index dc56f556be5c..f2df6f42f1e1 100644 --- a/src/core/symbology-ng/qgssinglesymbolrenderer.h +++ b/src/core/symbology-ng/qgssinglesymbolrenderer.h @@ -45,7 +45,7 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer virtual QgsSingleSymbolRenderer* clone() const override; - virtual void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props = QgsStringMap() ) const override; + virtual void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props = QgsStringMap() ) const override; static QgsFeatureRenderer* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ); virtual Capabilities capabilities() override { return SymbolLevels; } diff --git a/src/core/symbology-ng/qgssymbollayerutils.cpp b/src/core/symbology-ng/qgssymbollayerutils.cpp index 0b991a813998..e11d8eb92050 100644 --- a/src/core/symbology-ng/qgssymbollayerutils.cpp +++ b/src/core/symbology-ng/qgssymbollayerutils.cpp @@ -3973,7 +3973,7 @@ double QgsSymbolLayerUtils::rescaleUom( double size, QgsUnitTypes::RenderUnit un return rescaled; } -QPointF QgsSymbolLayerUtils::rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) +QPointF QgsSymbolLayerUtils::rescaleUom( QPointF point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ) { double x = rescaleUom( point.x(), unit, props ); double y = rescaleUom( point.y(), unit, props ); diff --git a/src/core/symbology-ng/qgssymbollayerutils.h b/src/core/symbology-ng/qgssymbollayerutils.h index 92cd86c196fd..c893bda24b26 100644 --- a/src/core/symbology-ng/qgssymbollayerutils.h +++ b/src/core/symbology-ng/qgssymbollayerutils.h @@ -534,7 +534,7 @@ class CORE_EXPORT QgsSymbolLayerUtils * returns a copy of the original point * @note added in 3.0 */ - static QPointF rescaleUom( const QPointF& point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ); + static QPointF rescaleUom( QPointF point, QgsUnitTypes::RenderUnit unit, const QgsStringMap& props ); /** Rescales the given array based on the uomScale found in the props, if any is found, otherwise * returns a copy of the original point diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp index d7ab9848f5a1..84f53b024829 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.cpp +++ b/src/gui/attributetable/qgsattributetablefiltermodel.cpp @@ -209,7 +209,7 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa sort( config.sortExpression(), config.sortOrder() ); } -void QgsAttributeTableFilterModel::sort( QString expression, Qt::SortOrder order ) +void QgsAttributeTableFilterModel::sort( const QString &expression, Qt::SortOrder order ) { QSortFilterProxyModel::sort( -1 ); masterModel()->prefetchSortData( expression ); diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h index 578080758e84..5b4d4a3e9b81 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.h +++ b/src/gui/attributetable/qgsattributetablefiltermodel.h @@ -187,7 +187,7 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub * @param expression The expression which should be used for sorting * @param order The order ( Qt::AscendingOrder or Qt::DescendingOrder ) */ - void sort( QString expression, Qt::SortOrder order = Qt::AscendingOrder ); + void sort( const QString& expression, Qt::SortOrder order = Qt::AscendingOrder ); /** * The expression which is used to sort the attribute table. diff --git a/src/gui/attributetable/qgsfeaturelistview.cpp b/src/gui/attributetable/qgsfeaturelistview.cpp index 17e4f53444ea..955768c5e315 100644 --- a/src/gui/attributetable/qgsfeaturelistview.cpp +++ b/src/gui/attributetable/qgsfeaturelistview.cpp @@ -197,7 +197,7 @@ void QgsFeatureListView::setEditSelection( const QgsFeatureIds &fids ) mCurrentEditSelectionModel->select( selection, QItemSelectionModel::ClearAndSelect ); } -void QgsFeatureListView::setEditSelection( const QModelIndex& index, const QItemSelectionModel::SelectionFlags& command ) +void QgsFeatureListView::setEditSelection( const QModelIndex& index, QItemSelectionModel::SelectionFlags command ) { bool ok = true; emit aboutToChangeEditSelection( ok ); diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h index 6ecde94cdc53..bf74a03e8870 100644 --- a/src/gui/attributetable/qgsfeaturelistview.h +++ b/src/gui/attributetable/qgsfeaturelistview.h @@ -158,7 +158,7 @@ class GUI_EXPORT QgsFeatureListView : public QListView * @param index The selection to set * @param command selection update mode */ - void setEditSelection( const QModelIndex& index, const QItemSelectionModel::SelectionFlags& command ); + void setEditSelection( const QModelIndex& index, QItemSelectionModel::SelectionFlags command ); /** * Select all currently visible features diff --git a/src/gui/attributetable/qgsfeatureselectionmodel.cpp b/src/gui/attributetable/qgsfeatureselectionmodel.cpp index e761f6974b1c..b3d1611772bb 100644 --- a/src/gui/attributetable/qgsfeatureselectionmodel.cpp +++ b/src/gui/attributetable/qgsfeatureselectionmodel.cpp @@ -69,7 +69,7 @@ bool QgsFeatureSelectionModel::isSelected( const QModelIndex &index ) return isSelected( index.model()->data( index, QgsAttributeTableModel::FeatureIdRole ).toLongLong() ); } -void QgsFeatureSelectionModel::selectFeatures( const QItemSelection &selection, const QItemSelectionModel::SelectionFlags& command ) +void QgsFeatureSelectionModel::selectFeatures( const QItemSelection &selection, QItemSelectionModel::SelectionFlags command ) { QgsFeatureIds ids; diff --git a/src/gui/attributetable/qgsfeatureselectionmodel.h b/src/gui/attributetable/qgsfeatureselectionmodel.h index b03eb1975417..8c53474b6416 100644 --- a/src/gui/attributetable/qgsfeatureselectionmodel.h +++ b/src/gui/attributetable/qgsfeatureselectionmodel.h @@ -97,7 +97,7 @@ class GUI_EXPORT QgsFeatureSelectionModel : public QItemSelectionModel * @param selection The QItemSelection which will be selected * @param command The command to apply. Select, Deselect and ClearAndSelect are processed. */ - virtual void selectFeatures( const QItemSelection &selection, const SelectionFlags& command ); + virtual void selectFeatures( const QItemSelection &selection, SelectionFlags command ); virtual void setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager ); diff --git a/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp index cd74a2ea60c3..154ab28226a8 100644 --- a/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp @@ -128,7 +128,7 @@ bool QgsRelationReferenceSearchWidgetWrapper::valid() const return true; } -void QgsRelationReferenceSearchWidgetWrapper::onValueChanged( QVariant value ) +void QgsRelationReferenceSearchWidgetWrapper::onValueChanged( const QVariant& value ) { if ( !value.isValid() ) { diff --git a/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h index 1b7733b39d06..9299e082e61d 100644 --- a/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h @@ -69,7 +69,7 @@ class GUI_EXPORT QgsRelationReferenceSearchWidgetWrapper : public QgsSearchWidge public slots: //! Called when current value of search widget changes - void onValueChanged( QVariant value ); + void onValueChanged( const QVariant &value ); protected slots: void setExpression( QString exp ) override; diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp index 0b7c8de45991..49774bf990d4 100644 --- a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp +++ b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp @@ -145,7 +145,7 @@ void QgsValueMapConfigDlg::updateMap( const QMap &map, bool i } } -void QgsValueMapConfigDlg::setRow( int row, const QString value, const QString description ) +void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString& description ) { QSettings settings; QTableWidgetItem* valueCell; diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.h b/src/gui/editorwidgets/qgsvaluemapconfigdlg.h index b7122afa5873..9798cab5ecd9 100644 --- a/src/gui/editorwidgets/qgsvaluemapconfigdlg.h +++ b/src/gui/editorwidgets/qgsvaluemapconfigdlg.h @@ -39,7 +39,7 @@ class GUI_EXPORT QgsValueMapConfigDlg : public QgsEditorConfigWidget, private Ui void updateMap( const QMap &map, bool insertNull ); private: - void setRow( int row, const QString value, const QString description ); + void setRow( int row, const QString &value, const QString &description ); private slots: void vCellChanged( int row, int column ); diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h index d94d7cfed011..16b44ce09dcc 100644 --- a/src/gui/qgsattributeform.h +++ b/src/gui/qgsattributeform.h @@ -325,14 +325,14 @@ class GUI_EXPORT QgsAttributeForm : public QWidget struct ContainerInformation { - ContainerInformation( QgsTabWidget* tabWidget, QWidget* widget, QgsExpression expression ) + ContainerInformation( QgsTabWidget* tabWidget, QWidget* widget, const QgsExpression& expression ) : tabWidget( tabWidget ) , widget( widget ) , expression( expression ) , isVisible( true ) {} - ContainerInformation( QWidget* widget, QgsExpression expression ) + ContainerInformation( QWidget* widget, const QgsExpression& expression ) : tabWidget( nullptr ) , widget( widget ) , expression( expression ) diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index b716d06d5518..3ad8e803f910 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -2233,7 +2233,7 @@ QMainWindow* QgsComposerView::composerWindow() return nullptr; } -void QgsComposerView::addPolygonNode( const QPointF & scenePoint ) +void QgsComposerView::addPolygonNode( QPointF scenePoint ) { QPolygonF polygon = mPolygonItem.data()->polygon(); polygon.append( QPointF( scenePoint.x(), scenePoint.y() ) ); @@ -2244,7 +2244,7 @@ void QgsComposerView::addPolygonNode( const QPointF & scenePoint ) mPolygonItem.data()->setPolygon( polygon ); } -void QgsComposerView::movePolygonNode( const QPointF & scenePoint ) +void QgsComposerView::movePolygonNode( QPointF scenePoint ) { QPolygonF polygon = mPolygonItem.data()->polygon(); diff --git a/src/gui/qgscomposerview.h b/src/gui/qgscomposerview.h index 1a1241a30d99..afcb139b2e63 100644 --- a/src/gui/qgscomposerview.h +++ b/src/gui/qgscomposerview.h @@ -220,8 +220,8 @@ class GUI_EXPORT QgsComposerView: public QGraphicsView void addShape( Tool currentTool ); /** Point based shape stuff */ - void addPolygonNode( const QPointF & scenePoint ); - void movePolygonNode( const QPointF & scenePoint ); + void addPolygonNode( QPointF scenePoint ); + void movePolygonNode( QPointF scenePoint ); void displayNodes( const bool display = true ); void setSelectedNode( QgsComposerNodesItem *shape, const int index ); void unselectNode(); diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp index 2cd99e244121..051a0f716173 100644 --- a/src/gui/qgsdatadefinedbutton.cpp +++ b/src/gui/qgsdatadefinedbutton.cpp @@ -31,7 +31,7 @@ QgsDataDefinedButton::QgsDataDefinedButton( QWidget* parent, const QgsVectorLayer* vl, const QgsDataDefined* datadefined, - const DataTypes& datatypes, + DataTypes datatypes, const QString& description ) : QToolButton( parent ) , mExpressionContextGenerator( nullptr ) @@ -143,7 +143,7 @@ void QgsDataDefinedButton::updateFieldLists() void QgsDataDefinedButton::init( const QgsVectorLayer* vl, const QgsDataDefined* datadefined, - const DataTypes& datatypes, + DataTypes datatypes, const QString& description ) { mVectorLayer = vl; diff --git a/src/gui/qgsdatadefinedbutton.h b/src/gui/qgsdatadefinedbutton.h index 8d29471a1bf8..50cd77615801 100644 --- a/src/gui/qgsdatadefinedbutton.h +++ b/src/gui/qgsdatadefinedbutton.h @@ -98,7 +98,7 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton QgsDataDefinedButton( QWidget* parent = nullptr, const QgsVectorLayer* vl = nullptr, const QgsDataDefined* datadefined = nullptr, - const QgsDataDefinedButton::DataTypes& datatypes = AnyType, + QgsDataDefinedButton::DataTypes datatypes = AnyType, const QString& description = QString() ); ~QgsDataDefinedButton(); @@ -112,7 +112,7 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton */ void init( const QgsVectorLayer* vl, const QgsDataDefined* datadefined = nullptr, - const QgsDataDefinedButton::DataTypes& datatypes = AnyType, + QgsDataDefinedButton::DataTypes datatypes = AnyType, const QString& description = QString() ); QMap< QString, QString > definedProperty() const { return mProperty; } diff --git a/src/gui/qgsdialog.cpp b/src/gui/qgsdialog.cpp index 7489fcceddf3..a21b6a914945 100644 --- a/src/gui/qgsdialog.cpp +++ b/src/gui/qgsdialog.cpp @@ -18,7 +18,7 @@ #include "qgsdialog.h" QgsDialog::QgsDialog( QWidget *parent, Qt::WindowFlags fl, - const QDialogButtonBox::StandardButtons& buttons, + QDialogButtonBox::StandardButtons buttons, Qt::Orientation orientation ) : QDialog( parent, fl ) { diff --git a/src/gui/qgsdialog.h b/src/gui/qgsdialog.h index 77d1de939b3a..8aab3f3f36cc 100644 --- a/src/gui/qgsdialog.h +++ b/src/gui/qgsdialog.h @@ -32,7 +32,7 @@ class GUI_EXPORT QgsDialog : public QDialog Q_OBJECT public: QgsDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, - const QDialogButtonBox::StandardButtons& buttons = QDialogButtonBox::Close, + QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close, Qt::Orientation orientation = Qt::Horizontal ); ~QgsDialog(); diff --git a/src/gui/qgsexternalresourcewidget.cpp b/src/gui/qgsexternalresourcewidget.cpp index 308ef1bde13f..c901752f80e3 100644 --- a/src/gui/qgsexternalresourcewidget.cpp +++ b/src/gui/qgsexternalresourcewidget.cpp @@ -203,7 +203,7 @@ QgsFileWidget::RelativeStorage QgsExternalResourceWidget::relativeStorage() cons return mRelativeStorage; } -void QgsExternalResourceWidget::setRelativeStorage( const QgsFileWidget::RelativeStorage& relativeStorage ) +void QgsExternalResourceWidget::setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage ) { mFileWidget->setRelativeStorage( relativeStorage ); mRelativeStorage = relativeStorage; diff --git a/src/gui/qgsexternalresourcewidget.h b/src/gui/qgsexternalresourcewidget.h index e5f0fe828fc7..af2d5ad43fcf 100644 --- a/src/gui/qgsexternalresourcewidget.h +++ b/src/gui/qgsexternalresourcewidget.h @@ -106,7 +106,7 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget * Configures if paths are handled absolute or relative and if relative, * which should be the base path. */ - void setRelativeStorage( const QgsFileWidget::RelativeStorage& relativeStorage ); + void setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage ); /** diff --git a/src/gui/qgsfieldcombobox.cpp b/src/gui/qgsfieldcombobox.cpp index 657bc6ba6ab3..12cece89844c 100644 --- a/src/gui/qgsfieldcombobox.cpp +++ b/src/gui/qgsfieldcombobox.cpp @@ -28,7 +28,7 @@ QgsFieldComboBox::QgsFieldComboBox( QWidget *parent ) connect( this, SIGNAL( activated( int ) ), this, SLOT( indexChanged( int ) ) ); } -void QgsFieldComboBox::setFilters( const QgsFieldProxyModel::Filters& filters ) +void QgsFieldComboBox::setFilters( QgsFieldProxyModel::Filters filters ) { mFieldProxyModel->setFilters( filters ); } diff --git a/src/gui/qgsfieldcombobox.h b/src/gui/qgsfieldcombobox.h index dd57892b9606..c83858edd5d6 100644 --- a/src/gui/qgsfieldcombobox.h +++ b/src/gui/qgsfieldcombobox.h @@ -44,7 +44,7 @@ class GUI_EXPORT QgsFieldComboBox : public QComboBox explicit QgsFieldComboBox( QWidget *parent = nullptr ); //! setFilters allows fitering according to the type of field - void setFilters( const QgsFieldProxyModel::Filters& filters ); + void setFilters( QgsFieldProxyModel::Filters filters ); //! currently used filter on list of fields QgsFieldProxyModel::Filters filters() const { return mFieldProxyModel->filters(); } diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp index ac87a5c65471..c4521af29df9 100644 --- a/src/gui/qgsfieldexpressionwidget.cpp +++ b/src/gui/qgsfieldexpressionwidget.cpp @@ -75,7 +75,7 @@ void QgsFieldExpressionWidget::setExpressionDialogTitle( const QString& title ) mExpressionDialogTitle = title; } -void QgsFieldExpressionWidget::setFilters( const QgsFieldProxyModel::Filters& filters ) +void QgsFieldExpressionWidget::setFilters( QgsFieldProxyModel::Filters filters ) { mFieldProxyModel->setFilters( filters ); } diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h index ab2633305714..ae3047f6c45f 100644 --- a/src/gui/qgsfieldexpressionwidget.h +++ b/src/gui/qgsfieldexpressionwidget.h @@ -59,7 +59,7 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget const QString expressionDialogTitle() { return mExpressionDialogTitle; } //! setFilters allows fitering according to the type of field - void setFilters( const QgsFieldProxyModel::Filters& filters ); + void setFilters( QgsFieldProxyModel::Filters filters ); void setLeftHandButtonStyle( bool isLeft ); diff --git a/src/gui/qgsfieldproxymodel.cpp b/src/gui/qgsfieldproxymodel.cpp index c001ad828380..c74843cd5718 100644 --- a/src/gui/qgsfieldproxymodel.cpp +++ b/src/gui/qgsfieldproxymodel.cpp @@ -25,7 +25,7 @@ QgsFieldProxyModel::QgsFieldProxyModel( QObject *parent ) setSourceModel( mModel ); } -QgsFieldProxyModel *QgsFieldProxyModel::setFilters( const Filters& filters ) +QgsFieldProxyModel *QgsFieldProxyModel::setFilters( QgsFieldProxyModel::Filters filters ) { mFilters = filters; invalidateFilter(); diff --git a/src/gui/qgsfieldproxymodel.h b/src/gui/qgsfieldproxymodel.h index 7bdc105d451f..0b0b3e5a4a49 100644 --- a/src/gui/qgsfieldproxymodel.h +++ b/src/gui/qgsfieldproxymodel.h @@ -60,7 +60,7 @@ class GUI_EXPORT QgsFieldProxyModel : public QSortFilterProxyModel * @param filters are Filter flags * @see filters() */ - QgsFieldProxyModel* setFilters( const QgsFieldProxyModel::Filters& filters ); + QgsFieldProxyModel* setFilters( QgsFieldProxyModel::Filters filters ); /** Returns the filters controlling displayed fields. * @see setFilters() diff --git a/src/gui/qgsmaplayeractionregistry.cpp b/src/gui/qgsmaplayeractionregistry.cpp index e9282eb773d5..d5cab72b7b78 100644 --- a/src/gui/qgsmaplayeractionregistry.cpp +++ b/src/gui/qgsmaplayeractionregistry.cpp @@ -16,7 +16,7 @@ #include "qgsmaplayeractionregistry.h" -QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, const Targets& targets, const QIcon& icon ) +QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, Targets targets, const QIcon& icon ) : QAction( icon, name, parent ) , mSingleLayer( false ) , mActionLayer( nullptr ) @@ -27,7 +27,7 @@ QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, cons } /** Creates a map layer action which can run only on a specific layer*/ -QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, QgsMapLayer* layer, const Targets& targets, const QIcon& icon ) +QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, QgsMapLayer* layer, Targets targets, const QIcon& icon ) : QAction( icon, name, parent ) , mSingleLayer( true ) , mActionLayer( layer ) @@ -38,7 +38,7 @@ QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, QgsM } /** Creates a map layer action which can run on a specific type of layer*/ -QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, QgsMapLayer::LayerType layerType, const Targets& targets, const QIcon& icon ) +QgsMapLayerAction::QgsMapLayerAction( const QString& name, QObject* parent, QgsMapLayer::LayerType layerType, Targets targets, const QIcon& icon ) : QAction( icon, name, parent ) , mSingleLayer( false ) , mActionLayer( nullptr ) @@ -125,7 +125,7 @@ void QgsMapLayerActionRegistry::addMapLayerAction( QgsMapLayerAction * action ) emit changed(); } -QList< QgsMapLayerAction* > QgsMapLayerActionRegistry::mapLayerActions( QgsMapLayer* layer, const QgsMapLayerAction::Targets& targets ) +QList< QgsMapLayerAction* > QgsMapLayerActionRegistry::mapLayerActions( QgsMapLayer* layer, QgsMapLayerAction::Targets targets ) { QList< QgsMapLayerAction* > validActions; QList::iterator actionIt; diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h index 6889daaf5a6c..15c43b7ffa3d 100644 --- a/src/gui/qgsmaplayeractionregistry.h +++ b/src/gui/qgsmaplayeractionregistry.h @@ -45,13 +45,13 @@ class GUI_EXPORT QgsMapLayerAction : public QAction //! Creates a map layer action which can run on any layer //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatiblity reasons. - QgsMapLayerAction( const QString& name, QObject *parent, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent, QgsMapLayerAction::Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run only on a specific layer - QgsMapLayerAction( const QString& name, QObject *parent, QgsMapLayer* layer, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent, QgsMapLayer* layer, QgsMapLayerAction::Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run on a specific type of layer - QgsMapLayerAction( const QString& name, QObject *parent, QgsMapLayer::LayerType layerType, const Targets& targets = AllActions, const QIcon& icon = QIcon() ); + QgsMapLayerAction( const QString& name, QObject *parent, QgsMapLayer::LayerType layerType, QgsMapLayerAction::Targets targets = AllActions, const QIcon& icon = QIcon() ); ~QgsMapLayerAction(); @@ -68,7 +68,7 @@ class GUI_EXPORT QgsMapLayerAction : public QAction void triggerForLayer( QgsMapLayer* layer ); /** Define the targets of the action */ - void setTargets( const Targets& targets ) {mTargets = targets;} + void setTargets( Targets targets ) {mTargets = targets;} /** Return availibity of action */ const Targets& targets() const {return mTargets;} @@ -117,7 +117,7 @@ class GUI_EXPORT QgsMapLayerActionRegistry : public QObject void addMapLayerAction( QgsMapLayerAction * action ); /** Returns the map layer actions which can run on the specified layer*/ - QList mapLayerActions( QgsMapLayer* layer, const QgsMapLayerAction::Targets& targets = QgsMapLayerAction::AllActions ); + QList mapLayerActions( QgsMapLayer* layer, QgsMapLayerAction::Targets targets = QgsMapLayerAction::AllActions ); /** Removes a map layer action from the registry*/ bool removeMapLayerAction( QgsMapLayerAction *action ); diff --git a/src/gui/qgsmaplayercombobox.h b/src/gui/qgsmaplayercombobox.h index 7325687a6896..e005e50deec7 100644 --- a/src/gui/qgsmaplayercombobox.h +++ b/src/gui/qgsmaplayercombobox.h @@ -41,7 +41,7 @@ class GUI_EXPORT QgsMapLayerComboBox : public QComboBox explicit QgsMapLayerComboBox( QWidget *parent = nullptr ); //! setFilters allows fitering according to layer type and/or geometry type. - void setFilters( const QgsMapLayerProxyModel::Filters& filters ) { mProxyModel->setFilters( filters ); } + void setFilters( QgsMapLayerProxyModel::Filters filters ) { mProxyModel->setFilters( filters ); } //! currently used filter on list layers QgsMapLayerProxyModel::Filters filters() const { return mProxyModel->filters(); } diff --git a/src/gui/qgsmaplayerconfigwidgetfactory.cpp b/src/gui/qgsmaplayerconfigwidgetfactory.cpp index 4aeced9c9557..76b36fe5752d 100644 --- a/src/gui/qgsmaplayerconfigwidgetfactory.cpp +++ b/src/gui/qgsmaplayerconfigwidgetfactory.cpp @@ -22,7 +22,7 @@ QgsMapLayerConfigWidgetFactory::QgsMapLayerConfigWidgetFactory() } -QgsMapLayerConfigWidgetFactory::QgsMapLayerConfigWidgetFactory( QString title, QIcon icon ) +QgsMapLayerConfigWidgetFactory::QgsMapLayerConfigWidgetFactory( const QString& title, const QIcon& icon ) : mIcon( icon ) , mTitle( title ) , mSupportsDock( true ) diff --git a/src/gui/qgsmaplayerconfigwidgetfactory.h b/src/gui/qgsmaplayerconfigwidgetfactory.h index d843cf91ae3a..6bcf8c3aaece 100644 --- a/src/gui/qgsmaplayerconfigwidgetfactory.h +++ b/src/gui/qgsmaplayerconfigwidgetfactory.h @@ -35,7 +35,7 @@ class GUI_EXPORT QgsMapLayerConfigWidgetFactory QgsMapLayerConfigWidgetFactory(); /** Constructor */ - QgsMapLayerConfigWidgetFactory( QString title, QIcon icon ); + QgsMapLayerConfigWidgetFactory( const QString &title, const QIcon &icon ); /** Destructor */ virtual ~QgsMapLayerConfigWidgetFactory(); diff --git a/src/gui/qgsmaplayerstylemanagerwidget.cpp b/src/gui/qgsmaplayerstylemanagerwidget.cpp index f1f12747939d..474b7ecce76f 100644 --- a/src/gui/qgsmaplayerstylemanagerwidget.cpp +++ b/src/gui/qgsmaplayerstylemanagerwidget.cpp @@ -92,7 +92,7 @@ QgsMapLayerStyleManagerWidget::QgsMapLayerStyleManagerWidget( QgsMapLayer* layer currentStyleChanged( active ); } -void QgsMapLayerStyleManagerWidget::styleClicked( QModelIndex index ) +void QgsMapLayerStyleManagerWidget::styleClicked( const QModelIndex &index ) { if ( !mLayer || !index.isValid() ) return; @@ -104,7 +104,7 @@ void QgsMapLayerStyleManagerWidget::styleClicked( QModelIndex index ) mLayer->styleManager()->setCurrentStyle( name ); } -void QgsMapLayerStyleManagerWidget::currentStyleChanged( QString name ) +void QgsMapLayerStyleManagerWidget::currentStyleChanged( const QString& name ) { QList items = mModel->findItems( name ); if ( items.isEmpty() ) @@ -115,14 +115,14 @@ void QgsMapLayerStyleManagerWidget::currentStyleChanged( QString name ) mStyleList->setCurrentIndex( item->index() ); } -void QgsMapLayerStyleManagerWidget::styleAdded( QString name ) +void QgsMapLayerStyleManagerWidget::styleAdded( const QString& name ) { QgsDebugMsg( "Style added" ); QStandardItem* item = new QStandardItem( name ); mModel->appendRow( item ); } -void QgsMapLayerStyleManagerWidget::styleRemoved( QString name ) +void QgsMapLayerStyleManagerWidget::styleRemoved( const QString& name ) { QList items = mModel->findItems( name ); if ( items.isEmpty() ) @@ -132,7 +132,7 @@ void QgsMapLayerStyleManagerWidget::styleRemoved( QString name ) mModel->removeRow( item->row() ); } -void QgsMapLayerStyleManagerWidget::styleRenamed( QString oldname, QString newname ) +void QgsMapLayerStyleManagerWidget::styleRenamed( const QString& oldname, const QString& newname ) { QList items = mModel->findItems( oldname ); if ( items.isEmpty() ) diff --git a/src/gui/qgsmaplayerstylemanagerwidget.h b/src/gui/qgsmaplayerstylemanagerwidget.h index 31025ba8af92..c7f2e7bbe4c9 100644 --- a/src/gui/qgsmaplayerstylemanagerwidget.h +++ b/src/gui/qgsmaplayerstylemanagerwidget.h @@ -46,11 +46,11 @@ class GUI_EXPORT QgsMapLayerStyleManagerWidget : public QgsMapLayerConfigWidget void apply() override {} private slots: - void styleClicked( QModelIndex index ); - void currentStyleChanged( QString name ); - void styleAdded( QString name ); - void styleRemoved( QString name ); - void styleRenamed( QString oldname, QString newname ); + void styleClicked( const QModelIndex& index ); + void currentStyleChanged( const QString &name ); + void styleAdded( const QString& name ); + void styleRemoved( const QString& name ); + void styleRenamed( const QString& oldname, const QString& newname ); void addStyle(); void removeStyle(); void saveAsDefault(); diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp index 830b7b1e58b8..652a3f9c1858 100644 --- a/src/gui/qgsmaptoolcapture.cpp +++ b/src/gui/qgsmaptoolcapture.cpp @@ -352,7 +352,7 @@ int QgsMapToolCapture::nextPoint( QPoint p, QgsPointV2 &layerPoint, QgsPointV2 & return nextPoint( mapPoint, layerPoint ); } -int QgsMapToolCapture::fetchLayerPoint( QgsPointLocator::Match match , QgsPointV2 &layerPoint ) +int QgsMapToolCapture::fetchLayerPoint( const QgsPointLocator::Match& match , QgsPointV2 &layerPoint ) { QgsVectorLayer* vlayer = qobject_cast( mCanvas->currentLayer() ); QgsVectorLayer* sourceLayer = match.layer(); @@ -387,7 +387,7 @@ int QgsMapToolCapture::addVertex( const QgsPoint& point ) return addVertex( point, QgsPointLocator::Match() ); } -int QgsMapToolCapture::addVertex( const QgsPoint& point, QgsPointLocator::Match match ) +int QgsMapToolCapture::addVertex( const QgsPoint& point, const QgsPointLocator::Match& match ) { if ( mode() == CaptureNone ) { diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h index 30d895f061b1..1e91e9078e59 100644 --- a/src/gui/qgsmaptoolcapture.h +++ b/src/gui/qgsmaptoolcapture.h @@ -119,7 +119,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing * @note added in 2.14 */ // TODO QGIS 3.0 returns an enum instead of a magic constant - int fetchLayerPoint( QgsPointLocator::Match match, QgsPointV2& layerPoint ); + int fetchLayerPoint( const QgsPointLocator::Match &match, QgsPointV2& layerPoint ); /** Adds a point to the rubber band (in map coordinates) and to the capture list (in layer coordinates) * @return 0 in case of success, 1 if current layer is not a vector layer, 2 if coordinate transformation failed @@ -132,7 +132,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing * @param match Data about the snapping match. Can be an invalid match, if point not snapped. * @note added in 2.14 */ - int addVertex( const QgsPoint& mapPoint, QgsPointLocator::Match match ); + int addVertex( const QgsPoint& mapPoint, const QgsPointLocator::Match &match ); /** Removes the last vertex from mRubberBand and mCaptureList*/ void undo(); diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 5b5325017633..0c2090c57b90 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -87,12 +87,12 @@ QList QgsMapToolIdentify::identify( int x, i return identify( x, y, mode, layerList, AllLayers ); } -QList QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, const LayerType& layerType ) +QList QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, LayerType layerType ) { return identify( x, y, mode, QList(), layerType ); } -QList QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, const QList& layerList, const LayerType& layerType ) +QList QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, const QList& layerList, LayerType layerType ) { QList results; @@ -182,7 +182,7 @@ void QgsMapToolIdentify::deactivate() QgsMapTool::deactivate(); } -bool QgsMapToolIdentify::identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, const LayerType& layerType ) +bool QgsMapToolIdentify::identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, LayerType layerType ) { if ( layer->type() == QgsMapLayer::RasterLayer && layerType.testFlag( RasterLayer ) ) { diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h index 1450a1c69ba3..18acba06a952 100644 --- a/src/gui/qgsmaptoolidentify.h +++ b/src/gui/qgsmaptoolidentify.h @@ -123,7 +123,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool @param mode Identification mode. Can use Qgis default settings or a defined mode. @param layerType Only performs identification in a certain type of layers (raster, vector). Default value is AllLayers. @return a list of IdentifyResult*/ - QList identify( int x, int y, IdentifyMode mode, const LayerType& layerType = AllLayers ); + QList identify( int x, int y, IdentifyMode mode, QgsMapToolIdentify::LayerType layerType = AllLayers ); //! return a pointer to the identify menu which will be used in layer selection mode //! this menu can also be customized @@ -147,12 +147,12 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool @param layerList Performs the identification within the given list of layers. @param layerType Only performs identification in a certain type of layers (raster, vector). @return a list of IdentifyResult*/ - QList identify( int x, int y, IdentifyMode mode, const QList& layerList, const LayerType& layerType = AllLayers ); + QList identify( int x, int y, IdentifyMode mode, const QList& layerList, QgsMapToolIdentify::LayerType layerType = AllLayers ); QgsIdentifyMenu* mIdentifyMenu; /** Call the right method depending on layer type */ - bool identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, const QgsMapToolIdentify::LayerType& layerType = AllLayers ); + bool identifyLayer( QList *results, QgsMapLayer *layer, const QgsPoint& point, const QgsRectangle& viewExtent, double mapUnitsPerPixel, QgsMapToolIdentify::LayerType layerType = AllLayers ); bool identifyRasterLayer( QList *results, QgsRasterLayer *layer, QgsPoint point, const QgsRectangle& viewExtent, double mapUnitsPerPixel ); bool identifyVectorLayer( QList *results, QgsVectorLayer *layer, const QgsPoint& point ); diff --git a/src/gui/qgspanelwidget.cpp b/src/gui/qgspanelwidget.cpp index 1598ae0922b2..0ef06bf32a81 100644 --- a/src/gui/qgspanelwidget.cpp +++ b/src/gui/qgspanelwidget.cpp @@ -28,7 +28,7 @@ QgsPanelWidget::QgsPanelWidget( QWidget *parent ) { } -void QgsPanelWidget::connectChildPanels( QList panels ) +void QgsPanelWidget::connectChildPanels( const QList& panels ) { Q_FOREACH ( QgsPanelWidget* widget, panels ) { diff --git a/src/gui/qgspanelwidget.h b/src/gui/qgspanelwidget.h index 63bb2065af97..c586ac12e69b 100644 --- a/src/gui/qgspanelwidget.h +++ b/src/gui/qgspanelwidget.h @@ -36,7 +36,7 @@ class GUI_EXPORT QgsPanelWidget : public QWidget * Set the title of the panel when shown in the interface. * @param panelTitle The panel title. */ - void setPanelTitle( QString panelTitle ) { mPanelTitle = panelTitle; } + void setPanelTitle( const QString& panelTitle ) { mPanelTitle = panelTitle; } /** * The title of the panel. @@ -51,7 +51,7 @@ class GUI_EXPORT QgsPanelWidget : public QWidget * Use this method if you have children widgets that need to show a panel to the user. * @param panels A list of panel widgets to connect. */ - void connectChildPanels( QList panels ); + void connectChildPanels( const QList &panels ); /** * Connect the given sub panel widgets showPanel signals to this current panels diff --git a/src/gui/qgssourceselectdialog.cpp b/src/gui/qgssourceselectdialog.cpp index ef495638ce83..8957678ed0ee 100644 --- a/src/gui/qgssourceselectdialog.cpp +++ b/src/gui/qgssourceselectdialog.cpp @@ -459,7 +459,7 @@ void QgsSourceSelectDialog::buildQueryButtonClicked() buildQuery( connection, treeView->selectionModel()->currentIndex() ); } -void QgsSourceSelectDialog::filterChanged( QString text ) +void QgsSourceSelectDialog::filterChanged( const QString& text ) { QgsDebugMsg( "FeatureType filter changed to :" + text ); QRegExp::PatternSyntax mySyntax = QRegExp::PatternSyntax( QRegExp::RegExp ); diff --git a/src/gui/qgssourceselectdialog.h b/src/gui/qgssourceselectdialog.h index f53efd0d306f..2718fdafca7b 100644 --- a/src/gui/qgssourceselectdialog.h +++ b/src/gui/qgssourceselectdialog.h @@ -98,7 +98,7 @@ class GUI_EXPORT QgsSourceSelectDialog : public QDialog, protected Ui::QgsSource void changeCrs(); void changeCrsFilter(); void connectToServer(); - void filterChanged( QString text ); + void filterChanged( const QString &text ); void on_btnLoad_clicked(); void on_btnSave_clicked(); void on_cmbConnections_activated( int index ); diff --git a/src/gui/qgssqlcomposerdialog.cpp b/src/gui/qgssqlcomposerdialog.cpp index e2ab8e29f754..e3ad2f24a498 100644 --- a/src/gui/qgssqlcomposerdialog.cpp +++ b/src/gui/qgssqlcomposerdialog.cpp @@ -766,7 +766,7 @@ void QgsSQLComposerDialog::addApis( const QStringList& list ) mQueryEdit->lexer()->setAPIs( apis ); } -void QgsSQLComposerDialog::setSupportMultipleTables( bool on, QString mainTypename ) +void QgsSQLComposerDialog::setSupportMultipleTables( bool on, const QString& mainTypename ) { mJoinsLabels->setVisible( on ); mTableJoins->setVisible( on ); diff --git a/src/gui/qgssqlcomposerdialog.h b/src/gui/qgssqlcomposerdialog.h index c3cd82455097..a398dfd194d0 100644 --- a/src/gui/qgssqlcomposerdialog.h +++ b/src/gui/qgssqlcomposerdialog.h @@ -134,7 +134,7 @@ class GUI_EXPORT QgsSQLComposerDialog : public QDialog, private Ui::QgsSQLCompos void addApis( const QStringList& list ); //! set if multiple tables/joins are supported. Default is false - void setSupportMultipleTables( bool bMultipleTables, QString mainTypename = QString() ); + void setSupportMultipleTables( bool bMultipleTables, const QString &mainTypename = QString() ); /** Set a callback that will be called when a new table is selected, so that new column names can be added typically. diff --git a/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp index 841976f59294..435fa69ada6a 100644 --- a/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp +++ b/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp @@ -137,7 +137,7 @@ QgsRendererPropertiesDialog::QgsRendererPropertiesDialog( QgsVectorLayer* layer, connect( mEffectWidget, SIGNAL( showPanel( QgsPanelWidget* ) ), this, SLOT( openPanel( QgsPanelWidget* ) ) ); } -void QgsRendererPropertiesDialog::connectValueChanged( QList widgets, const char *slot ) +void QgsRendererPropertiesDialog::connectValueChanged( const QList& widgets, const char *slot ) { Q_FOREACH ( QWidget* widget, widgets ) { diff --git a/src/gui/symbology-ng/qgsrendererpropertiesdialog.h b/src/gui/symbology-ng/qgsrendererpropertiesdialog.h index c0e19804968c..64bf2a0acf72 100644 --- a/src/gui/symbology-ng/qgsrendererpropertiesdialog.h +++ b/src/gui/symbology-ng/qgsrendererpropertiesdialog.h @@ -128,7 +128,7 @@ class GUI_EXPORT QgsRendererPropertiesDialog : public QDialog, private Ui::QgsRe * @param widgets The list of widgets to check. * @param slot The slot to connect to the signals. */ - void connectValueChanged( QList widgets, const char *slot ); + void connectValueChanged( const QList &widgets, const char *slot ); //! Reimplements dialog keyPress event so we can ignore it void keyPressEvent( QKeyEvent * event ) override; diff --git a/src/gui/symbology-ng/qgssvgselectorwidget.h b/src/gui/symbology-ng/qgssvgselectorwidget.h index 3095aa8f1ff0..b5d5c60b0ec8 100644 --- a/src/gui/symbology-ng/qgssvgselectorwidget.h +++ b/src/gui/symbology-ng/qgssvgselectorwidget.h @@ -277,7 +277,7 @@ class GUI_EXPORT QgsSvgSelectorDialog : public QDialog Q_OBJECT public: QgsSvgSelectorDialog( QWidget* parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, - const QDialogButtonBox::StandardButtons& buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok, + QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok, Qt::Orientation orientation = Qt::Horizontal ); ~QgsSvgSelectorDialog(); diff --git a/src/plugins/georeferencer/qgsleastsquares.cpp b/src/plugins/georeferencer/qgsleastsquares.cpp index d0bdf5a06cd8..d915404e4c89 100644 --- a/src/plugins/georeferencer/qgsleastsquares.cpp +++ b/src/plugins/georeferencer/qgsleastsquares.cpp @@ -23,8 +23,8 @@ #include "qgsleastsquares.h" -void QgsLeastSquares::linear( QVector mapCoords, - QVector pixelCoords, +void QgsLeastSquares::linear( const QVector& mapCoords, + const QVector& pixelCoords, QgsPoint& origin, double& pixelXSize, double& pixelYSize ) { int n = mapCoords.size(); @@ -62,8 +62,8 @@ void QgsLeastSquares::linear( QVector mapCoords, } -void QgsLeastSquares::helmert( QVector mapCoords, - QVector pixelCoords, +void QgsLeastSquares::helmert( const QVector& mapCoords, + const QVector& pixelCoords, QgsPoint& origin, double& pixelSize, double& rotation ) { diff --git a/src/plugins/georeferencer/qgsleastsquares.h b/src/plugins/georeferencer/qgsleastsquares.h index 12fde912cddb..cb3408871412 100644 --- a/src/plugins/georeferencer/qgsleastsquares.h +++ b/src/plugins/georeferencer/qgsleastsquares.h @@ -25,12 +25,12 @@ class QgsLeastSquares { public: - static void linear( QVector mapCoords, - QVector pixelCoords, + static void linear( const QVector &mapCoords, + const QVector &pixelCoords, QgsPoint& origin, double& pixelXSize, double& pixelYSize ); - static void helmert( QVector mapCoords, - QVector pixelCoords, + static void helmert( const QVector& mapCoords, + const QVector& pixelCoords, QgsPoint& origin, double& pixelSize, double& rotation ); static void affine( QVector mapCoords, diff --git a/src/plugins/qgisplugin.h b/src/plugins/qgisplugin.h index 4a1e8d811a15..bc074ed064c5 100644 --- a/src/plugins/qgisplugin.h +++ b/src/plugins/qgisplugin.h @@ -77,7 +77,7 @@ class QgisPlugin QString const & description = "", QString const & category = "", QString const & version = "", - PLUGINTYPE const & type = MAPLAYER ) + PLUGINTYPE type = MAPLAYER ) : mName( name ) , mDescription( description ) , mCategory( category ) diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp index a98497dcfc86..33ca2f925094 100644 --- a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp +++ b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp @@ -155,7 +155,7 @@ QIcon QgsSpatialQueryPlugin::getThemeIcon( const QString &theName ) } } -void QgsSpatialQueryPlugin::MsgDEBUG( QString sMSg ) +void QgsSpatialQueryPlugin::MsgDEBUG( const QString& sMSg ) { QMessageBox::warning( nullptr, tr( "DEBUG" ), sMSg, QMessageBox::Ok ); } diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.h b/src/plugins/spatialquery/qgsspatialqueryplugin.h index 7787f7e0afdc..7047cb1a8faf 100644 --- a/src/plugins/spatialquery/qgsspatialqueryplugin.h +++ b/src/plugins/spatialquery/qgsspatialqueryplugin.h @@ -74,7 +74,7 @@ class QgsSpatialQueryPlugin: public QObject, public QgisPlugin QAction* mSpatialQueryAction; - void MsgDEBUG( QString sMSg ); + void MsgDEBUG( const QString &sMSg ); }; #endif diff --git a/src/plugins/topology/topolError.cpp b/src/plugins/topology/topolError.cpp index 000997ed2f4d..9e6a8ebfea12 100644 --- a/src/plugins/topology/topolError.cpp +++ b/src/plugins/topology/topolError.cpp @@ -26,7 +26,7 @@ bool TopolError::fix( const QString& fixName ) return ( this->*mFixMap[fixName] )(); } -bool TopolError::fixMove( FeatureLayer fl1, FeatureLayer fl2 ) +bool TopolError::fixMove( const FeatureLayer& fl1, const FeatureLayer& fl2 ) { bool ok; QgsFeature f1, f2; @@ -59,7 +59,7 @@ bool TopolError::fixMoveSecond() return fixMove( mFeaturePairs.at( 1 ), mFeaturePairs.at( 0 ) ); } -bool TopolError::fixUnion( FeatureLayer fl1, FeatureLayer fl2 ) +bool TopolError::fixUnion( const FeatureLayer& fl1, const FeatureLayer& fl2 ) { bool ok; QgsFeature f1, f2; diff --git a/src/plugins/topology/topolError.h b/src/plugins/topology/topolError.h index 9fd21b27df17..9a8b000f8aec 100644 --- a/src/plugins/topology/topolError.h +++ b/src/plugins/topology/topolError.h @@ -96,13 +96,13 @@ class TopolError * @param fl1 first FeatureLayer pair * @param fl2 second FeatureLayer pair */ - bool fixMove( FeatureLayer fl1, FeatureLayer fl2 ); + bool fixMove( const FeatureLayer &fl1, const FeatureLayer &fl2 ); /** * Unions features to the first one * @param fl1 first FeatureLayer pair * @param fl2 second FeatureLayer pair */ - bool fixUnion( FeatureLayer fl1, FeatureLayer fl2 ); + bool fixUnion( const FeatureLayer &fl1, const FeatureLayer &fl2 ); public: /** diff --git a/src/providers/arcgisrest/qgsafsprovider.cpp b/src/providers/arcgisrest/qgsafsprovider.cpp index 25f5b5a8f9b5..9c7a7818a29e 100644 --- a/src/providers/arcgisrest/qgsafsprovider.cpp +++ b/src/providers/arcgisrest/qgsafsprovider.cpp @@ -153,7 +153,7 @@ QgsFeatureIterator QgsAfsProvider::getFeatures( const QgsFeatureRequest& request return new QgsAfsFeatureIterator( new QgsAfsFeatureSource( this ), true, request ); } -bool QgsAfsProvider::getFeature( const QgsFeatureId &id, QgsFeature &f, bool fetchGeometry, const QList& /*fetchAttributes*/, const QgsRectangle filterRect ) +bool QgsAfsProvider::getFeature( QgsFeatureId id, QgsFeature &f, bool fetchGeometry, const QList& /*fetchAttributes*/, const QgsRectangle& filterRect ) { // If cached, return cached feature QMap::const_iterator it = mCache.find( id ); diff --git a/src/providers/arcgisrest/qgsafsprovider.h b/src/providers/arcgisrest/qgsafsprovider.h index d061dc8bd275..44d28fff7421 100644 --- a/src/providers/arcgisrest/qgsafsprovider.h +++ b/src/providers/arcgisrest/qgsafsprovider.h @@ -36,7 +36,7 @@ class QgsAfsProvider : public QgsVectorDataProvider QgsAfsProvider( const QString& uri ); ~QgsAfsProvider() {} - bool getFeature( const QgsFeatureId& id, QgsFeature& f, bool fetchGeometry, const QList &fetchAttributes, const QgsRectangle filterRect = QgsRectangle() ); + bool getFeature( QgsFeatureId id, QgsFeature& f, bool fetchGeometry, const QList &fetchAttributes, const QgsRectangle &filterRect = QgsRectangle() ); /* Inherited from QgsVectorDataProvider */ QgsAbstractFeatureSource* featureSource() const override; diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp index 47b77e0b2358..f3f9dfec1712 100644 --- a/src/providers/arcgisrest/qgsamsprovider.cpp +++ b/src/providers/arcgisrest/qgsamsprovider.cpp @@ -50,7 +50,7 @@ void QgsAmsLegendFetcher::start() mQuery->start( queryUrl, &mQueryReply ); } -void QgsAmsLegendFetcher::handleError( QString errorTitle, QString errorMsg ) +void QgsAmsLegendFetcher::handleError( const QString& errorTitle, const QString& errorMsg ) { emit error( errorTitle + ": " + errorMsg ); } diff --git a/src/providers/arcgisrest/qgsamsprovider.h b/src/providers/arcgisrest/qgsamsprovider.h index 9cca888041bc..44d9077d0cdc 100644 --- a/src/providers/arcgisrest/qgsamsprovider.h +++ b/src/providers/arcgisrest/qgsamsprovider.h @@ -38,7 +38,7 @@ class QgsAmsLegendFetcher : public QgsImageFetcher private slots: void handleFinished(); - void handleError( QString errorTitle, QString errorMsg ); + void handleError( const QString &errorTitle, const QString &errorMsg ); private: QgsAmsProvider* mProvider; diff --git a/src/providers/db2/qgsdb2geometrycolumns.cpp b/src/providers/db2/qgsdb2geometrycolumns.cpp index cdb923c695bb..5576ca2dff5c 100644 --- a/src/providers/db2/qgsdb2geometrycolumns.cpp +++ b/src/providers/db2/qgsdb2geometrycolumns.cpp @@ -21,7 +21,7 @@ #include -QgsDb2GeometryColumns::QgsDb2GeometryColumns( const QSqlDatabase db ) +QgsDb2GeometryColumns::QgsDb2GeometryColumns( const QSqlDatabase& db ) : mDatabase( db ) , mEnvironment( ENV_LUW ) { diff --git a/src/providers/db2/qgsdb2geometrycolumns.h b/src/providers/db2/qgsdb2geometrycolumns.h index 21235f118194..a645bdc563a0 100644 --- a/src/providers/db2/qgsdb2geometrycolumns.h +++ b/src/providers/db2/qgsdb2geometrycolumns.h @@ -28,10 +28,10 @@ static const int ENV_LUW = 1, ENV_ZOS = 2; -class QgsDb2GeometryColumns +class QgsDb2GeometryColumns // clazy:exclude=rule-of-three { public: - explicit QgsDb2GeometryColumns( const QSqlDatabase db ); + explicit QgsDb2GeometryColumns( const QSqlDatabase &db ); ~QgsDb2GeometryColumns(); diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp index 3f83c0c5a3a9..31dc48b80f06 100644 --- a/src/providers/db2/qgsdb2provider.cpp +++ b/src/providers/db2/qgsdb2provider.cpp @@ -30,7 +30,7 @@ static const QString PROVIDER_DESCRIPTION = "DB2 Spatial Extender provider"; int QgsDb2Provider::sConnectionId = 0; -QgsDb2Provider::QgsDb2Provider( QString uri ) +QgsDb2Provider::QgsDb2Provider( const QString& uri ) : QgsVectorDataProvider( uri ) , mNumberFeatures( 0 ) , mEnvironment( ENV_LUW ) @@ -1542,7 +1542,7 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer( const QStrin return QgsVectorLayerImport::NoError; } -QString QgsDb2Provider::qgsFieldToDb2Field( QgsField field ) +QString QgsDb2Provider::qgsFieldToDb2Field( const QgsField& field ) { QString result = ""; switch ( field.type() ) diff --git a/src/providers/db2/qgsdb2provider.h b/src/providers/db2/qgsdb2provider.h index 310ee349b12b..12b89af8b9a7 100644 --- a/src/providers/db2/qgsdb2provider.h +++ b/src/providers/db2/qgsdb2provider.h @@ -34,7 +34,7 @@ class QgsDb2Provider : public QgsVectorDataProvider Q_OBJECT public: - explicit QgsDb2Provider( QString uri = QString() ); + explicit QgsDb2Provider( const QString &uri = QString() ); virtual ~QgsDb2Provider(); @@ -136,7 +136,7 @@ class QgsDb2Provider : public QgsVectorDataProvider static bool convertField( QgsField &field ); /** Convert a QgsField to work with DB2 */ - static QString qgsFieldToDb2Field( QgsField field ); + static QString qgsFieldToDb2Field( const QgsField &field ); protected: /** Loads fields from input file to member attributeFields */ diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp index bf85bc175bf2..f70a9394c270 100644 --- a/src/providers/db2/qgsdb2sourceselect.cpp +++ b/src/providers/db2/qgsdb2sourceselect.cpp @@ -234,7 +234,7 @@ void QgsDb2SourceSelect::on_btnDelete_clicked() emit connectionsChanged(); } -void QgsDb2SourceSelect::deleteConnection( QString name ) +void QgsDb2SourceSelect::deleteConnection( const QString& name ) { QString key = "/Db2/connections/" + name; QSettings settings; @@ -389,7 +389,7 @@ void QgsDb2SourceSelect::on_mSearchModeComboBox_currentIndexChanged( const QStri on_mSearchTableEdit_textChanged( mSearchTableEdit->text() ); } -void QgsDb2SourceSelect::setLayerType( QgsDb2LayerProperty layerProperty ) +void QgsDb2SourceSelect::setLayerType( const QgsDb2LayerProperty& layerProperty ) { mTableModel.setGeometryTypesForTable( layerProperty ); } @@ -612,7 +612,7 @@ void QgsDb2SourceSelect::setSql( const QModelIndex &index ) delete vlayer; } -void QgsDb2SourceSelect::addSearchGeometryColumn( QString connectionName, QgsDb2LayerProperty layerProperty, bool estimateMetadata ) +void QgsDb2SourceSelect::addSearchGeometryColumn( const QString& connectionName, const QgsDb2LayerProperty& layerProperty, bool estimateMetadata ) { // store the column details and do the query in a thread if ( !mColumnTypeThread ) @@ -631,7 +631,7 @@ void QgsDb2SourceSelect::addSearchGeometryColumn( QString connectionName, QgsDb2 emit addGeometryColumn( layerProperty ); } -QString QgsDb2SourceSelect::fullDescription( QString schema, QString table, QString column, QString type ) +QString QgsDb2SourceSelect::fullDescription( const QString& schema, const QString& table, const QString& column, const QString& type ) { QString full_desc = ""; if ( !schema.isEmpty() ) @@ -668,7 +668,7 @@ void QgsDb2SourceSelect::treeWidgetSelectionChanged( const QItemSelection &selec } -QgsDb2GeomColumnTypeThread::QgsDb2GeomColumnTypeThread( QString connectionName, bool useEstimatedMetadata ) +QgsDb2GeomColumnTypeThread::QgsDb2GeomColumnTypeThread( const QString& connectionName, bool useEstimatedMetadata ) : QThread() , mConnectionName( connectionName ) , mUseEstimatedMetadata( useEstimatedMetadata ) @@ -677,7 +677,7 @@ QgsDb2GeomColumnTypeThread::QgsDb2GeomColumnTypeThread( QString connectionName, qRegisterMetaType( "QgsDb2LayerProperty" ); } -void QgsDb2GeomColumnTypeThread::addGeometryColumn( QgsDb2LayerProperty layerProperty ) +void QgsDb2GeomColumnTypeThread::addGeometryColumn( const QgsDb2LayerProperty& layerProperty ) { layerProperties << layerProperty; } diff --git a/src/providers/db2/qgsdb2sourceselect.h b/src/providers/db2/qgsdb2sourceselect.h index 6bfbf1fca581..9da9bff981e2 100644 --- a/src/providers/db2/qgsdb2sourceselect.h +++ b/src/providers/db2/qgsdb2sourceselect.h @@ -57,7 +57,7 @@ class QgsDb2GeomColumnTypeThread : public QThread { Q_OBJECT public: - QgsDb2GeomColumnTypeThread( QString connectionName, bool useEstimatedMetadata ); + QgsDb2GeomColumnTypeThread( const QString &connectionName, bool useEstimatedMetadata ); // These functions get the layer types and pass that information out // by emitting the setLayerType() signal. @@ -67,7 +67,7 @@ class QgsDb2GeomColumnTypeThread : public QThread void setLayerType( QgsDb2LayerProperty layerProperty ); public slots: - void addGeometryColumn( QgsDb2LayerProperty layerProperty ); + void addGeometryColumn( const QgsDb2LayerProperty &layerProperty ); void stop(); private: @@ -94,7 +94,7 @@ class QgsDb2SourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase public: //! static function to delete a connection - static void deleteConnection( QString key ); + static void deleteConnection( const QString &key ); //! Constructor QgsDb2SourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false ); @@ -139,7 +139,7 @@ class QgsDb2SourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase void setSql( const QModelIndex& index ); //! Store the selected database void on_cmbConnections_activated( int ); - void setLayerType( QgsDb2LayerProperty layerProperty ); + void setLayerType( const QgsDb2LayerProperty &layerProperty ); void on_mTablesTreeView_clicked( const QModelIndex &index ); void on_mTablesTreeView_doubleClicked( const QModelIndex &index ); void treeWidgetSelectionChanged( const QItemSelection &selected, const QItemSelection &deselected ); @@ -161,14 +161,14 @@ class QgsDb2SourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase bool mEmbeddedMode; // queue another query for the thread - void addSearchGeometryColumn( QString connectionName, QgsDb2LayerProperty layerProperty, bool estimateMetadata ); + void addSearchGeometryColumn( const QString &connectionName, const QgsDb2LayerProperty &layerProperty, bool estimateMetadata ); // Set the position of the database connection list to the last // used one. void setConnectionListPosition(); // Combine the schema, table and column data into a single string // useful for display to the user - QString fullDescription( QString schema, QString table, QString column, QString type ); + QString fullDescription( const QString &schema, const QString &table, const QString &column, const QString &type ); // The column labels QStringList mColumnLabels; // Our thread for doing long running queries diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp index 47c373c8076d..aa881abedbb1 100644 --- a/src/providers/gdal/qgsgdaldataitems.cpp +++ b/src/providers/gdal/qgsgdaldataitems.cpp @@ -54,7 +54,7 @@ QgsGdalLayerItem::~QgsGdalLayerItem() } -bool QgsGdalLayerItem::setCrs( QgsCoordinateReferenceSystem crs ) +bool QgsGdalLayerItem::setCrs( const QgsCoordinateReferenceSystem &crs ) { GDALDatasetH hDS = GDALOpen( TO8F( mPath ), GA_Update ); if ( !hDS ) diff --git a/src/providers/gdal/qgsgdaldataitems.h b/src/providers/gdal/qgsgdaldataitems.h index b5d0625b50ed..a15738a21cf6 100644 --- a/src/providers/gdal/qgsgdaldataitems.h +++ b/src/providers/gdal/qgsgdaldataitems.h @@ -31,7 +31,7 @@ class QgsGdalLayerItem : public QgsLayerItem QStringList *theSublayers = nullptr ); ~QgsGdalLayerItem(); - bool setCrs( QgsCoordinateReferenceSystem crs ) override; + bool setCrs( const QgsCoordinateReferenceSystem& crs ) override; QVector createChildren() override; diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp index f22dba4ab841..056588d617fd 100644 --- a/src/providers/gdal/qgsgdalprovider.cpp +++ b/src/providers/gdal/qgsgdalprovider.cpp @@ -1916,7 +1916,7 @@ QStringList QgsGdalProvider::subLayers() const return mSubLayers; } -void QgsGdalProvider::emitProgress( int theType, double theProgress, QString theMessage ) +void QgsGdalProvider::emitProgress( int theType, double theProgress, const QString& theMessage ) { emit progress( theType, theProgress, theMessage ); } diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h index 10ee10ff269b..982bf04d19b9 100644 --- a/src/providers/gdal/qgsgdalprovider.h +++ b/src/providers/gdal/qgsgdalprovider.h @@ -221,7 +221,7 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase void closeDataset(); /** Emit a signal to notify of the progress event. */ - void emitProgress( int theType, double theProgress, QString theMessage ); + void emitProgress( int theType, double theProgress, const QString &theMessage ); void emitProgressUpdate( int theProgress ); static QMap supportedMimes(); diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp index cdec74c4d32f..aceda83085ce 100644 --- a/src/providers/grass/qgsgrass.cpp +++ b/src/providers/grass/qgsgrass.cpp @@ -592,13 +592,13 @@ QString QgsGrass::getDefaultMapsetPath() return getDefaultLocationPath() + "/" + defaultMapset; } -void QgsGrass::setLocation( QString gisdbase, QString location ) +void QgsGrass::setLocation( const QString& gisdbase, const QString& location ) { QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase, location ) ); setMapset( gisdbase, location, "PERMANENT" ); } -void QgsGrass::setMapset( QString gisdbase, QString location, QString mapset ) +void QgsGrass::setMapset( const QString& gisdbase, const QString& location, const QString& mapset ) { QgsDebugMsg( QString( "gisdbase = %1 location = %2 mapset = %3" ).arg( gisdbase, location, mapset ) ); if ( !init() ) @@ -647,12 +647,12 @@ void QgsGrass::setMapset( QString gisdbase, QString location, QString mapset ) #endif } -void QgsGrass::setMapset( QgsGrassObject grassObject ) +void QgsGrass::setMapset( const QgsGrassObject& grassObject ) { setMapset( grassObject.gisdbase(), grassObject.location(), grassObject.mapset() ); } -bool QgsGrass::isMapsetInSearchPath( QString mapset ) +bool QgsGrass::isMapsetInSearchPath( const QString& mapset ) { return mMapsetSearchPath.contains( mapset ); } @@ -1787,7 +1787,7 @@ void QgsGrass::initRegion( struct Cell_head *window ) window->cols = 1; } -void QgsGrass::setRegion( struct Cell_head *window, QgsRectangle rect ) +void QgsGrass::setRegion( struct Cell_head *window, const QgsRectangle& rect ) { window->west = rect.xMinimum(); window->south = rect.yMinimum(); @@ -1795,7 +1795,7 @@ void QgsGrass::setRegion( struct Cell_head *window, QgsRectangle rect ) window->north = rect.yMaximum(); } -QString QgsGrass::setRegion( struct Cell_head *window, QgsRectangle rect, int rows, int cols ) +QString QgsGrass::setRegion( struct Cell_head *window, const QgsRectangle& rect, int rows, int cols ) { initRegion( window ); window->west = rect.xMinimum(); @@ -1834,8 +1834,8 @@ QgsRectangle QgsGrass::extent( struct Cell_head *window ) return QgsRectangle( window->west, window->south, window->east, window->north ); } -bool QgsGrass::mapRegion( QgsGrassObject::Type type, QString gisdbase, - QString location, QString mapset, QString map, +bool QgsGrass::mapRegion( QgsGrassObject::Type type, const QString& gisdbase, + const QString& location, const QString& mapset, const QString& map, struct Cell_head *window ) { QgsDebugMsg( QString( "map = %1" ).arg( map ) ); @@ -2299,8 +2299,8 @@ QHash QgsGrass::info( const QString& gisdbase, const QString& return inf; } -QList QgsGrass::colors( QString gisdbase, QString location, QString mapset, - QString map, QString& error ) +QList QgsGrass::colors( const QString& gisdbase, const QString& location, const QString& mapset, + const QString& map, QString& error ) { QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase, location ) ); QList ct; @@ -2330,7 +2330,7 @@ QList QgsGrass::colors( QString gisdbase, QString location, QSt return ct; } -QMap QgsGrass::query( QString gisdbase, QString location, QString mapset, QString map, QgsGrassObject::Type type, double x, double y ) +QMap QgsGrass::query( const QString& gisdbase, const QString& location, const QString& mapset, const QString& map, QgsGrassObject::Type type, double x, double y ) { QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase, location ) ); @@ -2456,7 +2456,7 @@ void QgsGrass::createVectorMap( const QgsGrassObject & object, QString &error ) QgsGrass::unlock(); } -void QgsGrass::createTable( dbDriver *driver, const QString tableName, const QgsFields &fields ) +void QgsGrass::createTable( dbDriver *driver, const QString& tableName, const QgsFields &fields ) { if ( !driver ) // should not happen { @@ -2514,7 +2514,7 @@ void QgsGrass::createTable( dbDriver *driver, const QString tableName, const Qgs } } -void QgsGrass::insertRow( dbDriver *driver, const QString tableName, +void QgsGrass::insertRow( dbDriver *driver, const QString& tableName, const QgsAttributes& attributes ) { if ( !driver ) // should not happen @@ -2723,7 +2723,7 @@ QString QgsGrass::gisrcFilePath() return mGisrc; } -void QgsGrass::putEnv( QString name, QString value ) +void QgsGrass::putEnv( const QString& name, const QString& value ) { QString env = name + "=" + value; /* _Correct_ putenv() implementation is not making copy! */ diff --git a/src/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h index bff3f38634ce..624ca8573843 100644 --- a/src/providers/grass/qgsgrass.h +++ b/src/providers/grass/qgsgrass.h @@ -216,7 +216,7 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject * @param gisdbase full path to GRASS GISDBASE. * @param location location name (not path!). */ - static void setLocation( QString gisdbase, QString location ); + static void setLocation( const QString &gisdbase, const QString &location ); /*! * @param gisdbase full path to GRASS GISDBASE. @@ -224,17 +224,17 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject * @param mapset current mupset. Note that some variables depend on mapset and * may influence behaviour of some functions (e.g. search path etc.) */ - static void setMapset( QString gisdbase, QString location, QString mapset ); + static void setMapset( const QString &gisdbase, const QString &location, const QString &mapset ); /** Set mapset according to object gisdbase, location and mapset * @param grassObject */ - static void setMapset( QgsGrassObject grassObject ); + static void setMapset( const QgsGrassObject &grassObject ); /** Check if mapset is in search pat set by g.mapsets * @return true if in search path */ - bool isMapsetInSearchPath( QString mapset ); + bool isMapsetInSearchPath( const QString &mapset ); /** Add mapset to search path of currently open mapset */ void addMapsetToSearchPath( const QString & mapset, QString& error ); @@ -334,17 +334,17 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject //! Initialize GRASS region static void initRegion( struct Cell_head *window ); //! Set region extent - static void setRegion( struct Cell_head *window, QgsRectangle rect ); + static void setRegion( struct Cell_head *window, const QgsRectangle &rect ); /** Init region, set extent, rows and cols and adjust. * Returns error if adjustment failed. */ - static QString setRegion( struct Cell_head *window, QgsRectangle rect, int rows, int cols ); + static QString setRegion( struct Cell_head *window, const QgsRectangle &rect, int rows, int cols ); //! Get extent from region static QgsRectangle extent( struct Cell_head *window ); // ! Get map region - static bool mapRegion( QgsGrassObject::Type type, QString gisdbase, - QString location, QString mapset, QString map, + static bool mapRegion( QgsGrassObject::Type type, const QString &gisdbase, + const QString &location, const QString &mapset, const QString &map, struct Cell_head *window ); // ! String representation of region @@ -472,12 +472,12 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject int timeOut, QString &error ); // ! List of Color - static QList colors( QString gisdbase, QString location, QString mapset, - QString map, QString& error ); + static QList colors( const QString &gisdbase, const QString &location, const QString &mapset, + const QString &map, QString& error ); // ! Get map value / feature info - static QMap query( QString gisdbase, QString location, - QString mapset, QString map, QgsGrassObject::Type type, double x, double y ); + static QMap query( const QString &gisdbase, const QString &location, + const QString &mapset, const QString &map, QgsGrassObject::Type type, double x, double y ); // ! Rename GRASS object, throws QgsGrass::Exception static void renameObject( const QgsGrassObject & object, const QString& newName ); @@ -499,10 +499,10 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject static void createVectorMap( const QgsGrassObject & object, QString &error ); /** Create new table. Throws QgsGrass::Exception */ - static void createTable( dbDriver *driver, const QString tableName, const QgsFields &fields ); + static void createTable( dbDriver *driver, const QString &tableName, const QgsFields &fields ); /** Insert row to table. Throws QgsGrass::Exception */ - static void insertRow( dbDriver *driver, const QString tableName, + static void insertRow( dbDriver *driver, const QString &tableName, const QgsAttributes& attributes ); /** Returns true if object is link to external data (created by r.external) */ @@ -533,7 +533,7 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject // files case sensitivity (insensitive on windows) static Qt::CaseSensitivity caseSensitivity(); // set environment variable - static void putEnv( QString name, QString value ); + static void putEnv( const QString &name, const QString &value ); // platform dependent PATH separator static QString pathSeparator(); @@ -611,7 +611,7 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject // Sleep miliseconds (for debugging), does not work on threads(?) static void sleep( int ms ); - void emitNewLayer( QString uri, QString name ) { emit newLayer( uri, name ); } + void emitNewLayer( const QString& uri, const QString& name ) { emit newLayer( uri, name ); } /** Parse single line of output from GRASS modules run with GRASS_MESSAGE_FORMAT=gui * @param input input string read from module stderr diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp index fcee33c85f4d..6c16f3ea96ba 100644 --- a/src/providers/grass/qgsgrassimport.cpp +++ b/src/providers/grass/qgsgrassimport.cpp @@ -123,7 +123,7 @@ void QgsGrassImportProgress::setValue( int value ) } //------------------------------ QgsGrassImport ------------------------------------ -QgsGrassImport::QgsGrassImport( QgsGrassObject grassObject ) +QgsGrassImport::QgsGrassImport( const QgsGrassObject& grassObject ) : QObject() , mGrassObject( grassObject ) , mCanceled( false ) @@ -147,7 +147,7 @@ QgsGrassImport::~QgsGrassImport() QgsGrassImportIcon::instance()->disconnectFrameChanged( this, SLOT( frameChanged() ) ); } -void QgsGrassImport::setError( QString error ) +void QgsGrassImport::setError( const QString& error ) { QgsDebugMsg( "error: " + error ); mError = error; diff --git a/src/providers/grass/qgsgrassimport.h b/src/providers/grass/qgsgrassimport.h index dd03961f5620..a26fba7fbe86 100644 --- a/src/providers/grass/qgsgrassimport.h +++ b/src/providers/grass/qgsgrassimport.h @@ -73,7 +73,7 @@ class GRASS_LIB_EXPORT QgsGrassImport : public QObject { Q_OBJECT public: - QgsGrassImport( QgsGrassObject grassObject ); + QgsGrassImport( const QgsGrassObject &grassObject ); virtual ~QgsGrassImport(); QgsGrassObject grassObject() const { return mGrassObject; } virtual void importInThread(); @@ -101,7 +101,7 @@ class GRASS_LIB_EXPORT QgsGrassImport : public QObject protected: static bool run( QgsGrassImport *imp ); - void setError( QString error ); + void setError( const QString &error ); void addProgressRow( QString html ); QgsGrassObject mGrassObject; QString mError; diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp index 3865d6bcb22e..f10ace7e4a84 100644 --- a/src/providers/grass/qgsgrassprovider.cpp +++ b/src/providers/grass/qgsgrassprovider.cpp @@ -109,7 +109,7 @@ static QString GRASS_KEY = "grass"; int QgsGrassProvider::LAST_TYPE = -9999; int QgsGrassProvider::mEditedCount = 0; -QgsGrassProvider::QgsGrassProvider( QString uri ) +QgsGrassProvider::QgsGrassProvider( const QString& uri ) : QgsVectorDataProvider( uri ) , mLayerField( -1 ) , mLayerType( POINT ) @@ -516,7 +516,7 @@ int QgsGrassProvider::grassLayer() return mLayerField; } -int QgsGrassProvider::grassLayer( QString name ) +int QgsGrassProvider::grassLayer( const QString& name ) { // Get field number int pos = name.indexOf( '_' ); @@ -529,7 +529,7 @@ int QgsGrassProvider::grassLayer( QString name ) return name.leftRef( pos ).toInt(); } -int QgsGrassProvider::grassLayerType( QString name ) +int QgsGrassProvider::grassLayerType( const QString& name ) { int pos = name.indexOf( '_' ); diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h index f78c2bfb7d6b..daef91fec2d3 100644 --- a/src/providers/grass/qgsgrassprovider.h +++ b/src/providers/grass/qgsgrassprovider.h @@ -59,7 +59,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider public: static int LAST_TYPE; - QgsGrassProvider( QString uri = QString() ); + QgsGrassProvider( const QString &uri = QString() ); virtual ~QgsGrassProvider(); @@ -339,12 +339,12 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider /** Returns GRASS layer number for given layer name or -1 if cannot * get layer number */ - static int grassLayer( QString ); + static int grassLayer( const QString & ); /** Returns GRASS layer type (GV_POINT, GV_LINES, GV_AREA) for * given layer name or -1 if cannot get layer type */ - static int grassLayerType( QString ); + static int grassLayerType( const QString & ); /** Return a provider name */ QString name() const override; diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp index 7f09abbd84c5..d3348807abe4 100644 --- a/src/providers/grass/qgsgrassprovidermodule.cpp +++ b/src/providers/grass/qgsgrassprovidermodule.cpp @@ -39,7 +39,7 @@ #include //----------------------- QgsGrassItemActions ------------------------------ -QgsGrassItemActions::QgsGrassItemActions( QgsGrassObject grassObject, bool valid, QObject *parent ) +QgsGrassItemActions::QgsGrassItemActions( const QgsGrassObject& grassObject, bool valid, QObject *parent ) : QObject( parent ) , mGrassObject( grassObject ) , mValid( valid ) @@ -265,7 +265,7 @@ QString QgsGrassItemActions::newVectorMap() } -void QgsGrassItemActions::newLayer( QString type ) +void QgsGrassItemActions::newLayer( const QString& type ) { QString name; if ( mGrassObject.type() == QgsGrassObject::Mapset ) @@ -316,7 +316,7 @@ void QgsGrassItemActions::newPolygonLayer() //----------------------- QgsGrassObjectItemBase ------------------------------ -QgsGrassObjectItemBase::QgsGrassObjectItemBase( QgsGrassObject grassObject ) +QgsGrassObjectItemBase::QgsGrassObjectItemBase( const QgsGrassObject& grassObject ) : mGrassObject( grassObject ) { } @@ -434,7 +434,7 @@ void QgsGrassMapsetItem::setState( State state ) QgsDirectoryItem::setState( state ); } -bool QgsGrassMapsetItem::objectInImports( QgsGrassObject grassObject ) +bool QgsGrassMapsetItem::objectInImports( const QgsGrassObject& grassObject ) { Q_FOREACH ( QgsGrassImport* import, mImports ) { diff --git a/src/providers/grass/qgsgrassprovidermodule.h b/src/providers/grass/qgsgrassprovidermodule.h index 58a093e17cb8..c741d85b5d43 100644 --- a/src/providers/grass/qgsgrassprovidermodule.h +++ b/src/providers/grass/qgsgrassprovidermodule.h @@ -34,7 +34,7 @@ class QgsGrassItemActions : public QObject { Q_OBJECT public: - QgsGrassItemActions( QgsGrassObject grassObject, bool valid, QObject *parent ); + QgsGrassItemActions( const QgsGrassObject &grassObject, bool valid, QObject *parent ); QList actions(); @@ -52,7 +52,7 @@ class QgsGrassItemActions : public QObject private: // returns name of new vector map or empty string QString newVectorMap(); - void newLayer( QString type ); + void newLayer( const QString &type ); QgsGrassObject mGrassObject; // Grass object is valid bool mValid; @@ -62,7 +62,7 @@ class QgsGrassObjectItemBase { public: // actionsParent so that actions are moved to thread with item - explicit QgsGrassObjectItemBase( QgsGrassObject grassObject ); + explicit QgsGrassObjectItemBase( const QgsGrassObject &grassObject ); bool equal( const QgsDataItem *other ); @@ -105,7 +105,7 @@ class QgsGrassMapsetItem : public QgsDirectoryItem, public QgsGrassObjectItemBas virtual void childrenCreated() override; private: - bool objectInImports( QgsGrassObject grassObject ); + bool objectInImports( const QgsGrassObject &grassObject ); QgsGrassItemActions *mActions; //void showImportError(const QString& error); QFileSystemWatcher *mMapsetFileSystemWatcher; @@ -229,7 +229,7 @@ class QgsGrassImportItem : public QgsDataItem, public QgsGrassObjectItemBase protected: // override refresh to keep Populating state - virtual void refresh( QVector children ) override { Q_UNUSED( children ); } + virtual void refresh( const QVector& children ) override { Q_UNUSED( children ); } //bool mDeleteAction; QgsGrassImport* mImport; diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp index 37b477950573..3a9302886199 100644 --- a/src/providers/grass/qgsgrassrasterprovider.cpp +++ b/src/providers/grass/qgsgrassrasterprovider.cpp @@ -576,7 +576,7 @@ bool QgsGrassRasterProvider::isValid() const return mValid; } -void QgsGrassRasterProvider::setLastError( QString error ) +void QgsGrassRasterProvider::setLastError( const QString& error ) { mLastErrorTitle = tr( "GRASS raster provider" ); mLastError = error; @@ -588,7 +588,7 @@ void QgsGrassRasterProvider::clearLastError() mLastError.clear(); } -void QgsGrassRasterProvider::appendIfError( QString error ) +void QgsGrassRasterProvider::appendIfError( const QString& error ) { if ( !error.isEmpty() ) { diff --git a/src/providers/grass/qgsgrassrasterprovider.h b/src/providers/grass/qgsgrassrasterprovider.h index ae169794189e..e5eb82d14b3e 100644 --- a/src/providers/grass/qgsgrassrasterprovider.h +++ b/src/providers/grass/qgsgrassrasterprovider.h @@ -63,6 +63,9 @@ class GRASS_LIB_EXPORT QgsGrassRasterValue // ok is set to true if ok or false on error double value( double x, double y, bool *ok ); private: + QgsGrassRasterValue( const QgsGrassRasterValue& other ); + QgsGrassRasterValue& operator=( const QgsGrassRasterValue& other ); + void start(); QString mGisdbase; // map gisdabase QString mLocation; // map location name (not path!) @@ -209,10 +212,10 @@ class GRASS_LIB_EXPORT QgsGrassRasterProvider : public QgsRasterDataProvider void thaw(); private: - void setLastError( QString error ); + void setLastError( const QString &error ); void clearLastError(); // append error if it is not empty - void appendIfError( QString error ); + void appendIfError( const QString &error ); /** * Flag indicating if the layer data source is a valid layer */ diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp index 7877f166583b..21e178aabec9 100644 --- a/src/providers/grass/qgsgrassvectormaplayer.cpp +++ b/src/providers/grass/qgsgrassvectormaplayer.cpp @@ -386,7 +386,7 @@ void QgsGrassVectorMapLayer::updateFields() #endif } -QString QgsGrassVectorMapLayer::quotedValue( QVariant value ) +QString QgsGrassVectorMapLayer::quotedValue( const QVariant& value ) { if ( value.isNull() ) { @@ -1069,7 +1069,7 @@ bool QgsGrassVectorMapLayer::isOrphan( int cat, QString &error ) return recordExists( cat, error ); } -void QgsGrassVectorMapLayer::changeAttributeValue( int cat, QgsField field, QVariant value, QString &error ) +void QgsGrassVectorMapLayer::changeAttributeValue( int cat, const QgsField& field, const QVariant& value, QString &error ) { QgsDebugMsg( QString( "cat = %1 field.name() = %2 value = %3" ).arg( cat ).arg( field.name(), value.toString() ) ); diff --git a/src/providers/grass/qgsgrassvectormaplayer.h b/src/providers/grass/qgsgrassvectormaplayer.h index 98202dcfebb1..4ea54fe92e23 100644 --- a/src/providers/grass/qgsgrassvectormaplayer.h +++ b/src/providers/grass/qgsgrassvectormaplayer.h @@ -108,7 +108,7 @@ class GRASS_LIB_EXPORT QgsGrassVectorMapLayer : public QObject /** Update attributes * @param cat * @param index ields index */ - void changeAttributeValue( int cat, QgsField field, QVariant value, QString &error ); + void changeAttributeValue( int cat, const QgsField &field, const QVariant &value, QString &error ); /** Insert new attributes to the table (it does not check if attributes already exists) * @param cat */ @@ -166,7 +166,7 @@ class GRASS_LIB_EXPORT QgsGrassVectorMapLayer : public QObject void printCachedAttributes(); private: - QString quotedValue( QVariant value ); + QString quotedValue( const QVariant &value ); dbDriver * openDriver( QString &error ); void addTopoField( QgsFields &fields ); int mField; diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp index d7f24343068e..77c3795a1295 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.cpp +++ b/src/providers/mssql/qgsmssqlsourceselect.cpp @@ -686,7 +686,7 @@ void QgsMssqlSourceSelect::setSql( const QModelIndex &index ) delete vlayer; } -void QgsMssqlSourceSelect::addSearchGeometryColumn( QString connectionName, QgsMssqlLayerProperty layerProperty, bool estimateMetadata ) +void QgsMssqlSourceSelect::addSearchGeometryColumn( const QString& connectionName, const QgsMssqlLayerProperty& layerProperty, bool estimateMetadata ) { // store the column details and do the query in a thread if ( !mColumnTypeThread ) @@ -741,7 +741,7 @@ void QgsMssqlSourceSelect::treeWidgetSelectionChanged( const QItemSelection &sel mAddButton->setEnabled( !selected.isEmpty() ); } -QgsMssqlGeomColumnTypeThread::QgsMssqlGeomColumnTypeThread( QString connectionName, bool useEstimatedMetadata ) +QgsMssqlGeomColumnTypeThread::QgsMssqlGeomColumnTypeThread( const QString& connectionName, bool useEstimatedMetadata ) : QThread() , mConnectionName( connectionName ) , mUseEstimatedMetadata( useEstimatedMetadata ) @@ -750,7 +750,7 @@ QgsMssqlGeomColumnTypeThread::QgsMssqlGeomColumnTypeThread( QString connectionNa qRegisterMetaType( "QgsMssqlLayerProperty" ); } -void QgsMssqlGeomColumnTypeThread::addGeometryColumn( QgsMssqlLayerProperty layerProperty ) +void QgsMssqlGeomColumnTypeThread::addGeometryColumn( const QgsMssqlLayerProperty& layerProperty ) { layerProperties << layerProperty; } diff --git a/src/providers/mssql/qgsmssqlsourceselect.h b/src/providers/mssql/qgsmssqlsourceselect.h index 86d5e8141792..40cabbdac121 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.h +++ b/src/providers/mssql/qgsmssqlsourceselect.h @@ -55,7 +55,7 @@ class QgsMssqlGeomColumnTypeThread : public QThread { Q_OBJECT public: - QgsMssqlGeomColumnTypeThread( QString connectionName, bool useEstimatedMetadata ); + QgsMssqlGeomColumnTypeThread( const QString &connectionName, bool useEstimatedMetadata ); // These functions get the layer types and pass that information out // by emitting the setLayerType() signal. @@ -65,7 +65,7 @@ class QgsMssqlGeomColumnTypeThread : public QThread void setLayerType( const QgsMssqlLayerProperty& layerProperty ); public slots: - void addGeometryColumn( QgsMssqlLayerProperty layerProperty ); + void addGeometryColumn( const QgsMssqlLayerProperty &layerProperty ); void stop(); private: @@ -159,7 +159,7 @@ class QgsMssqlSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase bool mEmbeddedMode; // queue another query for the thread - void addSearchGeometryColumn( QString connectionName, QgsMssqlLayerProperty layerProperty, bool estimateMetadata ); + void addSearchGeometryColumn( const QString &connectionName, const QgsMssqlLayerProperty &layerProperty, bool estimateMetadata ); // Set the position of the database connection list to the last // used one. diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h index b020f9c7773c..8159a40a4e81 100644 --- a/src/providers/ogr/qgsogrconnpool.h +++ b/src/providers/ogr/qgsogrconnpool.h @@ -33,7 +33,7 @@ inline QString qgsConnectionPool_ConnectionToName( QgsOgrConn* c ) return c->path; } -inline void qgsConnectionPool_ConnectionCreate( QString connInfo, QgsOgrConn*& c ) +inline void qgsConnectionPool_ConnectionCreate( const QString& connInfo, QgsOgrConn*& c ) { c = new QgsOgrConn; QString filePath = connInfo.left( connInfo.indexOf( "|" ) ); @@ -63,7 +63,7 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup( name ) , mRefCount( 0 ) { initTimer( this ); } diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp index 0cddf1b00241..ebb5653a3389 100644 --- a/src/providers/ogr/qgsogrdataitems.cpp +++ b/src/providers/ogr/qgsogrdataitems.cpp @@ -60,7 +60,7 @@ QgsOgrLayerItem::~QgsOgrLayerItem() } -bool QgsOgrLayerItem::setCrs( QgsCoordinateReferenceSystem crs ) +bool QgsOgrLayerItem::setCrs( const QgsCoordinateReferenceSystem& crs ) { if ( !( mCapabilities & SetCrs ) ) return false; diff --git a/src/providers/ogr/qgsogrdataitems.h b/src/providers/ogr/qgsogrdataitems.h index d20d502073fc..a3657d7e6998 100644 --- a/src/providers/ogr/qgsogrdataitems.h +++ b/src/providers/ogr/qgsogrdataitems.h @@ -26,7 +26,7 @@ class QgsOgrLayerItem : public QgsLayerItem QgsOgrLayerItem( QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType ); ~QgsOgrLayerItem(); - bool setCrs( QgsCoordinateReferenceSystem crs ) override; + bool setCrs( const QgsCoordinateReferenceSystem& crs ) override; QString layerName() const override; }; diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h index 1c527904575d..b60aa3e09b3d 100644 --- a/src/providers/ogr/qgsogrprovider.h +++ b/src/providers/ogr/qgsogrprovider.h @@ -250,7 +250,7 @@ class QgsOgrProvider : public QgsVectorDataProvider int layerIndex() const { return mLayerIndex; } - QByteArray quotedIdentifier( QByteArray field ) const; + QByteArray quotedIdentifier( const QByteArray &field ) const; /** * A forced reload invalidates the underlying connection. diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp index 1ee8b93ff9f9..200478f70816 100644 --- a/src/providers/postgres/qgspostgresconn.cpp +++ b/src/providers/postgres/qgspostgresconn.cpp @@ -141,7 +141,7 @@ QMap QgsPostgresConn::sConnectionsRO; QMap QgsPostgresConn::sConnectionsRW; const int QgsPostgresConn::sGeomTypeSelectLimit = 100; -QgsPostgresConn *QgsPostgresConn::connectDb( QString conninfo, bool readonly, bool shared, bool transaction ) +QgsPostgresConn *QgsPostgresConn::connectDb( const QString& conninfo, bool readonly, bool shared, bool transaction ) { QMap &connections = readonly ? QgsPostgresConn::sConnectionsRO : QgsPostgresConn::sConnectionsRW; @@ -753,7 +753,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP return true; } -bool QgsPostgresConn::supportedLayers( QVector &layers, bool searchGeometryColumnsOnly, bool searchPublicOnly, bool allowGeometrylessTables, QString schema ) +bool QgsPostgresConn::supportedLayers( QVector &layers, bool searchGeometryColumnsOnly, bool searchPublicOnly, bool allowGeometrylessTables, const QString& schema ) { // Get the list of supported tables if ( !getTableInfo( searchGeometryColumnsOnly, searchPublicOnly, allowGeometrylessTables, schema ) ) diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h index 2594e87ffdc5..4af1228d8e81 100644 --- a/src/providers/postgres/qgspostgresconn.h +++ b/src/providers/postgres/qgspostgresconn.h @@ -191,7 +191,7 @@ class QgsPostgresConn : public QObject * called from a thread other than the main one. * An assertion guards against such programmatic error. */ - static QgsPostgresConn *connectDb( QString connInfo, bool readOnly, bool shared = true, bool transaction = false ); + static QgsPostgresConn *connectDb( const QString &connInfo, bool readOnly, bool shared = true, bool transaction = false ); void ref() { ++mRef; } void unref(); @@ -282,7 +282,7 @@ class QgsPostgresConn : public QObject bool searchGeometryColumnsOnly = true, bool searchPublicOnly = true, bool allowGeometrylessTables = false, - const QString schema = QString() ); + const QString &schema = QString() ); /** Get the list of database schemas * @param schemas list to store schemas in diff --git a/src/providers/postgres/qgspostgresconnpool.h b/src/providers/postgres/qgspostgresconnpool.h index 245709ed7e53..a3ae398c03e8 100644 --- a/src/providers/postgres/qgspostgresconnpool.h +++ b/src/providers/postgres/qgspostgresconnpool.h @@ -25,7 +25,7 @@ inline QString qgsConnectionPool_ConnectionToName( QgsPostgresConn* c ) return c->connInfo(); } -inline void qgsConnectionPool_ConnectionCreate( QString connInfo, QgsPostgresConn*& c ) +inline void qgsConnectionPool_ConnectionCreate( const QString& connInfo, QgsPostgresConn*& c ) { c = QgsPostgresConn::connectDb( connInfo, true, false ); } @@ -52,7 +52,7 @@ class QgsPostgresConnPoolGroup : public QObject, public QgsConnectionPoolGroup( name ) { initTimer( this ); } + explicit QgsPostgresConnPoolGroup( const QString& name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); } protected slots: void handleConnectionExpired() { onConnectionExpired(); } diff --git a/src/providers/spatialite/qgsspatialiteconnpool.h b/src/providers/spatialite/qgsspatialiteconnpool.h index 6f37fecb529b..1266d06be022 100644 --- a/src/providers/spatialite/qgsspatialiteconnpool.h +++ b/src/providers/spatialite/qgsspatialiteconnpool.h @@ -24,7 +24,7 @@ inline QString qgsConnectionPool_ConnectionToName( QgsSqliteHandle* c ) return c->dbPath(); } -inline void qgsConnectionPool_ConnectionCreate( QString connInfo, QgsSqliteHandle*& c ) +inline void qgsConnectionPool_ConnectionCreate( const QString& connInfo, QgsSqliteHandle*& c ) { c = QgsSqliteHandle::openDb( connInfo, false ); } @@ -53,7 +53,7 @@ class QgsSpatiaLiteConnPoolGroup : public QObject, public QgsConnectionPoolGroup Q_OBJECT public: - explicit QgsSpatiaLiteConnPoolGroup( QString name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); } + explicit QgsSpatiaLiteConnPoolGroup( const QString& name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); } protected slots: void handleConnectionExpired() { onConnectionExpired(); } diff --git a/src/providers/virtual/qgsvirtuallayerqueryparser.h b/src/providers/virtual/qgsvirtuallayerqueryparser.h index 635f1d052042..65141df70dc3 100644 --- a/src/providers/virtual/qgsvirtuallayerqueryparser.h +++ b/src/providers/virtual/qgsvirtuallayerqueryparser.h @@ -56,7 +56,7 @@ namespace QgsVirtualLayerQueryParser {} QString name() const { return mName; } - void setName( QString name ) { mName = name; } + void setName( const QString& name ) { mName = name; } bool isGeometry() const { return mType == QVariant::UserType; } void setGeometry( QgsWkbTypes::Type wkbType ) { mType = QVariant::UserType; mWkbType = wkbType; } diff --git a/src/providers/virtual/qgsvirtuallayersourceselect.cpp b/src/providers/virtual/qgsvirtuallayersourceselect.cpp index 0ee706d2fe61..7a511825a95b 100644 --- a/src/providers/virtual/qgsvirtuallayersourceselect.cpp +++ b/src/providers/virtual/qgsvirtuallayersourceselect.cpp @@ -271,7 +271,7 @@ void QgsVirtualLayerSourceSelect::onTableRowChanged( const QModelIndex& current, mRemoveLayerBtn->setEnabled( current.row() != -1 ); } -void QgsVirtualLayerSourceSelect::addEmbeddedLayer( QString name, QString provider, QString encoding, QString source ) +void QgsVirtualLayerSourceSelect::addEmbeddedLayer( const QString& name, const QString& provider, const QString& encoding, const QString& source ) { // insert a new row onAddLayer(); diff --git a/src/providers/virtual/qgsvirtuallayersourceselect.h b/src/providers/virtual/qgsvirtuallayersourceselect.h index 1889cde6a165..0032d7b7dad5 100644 --- a/src/providers/virtual/qgsvirtuallayersourceselect.h +++ b/src/providers/virtual/qgsvirtuallayersourceselect.h @@ -56,7 +56,7 @@ class QgsVirtualLayerSourceSelect : public QDialog, private Ui::QgsVirtualLayerS long mSrid; QStringList mProviderList; QgsEmbeddedLayerSelectDialog* mEmbeddedSelectionDialog; - void addEmbeddedLayer( QString name, QString provider, QString encoding, QString source ); + void addEmbeddedLayer( const QString &name, const QString &provider, const QString &encoding, const QString &source ); }; #endif diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp index 437037f69c93..589bb45324f7 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.cpp +++ b/src/providers/wfs/qgswfsfeatureiterator.cpp @@ -889,7 +889,7 @@ void QgsWFSFeatureIterator::setInterruptionChecker( QgsInterruptionChecker* inte // This method will serialize the receive feature list, first into memory, and // if it goes above a given threshold, on disk -void QgsWFSFeatureIterator::featureReceivedSynchronous( QVector list ) +void QgsWFSFeatureIterator::featureReceivedSynchronous( const QVector& list ) { QgsDebugMsg( QString( "QgsWFSFeatureIterator::featureReceivedSynchronous %1 features" ).arg( list.size() ) ); QMutexLocker locker( &mMutex ); diff --git a/src/providers/wfs/qgswfsfeatureiterator.h b/src/providers/wfs/qgswfsfeatureiterator.h index 040e3b32d0e7..a78c63c7c71f 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.h +++ b/src/providers/wfs/qgswfsfeatureiterator.h @@ -205,7 +205,7 @@ class QgsWFSFeatureIterator : public QObject, private slots: void featureReceived( int featureCount ); - void featureReceivedSynchronous( QVector list ); + void featureReceivedSynchronous( const QVector &list ); void endOfDownload( bool success ); void checkInterruption(); diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp index 214bcc0100d5..ea59e0bca6b0 100644 --- a/src/providers/wfs/qgswfsshareddata.cpp +++ b/src/providers/wfs/qgswfsshareddata.cpp @@ -479,7 +479,7 @@ bool QgsWFSSharedData::createCache() return true; } -int QgsWFSSharedData::registerToCache( QgsWFSFeatureIterator* iterator, QgsRectangle rect ) +int QgsWFSSharedData::registerToCache( QgsWFSFeatureIterator* iterator, const QgsRectangle& rect ) { // This locks prevents 2 readers to register at the same time (and particularly // destroy the current mDownloader at the same time) @@ -979,7 +979,7 @@ void QgsWFSSharedData::pushError( const QString& errorMsg ) void QgsWFSSharedData::endOfDownload( bool success, int featureCount, bool truncatedResponse, bool interrupted, - QString errorMsg ) + const QString& errorMsg ) { QMutexLocker locker( &mMutex ); diff --git a/src/providers/wfs/qgswfsshareddata.h b/src/providers/wfs/qgswfsshareddata.h index 148947b2a87e..aecc4698b7d9 100644 --- a/src/providers/wfs/qgswfsshareddata.h +++ b/src/providers/wfs/qgswfsshareddata.h @@ -53,7 +53,7 @@ class QgsWFSSharedData : public QObject /** Used by a QgsWFSFeatureIterator to start a downloader and get the generation counter. */ - int registerToCache( QgsWFSFeatureIterator* iterator, QgsRectangle rect = QgsRectangle() ); + int registerToCache( QgsWFSFeatureIterator* iterator, const QgsRectangle &rect = QgsRectangle() ); /** Used by the rewind() method of an iterator so as to get the up-to-date generation counter. */ @@ -64,7 +64,7 @@ class QgsWFSSharedData : public QObject void serializeFeatures( QVector& featureList ); /** Called by QgsWFSFeatureDownloader::run() at the end of the download process. */ - void endOfDownload( bool success, int featureCount, bool truncatedResponse, bool interrupted, QString errorMsg ); + void endOfDownload( bool success, int featureCount, bool truncatedResponse, bool interrupted, const QString &errorMsg ); /** Used by QgsWFSProvider::reloadData(). The effect is to invalid all the caching state, so that a new request results in fresh download */ diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp index 031806e5c490..65ff4da52a1f 100644 --- a/src/providers/wms/qgswmscapabilities.cpp +++ b/src/providers/wms/qgswmscapabilities.cpp @@ -166,7 +166,7 @@ QgsWmsCapabilities::QgsWmsCapabilities() { } -bool QgsWmsCapabilities::parseResponse( const QByteArray& response, const QgsWmsParserSettings& settings ) +bool QgsWmsCapabilities::parseResponse( const QByteArray& response, QgsWmsParserSettings settings ) { mParserSettings = settings; mValid = false; diff --git a/src/providers/wms/qgswmscapabilities.h b/src/providers/wms/qgswmscapabilities.h index 7e4babee6721..adcd16520cc9 100644 --- a/src/providers/wms/qgswmscapabilities.h +++ b/src/providers/wms/qgswmscapabilities.h @@ -615,7 +615,7 @@ class QgsWmsCapabilities bool isValid() const { return mValid; } - bool parseResponse( const QByteArray& response, const QgsWmsParserSettings& settings ); + bool parseResponse( const QByteArray& response, QgsWmsParserSettings settings ); QString lastError() const { return mError; } QString lastErrorFormat() const { return mErrorFormat; } diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index 89b6655e3553..fbec63444ff1 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -590,7 +590,7 @@ void QgsWmsProvider::fetchOtherResTiles( QgsTileMode tileMode, const QgsRectangl .arg( otherResTiles.count() ) ); } -uint qHash( const QgsWmsProvider::TilePosition& tp ) +uint qHash( QgsWmsProvider::TilePosition tp ) { return ( uint ) tp.col + (( uint ) tp.row << 16 ); } diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h index 5f26c8e55a4b..cb0c5d036c00 100644 --- a/src/providers/wms/qgswmsprovider.h +++ b/src/providers/wms/qgswmsprovider.h @@ -366,7 +366,7 @@ class QgsWmsProvider : public QgsRasterDataProvider typedef struct TilePosition { TilePosition( int r, int c ): row( r ), col( c ) {} - bool operator==( const TilePosition& other ) const { return row == other.row && col == other.col; } + bool operator==( TilePosition other ) const { return row == other.row && col == other.col; } int row; int col; } TilePosition; @@ -459,7 +459,7 @@ class QgsWmsProvider : public QgsRasterDataProvider //! Helper structure to store a cached tile image with its rectangle typedef struct TileImage { - TileImage( QRectF r, QImage i ): rect( r ), img( i ) {} + TileImage( const QRectF& r, const QImage& i ): rect( r ), img( i ) {} QRectF rect; //!< destination rectangle for a tile (in screen coordinates) QImage img; //!< cached tile to be drawn } TileImage; diff --git a/src/server/qgshttprequesthandler.cpp b/src/server/qgshttprequesthandler.cpp index 794c6fc3edf0..b68d4b62f8d6 100644 --- a/src/server/qgshttprequesthandler.cpp +++ b/src/server/qgshttprequesthandler.cpp @@ -190,7 +190,7 @@ void QgsHttpRequestHandler::sendBody() } #ifdef HAVE_SERVER_PYTHON_PLUGINS -void QgsHttpRequestHandler::setPluginFilters( QgsServerFiltersMap pluginFilters ) +void QgsHttpRequestHandler::setPluginFilters( const QgsServerFiltersMap& pluginFilters ) { mPluginFilters = pluginFilters; } @@ -457,7 +457,7 @@ void QgsHttpRequestHandler::setGetFeatureInfoResponse( const QDomDocument& infoD setHttpResponse( &ba, infoFormat ); } -void QgsHttpRequestHandler::setServiceException( QgsMapServiceException ex ) +void QgsHttpRequestHandler::setServiceException( const QgsMapServiceException& ex ) { // Safety measure to avoid potential leaks if called repeatedly delete mException; diff --git a/src/server/qgshttprequesthandler.h b/src/server/qgshttprequesthandler.h index 8925edf0136d..833fab653ff5 100644 --- a/src/server/qgshttprequesthandler.h +++ b/src/server/qgshttprequesthandler.h @@ -39,7 +39,7 @@ class QgsHttpRequestHandler: public QgsRequestHandler virtual void setGetMapResponse( const QString& service, QImage* img, int imageQuality ) override; virtual void setGetCapabilitiesResponse( const QDomDocument& doc ) override; virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) override; - virtual void setServiceException( QgsMapServiceException ex ) override; + virtual void setServiceException( const QgsMapServiceException &ex ) override; virtual void setXmlResponse( const QDomDocument& doc ) override; virtual void setXmlResponse( const QDomDocument& doc, const QString& mimeType ) override; virtual void setGetPrintResponse( QByteArray* ba ) override; @@ -62,7 +62,7 @@ class QgsHttpRequestHandler: public QgsRequestHandler virtual QString parameter( const QString &key ) const override; virtual int removeParameter( const QString &key ) override; #ifdef HAVE_SERVER_PYTHON_PLUGINS - virtual void setPluginFilters( QgsServerFiltersMap pluginFilters ) override; + virtual void setPluginFilters( const QgsServerFiltersMap &pluginFilters ) override; #endif /** Return the response if capture output is activated */ QPair getResponse() override; diff --git a/src/server/qgsrequesthandler.h b/src/server/qgsrequesthandler.h index 2bef3970122a..72c3f690e123 100644 --- a/src/server/qgsrequesthandler.h +++ b/src/server/qgsrequesthandler.h @@ -72,7 +72,7 @@ class QgsRequestHandler virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) = 0; /** Allow plugins to return a QgsMapServiceException*/ - virtual void setServiceException( QgsMapServiceException ex ) = 0; + virtual void setServiceException( const QgsMapServiceException& ex ) = 0; //! @note not available in Python bindings virtual void setXmlResponse( const QDomDocument& doc ) = 0; @@ -155,7 +155,7 @@ class QgsRequestHandler /** Allow core services to call plugin hooks through sendResponse() * @note not available in Python bindings */ - virtual void setPluginFilters( QgsServerFiltersMap pluginFilters ) = 0; + virtual void setPluginFilters( const QgsServerFiltersMap& pluginFilters ) = 0; #endif //! @note not available in Python bindings diff --git a/src/server/qgssoaprequesthandler.h b/src/server/qgssoaprequesthandler.h index da76572226e6..c683fb4cd157 100644 --- a/src/server/qgssoaprequesthandler.h +++ b/src/server/qgssoaprequesthandler.h @@ -32,7 +32,7 @@ class QgsSOAPRequestHandler: public QgsHttpRequestHandler void setGetMapResponse( const QString& service, QImage* img ); void setGetCapabilitiesResponse( const QDomDocument& doc ) override; void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) override; - void setServiceException( const QgsMapServiceException& ex ); + void setServiceException( const QgsMapServiceException& ex ) override; void setXmlResponse( const QDomDocument& doc ) override; void setXmlResponse( const QDomDocument& doc, const QString& mimeType ) override; void setGetPrintResponse( QByteArray* ba ) override; diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp index 7e1b315dea3f..75a8cbb3766b 100644 --- a/src/server/qgswmsprojectparser.cpp +++ b/src/server/qgswmsprojectparser.cpp @@ -1103,7 +1103,7 @@ void QgsWmsProjectParser::addLayers( QDomDocument &doc, QgsLayerTreeGroup *layerTreeGroup, const QMap &layerMap, const QStringList &nonIdentifiableLayers, - QString version, //1.1.1 or 1.3.0 + const QString& version, //1.1.1 or 1.3.0 bool fullProjectSettings, QHash &idNameMap, QStringList &layerIDList ) const diff --git a/src/server/qgswmsprojectparser.h b/src/server/qgswmsprojectparser.h index 331dbc693531..2b4687877349 100644 --- a/src/server/qgswmsprojectparser.h +++ b/src/server/qgswmsprojectparser.h @@ -155,7 +155,7 @@ class SERVER_EXPORT QgsWmsProjectParser : public QgsWmsConfigParser QgsLayerTreeGroup *layerTreeGroup, const QMap &layerMap, const QStringList &nonIdentifiableLayers, - QString version, //1.1.1 or 1.3.0 + const QString &version, //1.1.1 or 1.3.0 bool fullProjectSettings, QHash &idNameMap, QStringList &layerIDList ) const; diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp index ac8227fbd242..349d1072374a 100644 --- a/src/server/qgswmsserver.cpp +++ b/src/server/qgswmsserver.cpp @@ -410,7 +410,7 @@ void QgsWmsServer::appendFormats( QDomDocument &doc, QDomElement &elem, const QS } } -QDomDocument QgsWmsServer::getCapabilities( QString version, bool fullProjectInformation ) +QDomDocument QgsWmsServer::getCapabilities( const QString& version, bool fullProjectInformation ) { QgsMessageLog::logMessage( "Entering." ); QDomDocument doc; diff --git a/src/server/qgswmsserver.h b/src/server/qgswmsserver.h index e2167bb4f840..5053531e9891 100644 --- a/src/server/qgswmsserver.h +++ b/src/server/qgswmsserver.h @@ -81,7 +81,7 @@ class QgsWmsServer: public QgsOWSServer /** Returns an XML file with the capabilities description (as described in the WMS specs) @param version WMS version (1.1.1 or 1.3.0) @param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/ - QDomDocument getCapabilities( QString version = "1.3.0", bool fullProjectInformation = false ); + QDomDocument getCapabilities( const QString &version = "1.3.0", bool fullProjectInformation = false ); QDomDocument getContext(); /** Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership