Skip to content

Commit

Permalink
Use const auto.
Browse files Browse the repository at this point in the history
Signed-off-by: Camila Ayres <[email protected]>
  • Loading branch information
camilasan authored and backportbot[bot] committed Oct 29, 2024
1 parent 1e586da commit 44df4a8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
5 changes: 3 additions & 2 deletions src/gui/accountmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,9 @@ void AccountManager::saveAccountHelper(Account *acc, QSettings &settings, bool s
settings.setValue(QLatin1String(authTypeC), acc->_credentials->authType());

// HACK: Save http_user also as user
if (acc->_settingsMap.contains(httpUserC) && acc->_settingsMap.value(httpUserC).isValid()) {
settings.setValue(userC, acc->_settingsMap.value(httpUserC));
const auto settingsMap = acc->_settingsMap;
if (settingsMap.contains(httpUserC) && settingsMap.value(httpUserC).isValid()) {
settings.setValue(userC, settingsMap.value(httpUserC));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/creds/webflowcredentials.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ void WebFlowCredentials::forgetSensitiveData() {

_account->deleteAppPassword();

const QString kck = keychainKey(_account->url().toString(), _user, _account->id());
const auto kck = keychainKey(_account->url().toString(), _user, _account->id());
if (kck.isEmpty()) {
qCDebug(lcWebFlowCredentials()) << "InvalidateToken: User is empty, bailing out!";
return;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/wizard/owncloudadvancedsetuppage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@ void OwncloudAdvancedSetupPage::stopSpinner()

QUrl OwncloudAdvancedSetupPage::serverUrl() const
{
const QString urlString = dynamic_cast<OwncloudWizard *>(wizard())->ocUrl();
const QString user = dynamic_cast<OwncloudWizard *>(wizard())->getCredentials()->user();
const auto urlString = dynamic_cast<OwncloudWizard *>(wizard())->ocUrl();
const auto user = dynamic_cast<OwncloudWizard *>(wizard())->getCredentials()->user();

QUrl url(urlString);
url.setUserName(user);
Expand Down
10 changes: 6 additions & 4 deletions src/libsync/account.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ QUrl Account::deprecatedPrivateLinkUrl(const QByteArray &numericFileId) const
*/
void Account::clearCookieJar()
{
auto jar = qobject_cast<CookieJar *>(_am->cookieJar());
const auto jar = qobject_cast<CookieJar *>(_am->cookieJar());
ASSERT(jar);
jar->setAllCookies(QList<QNetworkCookie>());
}
Expand Down Expand Up @@ -529,11 +529,12 @@ void Account::setUserVisibleHost(const QString &host)
QVariant Account::credentialSetting(const QString &key) const
{
if (_credentials) {
QString prefix = _credentials->authType();
QVariant value = _settingsMap.value(prefix + "_" + key);
const auto prefix = _credentials->authType();
auto value = _settingsMap.value(prefix + "_" + key);
if (value.isNull()) {
value = _settingsMap.value(key);
}

return value;
}
return QVariant();
Expand Down Expand Up @@ -828,9 +829,10 @@ void Account::writeAppPasswordOnce(QString appPassword){
}

void Account::retrieveAppPassword(){
const QString key = credentials()->user() + app_password;
const QString kck = AbstractCredentials::keychainKey(
url().toString(),
credentials()->user() + app_password,
key,
id()
);

Expand Down

0 comments on commit 44df4a8

Please sign in to comment.