[auth] Renamed setters to better follow Qt5 conventions

elpaso · elpaso · commit f09e5b16e0cf · 2017-10-02T17:12:02.000+02:00
diff --git a/python/gui/auth/qgsauthsettingswidget.sip b/python/gui/auth/qgsauthsettingswidget.sip
@@ -117,16 +117,16 @@ class QgsAuthSettingsWidget : QWidget
  \param enabled
 %End
 
-    void setStoreUsername( bool checked );
+    void setStoreUsernameChecked( bool checked );
 %Docstring
- setStoreUsername check the "Store" checkbox for the username
+ setStoreUsernameChecked check the "Store" checkbox for the username
  \param checked
 .. seealso:: showStoreCheckboxes
 %End
 
-    void setStorePassword( bool checked );
+    void setStorePasswordChecked( bool checked );
 %Docstring
-  updateStorePasswordcheck the "Store" checkbox for the password
+ setStorePasswordCheched check the "Store" checkbox for the password
  \param checked
 .. seealso:: showStoreCheckboxes
 %End
diff --git a/src/gui/auth/qgsauthsettingswidget.cpp b/src/gui/auth/qgsauthsettingswidget.cpp
@@ -120,12 +120,12 @@ void QgsAuthSettingsWidget::showStoreCheckboxes( bool enabled )
   }
 }
 
-void QgsAuthSettingsWidget::setStoreUsername( bool checked )
+void QgsAuthSettingsWidget::setStoreUsernameChecked( bool checked )
 {
   cbStoreUsername->setChecked( checked );
 }
 
-void QgsAuthSettingsWidget::setStorePassword( bool checked )
+void QgsAuthSettingsWidget::setStorePasswordChecked( bool checked )
 {
   cbStorePassword->setChecked( checked );
 }
diff --git a/src/gui/auth/qgsauthsettingswidget.h b/src/gui/auth/qgsauthsettingswidget.h
@@ -126,18 +126,18 @@ class GUI_EXPORT QgsAuthSettingsWidget : public QWidget, private Ui::QgsAuthSett
     void showStoreCheckboxes( bool enabled );
 
     /**
-     * \brief setStoreUsername check the "Store" checkbox for the username
+     * \brief setStoreUsernameChecked check the "Store" checkbox for the username
      * \param checked
      * \see showStoreCheckboxes
      */
-    void setStoreUsername( bool checked );
+    void setStoreUsernameChecked( bool checked );
 
     /**
-     * \brief  updateStorePasswordcheck the "Store" checkbox for the password
+     * \brief setStorePasswordCheched check the "Store" checkbox for the password
      * \param checked
      * \see showStoreCheckboxes
      */
-    void setStorePassword( bool checked );
+    void setStorePasswordChecked( bool checked );
 
     /**
      * \brief storePassword
diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp
@@ -53,13 +53,13 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString &connNa
     if ( settings.value( key + "/saveUsername" ).toString() == QLatin1String( "true" ) )
     {
       mAuthSettings->setUsername( settings.value( key + "/username" ).toString() );
-      mAuthSettings->setStoreUsername( true );
+      mAuthSettings->setStoreUsernameChecked( true );
     }
 
     if ( settings.value( key + "/savePassword" ).toString() == QLatin1String( "true" ) )
     {
       mAuthSettings->setPassword( settings.value( key + "/password" ).toString() );
-      mAuthSettings->setStorePassword( true );
+      mAuthSettings->setStorePasswordChecked( true );
     }
 
     QString authcfg = settings.value( key + "/authcfg" ).toString();
diff --git a/src/providers/db2/qgsdb2newconnection.h b/src/providers/db2/qgsdb2newconnection.h
@@ -20,7 +20,6 @@
 #include "ui_qgsdb2newconnectionbase.h"
 #include "qgsguiutils.h"
 #include "qgshelp.h"
-#include "qgsauthconfigselect.h"
 
 /** \class QgsDb2NewConnection
  * \brief Dialog to allow the user to configure and save connection
diff --git a/tests/src/python/test_authsettingswidget.py b/tests/src/python/test_authsettingswidget.py
@@ -178,18 +178,18 @@ def test_storeCheckBoxes(self):
         self.assertFalse(w.storeUsernameIsChecked())
 
         w = QgsAuthSettingsWidget()
-        w.setStorePassword(True)
+        w.setStorePasswordChecked(True)
         self.assertTrue(w.storePasswordIsChecked())
         self.assertFalse(w.storeUsernameIsChecked())
 
         w = QgsAuthSettingsWidget()
-        w.setStoreUsername(True)
+        w.setStoreUsernameChecked(True)
         self.assertFalse(w.storePasswordIsChecked())
         self.assertTrue(w.storeUsernameIsChecked())
 
         w = QgsAuthSettingsWidget()
-        w.setStoreUsername(True)
-        w.setStorePassword(True)
+        w.setStoreUsernameChecked(True)
+        w.setStorePasswordChecked(True)
         self.assertTrue(w.storePasswordIsChecked())
         self.assertTrue(w.storeUsernameIsChecked())
 

Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,12 @@ void QgsAuthSettingsWidget::showStoreCheckboxes( bool enabled )`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-void QgsAuthSettingsWidget::setStoreUsername( bool checked )`
	`123`	`+void QgsAuthSettingsWidget::setStoreUsernameChecked( bool checked )`
`124`	`124`	`{`
`125`	`125`	`cbStoreUsername->setChecked( checked );`
`126`	`126`	`}`
`127`	`127`
`128`		`-void QgsAuthSettingsWidget::setStorePassword( bool checked )`
	`128`	`+void QgsAuthSettingsWidget::setStorePasswordChecked( bool checked )`
`129`	`129`	`{`
`130`	`130`	`cbStorePassword->setChecked( checked );`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString &connNa`
`53`	`53`	`if ( settings.value( key + "/saveUsername" ).toString() == QLatin1String( "true" ) )`
`54`	`54`	`{`
`55`	`55`	`mAuthSettings->setUsername( settings.value( key + "/username" ).toString() );`
`56`		`- mAuthSettings->setStoreUsername( true );`
	`56`	`+ mAuthSettings->setStoreUsernameChecked( true );`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ( settings.value( key + "/savePassword" ).toString() == QLatin1String( "true" ) )`
`60`	`60`	`{`
`61`	`61`	`mAuthSettings->setPassword( settings.value( key + "/password" ).toString() );`
`62`		`- mAuthSettings->setStorePassword( true );`
	`62`	`+ mAuthSettings->setStorePasswordChecked( true );`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`QString authcfg = settings.value( key + "/authcfg" ).toString();`