Skip to content

Commit a3968a2

Browse files
nyalldawsonnyalldawson
committed
Fix clazy qmap-with-pointer-key warnings
From the clazy docs: Finds cases where you're using QMap<K,T> and K is a pointer. QMap has the particularity of sorting it's keys, but sorting by memory address makes no sense. Use QHash instead, which provides faster lookups.
1 parent bd20fe4 commit a3968a2

24 files changed

+33
-33
lines changed

‎python/gui/editorwidgets/core/qgseditorwidgetfactory.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class QgsEditorWidgetFactory
108108
* @return A map of widget type names and weight values
109109
* @note not available in Python bindings
110110
*/
111-
//virtual QMap<const char*, int> supportedWidgetTypes() { return QMap<const char*, int>(); }
111+
//virtual QHash<const char*, int> supportedWidgetTypes();
112112

113113
/**
114114
* Create a pretty String representation of the value.

‎src/app/qgsfeatureaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,4 @@ void QgsFeatureAction::onFeatureSaved( const QgsFeature& feature )
257257
}
258258
}
259259

260-
QMap<QgsVectorLayer *, QgsAttributeMap> QgsFeatureAction::sLastUsedValues;
260+
QHash<QgsVectorLayer *, QgsAttributeMap> QgsFeatureAction::sLastUsedValues;

‎src/app/qgsfeatureaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class APP_EXPORT QgsFeatureAction : public QAction
6464

6565
bool mFeatureSaved;
6666

67-
static QMap<QgsVectorLayer *, QgsAttributeMap> sLastUsedValues;
67+
static QHash<QgsVectorLayer *, QgsAttributeMap> sLastUsedValues;
6868
};
6969

7070
#endif

‎src/app/qgsmaptoolreshape.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
105105
if ( vlayer->geometryType() == QgsWkbTypes::PolygonGeometry )
106106
{
107107
//ignore all current layer features as they should be reshaped too
108-
QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures;
108+
QHash<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures;
109109
ignoreFeatures.insert( vlayer, vlayer->allFeatureIds() );
110110

111111
if ( geom.avoidIntersections( ignoreFeatures ) != 0 )

‎src/core/geometry/qgsgeometry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@ bool QgsGeometry::deletePart( int partNum )
17901790
return ok;
17911791
}
17921792

1793-
int QgsGeometry::avoidIntersections( const QMap<QgsVectorLayer*, QSet< QgsFeatureId > >& ignoreFeatures )
1793+
int QgsGeometry::avoidIntersections( const QHash<QgsVectorLayer *, QSet<QgsFeatureId> > &ignoreFeatures )
17941794
{
17951795
if ( !d->geometry )
17961796
{

‎src/core/geometry/qgsgeometry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ class CORE_EXPORT QgsGeometry
737737
* @param ignoreFeatures possibility to give a list of features where intersections should be ignored (not available in python bindings)
738738
* @note added in 1.5
739739
*/
740-
int avoidIntersections( const QMap<QgsVectorLayer*, QSet<QgsFeatureId> >& ignoreFeatures = ( QMap<QgsVectorLayer*, QSet<QgsFeatureId> >() ) );
740+
int avoidIntersections( const QHash<QgsVectorLayer*, QSet<QgsFeatureId> >& ignoreFeatures = ( QHash<QgsVectorLayer*, QSet<QgsFeatureId> >() ) );
741741

742742
/** \ingroup core
743743
*/

‎src/core/geometry/qgsgeometryeditutils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometry* geom, int partNum )
225225
return c->removeGeometry( partNum );
226226
}
227227

