mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PreferencesNetwork::passwordUpdateSuccessful slot

Browse source 
In preferences_network.cpp, the CloudStorageAuthenticate::passwordChangeSuccessful
signal was connected to the PreferencesNetwork::passwordUpdateSuccessful
slot. This never worked, because passwordUpdateSuccessful() was declared
as a normal member function, not a slot (hooray for Qt's weird runtime-checked
signal system).

While touching this code, change the weird SIGNAL/SLOT macros to
actual member function, to at least get *some* compile-time checks.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-01-16 21:58:27 +01:00 • committed by Jan Mulder
parent a116ff85f8
commit ff9bdfd0df
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/preferences/preferences_network.cpp
View file

@ -72,8 +72,8 @@ void PreferencesNetwork::syncSettings()
report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'."))); report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.")));
} else { } else {
CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this); CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(updateCloudAuthenticationState())); connect(cloudAuth, &CloudStorageAuthenticate::finishedAuthenticate, this, &PreferencesNetwork::updateCloudAuthenticationState);
connect(cloudAuth, SIGNAL(passwordChangeSuccessful()), this, SLOT(passwordUpdateSuccessful())); connect(cloudAuth, &CloudStorageAuthenticate::passwordChangeSuccessful, this, &PreferencesNetwork::passwordUpdateSuccessful);
cloudAuth->backend(email, password, "", newpassword); cloudAuth->backend(email, password, "", newpassword);
ui->cloud_storage_new_passwd->setText(""); ui->cloud_storage_new_passwd->setText("");
cloud->setNewPassword(newpassword); cloud->setNewPassword(newpassword);

2
desktop-widgets/preferences/preferences_network.h
View file

@ -20,10 +20,10 @@ public:
public slots: public slots:
void proxyType_changed(int i); void proxyType_changed(int i);
void updateCloudAuthenticationState(); void updateCloudAuthenticationState();
void passwordUpdateSuccessful();
private: private:
Ui::PreferencesNetwork *ui; Ui::PreferencesNetwork *ui;
void passwordUpdateSuccessful();
}; };
#endif #endif