Code cleanup (#9392)

m-kuhn · 3nids · commit 825c240be3d2 · 2019-03-06T20:21:58.000+01:00
* Make auth a Q_FOREACH free zone

* Code cleanup

* Add const

* Indentation

* Indentation
diff --git a/src/auth/basic/CMakeLists.txt b/src/auth/basic/CMakeLists.txt
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (basicauthmethod
   qgis_core
   qgis_gui
 )
+TARGET_COMPILE_DEFINITIONS(basicauthmethod PRIVATE "-DQT_NO_FOREACH")
 
 INSTALL(TARGETS basicauthmethod
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/src/auth/esritoken/CMakeLists.txt b/src/auth/esritoken/CMakeLists.txt
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (esritokenauthmethod
   qgis_core
   qgis_gui
 )
+TARGET_COMPILE_DEFINITIONS(esritokenauthmethod PRIVATE "-DQT_NO_FOREACH")
 
 INSTALL(TARGETS esritokenauthmethod
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/src/auth/identcert/CMakeLists.txt b/src/auth/identcert/CMakeLists.txt
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (identcertauthmethod
   qgis_core
   qgis_gui
 )
+TARGET_COMPILE_DEFINITIONS(identcertauthmethod PRIVATE "-DQT_NO_FOREACH")
 
 INSTALL(TARGETS identcertauthmethod
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/src/auth/identcert/qgsauthidentcertedit.cpp b/src/auth/identcert/qgsauthidentcertedit.cpp
@@ -75,12 +75,12 @@ void QgsAuthIdentCertEdit::populateIdentityComboBox()
 {
   cmbIdentityCert->addItem( tr( "Select identity…" ), "" );
 
-  QList<QSslCertificate> certs( QgsApplication::authManager()->certIdentities() );
+  const QList<QSslCertificate> certs( QgsApplication::authManager()->certIdentities() );
   if ( !certs.isEmpty() )
   {
     cmbIdentityCert->setIconSize( QSize( 26, 22 ) );
     QgsStringMap idents;
-    Q_FOREACH ( const QSslCertificate &cert, certs )
+    for ( const QSslCertificate &cert : certs )
     {
       QString org( SSL_SUBJECT_INFO( cert, QSslCertificate::Organization ) );
       if ( org.isEmpty() )
diff --git a/src/auth/oauth2/qgsauthoauth2edit.cpp b/src/auth/oauth2/qgsauthoauth2edit.cpp
@@ -633,11 +633,11 @@ void QgsAuthOAuth2Edit::removeTokenCacheFile()
     return;
   }
 
-  QStringList cachefiles;
-  cachefiles << QgsAuthOAuth2Config::tokenCachePath( authcfg, false )
-             << QgsAuthOAuth2Config::tokenCachePath( authcfg, true );
+  const QStringList cachefiles = QStringList()
+                                 << QgsAuthOAuth2Config::tokenCachePath( authcfg, false )
+                                 << QgsAuthOAuth2Config::tokenCachePath( authcfg, true );
 
-  Q_FOREACH ( const QString &cachefile, cachefiles )
+  for ( const QString &cachefile : cachefiles )
   {
     if ( QFile::exists( cachefile ) && !QFile::remove( cachefile ) )
     {
diff --git a/src/auth/oauth2/qgsauthoauth2method.cpp b/src/auth/oauth2/qgsauthoauth2method.cpp
@@ -54,11 +54,11 @@ QgsAuthOAuth2Method::QgsAuthOAuth2Method()
                     << QStringLiteral( "wcs" )
                     << QStringLiteral( "wms" ) );
 
-  QStringList cachedirpaths;
-  cachedirpaths << QgsAuthOAuth2Config::tokenCacheDirectory()
-                << QgsAuthOAuth2Config::tokenCacheDirectory( true );
+  const QStringList cachedirpaths = QStringList()
+                                    << QgsAuthOAuth2Config::tokenCacheDirectory()
+                                    << QgsAuthOAuth2Config::tokenCacheDirectory( true );
 
-  Q_FOREACH ( const QString &cachedirpath, cachedirpaths )
+  for ( const QString &cachedirpath : cachedirpaths )
   {
     QDir cachedir( cachedirpath );
     if ( !cachedir.mkpath( cachedirpath ) )
@@ -71,10 +71,10 @@ QgsAuthOAuth2Method::QgsAuthOAuth2Method()
 QgsAuthOAuth2Method::~QgsAuthOAuth2Method()
 {
   QDir tempdir( QgsAuthOAuth2Config::tokenCacheDirectory( true ) );
-  QStringList dirlist = tempdir.entryList( QDir::Files | QDir::NoDotAndDotDot );
-  Q_FOREACH ( const QString &f, dirlist )
+  const QStringList dirlist = tempdir.entryList( QDir::Files | QDir::NoDotAndDotDot );
+  for ( const QString &f : dirlist )
   {
-    QString tempfile( tempdir.path() + QStringLiteral( "/" ) + f );
+    QString tempfile( tempdir.path() + '/' + f );
     if ( !QFile::remove( tempfile ) )
     {
       QgsDebugMsg( QStringLiteral( "FAILED to delete temp token cache file: %1" ).arg( tempfile ) );
@@ -343,7 +343,8 @@ void QgsAuthOAuth2Method::onLinkingSucceeded()
   if ( !extraTokens.isEmpty() )
   {
     QString msg = QStringLiteral( "Extra tokens in response:\n" );
-    Q_FOREACH ( const QString &key, extraTokens.keys() )
+    const QStringList extraTokenKeys = extraTokens.keys();
+    for ( const QString &key : extraTokenKeys )
     {
       // don't expose the values in a log (unless they are only 3 chars long, of course)
       msg += QStringLiteral( "    %1:%2…\n" ).arg( key, extraTokens.value( key ).toString().left( 3 ) );
@@ -371,7 +372,8 @@ void QgsAuthOAuth2Method::onCloseBrowser()
   // Bring focus back to QGIS app
   if ( qobject_cast<QApplication *>( qApp ) )
   {
-    Q_FOREACH ( QWidget *topwdgt, QgsApplication::topLevelWidgets() )
+    const QList<QWidget *> widgets = QgsApplication::topLevelWidgets();
+    for ( QWidget *topwdgt : widgets )
     {
       if ( topwdgt->objectName() == QStringLiteral( "MainWindow" ) )
       {
diff --git a/src/auth/pkipaths/CMakeLists.txt b/src/auth/pkipaths/CMakeLists.txt
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (pkipathsauthmethod
   qgis_core
   qgis_gui
 )
+TARGET_COMPILE_DEFINITIONS(pkipathsauthmethod PRIVATE "-DQT_NO_FOREACH")
 
 INSTALL(TARGETS pkipathsauthmethod
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/src/auth/pkipkcs12/CMakeLists.txt b/src/auth/pkipkcs12/CMakeLists.txt
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (pkcs12authmethod
   qgis_core
   qgis_gui
 )
+TARGET_COMPILE_DEFINITIONS(pkcs12authmethod PRIVATE "-DQT_NO_FOREACH")
 
 INSTALL(TARGETS pkcs12authmethod
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp
@@ -107,7 +107,7 @@ QgsEditorWidgetSetup QgsEditorWidgetAutoConf::editorWidgetSetup( const QgsVector
     }
 
     int bestScore = 0;
-    Q_FOREACH ( std::shared_ptr<QgsEditorWidgetAutoConfPlugin> cur, plugins )
+    for ( const std::shared_ptr<QgsEditorWidgetAutoConfPlugin> &cur : mPlugins )
     {
       int score = 0;
       const QgsEditorWidgetSetup curResult = cur->editorWidgetSetup( vl, fieldName, score );
@@ -124,6 +124,6 @@ QgsEditorWidgetSetup QgsEditorWidgetAutoConf::editorWidgetSetup( const QgsVector
 
 void QgsEditorWidgetAutoConf::registerPlugin( QgsEditorWidgetAutoConfPlugin *plugin )
 {
-  plugins.append( std::shared_ptr<QgsEditorWidgetAutoConfPlugin>( plugin ) );
+  mPlugins.append( std::shared_ptr<QgsEditorWidgetAutoConfPlugin>( plugin ) );
 }
 ///@endcond
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h
@@ -90,7 +90,7 @@ class GUI_EXPORT QgsEditorWidgetAutoConf SIP_SKIP
     void registerPlugin( QgsEditorWidgetAutoConfPlugin *plugin );
 
   private:
-    QList<std::shared_ptr<QgsEditorWidgetAutoConfPlugin> > plugins;
+    QList<std::shared_ptr<QgsEditorWidgetAutoConfPlugin> > mPlugins;
 };
 ///@endcond
 
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -105,7 +105,7 @@ void QgsRelationWidgetWrapper::setShowLabel( bool showLabel )
 
 void QgsRelationWidgetWrapper::initWidget( QWidget *editor )
 {
-  QgsRelationEditorWidget *w = dynamic_cast<QgsRelationEditorWidget *>( editor );
+  QgsRelationEditorWidget *w = qobject_cast<QgsRelationEditorWidget *>( editor );
 
   // if the editor cannot be cast to relation editor, insert a new one
   if ( !w )
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -1374,11 +1374,12 @@ void QgsAttributeForm::init()
       }
     }
 
-    Q_FOREACH ( const QgsRelation &rel, QgsProject::instance()->relationManager()->referencedRelations( mLayer ) )
+    const QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mLayer );
+    for ( const QgsRelation &rel : relations )
     {
       QgsRelationWidgetWrapper *rww = new QgsRelationWidgetWrapper( mLayer, rel, nullptr, this );
-      const QgsEditorWidgetSetup setup = QgsGui::editorWidgetRegistry()->findBest( mLayer, rel.id() );
-      rww->setConfig( setup.config() );
+      const QVariantMap config = mLayer->editFormConfig().widgetConfig( rel.id() );
+      rww->setConfig( config );
       rww->setContext( mContext );
 
       QgsAttributeFormRelationEditorWidget *formWidget = new QgsAttributeFormRelationEditorWidget( rww, this );

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES (basicauthmethod`
`43`	`43`	`qgis_core`
`44`	`44`	`qgis_gui`
`45`	`45`	`)`
	`46`	`+TARGET_COMPILE_DEFINITIONS(basicauthmethod PRIVATE "-DQT_NO_FOREACH")`
`46`	`47`
`47`	`48`	`INSTALL(TARGETS basicauthmethod`
`48`	`49`	`RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ void QgsAuthIdentCertEdit::populateIdentityComboBox()`
`75`	`75`	`{`
`76`	`76`	`cmbIdentityCert->addItem( tr( "Select identity…" ), "" );`
`77`	`77`
`78`		`- QList<QSslCertificate> certs( QgsApplication::authManager()->certIdentities() );`
	`78`	`+ const QList<QSslCertificate> certs( QgsApplication::authManager()->certIdentities() );`
`79`	`79`	`if ( !certs.isEmpty() )`
`80`	`80`	`{`
`81`	`81`	`cmbIdentityCert->setIconSize( QSize( 26, 22 ) );`
`82`	`82`	`QgsStringMap idents;`
`83`		`- Q_FOREACH ( const QSslCertificate &cert, certs )`
	`83`	`+ for ( const QSslCertificate &cert : certs )`
`84`	`84`	`{`
`85`	`85`	`QString org( SSL_SUBJECT_INFO( cert, QSslCertificate::Organization ) );`
`86`	`86`	`if ( org.isEmpty() )`
Original file line number	Diff line number	Diff line change
`@@ -633,11 +633,11 @@ void QgsAuthOAuth2Edit::removeTokenCacheFile()`
`633`	`633`	`return;`
`634`	`634`	`}`
`635`	`635`
`636`		`- QStringList cachefiles;`
`637`		`- cachefiles << QgsAuthOAuth2Config::tokenCachePath( authcfg, false )`
`638`		`- << QgsAuthOAuth2Config::tokenCachePath( authcfg, true );`
	`636`	`+ const QStringList cachefiles = QStringList()`
	`637`	`+ << QgsAuthOAuth2Config::tokenCachePath( authcfg, false )`
	`638`	`+ << QgsAuthOAuth2Config::tokenCachePath( authcfg, true );`
`639`	`639`
`640`		`- Q_FOREACH ( const QString &cachefile, cachefiles )`
	`640`	`+ for ( const QString &cachefile : cachefiles )`
`641`	`641`	`{`
`642`	`642`	`if ( QFile::exists( cachefile ) && !QFile::remove( cachefile ) )`
`643`	`643`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ QgsAuthOAuth2Method::QgsAuthOAuth2Method()`
`54`	`54`	`<< QStringLiteral( "wcs" )`
`55`	`55`	`<< QStringLiteral( "wms" ) );`
`56`	`56`
`57`		`- QStringList cachedirpaths;`
`58`		`- cachedirpaths << QgsAuthOAuth2Config::tokenCacheDirectory()`
`59`		`- << QgsAuthOAuth2Config::tokenCacheDirectory( true );`
	`57`	`+ const QStringList cachedirpaths = QStringList()`
	`58`	`+ << QgsAuthOAuth2Config::tokenCacheDirectory()`
	`59`	`+ << QgsAuthOAuth2Config::tokenCacheDirectory( true );`
`60`	`60`
`61`		`- Q_FOREACH ( const QString &cachedirpath, cachedirpaths )`
	`61`	`+ for ( const QString &cachedirpath : cachedirpaths )`
`62`	`62`	`{`
`63`	`63`	`QDir cachedir( cachedirpath );`
`64`	`64`	`if ( !cachedir.mkpath( cachedirpath ) )`
`@@ -71,10 +71,10 @@ QgsAuthOAuth2Method::QgsAuthOAuth2Method()`
`71`	`71`	`QgsAuthOAuth2Method::~QgsAuthOAuth2Method()`
`72`	`72`	`{`
`73`	`73`	`QDir tempdir( QgsAuthOAuth2Config::tokenCacheDirectory( true ) );`
`74`		`- QStringList dirlist = tempdir.entryList( QDir::Files \| QDir::NoDotAndDotDot );`
`75`		`- Q_FOREACH ( const QString &f, dirlist )`
	`74`	`+ const QStringList dirlist = tempdir.entryList( QDir::Files \| QDir::NoDotAndDotDot );`
	`75`	`+ for ( const QString &f : dirlist )`
`76`	`76`	`{`
`77`		`- QString tempfile( tempdir.path() + QStringLiteral( "/" ) + f );`
	`77`	`+ QString tempfile( tempdir.path() + '/' + f );`
`78`	`78`	`if ( !QFile::remove( tempfile ) )`
`79`	`79`	`{`
`80`	`80`	`QgsDebugMsg( QStringLiteral( "FAILED to delete temp token cache file: %1" ).arg( tempfile ) );`
`@@ -343,7 +343,8 @@ void QgsAuthOAuth2Method::onLinkingSucceeded()`
`343`	`343`	`if ( !extraTokens.isEmpty() )`
`344`	`344`	`{`
`345`	`345`	`QString msg = QStringLiteral( "Extra tokens in response:\n" );`
`346`		`- Q_FOREACH ( const QString &key, extraTokens.keys() )`
	`346`	`+ const QStringList extraTokenKeys = extraTokens.keys();`
	`347`	`+ for ( const QString &key : extraTokenKeys )`
`347`	`348`	`{`
`348`	`349`	`// don't expose the values in a log (unless they are only 3 chars long, of course)`
`349`	`350`	`msg += QStringLiteral( " %1:%2…\n" ).arg( key, extraTokens.value( key ).toString().left( 3 ) );`
`@@ -371,7 +372,8 @@ void QgsAuthOAuth2Method::onCloseBrowser()`
`371`	`372`	`// Bring focus back to QGIS app`
`372`	`373`	`if ( qobject_cast<QApplication *>( qApp ) )`
`373`	`374`	`{`
`374`		`- Q_FOREACH ( QWidget *topwdgt, QgsApplication::topLevelWidgets() )`
	`375`	`+ const QList<QWidget *> widgets = QgsApplication::topLevelWidgets();`
	`376`	`+ for ( QWidget *topwdgt : widgets )`
`375`	`377`	`{`
`376`	`378`	`if ( topwdgt->objectName() == QStringLiteral( "MainWindow" ) )`
`377`	`379`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ QgsEditorWidgetSetup QgsEditorWidgetAutoConf::editorWidgetSetup( const QgsVector`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`int bestScore = 0;`
`110`		`- Q_FOREACH ( std::shared_ptr<QgsEditorWidgetAutoConfPlugin> cur, plugins )`
	`110`	`+ for ( const std::shared_ptr<QgsEditorWidgetAutoConfPlugin> &cur : mPlugins )`
`111`	`111`	`{`
`112`	`112`	`int score = 0;`
`113`	`113`	`const QgsEditorWidgetSetup curResult = cur->editorWidgetSetup( vl, fieldName, score );`
`@@ -124,6 +124,6 @@ QgsEditorWidgetSetup QgsEditorWidgetAutoConf::editorWidgetSetup( const QgsVector`
`124`	`124`
`125`	`125`	`void QgsEditorWidgetAutoConf::registerPlugin( QgsEditorWidgetAutoConfPlugin *plugin )`
`126`	`126`	`{`
`127`		`- plugins.append( std::shared_ptr<QgsEditorWidgetAutoConfPlugin>( plugin ) );`
	`127`	`+ mPlugins.append( std::shared_ptr<QgsEditorWidgetAutoConfPlugin>( plugin ) );`
`128`	`128`	`}`
`129`	`129`	`///@endcond`