Skip to content

Commit 0f73d52

Browse files
SopwitSopwit
committed
Stabilize clang format checks
1 parent 3e580d1 commit 0f73d52

3 files changed

Lines changed: 44 additions & 38 deletions

File tree

‎src/backend/nvidia/installer.cpp‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,12 @@ void NvidiaInstaller::installProprietary(bool agreementAccepted) {
370370
NvidiaInstaller::tr(
371371
"Installing the closed-source NVIDIA driver with one privileged "
372372
"authorization..."));
373-
emitProgressAsync(guard,
374-
NvidiaInstaller::tr(
375-
"Closed-source install packages for %1: %2")
376-
.arg(NvidiaInstaller::tr("Wayland"))
377-
.arg(quotedList(buildDriverInstallTargets(
378-
QStringLiteral("akmod-nvidia"), sessionType))));
373+
const QString installPackagesMessage =
374+
NvidiaInstaller::tr("Closed-source install packages for %1: %2")
375+
.arg(NvidiaInstaller::tr("Wayland"))
376+
.arg(quotedList(buildDriverInstallTargets(
377+
QStringLiteral("akmod-nvidia"), sessionType)));
378+
emitProgressAsync(guard, installPackagesMessage);
379379

380380
QStringList installArgs{QStringLiteral("install"), QStringLiteral("-y"),
381381
QStringLiteral("--refresh"),
@@ -399,13 +399,15 @@ void NvidiaInstaller::installProprietary(bool agreementAccepted) {
399399
{QStringLiteral("akmods"), {QStringLiteral("--force")}});
400400
rootCommands.append(buildSessionSpecificRootCommands(sessionType));
401401

402-
emitProgressAsync(guard, NvidiaInstaller::tr("Detected %1 session via %2.")
403-
.arg(sessionType == QStringLiteral("wayland")
404-
? NvidiaInstaller::tr("Wayland")
405-
: sessionType,
406-
sessionInfo.source.isEmpty()
407-
? NvidiaInstaller::tr("session probe")
408-
: sessionInfo.source));
402+
const QString detectedSessionMessage =
403+
NvidiaInstaller::tr("Detected %1 session via %2.")
404+
.arg(sessionType == QStringLiteral("wayland")
405+
? NvidiaInstaller::tr("Wayland")
406+
: sessionType,
407+
sessionInfo.source.isEmpty()
408+
? NvidiaInstaller::tr("session probe")
409+
: sessionInfo.source);
410+
emitProgressAsync(guard, detectedSessionMessage);
409411

410412
auto result = runner.runAsRootBatch(rootCommands, runOptions);
411413
if (!result.success()) {
@@ -511,13 +513,15 @@ void NvidiaInstaller::installOpenSource() {
511513
{QStringLiteral("akmods"), {QStringLiteral("--force")}});
512514
rootCommands.append(buildSessionSpecificRootCommands(sessionType));
513515

514-
emitProgressAsync(guard, NvidiaInstaller::tr("Detected %1 session via %2.")
515-
.arg(sessionType == QStringLiteral("wayland")
516-
? NvidiaInstaller::tr("Wayland")
517-
: sessionType,
518-
sessionInfo.source.isEmpty()
519-
? NvidiaInstaller::tr("session probe")
520-
: sessionInfo.source));
516+
const QString detectedSessionMessage =
517+
NvidiaInstaller::tr("Detected %1 session via %2.")
518+
.arg(sessionType == QStringLiteral("wayland")
519+
? NvidiaInstaller::tr("Wayland")
520+
: sessionType,
521+
sessionInfo.source.isEmpty()
522+
? NvidiaInstaller::tr("session probe")
523+
: sessionInfo.source);
524+
emitProgressAsync(guard, detectedSessionMessage);
521525

522526
auto result = runner.runAsRootBatch(rootCommands, runOptions);
523527
if (!result.success()) {

‎src/backend/nvidia/updater.cpp‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -673,29 +673,30 @@ void NvidiaUpdater::applyVersion(const QString &version) {
673673
emitProgressAsync(
674674
guard, NvidiaUpdater::tr("Driver transaction kernel package: `%1`")
675675
.arg(kernelPackageName));
676-
emitProgressAsync(guard,
677-
NvidiaUpdater::tr(
678-
"Driver transaction packages for %1: %2")
679-
.arg(NvidiaUpdater::tr("Wayland"))
680-
.arg(quotedList(guard->buildDriverTargets(
681-
trimmedVersion.isEmpty()
682-
? guard->m_latestPackageVersion
683-
: trimmedVersion,
684-
sessionType, kernelPackageName))));
676+
const QString transactionPackagesMessage =
677+
NvidiaUpdater::tr("Driver transaction packages for %1: %2")
678+
.arg(NvidiaUpdater::tr("Wayland"))
679+
.arg(quotedList(guard->buildDriverTargets(
680+
trimmedVersion.isEmpty() ? guard->m_latestPackageVersion
681+
: trimmedVersion,
682+
sessionType, kernelPackageName)));
683+
emitProgressAsync(guard, transactionPackagesMessage);
685684

686685
QList<CommandRunner::RootCommand> rootCommands;
687686
rootCommands.append({QStringLiteral("dnf"), args});
688687
rootCommands.append(
689688
{QStringLiteral("akmods"), {QStringLiteral("--force")}});
690689
rootCommands.append(buildSessionSpecificRootCommands(sessionType));
691690

692-
emitProgressAsync(guard, NvidiaUpdater::tr("Detected %1 session via %2.")
693-
.arg(sessionType == QStringLiteral("wayland")
694-
? NvidiaUpdater::tr("Wayland")
695-
: sessionType,
696-
sessionInfo.source.isEmpty()
697-
? NvidiaUpdater::tr("session probe")
698-
: sessionInfo.source));
691+
const QString detectedSessionMessage =
692+
NvidiaUpdater::tr("Detected %1 session via %2.")
693+
.arg(sessionType == QStringLiteral("wayland")
694+
? NvidiaUpdater::tr("Wayland")
695+
: sessionType,
696+
sessionInfo.source.isEmpty()
697+
? NvidiaUpdater::tr("session probe")
698+
: sessionInfo.source);
699+
emitProgressAsync(guard, detectedSessionMessage);
699700

700701
auto result = runner.runAsRootBatch(rootCommands, runOptions);
701702
if (!result.success()) {

‎src/backend/system/systeminfoprovider.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,9 @@ QString SystemInfoProvider::detectDeviceType() const {
284284
return QStringLiteral("Laptop");
285285
}
286286

287-
static const QList<int> desktopChassisTypes = {3, 4, 5, 6, 7,
288-
15, 16, 35, 36};
287+
static const QList<int> desktopChassisTypes = {
288+
3, 4, 5, 6, 7, 15, 16, 35, 36,
289+
};
289290
if (desktopChassisTypes.contains(chassis)) {
290291
return QStringLiteral("Desktop");
291292
}

0 commit comments

Comments
 (0)