From e0dd62e6210178c63d1928df04671e2e2023c124 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Sun, 2 Feb 2025 17:50:45 -0700 Subject: [PATCH 1/2] Use `enum class` for `AnnouncementType` --- appOPHD/UI/MajorEventAnnouncement.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appOPHD/UI/MajorEventAnnouncement.h b/appOPHD/UI/MajorEventAnnouncement.h index a04672072..c9f2ac926 100644 --- a/appOPHD/UI/MajorEventAnnouncement.h +++ b/appOPHD/UI/MajorEventAnnouncement.h @@ -8,7 +8,7 @@ class MajorEventAnnouncement : public Window { public: - enum AnnouncementType + enum class AnnouncementType { ANNOUNCEMENT_COLONY_SHIP_CRASH, ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS From 2c4182cbe30b8ea64a2f483516650630adec8711 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Sun, 2 Feb 2025 17:53:01 -0700 Subject: [PATCH 2/2] Use CamcelCase for `AnnouncementType` enum value names Strip off the enum name prefix from the value names. --- appOPHD/States/MapViewStateTurn.cpp | 4 ++-- appOPHD/UI/MajorEventAnnouncement.cpp | 4 ++-- appOPHD/UI/MajorEventAnnouncement.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appOPHD/States/MapViewStateTurn.cpp b/appOPHD/States/MapViewStateTurn.cpp index dcf3d3bd7..bfaf42e70 100644 --- a/appOPHD/States/MapViewStateTurn.cpp +++ b/appOPHD/States/MapViewStateTurn.cpp @@ -430,13 +430,13 @@ void MapViewState::checkColonyShip() populateStructureMenu(); mWindowStack.bringToFront(&mAnnouncement); - mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS); + mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ColonyShipCrashWithColonists); mAnnouncement.show(); } else { mWindowStack.bringToFront(&mAnnouncement); - mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH); + mAnnouncement.announcement(MajorEventAnnouncement::AnnouncementType::ColonyShipCrash); mAnnouncement.show(); } } diff --git a/appOPHD/UI/MajorEventAnnouncement.cpp b/appOPHD/UI/MajorEventAnnouncement.cpp index af29fc563..3b8d69b57 100644 --- a/appOPHD/UI/MajorEventAnnouncement.cpp +++ b/appOPHD/UI/MajorEventAnnouncement.cpp @@ -33,10 +33,10 @@ void MajorEventAnnouncement::announcement(AnnouncementType a) { switch (a) { - case AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH: + case AnnouncementType::ColonyShipCrash: mMessage = "Colony ship deorbited and crashed on the surface."; break; - case AnnouncementType::ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS: + case AnnouncementType::ColonyShipCrashWithColonists: mMessage = "Colony ship deorbited and crashed on the surface but you left colonists on board!"; break; } diff --git a/appOPHD/UI/MajorEventAnnouncement.h b/appOPHD/UI/MajorEventAnnouncement.h index c9f2ac926..936108283 100644 --- a/appOPHD/UI/MajorEventAnnouncement.h +++ b/appOPHD/UI/MajorEventAnnouncement.h @@ -10,8 +10,8 @@ class MajorEventAnnouncement : public Window enum class AnnouncementType { - ANNOUNCEMENT_COLONY_SHIP_CRASH, - ANNOUNCEMENT_COLONY_SHIP_CRASH_WITH_COLONISTS + ColonyShipCrash, + ColonyShipCrashWithColonists, }; MajorEventAnnouncement();