Call qDeleteAll on containers themselves, rather than using

nyalldawson · nyalldawson · commit 24b18bc42654 · 2015-10-17T09:15:51.000+11:00
qDeleteAll( container.values() ). The values() call isn't
needed and requires building a QList of values first.

Thanks clazy - keep the good optimisations coming!
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -80,7 +80,7 @@ QgsAttributeTypeDialog::~QgsAttributeTypeDialog()
   QSettings settings;
   settings.setValue( "/Windows/QgsAttributeTypeDialog/geometry", saveGeometry() );
 
-  qDeleteAll( mEditorConfigWidgets.values() );
+  qDeleteAll( mEditorConfigWidgets );
 }
 
 const QString QgsAttributeTypeDialog::editorWidgetV2Type()
diff --git a/src/auth/identcert/qgsauthidentcertmethod.cpp b/src/auth/identcert/qgsauthidentcertmethod.cpp
@@ -48,7 +48,7 @@ QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()
 
 QgsAuthIdentCertMethod::~QgsAuthIdentCertMethod()
 {
-  qDeleteAll( mPkiConfigBundleCache.values() );
+  qDeleteAll( mPkiConfigBundleCache );
   mPkiConfigBundleCache.clear();
 }
 
diff --git a/src/auth/pkipaths/qgsauthpkipathsmethod.cpp b/src/auth/pkipaths/qgsauthpkipathsmethod.cpp
@@ -48,7 +48,7 @@ QgsAuthPkiPathsMethod::QgsAuthPkiPathsMethod()
 
 QgsAuthPkiPathsMethod::~QgsAuthPkiPathsMethod()
 {
-  qDeleteAll( mPkiConfigBundleCache.values() );
+  qDeleteAll( mPkiConfigBundleCache );
   mPkiConfigBundleCache.clear();
 }
 
diff --git a/src/auth/pkipkcs12/qgsauthpkcs12method.cpp b/src/auth/pkipkcs12/qgsauthpkcs12method.cpp
@@ -48,7 +48,7 @@ QgsAuthPkcs12Method::QgsAuthPkcs12Method()
 
 QgsAuthPkcs12Method::~QgsAuthPkcs12Method()
 {
-  qDeleteAll( mPkiConfigBundleCache.values() );
+  qDeleteAll( mPkiConfigBundleCache );
   mPkiConfigBundleCache.clear();
 }
 
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -746,7 +746,7 @@ bool QgsAuthManager::registerCoreAuthMethods()
   if ( isDisabled() )
     return false;
 
-  qDeleteAll( mAuthMethods.values() );
+  qDeleteAll( mAuthMethods );
   mAuthMethods.clear();
   Q_FOREACH ( const QString& authMethodKey, QgsAuthMethodRegistry::instance()->authMethodList() )
   {
@@ -2819,7 +2819,7 @@ QgsAuthManager::~QgsAuthManager()
   if ( !isDisabled() )
   {
     delete QgsAuthMethodRegistry::instance();
-    qDeleteAll( mAuthMethods.values() );
+    qDeleteAll( mAuthMethods );
 
     QSqlDatabase authConn = authDbConnection();
     if ( authConn.isValid() && authConn.isOpen() )
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -170,7 +170,7 @@ QgsVectorLayerFeatureIterator::~QgsVectorLayerFeatureIterator()
   delete mEditGeometrySimplifier;
   mEditGeometrySimplifier = NULL;
 
-  qDeleteAll( mExpressionFieldInfo.values() );
+  qDeleteAll( mExpressionFieldInfo );
 
   close();
 }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -81,7 +81,7 @@ QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()
 
 QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry()
 {
-  qDeleteAll( mWidgetFactories.values() );
+  qDeleteAll( mWidgetFactories );
 }
 
 QgsEditorWidgetWrapper* QgsEditorWidgetRegistry::create( const QString& widgetId, QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, QWidget* editor, QWidget* parent, const QgsAttributeEditorContext &context )

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ QgsAttributeTypeDialog::~QgsAttributeTypeDialog()`
`80`	`80`	`QSettings settings;`
`81`	`81`	`settings.setValue( "/Windows/QgsAttributeTypeDialog/geometry", saveGeometry() );`
`82`	`82`
`83`		`- qDeleteAll( mEditorConfigWidgets.values() );`
	`83`	`+ qDeleteAll( mEditorConfigWidgets );`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`const QString QgsAttributeTypeDialog::editorWidgetV2Type()`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QgsAuthIdentCertMethod::QgsAuthIdentCertMethod()`
`48`	`48`
`49`	`49`	`QgsAuthIdentCertMethod::~QgsAuthIdentCertMethod()`
`50`	`50`	`{`
`51`		`- qDeleteAll( mPkiConfigBundleCache.values() );`
	`51`	`+ qDeleteAll( mPkiConfigBundleCache );`
`52`	`52`	`mPkiConfigBundleCache.clear();`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QgsAuthPkiPathsMethod::QgsAuthPkiPathsMethod()`
`48`	`48`
`49`	`49`	`QgsAuthPkiPathsMethod::~QgsAuthPkiPathsMethod()`
`50`	`50`	`{`
`51`		`- qDeleteAll( mPkiConfigBundleCache.values() );`
	`51`	`+ qDeleteAll( mPkiConfigBundleCache );`
`52`	`52`	`mPkiConfigBundleCache.clear();`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QgsAuthPkcs12Method::QgsAuthPkcs12Method()`
`48`	`48`
`49`	`49`	`QgsAuthPkcs12Method::~QgsAuthPkcs12Method()`
`50`	`50`	`{`
`51`		`- qDeleteAll( mPkiConfigBundleCache.values() );`
	`51`	`+ qDeleteAll( mPkiConfigBundleCache );`
`52`	`52`	`mPkiConfigBundleCache.clear();`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ QgsVectorLayerFeatureIterator::~QgsVectorLayerFeatureIterator()`
`170`	`170`	`delete mEditGeometrySimplifier;`
`171`	`171`	`mEditGeometrySimplifier = NULL;`
`172`	`172`
`173`		`- qDeleteAll( mExpressionFieldInfo.values() );`
	`173`	`+ qDeleteAll( mExpressionFieldInfo );`
`174`	`174`
`175`	`175`	`close();`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()`
`81`	`81`
`82`	`82`	`QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry()`
`83`	`83`	`{`
`84`		`- qDeleteAll( mWidgetFactories.values() );`
	`84`	`+ qDeleteAll( mWidgetFactories );`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`QgsEditorWidgetWrapper* QgsEditorWidgetRegistry::create( const QString& widgetId, QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, QWidget* editor, QWidget* parent, const QgsAttributeEditorContext &context )`