From: Kevin Ottens Date: Tue, 26 May 2020 18:13:51 +0000 (+0200) Subject: Use raw string literals when appropriate X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~207^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5350db0785a586c0940c2a78decc1249487e810;p=nextcloud-desktop.git Use raw string literals when appropriate This is especially nice for Windows paths. Signed-off-by: Kevin Ottens --- diff --git a/src/gui/navigationpanehelper.cpp b/src/gui/navigationpanehelper.cpp index 149e43eea..f738799d4 100644 --- a/src/gui/navigationpanehelper.cpp +++ b/src/gui/navigationpanehelper.cpp @@ -90,9 +90,9 @@ void NavigationPaneHelper::updateCloudStorageRegistry() entriesToRemove.removeOne(folder->navigationPaneClsid()); QString clsidStr = folder->navigationPaneClsid().toString(); - QString clsidPath = QString() % "Software\\Classes\\CLSID\\" % clsidStr; - QString clsidPathWow64 = QString() % "Software\\Classes\\Wow6432Node\\CLSID\\" % clsidStr; - QString namespacePath = QString() % "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\NameSpace\\" % clsidStr; + QString clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr; + QString clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr; + QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr; QString title = folder->shortGuiRemotePathOrAppName(); // Write the account name in the sidebar only when using more than one account. @@ -157,9 +157,9 @@ void NavigationPaneHelper::updateCloudStorageRegistry() // Then remove anything that isn't in our folder list anymore. foreach (auto &clsid, entriesToRemove) { QString clsidStr = clsid.toString(); - QString clsidPath = QString() % "Software\\Classes\\CLSID\\" % clsidStr; - QString clsidPathWow64 = QString() % "Software\\Classes\\Wow6432Node\\CLSID\\" % clsidStr; - QString namespacePath = QString() % "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\NameSpace\\" % clsidStr; + QString clsidPath = QString() % R"(Software\Classes\CLSID\)" % clsidStr; + QString clsidPathWow64 = QString() % R"(Software\Classes\Wow6432Node\CLSID\)" % clsidStr; + QString namespacePath = QString() % R"(Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\)" % clsidStr; qCInfo(lcNavPane) << "Explorer Cloud storage provider: now unused, removing own CLSID" << clsidStr; #ifdef Q_OS_WIN diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index c186fc4fe..3754bbd9f 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -129,7 +129,7 @@ void showInFileManager(const QString &localPath) } else if (Utility::isMac()) { QStringList scriptArgs; scriptArgs << QLatin1String("-e") - << QString::fromLatin1("tell application \"Finder\" to reveal POSIX file \"%1\"") + << QString::fromLatin1(R"(tell application "Finder" to reveal POSIX file "%1")") .arg(localPath); QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs); scriptArgs.clear(); diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp index a3474c783..8c0ec3912 100644 --- a/src/gui/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -177,7 +177,7 @@ SocketApi::SocketApi(QObject *parent) QString socketPath; if (Utility::isWindows()) { - socketPath = QLatin1String("\\\\.\\pipe\\") + socketPath = QLatin1String(R"(\\.\pipe\)") + QLatin1String("ownCloud-") + QString::fromLocal8Bit(qgetenv("USERNAME")); // TODO: once the windows extension supports multiple diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp index e493918e1..b241b595b 100644 --- a/src/gui/syncrunfilelog.cpp +++ b/src/gui/syncrunfilelog.cpp @@ -168,7 +168,7 @@ void SyncRunFileLog::logItem(const SyncFileItem &item) } QString ts = QString::fromLatin1(item._responseTimeStamp); if (ts.length() > 6) { - QRegExp rx("(\\d\\d:\\d\\d:\\d\\d)"); + QRegExp rx(R"((\d\d:\d\d:\d\d))"); if (ts.contains(rx)) { ts = rx.cap(0); } diff --git a/src/gui/wizard/owncloudwizardcommon.cpp b/src/gui/wizard/owncloudwizardcommon.cpp index cf27126dd..56768209b 100644 --- a/src/gui/wizard/owncloudwizardcommon.cpp +++ b/src/gui/wizard/owncloudwizardcommon.cpp @@ -47,7 +47,7 @@ namespace WizardCommon { QString titleTemplate() { - return QString::fromLatin1("").arg(Theme::instance()->wizardHeaderTitleColor().name()) + QString::fromLatin1("%1"); + return QString::fromLatin1(R"()").arg(Theme::instance()->wizardHeaderTitleColor().name()) + QString::fromLatin1("%1"); } QString subTitleTemplate() diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp index ca64361d7..701ab3116 100644 --- a/src/libsync/abstractnetworkjob.cpp +++ b/src/libsync/abstractnetworkjob.cpp @@ -433,7 +433,7 @@ QString networkReplyErrorString(const QNetworkReply &reply) return base; } - return AbstractNetworkJob::tr("Server replied \"%1 %2\" to \"%3 %4\"").arg(QString::number(httpStatus), httpReason, requestVerb(reply), reply.request().url().toDisplayString()); + return AbstractNetworkJob::tr(R"(Server replied "%1 %2" to "%3 %4")").arg(QString::number(httpStatus), httpReason, requestVerb(reply), reply.request().url().toDisplayString()); } } // namespace OCC diff --git a/src/libsync/clientsideencryptionjobs.cpp b/src/libsync/clientsideencryptionjobs.cpp index 7608ee956..5c8876206 100644 --- a/src/libsync/clientsideencryptionjobs.cpp +++ b/src/libsync/clientsideencryptionjobs.cpp @@ -36,7 +36,7 @@ void GetFolderEncryptStatusJob::start() req.setRawHeader("OCS-APIREQUEST", "true"); req.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/xml")); - QByteArray xml = " "; + QByteArray xml = R"( )"; auto *buf = new QBuffer(this); buf->setData(xml); buf->open(QIODevice::ReadOnly); diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 874585d41..184d9af9d 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -288,14 +288,14 @@ QVariant ConfigFile::getPolicySetting(const QString &setting, const QVariant &de { if (Utility::isWindows()) { // check for policies first and return immediately if a value is found. - QSettings userPolicy(QString::fromLatin1("HKEY_CURRENT_USER\\Software\\Policies\\%1\\%2") + QSettings userPolicy(QString::fromLatin1(R"(HKEY_CURRENT_USER\Software\Policies\%1\%2)") .arg(APPLICATION_VENDOR, Theme::instance()->appName()), QSettings::NativeFormat); if (userPolicy.contains(setting)) { return userPolicy.value(setting); } - QSettings machinePolicy(QString::fromLatin1("HKEY_LOCAL_MACHINE\\Software\\Policies\\%1\\%2") + QSettings machinePolicy(QString::fromLatin1(R"(HKEY_LOCAL_MACHINE\Software\Policies\%1\%2)") .arg(APPLICATION_VENDOR, APPLICATION_NAME), QSettings::NativeFormat); if (machinePolicy.contains(setting)) { @@ -669,7 +669,7 @@ QVariant ConfigFile::getValue(const QString ¶m, const QString &group, } systemSetting = systemSettings.value(param, defaultValue); } else { // Windows - QSettings systemSettings(QString::fromLatin1("HKEY_LOCAL_MACHINE\\Software\\%1\\%2") + QSettings systemSettings(QString::fromLatin1(R"(HKEY_LOCAL_MACHINE\Software\%1\%2)") .arg(APPLICATION_VENDOR, Theme::instance()->appName()), QSettings::NativeFormat); if (!group.isEmpty()) { diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index c1bf86d42..d8a642556 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -832,7 +832,7 @@ bool JsonApiJob::finished() qCWarning(lcJsonApiJob) << "Nothing changed so nothing to retrieve - status code: " << httpStatusCode; statusCode = httpStatusCode; } else { - QRegExp rex("\"statuscode\":(\\d+),"); + QRegExp rex(R"("statuscode":(\d+),)"); // example: "{"ocs":{"meta":{"status":"ok","statuscode":100,"message":null},"data":{"version":{"major":8,"minor":"... (504) if (jsonStr.contains(rex)) { statusCode = rex.cap(1).toInt(); diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index c34317ac8..3ca2563a5 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -1027,7 +1027,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult) // files with names that contain these. // It's important to respect the capability also for older servers -- the // version check doesn't make sense for custom servers. - invalidFilenamePattern = "[\\\\:?*\"<>|]"; + invalidFilenamePattern = R"([\\:?*"<>|])"; } if (!invalidFilenamePattern.isEmpty()) { const QRegExp invalidFilenameRx(invalidFilenamePattern); diff --git a/test/testutility.cpp b/test/testutility.cpp index 620548ba3..66473dfa3 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -120,7 +120,7 @@ private slots: qDebug() << "Version of installed Nextcloud: " << ver; QVERIFY( !ver.isEmpty()); - QRegExp rx( "Nextcloud version \\d+\\.\\d+\\.\\d+.*" ); + QRegExp rx( R"(Nextcloud version \d+\.\d+\.\d+.*)" ); QVERIFY( rx.exactMatch(ver)); } else { QVERIFY( versionOfInstalledBinary().isEmpty());