jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-09 19:43:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[Client] Make stateless at-risk helpers static

Browse source
This commit is contained in:
Lukas Brübach 2026-10-16 12:45:42 +02:00
parent b429561bc8
commit d72db0f5b0
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/interface/window_main.cpp
View file

@ -687,7 +687,7 @@ static bool isPortableBackupExcluded(const QString &offender)
return false; return false;
} }
MainWindow::AtRiskPaths MainWindow::collectPortableAtRiskPaths(const QString &appDir) const MainWindow::AtRiskPaths MainWindow::collectPortableAtRiskPaths(const QString &appDir)
{ {
auto &paths = SettingsCache::instance().paths(); auto &paths = SettingsCache::instance().paths();
AtRiskPaths atRisk; AtRiskPaths atRisk;
@ -757,7 +757,7 @@ MainWindow::AtRiskPaths MainWindow::collectPortableAtRiskPaths(const QString &ap
return atRisk; return atRisk;
} }
QStringList MainWindow::collectInstalledAtRiskPaths(const QString &appDir) const QStringList MainWindow::collectInstalledAtRiskPaths(const QString &appDir)
{ {
QStringList offenders = SettingsCache::instance().paths().pathsInsideDir(appDir); QStringList offenders = SettingsCache::instance().paths().pathsInsideDir(appDir);
@ -778,7 +778,7 @@ QStringList MainWindow::collectInstalledAtRiskPaths(const QString &appDir) const
return offenders; return offenders;
} }
MainWindow::AtRiskBackupOutcome MainWindow::backUpAtRiskPaths(const QStringList &sources, const QString &appDir) const MainWindow::AtRiskBackupOutcome MainWindow::backUpAtRiskPaths(const QStringList &sources, const QString &appDir)
{ {
AtRiskBackupOutcome outcome; AtRiskBackupOutcome outcome;
const QString backupRoot = resolveBackupRoot(appDir); const QString backupRoot = resolveBackupRoot(appDir);
@ -837,7 +837,7 @@ MainWindow::AtRiskBackupOutcome MainWindow::backUpAtRiskPaths(const QStringList
return outcome; return outcome;
} }
QString MainWindow::buildPortableAtRiskMessage(const AtRiskBackupOutcome &outcome, bool emptySources) const QString MainWindow::buildPortableAtRiskMessage(const AtRiskBackupOutcome &outcome, bool emptySources)
{ {
const QString backupVerb = outcome.reused ? tr("is already available") : tr("has been created"); const QString backupVerb = outcome.reused ? tr("is already available") : tr("has been created");
const QString sizeInfo = tr("%1 MB (automatic backups are capped at %2 MB)") const QString sizeInfo = tr("%1 MB (automatic backups are capped at %2 MB)")
@ -883,7 +883,7 @@ QString MainWindow::buildPortableAtRiskMessage(const AtRiskBackupOutcome &outcom
QString MainWindow::buildInstalledAtRiskMessage(const QStringList &offenders, QString MainWindow::buildInstalledAtRiskMessage(const QStringList &offenders,
const QStringList &sources, const QStringList &sources,
const AtRiskBackupOutcome &outcome) const const AtRiskBackupOutcome &outcome)
{ {
const QString backupVerb = outcome.reused ? tr("is already available") : tr("has been created"); const QString backupVerb = outcome.reused ? tr("is already available") : tr("has been created");
const QString sizeInfo = tr("%1 MB (automatic backups are capped at %2 MB)") const QString sizeInfo = tr("%1 MB (automatic backups are capped at %2 MB)")

14
cockatrice/src/interface/window_main.h
View file

@ -165,13 +165,13 @@ private:
QStringList sourcesToBackUp; ///< existing paths that need a safety copy QStringList sourcesToBackUp; ///< existing paths that need a safety copy
QStringList offendersForDisplay; ///< paths listed in the warning (empty for portable) QStringList offendersForDisplay; ///< paths listed in the warning (empty for portable)
}; };
AtRiskPaths collectPortableAtRiskPaths(const QString &appDir) const; static AtRiskPaths collectPortableAtRiskPaths(const QString &appDir);
QStringList collectInstalledAtRiskPaths(const QString &appDir) const; static QStringList collectInstalledAtRiskPaths(const QString &appDir);
AtRiskBackupOutcome backUpAtRiskPaths(const QStringList &sources, const QString &appDir) const; static AtRiskBackupOutcome backUpAtRiskPaths(const QStringList &sources, const QString &appDir);
QString buildPortableAtRiskMessage(const AtRiskBackupOutcome &outcome, bool emptySources) const; static QString buildPortableAtRiskMessage(const AtRiskBackupOutcome &outcome, bool emptySources);
QString buildInstalledAtRiskMessage(const QStringList &offenders, static QString buildInstalledAtRiskMessage(const QStringList &offenders,
const QStringList &sources, const QStringList &sources,
const AtRiskBackupOutcome &outcome) const; const AtRiskBackupOutcome &outcome);
void showAtRiskDataWarning(const QString &title, const QString &message); void showAtRiskDataWarning(const QString &title, const QString &message);
inline QString getCardUpdaterBinaryName() inline QString getCardUpdaterBinaryName()