[oauth] Use whileBlocking instead of blockSignals

elpaso · elpaso · commit fbe05be5f7c8 · 2018-07-20T11:43:21.000+02:00
diff --git a/src/auth/oauth2/qgsauthoauth2edit.cpp b/src/auth/oauth2/qgsauthoauth2edit.cpp
@@ -647,10 +647,7 @@ void QgsAuthOAuth2Edit::updateDefinedConfigsCache()
 
 void QgsAuthOAuth2Edit::loadDefinedConfigs()
 {
-  lstwdgDefinedConfigs->blockSignals( true );
-  lstwdgDefinedConfigs->clear();
-  lstwdgDefinedConfigs->blockSignals( false );
-
+  whileBlocking( lstwdgDefinedConfigs )->clear();
   updateDefinedConfigsCache();
 
   QgsStringMap::const_iterator i = mDefinedConfigsCache.constBegin();
@@ -716,9 +713,7 @@ void QgsAuthOAuth2Edit::updateGrantFlow( int indx )
 {
   if ( cmbbxGrantFlow->currentIndex() != indx )
   {
-    cmbbxGrantFlow->blockSignals( true );
-    cmbbxGrantFlow->setCurrentIndex( indx );
-    cmbbxGrantFlow->blockSignals( false );
+    whileBlocking( cmbbxGrantFlow )->setCurrentIndex( indx );
   }
 
   QgsAuthOAuth2Config::GrantFlow flow =
diff --git a/src/auth/oauth2/qgso2.cpp b/src/auth/oauth2/qgso2.cpp
@@ -228,7 +228,7 @@ void QgsO2::link()
 
     QUrl url( tokenUrl_ );
     QNetworkRequest tokenRequest( url );
-    tokenRequest.setHeader( QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded" );
+    tokenRequest.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1Literal( "application/x-www-form-urlencoded" ) );
     QNetworkReply *tokenReply = manager_->post( tokenRequest, payload );
 
     connect( tokenReply, SIGNAL( finished() ), this, SLOT( onTokenReplyFinished() ), Qt::QueuedConnection );

Original file line number	Diff line number	Diff line change
`@@ -647,10 +647,7 @@ void QgsAuthOAuth2Edit::updateDefinedConfigsCache()`
`647`	`647`
`648`	`648`	`void QgsAuthOAuth2Edit::loadDefinedConfigs()`
`649`	`649`	`{`
`650`		`- lstwdgDefinedConfigs->blockSignals( true );`
`651`		`- lstwdgDefinedConfigs->clear();`
`652`		`- lstwdgDefinedConfigs->blockSignals( false );`
`653`		`-`
	`650`	`+ whileBlocking( lstwdgDefinedConfigs )->clear();`
`654`	`651`	`updateDefinedConfigsCache();`
`655`	`652`
`656`	`653`	`QgsStringMap::const_iterator i = mDefinedConfigsCache.constBegin();`
`@@ -716,9 +713,7 @@ void QgsAuthOAuth2Edit::updateGrantFlow( int indx )`
`716`	`713`	`{`
`717`	`714`	`if ( cmbbxGrantFlow->currentIndex() != indx )`
`718`	`715`	`{`
`719`		`- cmbbxGrantFlow->blockSignals( true );`
`720`		`- cmbbxGrantFlow->setCurrentIndex( indx );`
`721`		`- cmbbxGrantFlow->blockSignals( false );`
	`716`	`+ whileBlocking( cmbbxGrantFlow )->setCurrentIndex( indx );`
`722`	`717`	`}`
`723`	`718`
`724`	`719`	`QgsAuthOAuth2Config::GrantFlow flow =`