jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-06 18:13:29 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[DeckSync] Address conflict review nits: enum class and designated initializers

Browse source
This commit is contained in:
Lukas Brübach 2026-11-06 09:31:10 +01:00
parent ed763ba170
commit 7390c89827
4 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/interface/deck_sync/deck_sync_conflict.h
View file

@ -9,13 +9,13 @@
#include <QString>
/** @brief How a both-sides-changed deck is resolved. */
enum DeckSyncResolutionAction
enum class DeckSyncResolutionAction
{
DeckSyncKeepMine, ///< Upload the local deck, discarding the server version.
DeckSyncKeepServer, ///< Download the server deck, discarding local changes.
DeckSyncKeepBoth, ///< Keep the local deck and store the server version aside.
DeckSyncUseMerge, ///< Upload the auto-merged deck (only when mergeable).
DeckSyncSkipConflict, ///< Leave both sides untouched for this run.
KeepMine, ///< Upload the local deck, discarding the server version.
KeepServer, ///< Download the server deck, discarding local changes.
KeepBoth, ///< Keep the local deck and store the server version aside.
UseMerge, ///< Upload the auto-merged deck (only when mergeable).
SkipConflict, ///< Leave both sides untouched for this run.
};
/** @brief Sync direction for one run. */
@ -42,7 +42,7 @@ struct DeckSyncConflict
/** @brief The dialog verdict for one DeckSyncConflict. */
struct DeckSyncResolution
{
DeckSyncResolutionAction action = DeckSyncKeepMine;
DeckSyncResolutionAction action = DeckSyncResolutionAction::KeepMine;
bool rememberSession = false; ///< Reuse this verdict for later conflicts this run.
bool rememberAlways = false; ///< Store this verdict as the conflict default setting.
};