228-
QgsAbstractGeometry* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometry& geom, QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures )
228+
QgsAbstractGeometry* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometry& geom, QHash<QgsVectorLayer *, QSet<QgsFeatureId> > ignoreFeatures )
229229
{
230230
QScopedPointer<QgsGeometryEngine> geomEngine( QgsGeometry::createGeometryEngine( &geom ) );
231231
if ( geomEngine.isNull() )
@@ -256,7 +256,7 @@ QgsAbstractGeometry* QgsGeometryEditUtils::avoidIntersections( const QgsAbstract
256256
if ( currentLayer )
257257
{
258258
QgsFeatureIds ignoreIds;
259-
QMap<QgsVectorLayer*, QSet<qint64> >::const_iterator ignoreIt = ignoreFeatures.find( currentLayer );
259+
QHash<QgsVectorLayer*, QSet<qint64> >::const_iterator ignoreIt = ignoreFeatures.find( currentLayer );
260260
if ( ignoreIt != ignoreFeatures.constEnd() )
261261
ignoreIds = ignoreIt.value();
262262

‎src/core/geometry/qgsgeometryeditutils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class QgsGeometryEditUtils
6060
* @param geom geometry to alter
6161
* @param ignoreFeatures map of layer to feature id of features to ignore
6262
*/
63-
static QgsAbstractGeometry* avoidIntersections( const QgsAbstractGeometry& geom, QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures = ( QMap<QgsVectorLayer*, QSet<QgsFeatureId> >() ) );
63+
static QgsAbstractGeometry* avoidIntersections( const QgsAbstractGeometry& geom, QHash<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures = ( QHash<QgsVectorLayer*, QSet<QgsFeatureId> >() ) );
6464
};
6565

6666
#endif // QGSGEOMETRYEDITUTILS_H

‎src/gui/editorwidgets/core/qgseditorwidgetfactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class GUI_EXPORT QgsEditorWidgetFactory
125125
* @return A map of widget type names and weight values
126126
* @note not available in Python bindings
127127
*/
128-
virtual QMap<const char*, int> supportedWidgetTypes() { return QMap<const char*, int>(); }
128+
virtual QHash<const char*, int> supportedWidgetTypes() { return QHash<const char*, int>(); }
129129

130130
/**
131131
* Create a pretty String representation of the value.

‎src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ bool QgsEditorWidgetRegistry::registerWidget( const QString& widgetId, QgsEditor
207207
mWidgetFactories.insert( widgetId, widgetFactory );
208208

209209
// Use this factory as default where it provides the heighest priority
210-
QMap<const char*, int> types = widgetFactory->supportedWidgetTypes();
211-
QMap<const char*, int>::ConstIterator it;
210+
QHash<const char*, int> types = widgetFactory->supportedWidgetTypes();
211+
QHash<const char*, int>::ConstIterator it;
212212
it = types.constBegin();
213213

214214
for ( ; it != types.constEnd(); ++it )

‎src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ void QgsCheckboxWidgetFactory::writeConfig( const QgsEditorWidgetConfig& config,
6161
configElement.setAttribute( "UncheckedState", config.value( "UncheckedState", "0" ).toString() );
6262
}
6363

64-
QMap<const char*, int> QgsCheckboxWidgetFactory::supportedWidgetTypes()
64+
QHash<const char*, int> QgsCheckboxWidgetFactory::supportedWidgetTypes()
6565
{
66-
QMap<const char*, int> map = QMap<const char*, int>();
66+
QHash<const char*, int> map = QHash<const char*, int>();
6767
map.insert( QCheckBox::staticMetaObject.className(), 10 );
6868
map.insert( QGroupBox::staticMetaObject.className(), 10 );
6969
return map;

‎src/gui/editorwidgets/qgscheckboxwidgetfactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GUI_EXPORT QgsCheckboxWidgetFactory : public QgsEditorWidgetFactory
3535
QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
3636
QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override;
3737
void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
38-
QMap<const char*, int> supportedWidgetTypes() override;
38+
QHash<const char *, int> supportedWidgetTypes() override;
3939
unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
4040
};
4141

‎src/gui/editorwidgets/qgsdatetimeeditfactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ Qt::AlignmentFlag QgsDateTimeEditFactory::alignmentFlag( QgsVectorLayer* vl, int
108108
return Qt::AlignLeft;
109109
}
110110

111-
QMap<const char*, int> QgsDateTimeEditFactory::supportedWidgetTypes()
111+
QHash<const char*, int> QgsDateTimeEditFactory::supportedWidgetTypes()
112112
{
113-
QMap<const char*, int> map = QMap<const char*, int>();
113+
QHash<const char*, int> map = QHash<const char*, int>();
114114
map.insert( QDateTimeEdit::staticMetaObject.className(), 10 );
115115
map.insert( QgsDateTimeEdit::staticMetaObject.className(), 10 );
116116
return map;

‎src/gui/editorwidgets/qgsdatetimeeditfactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class GUI_EXPORT QgsDateTimeEditFactory : public QgsEditorWidgetFactory
4141
void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
4242
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, const QVariant& cache, const QVariant& value ) const override;
4343
Qt::AlignmentFlag alignmentFlag( QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config ) const override;
44-
virtual QMap<const char*, int> supportedWidgetTypes() override;
44+
virtual QHash<const char*, int> supportedWidgetTypes() override;
4545
unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
4646
};
4747

‎src/gui/editorwidgets/qgsrangewidgetfactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ unsigned int QgsRangeWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fi
7979
return 0;
8080
}
8181

82-
QMap<const char*, int> QgsRangeWidgetFactory::supportedWidgetTypes()
82+
QHash<const char*, int> QgsRangeWidgetFactory::supportedWidgetTypes()
8383
{
84-
QMap<const char*, int> map = QMap<const char*, int>();
84+
QHash<const char*, int> map = QHash<const char*, int>();
8585
map.insert( QSlider::staticMetaObject.className(), 10 );
8686
map.insert( QDial::staticMetaObject.className(), 10 );
8787
map.insert( QSpinBox::staticMetaObject.className(), 10 );

‎src/gui/editorwidgets/qgsrangewidgetfactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GUI_EXPORT QgsRangeWidgetFactory : public QgsEditorWidgetFactory
3434
virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
3535
virtual QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override;
3636
virtual void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
37-
virtual QMap<const char*, int> supportedWidgetTypes() override;
37+
virtual QHash<const char *, int> supportedWidgetTypes() override;
3838

3939
private:
4040
virtual unsigned int fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const override;

‎src/gui/editorwidgets/qgsrelationreferencefactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ void QgsRelationReferenceFactory::writeConfig( const QgsEditorWidgetConfig& conf
109109
}
110110
}
111111

112-
QMap<const char*, int> QgsRelationReferenceFactory::supportedWidgetTypes()
112+
QHash<const char*, int> QgsRelationReferenceFactory::supportedWidgetTypes()
113113
{
114-
QMap<const char*, int> map = QMap<const char*, int>();
114+
QHash<const char*, int> map = QHash<const char*, int>();
115115
map.insert( QgsRelationReferenceWidget::staticMetaObject.className(), 10 );
116116
return map;
117117
}

‎src/gui/editorwidgets/qgsrelationreferencefactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class GUI_EXPORT QgsRelationReferenceFactory : public QgsEditorWidgetFactory
8686

8787
virtual QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config, const QVariant &cache, const QVariant &value ) const override;
8888

89-
virtual QMap<const char*, int> supportedWidgetTypes() override;
89+
virtual QHash<const char *, int> supportedWidgetTypes() override;
9090

9191
private:
9292
QgsAttributeEditorContext mEditorContext;

‎src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ Qt::AlignmentFlag QgsValueMapWidgetFactory::alignmentFlag( QgsVectorLayer* vl, i
109109
return Qt::AlignLeft;
110110
}
111111

112-
QMap<const char*, int> QgsValueMapWidgetFactory::supportedWidgetTypes()
112+
QHash<const char*, int> QgsValueMapWidgetFactory::supportedWidgetTypes()
113113
{
114-
QMap<const char*, int> map = QMap<const char*, int>();
114+
QHash<const char*, int> map = QHash<const char*, int>();
115115
map.insert( QComboBox::staticMetaObject.className(), 10 );
116116
return map;
117117
}

‎src/gui/editorwidgets/qgsvaluemapwidgetfactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class GUI_EXPORT QgsValueMapWidgetFactory : public QgsEditorWidgetFactory
3838
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, const QVariant& cache, const QVariant& value ) const override;
3939
QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config, const QVariant &cache, const QVariant &value ) const override;
4040
Qt::AlignmentFlag alignmentFlag( QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config ) const override;
41-
virtual QMap<const char*, int> supportedWidgetTypes() override;
41+
virtual QHash<const char *, int> supportedWidgetTypes() override;
4242
};
4343

4444
#endif // QGSVALUEMAPWIDGETFACTORY_H

‎src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ void QgsRuleBasedRendererWidget::countFeatures()
507507
{
508508
return;
509509
}
510-
QMap<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount> countMap;
510+
QHash<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount> countMap;
511511

512512
QgsRuleBasedRenderer::RuleList ruleList = mRenderer->rootRule()->descendants();
513513
// insert all so that we have counts 0
@@ -1285,7 +1285,7 @@ void QgsRuleBasedRendererModel::finishedAddingRules()
12851285
emit endInsertRows();
12861286
}
12871287

1288-
void QgsRuleBasedRendererModel::setFeatureCounts( const QMap<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount>& theCountMap )
1288+
void QgsRuleBasedRendererModel::setFeatureCounts( const QHash<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount>& theCountMap )
12891289
{
12901290
mFeatureCountMap = theCountMap;
12911291
updateRule( QModelIndex() );

‎src/gui/symbology-ng/qgsrulebasedrendererwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel
8585
void finishedAddingRules(); // call endInsertRows
8686

8787
//! @note not available in python bindungs
88-
void setFeatureCounts( const QMap<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount>& theCountMap );
88+
void setFeatureCounts( const QHash<QgsRuleBasedRenderer::Rule *, QgsRuleBasedRendererCount> &theCountMap );
8989
void clearFeatureCounts();
9090

9191
protected:
9292
QgsRuleBasedRenderer* mR;
93-
QMap<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount> mFeatureCountMap;
93+
QHash<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount> mFeatureCountMap;
9494
};
9595

9696

‎src/providers/ows/qgsowsdataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QgsOWSConnectionItem::~QgsOWSConnectionItem()
3838
QVector<QgsDataItem*> QgsOWSConnectionItem::createChildren()
3939
{
4040
QVector<QgsDataItem*> children;
41-
QMap<QgsDataItem*, QString> serviceItems; // service/provider key
41+
QHash<QgsDataItem*, QString> serviceItems; // service/provider key
4242

4343
int layerCount = 0;
4444
// Try to open with WMS,WFS,WCS

‎src/server/qgswmsserver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class QgsWmsServer: public QgsOWSServer
8989
QImage* getLegendGraphics();
9090

9191
typedef QSet<QgsSymbol*> SymbolSet;
92-
typedef QMap<QgsVectorLayer*, SymbolSet> HitTest;
92+
typedef QHash<QgsVectorLayer*, SymbolSet> HitTest;
9393

9494
/** Returns the map as an image (or a null pointer in case of error). The caller takes ownership
9595
of the image object). If an instance to existing hit test structure is passed, instead of rendering

0 commit comments

Comments
 (0)