Skip to content

Commit 8b4bb1e

Browse files
CopilotCopilot
authored
Use auto keyword for variable declarations where type is evident from RHS
1 parent d637b86 commit 8b4bb1e

37 files changed

Lines changed: 79 additions & 79 deletions

‎src/cmd/cmd.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
333333
const auto sanitisedTargetUrl = options.target_url.endsWith('/') || options.target_url.endsWith('\\')
334334
? options.target_url.chopped(1)
335335
: options.target_url;
336-
QUrl hostUrl = QUrl::fromUserInput(sanitisedTargetUrl);
336+
auto hostUrl = QUrl::fromUserInput(sanitisedTargetUrl);
337337

338338
if (const auto hostUrlPath = hostUrl.path(); hostUrlPath.contains("/webdav", Qt::CaseInsensitive) || hostUrlPath.contains("/dav", Qt::CaseInsensitive)) {
339339
qWarning("Dav or webdav in server URL.");

‎src/cmd/e2ee_verify_metadata.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static QByteArray decryptAndDecompressMetadata(const QJsonDocument &innerDoc,
247247
// separate "nonce" field.
248248
const QList<QByteArray> ciphertextParts = ciphertextField.split('|');
249249
const QByteArray ciphertextBase64 = ciphertextParts.value(0);
250-
const QByteArray ciphertextWithTag = QByteArray::fromBase64(ciphertextBase64);
250+
const auto ciphertextWithTag = QByteArray::fromBase64(ciphertextBase64);
251251

252252
printVerbose(QStringLiteral("Ciphertext+tag size: %1 bytes").arg(ciphertextWithTag.size()));
253253
printVerbose(QStringLiteral("Nonce size: %1 bytes").arg(nonce.size()));
@@ -277,7 +277,7 @@ static QByteArray decryptAndDecompressMetadata(const QJsonDocument &innerDoc,
277277
static QByteArray decryptRsaOaepSha256(const QByteArray &encryptedKeyBase64,
278278
const QByteArray &privateKeyPem)
279279
{
280-
const QByteArray encryptedKey = QByteArray::fromBase64(encryptedKeyBase64);
280+
const auto encryptedKey = QByteArray::fromBase64(encryptedKeyBase64);
281281

282282
BIO *keyBio = BIO_new_mem_buf(privateKeyPem.constData(), privateKeyPem.size());
283283
if (!keyBio) {
@@ -352,7 +352,7 @@ static QByteArray decryptRsaOaepSha256(const QByteArray &encryptedKeyBase64,
352352
*/
353353
static QJsonDocument extractInnerMetadata(const QByteArray &rawFileContents)
354354
{
355-
const QJsonDocument outerDoc = QJsonDocument::fromJson(rawFileContents);
355+
const auto outerDoc = QJsonDocument::fromJson(rawFileContents);
356356
if (outerDoc.isNull()) {
357357
return {};
358358
}
@@ -368,7 +368,7 @@ static QJsonDocument extractInnerMetadata(const QByteArray &rawFileContents)
368368

369369
if (!metaDataStr.isEmpty()) {
370370
printVerbose(QStringLiteral("OCS envelope detected – extracting inner metadata string"));
371-
const QJsonDocument innerDoc = QJsonDocument::fromJson(metaDataStr.toUtf8());
371+
const auto innerDoc = QJsonDocument::fromJson(metaDataStr.toUtf8());
372372
if (innerDoc.isNull()) {
373373
printVerbose(QStringLiteral("Failed to parse inner metadata string as JSON"));
374374
}
@@ -727,7 +727,7 @@ static bool verifyCmsSignature(const QByteArray &signatureBase64,
727727
const QJsonDocument &innerDoc,
728728
const QByteArray &certificatePem)
729729
{
730-
const QByteArray signature = QByteArray::fromBase64(signatureBase64);
730+
const auto signature = QByteArray::fromBase64(signatureBase64);
731731

732732
BIO *sigBio = BIO_new_mem_buf(signature.constData(), signature.size());
733733
CMS_ContentInfo *cms = d2i_CMS_bio(sigBio, nullptr);
@@ -1016,7 +1016,7 @@ int main(int argc, char *argv[])
10161016
// Step 7 – Validate decrypted JSON structure
10171017
// -----------------------------------------------------------------------
10181018

1019-
const QJsonDocument decryptedDoc = QJsonDocument::fromJson(decryptedBytes);
1019+
const auto decryptedDoc = QJsonDocument::fromJson(decryptedBytes);
10201020
if (decryptedDoc.isNull()) {
10211021
printFail(QStringLiteral("Decrypted JSON: failed to parse decrypted bytes as JSON"));
10221022
allPassed = false;

‎src/cmd/netrcparser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ bool NetrcParser::parse()
9292

9393
NetrcParser::LoginPair NetrcParser::find(const QString &machine)
9494
{
95-
QHash<QString, LoginPair>::const_iterator it = _entries.find(machine);
95+
auto it = _entries.find(machine);
9696
if (it != _entries.end()) {
9797
return *it;
9898
} else {

‎src/common/utility.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ QString Utility::formatFingerprint(const QByteArray &fmhash, bool colonSeparated
8282
hash.append(' ');
8383
}
8484

85-
QString fp = QString::fromLatin1(hash.trimmed());
85+
auto fp = QString::fromLatin1(hash.trimmed());
8686
if (colonSeparated) {
8787
fp.replace(QLatin1Char(' '), QLatin1Char(':'));
8888
}
@@ -195,7 +195,7 @@ qint64 Utility::freeDiskSpace(const QString &path)
195195

196196
QString Utility::compactFormatDouble(double value, int prec, const QString &unit)
197197
{
198-
QLocale locale = QLocale::system();
198+
auto locale = QLocale::system();
199199
const auto decPoint = locale.decimalPoint();
200200
QString str = locale.toString(value, 'f', prec);
201201
while (str.endsWith(QLatin1Char('0')) || str.endsWith(decPoint)) {
@@ -417,7 +417,7 @@ QByteArray Utility::versionOfInstalledBinary(const QString &command)
417417

418418
QString Utility::timeAgoInWords(const QDateTime &dt, const QDateTime &from)
419419
{
420-
QDateTime now = QDateTime::currentDateTimeUtc();
420+
auto now = QDateTime::currentDateTimeUtc();
421421

422422
if (from.isValid()) {
423423
now = from;

‎src/gui/accountmanager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ void AccountManager::updateServerHasValidSubscriptionConfig()
811811

812812
void AccountManager::updateServerDesktopEnterpriseUpdateChannel()
813813
{
814-
UpdateChannel most_stable_channel = UpdateChannel::Invalid;
814+
auto most_stable_channel = UpdateChannel::Invalid;
815815
for (const auto &account : std::as_const(_accounts)) {
816816
if (const auto accounts_channel = account->account()->enterpriseUpdateChannel();
817817
account->account()->serverHasValidSubscription() && accounts_channel > most_stable_channel) {

‎src/gui/connectionvalidator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void ConnectionValidator::slotCapabilitiesRecieved(const QJsonDocument &json)
267267
}
268268

269269
// Check for the directEditing capability
270-
QUrl directEditingURL = QUrl(caps["files"].toObject()["directEditing"].toObject()["url"].toString());
270+
auto directEditingURL = QUrl(caps["files"].toObject()["directEditing"].toObject()["url"].toString());
271271
QString directEditingETag = caps["files"].toObject()["directEditing"].toObject()["etag"].toString();
272272
_account->fetchDirectEditors(directEditingURL, directEditingETag);
273273

‎src/gui/creds/webflowcredentials.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class WebFlowCredentialsAccessManager : public AccessManager
5454
QNetworkRequest req(request);
5555
if (!req.attribute(AbstractCredentials::DontAddCredentialsAttribute).toBool()) {
5656
if (_cred && !_cred->password().isEmpty()) {
57-
QByteArray credHash = QByteArray(_cred->user().toUtf8() + ":" + _cred->password().toUtf8()).toBase64();
57+
auto credHash = QByteArray(_cred->user().toUtf8() + ":" + _cred->password().toUtf8()).toBase64();
5858
req.setRawHeader("Authorization", "Basic " + credHash);
5959
}
6060
}

‎src/gui/folderstatusdelegate.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ bool FolderStatusDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
420420

421421
QRect FolderStatusDelegate::optionsButtonRect(QRect within, Qt::LayoutDirection direction)
422422
{
423-
QFont font = QFont();
423+
auto font = QFont();
424424
QFont aliasFont = makeAliasFont(font);
425425
QFontMetrics fm(font);
426426
QFontMetrics aliasFm(aliasFont);
@@ -460,7 +460,7 @@ QRect FolderStatusDelegate::sandboxButtonRect(QRect errorBannerRect)
460460

461461
QRect FolderStatusDelegate::errorsListRect(QRect within)
462462
{
463-
QFont font = QFont();
463+
auto font = QFont();
464464
QFont aliasFont = makeAliasFont(font);
465465
QFontMetrics fm(font);
466466
QFontMetrics aliasFm(aliasFont);

‎src/gui/navigationpanehelper.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
8989
entriesToRemove.removeOne(folder->navigationPaneClsid());
9090

9191
const auto clsidStr = folder->navigationPaneClsid().toString();
92-
const QString clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr;
93-
const QString clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr;
94-
const QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
92+
const auto clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr;
93+
const auto clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr;
94+
const auto namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
9595
const auto title = folder->sidebarDisplayName();
9696
qCDebug(lcNavPane) << "Folder" << folder->cleanPath() << "will use shortcutname" << title;
9797

@@ -154,9 +154,9 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
154154
// Then remove anything that isn't in our folder list anymore.
155155
for (const auto &clsid : std::as_const(entriesToRemove)) {
156156
const auto clsidStr = clsid.toString();
157-
const QString clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr;
158-
const QString clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr;
159-
const QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
157+
const auto clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr;
158+
const auto clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr;
159+
const auto namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr;
160160

161161
qCInfo(lcNavPane) << "Explorer Cloud storage provider: now unused, removing own CLSID" << clsidStr;
162162
#ifdef Q_OS_WIN

‎src/gui/ocssharejob.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void OcsShareJob::setPublicUpload(const QString &shareId, bool publicUpload)
8686
appendPath(shareId);
8787
setVerb("PUT");
8888

89-
const QString value = QString::fromLatin1(publicUpload ? "true" : "false");
89+
const auto value = QString::fromLatin1(publicUpload ? "true" : "false");
9090
addParam(QString::fromLatin1("publicUpload"), value);
9191
_value = publicUpload;
9292

0 commit comments

Comments
 (0)