[auth] Use explicit signal connections

elpaso · elpaso · commit feeec8e0bfaf · 2017-10-02T12:26:15.000+02:00
diff --git a/python/gui/auth/qgsauthsettingswidget.sip b/python/gui/auth/qgsauthsettingswidget.sip
@@ -86,9 +86,10 @@ class QgsAuthSettingsWidget : QWidget
 
   public slots:
 
-    bool on_btnConvertToEncrypted_clicked( );
+    bool convertToEncrypted( );
 %Docstring
- on_btnConvertToEncrypted_clicked create a Basic authentication configuration from
+ convertToEncrypted is called when the convert to encrypted button is
+        clicked and it creates a Basic authentication configuration from
         username and password specified in the Basic tab
  :return: return true on success
  :rtype: bool
diff --git a/src/gui/auth/qgsauthsettingswidget.cpp b/src/gui/auth/qgsauthsettingswidget.cpp
@@ -42,6 +42,7 @@ QgsAuthSettingsWidget::QgsAuthSettingsWidget( QWidget *parent,
   {
     tabAuth->setCurrentIndex( tabAuth->indexOf( tabBasic ) );
   }
+  connect( btnConvertToEncrypted, &QPushButton::clicked, this, &QgsAuthSettingsWidget::convertToEncrypted );
   updateConvertBtnState();
 }
 
@@ -80,7 +81,7 @@ bool QgsAuthSettingsWidget::btnConvertToEncryptedIsEnabled() const
   return btnConvertToEncrypted->isEnabled( );
 }
 
-bool QgsAuthSettingsWidget::on_btnConvertToEncrypted_clicked()
+bool QgsAuthSettingsWidget::convertToEncrypted( )
 {
   tabAuth->setCurrentIndex( tabAuth->indexOf( tabConfigurations ) );
   QgsAuthMethodConfig config( QStringLiteral( "Basic" ) );
diff --git a/src/gui/auth/qgsauthsettingswidget.h b/src/gui/auth/qgsauthsettingswidget.h
@@ -95,11 +95,12 @@ class GUI_EXPORT QgsAuthSettingsWidget : public QWidget, private Ui::QgsAuthSett
   public slots:
 
     /**
-     * \brief on_btnConvertToEncrypted_clicked create a Basic authentication configuration from
+     * \brief convertToEncrypted is called when the convert to encrypted button is
+     *        clicked and it creates a Basic authentication configuration from
      *        username and password specified in the Basic tab
      * \return return true on success
      */
-    bool on_btnConvertToEncrypted_clicked( );
+    bool convertToEncrypted( );
 
     /**
      * \brief on_txtUserName_textChanged set convert button state
diff --git a/tests/src/python/test_authsettingswidget.py b/tests/src/python/test_authsettingswidget.py
@@ -132,7 +132,7 @@ def testConvertToEncrypted(self):
         self.assertEqual(w.configId(), '')
         self.assertEqual(w.currentTabIndex(), 1)
         self.assertTrue(w.btnConvertToEncryptedIsEnabled())
-        self.assertTrue(w.on_btnConvertToEncrypted_clicked())
+        self.assertTrue(w.convertToEncrypted())
         self.assertNotEqual(w.configId(), '')
         self.assertEqual(w.username(), '')
         self.assertEqual(w.password(), '')

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ QgsAuthSettingsWidget::QgsAuthSettingsWidget( QWidget *parent,`
`42`	`42`	`{`
`43`	`43`	`tabAuth->setCurrentIndex( tabAuth->indexOf( tabBasic ) );`
`44`	`44`	`}`
	`45`	`+ connect( btnConvertToEncrypted, &QPushButton::clicked, this, &QgsAuthSettingsWidget::convertToEncrypted );`
`45`	`46`	`updateConvertBtnState();`
`46`	`47`	`}`
`47`	`48`
`@@ -80,7 +81,7 @@ bool QgsAuthSettingsWidget::btnConvertToEncryptedIsEnabled() const`
`80`	`81`	`return btnConvertToEncrypted->isEnabled( );`
`81`	`82`	`}`
`82`	`83`
`83`		`-bool QgsAuthSettingsWidget::on_btnConvertToEncrypted_clicked()`
	`84`	`+bool QgsAuthSettingsWidget::convertToEncrypted( )`
`84`	`85`	`{`
`85`	`86`	`tabAuth->setCurrentIndex( tabAuth->indexOf( tabConfigurations ) );`
`86`	`87`	`QgsAuthMethodConfig config( QStringLiteral( "Basic" ) );`