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

Remove function-call indirection in qmlmanager.cpp

Browse source 
QMLManager::tryRetrieveDataFromBackend() was a one-liner calling
void QMLManager::checkCredentialsAndExecute() with a pointer-to-member.
The latter was never called with a different pointer, therefore
fold the latter into the former and remove the indirection.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-01-24 21:23:55 +01:00 • committed by Jan Mulder
parent b9ac89574e
commit a07b6b4d97
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mobile-widgets/qmlmanager.cpp
View file

@ -426,7 +426,7 @@ void QMLManager::saveCloudCredentials()
} }
} }
void QMLManager::checkCredentialsAndExecute(execute_function_type execute) void QMLManager::tryRetrieveDataFromBackend()
{ {
// if the cloud credentials are present, we should try to get the GPS Webservice ID // if the cloud credentials are present, we should try to get the GPS Webservice ID
// and (if we haven't done so) load the dive list // and (if we haven't done so) load the dive list
@ -477,15 +477,10 @@ void QMLManager::checkCredentialsAndExecute(execute_function_type execute)
reply = manager()->get(request); reply = manager()->get(request);
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError(QNetworkReply::NetworkError))); connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError(QNetworkReply::NetworkError)));
connect(reply, &QNetworkReply::sslErrors, this, &QMLManager::handleSslErrors); connect(reply, &QNetworkReply::sslErrors, this, &QMLManager::handleSslErrors);
connect(reply, &QNetworkReply::finished, this, execute, Qt::UniqueConnection); connect(reply, &QNetworkReply::finished, this, &QMLManager::retrieveUserid, Qt::UniqueConnection);
} }
} }
void QMLManager::tryRetrieveDataFromBackend()
{
checkCredentialsAndExecute(&QMLManager::retrieveUserid);
}
void QMLManager::provideAuth(QNetworkReply *reply, QAuthenticator *auth) void QMLManager::provideAuth(QNetworkReply *reply, QAuthenticator *auth)
{ {
if (auth->user() == QString(prefs.cloud_storage_email) && if (auth->user() == QString(prefs.cloud_storage_email) &&

2
mobile-widgets/qmlmanager.h
View file

@ -126,7 +126,6 @@ public:
bool btEnabled() const; bool btEnabled() const;
void setBtEnabled(bool value); void setBtEnabled(bool value);
typedef void (QMLManager::*execute_function_type)();
DiveListSortModel *dlSortModel; DiveListSortModel *dlSortModel;
QStringList suitInit() const; QStringList suitInit() const;
@ -146,7 +145,6 @@ public slots:
void applicationStateChanged(Qt::ApplicationState state); void applicationStateChanged(Qt::ApplicationState state);
void savePreferences(); void savePreferences();
void saveCloudCredentials(); void saveCloudCredentials();
void checkCredentialsAndExecute(execute_function_type execute);
void tryRetrieveDataFromBackend(); void tryRetrieveDataFromBackend();
void handleError(QNetworkReply::NetworkError nError); void handleError(QNetworkReply::NetworkError nError);
void handleSslErrors(const QList<QSslError> &errors); void handleSslErrors(const QList<QSslError> &errors);