From 9161ce4286d7280ac57cc876847b4e10cce7d2db Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 15:56:59 -0700 Subject: [PATCH 1/4] Update NAS2D submodule Enums can now be used without the `EventHandler::` prefix. An alias provides backwards compatibility. --- nas2d-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nas2d-core b/nas2d-core index 9258fbc0d..006a1a52c 160000 --- a/nas2d-core +++ b/nas2d-core @@ -1 +1 @@ -Subproject commit 9258fbc0d95e993d18ec746955da124d018ff31a +Subproject commit 006a1a52caddfc28fc440f02c25439ffe140002a From 8a0033a3580eceeca6e484f56cb6f3a3f1417e32 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 15:57:40 -0700 Subject: [PATCH 2/4] Remove `EventHandler::` prefix on enum uses --- appOPHD/States/MainMenuState.cpp | 2 +- appOPHD/States/MainMenuState.h | 2 +- appOPHD/States/MainReportsUiState.cpp | 8 ++-- appOPHD/States/MainReportsUiState.h | 4 +- appOPHD/States/MapViewState.cpp | 64 ++++++++++++------------- appOPHD/States/MapViewState.h | 8 ++-- appOPHD/States/PlanetSelectState.cpp | 2 +- appOPHD/States/PlanetSelectState.h | 2 +- appOPHD/States/SplashState.cpp | 4 +- appOPHD/States/SplashState.h | 4 +- appOPHD/UI/FileIo.cpp | 8 ++-- appOPHD/UI/FileIo.h | 4 +- appOPHD/UI/IconGrid.cpp | 4 +- appOPHD/UI/IconGrid.h | 2 +- appOPHD/UI/MiniMap.cpp | 6 +-- appOPHD/UI/MiniMap.h | 4 +- appOPHD/UI/NotificationArea.cpp | 8 ++-- appOPHD/UI/NotificationArea.h | 2 +- appOPHD/UI/Reports/ResearchReport.cpp | 4 +- appOPHD/UI/Reports/ResearchReport.h | 2 +- appOPHD/UI/Reports/SatellitesReport.cpp | 2 +- appOPHD/UI/Reports/SatellitesReport.h | 2 +- appOPHD/UI/Reports/SpaceportsReport.cpp | 2 +- appOPHD/UI/Reports/SpaceportsReport.h | 2 +- appOPHD/UI/Reports/WarehouseReport.cpp | 4 +- appOPHD/UI/Reports/WarehouseReport.h | 2 +- appOPHD/UI/ResourceInfoBar.cpp | 4 +- appOPHD/UI/ResourceInfoBar.h | 2 +- libControls/Button.cpp | 8 ++-- libControls/Button.h | 4 +- libControls/CheckBox.cpp | 4 +- libControls/CheckBox.h | 2 +- libControls/ComboBox.cpp | 4 +- libControls/ComboBox.h | 2 +- libControls/ListBox.h | 2 +- libControls/ListBoxBase.cpp | 6 +-- libControls/ListBoxBase.h | 2 +- libControls/RadioButton.cpp | 4 +- libControls/RadioButtonGroup.h | 2 +- libControls/ScrollBar.cpp | 8 ++-- libControls/ScrollBar.h | 4 +- libControls/TextField.cpp | 24 +++++----- libControls/TextField.h | 4 +- libControls/UIContainer.cpp | 2 +- libControls/UIContainer.h | 2 +- libControls/Window.cpp | 6 +-- libControls/Window.h | 4 +- 47 files changed, 129 insertions(+), 129 deletions(-) diff --git a/appOPHD/States/MainMenuState.cpp b/appOPHD/States/MainMenuState.cpp index c748ac1ac..b521866ab 100644 --- a/appOPHD/States/MainMenuState.cpp +++ b/appOPHD/States/MainMenuState.cpp @@ -165,7 +165,7 @@ void MainMenuState::onFileIoAction(const std::string& filePath, FileIo::FileOper /** * Key down event handler. */ -void MainMenuState::onKeyDown(NAS2D::EventHandler::KeyCode /*key*/, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/) +void MainMenuState::onKeyDown(NAS2D::KeyCode /*key*/, NAS2D::KeyModifier /*mod*/, bool /*repeat*/) {} diff --git a/appOPHD/States/MainMenuState.h b/appOPHD/States/MainMenuState.h index cf85ba31e..8bf18410c 100644 --- a/appOPHD/States/MainMenuState.h +++ b/appOPHD/States/MainMenuState.h @@ -24,7 +24,7 @@ class MainMenuState : public NAS2D::State State* update() override; private: - void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); + void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); void onWindowResized(NAS2D::Vector newSize); void onFadeComplete(); diff --git a/appOPHD/States/MainReportsUiState.cpp b/appOPHD/States/MainReportsUiState.cpp index 1a162986f..90470dfb9 100644 --- a/appOPHD/States/MainReportsUiState.cpp +++ b/appOPHD/States/MainReportsUiState.cpp @@ -237,21 +237,21 @@ void MainReportsUiState::_deactivate() } -void MainReportsUiState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/) +void MainReportsUiState::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, bool /*repeat*/) { if (!active()) { return; } - if (key == NAS2D::EventHandler::KeyCode::KEY_ESCAPE) + if (key == NAS2D::KeyCode::KEY_ESCAPE) { exit(); } } -void MainReportsUiState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void MainReportsUiState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!active()) { @@ -264,7 +264,7 @@ void MainReportsUiState::onMouseDown(NAS2D::EventHandler::MouseButton button, NA return; } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { for (Panel& panel : Panels) { diff --git a/appOPHD/States/MainReportsUiState.h b/appOPHD/States/MainReportsUiState.h index a243bf152..57438129d 100644 --- a/appOPHD/States/MainReportsUiState.h +++ b/appOPHD/States/MainReportsUiState.h @@ -50,8 +50,8 @@ class MainReportsUiState : public Wrapper void _activate() override; private: - void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); void onWindowResized(NAS2D::Vector newSize); void deselectAllPanels(); diff --git a/appOPHD/States/MapViewState.cpp b/appOPHD/States/MapViewState.cpp index 9954b3807..d78a84da9 100644 --- a/appOPHD/States/MapViewState.cpp +++ b/appOPHD/States/MapViewState.cpp @@ -411,7 +411,7 @@ void MapViewState::onWindowResized(NAS2D::Vector newSize) /** * Key down event handler. */ -void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool /*repeat*/) +void MapViewState::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool /*repeat*/) { if (!active()) { return; } @@ -426,7 +426,7 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl return; } - if (key == NAS2D::EventHandler::KeyCode::KEY_F1) + if (key == NAS2D::KeyCode::KEY_F1) { mReportsUiSignal(); return; @@ -437,64 +437,64 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl switch(key) { - case NAS2D::EventHandler::KeyCode::KEY_w: - case NAS2D::EventHandler::KeyCode::KEY_UP: + case NAS2D::KeyCode::KEY_w: + case NAS2D::KeyCode::KEY_UP: moveView(MapOffsetNorthWest * shiftMoveScalar); break; - case NAS2D::EventHandler::KeyCode::KEY_s: - case NAS2D::EventHandler::KeyCode::KEY_DOWN: + case NAS2D::KeyCode::KEY_s: + case NAS2D::KeyCode::KEY_DOWN: moveView(MapOffsetSouthEast * shiftMoveScalar); break; - case NAS2D::EventHandler::KeyCode::KEY_a: - case NAS2D::EventHandler::KeyCode::KEY_LEFT: + case NAS2D::KeyCode::KEY_a: + case NAS2D::KeyCode::KEY_LEFT: moveView(MapOffsetSouthWest * shiftMoveScalar); break; - case NAS2D::EventHandler::KeyCode::KEY_d: - case NAS2D::EventHandler::KeyCode::KEY_RIGHT: + case NAS2D::KeyCode::KEY_d: + case NAS2D::KeyCode::KEY_RIGHT: moveView(MapOffsetNorthEast * shiftMoveScalar); break; - case NAS2D::EventHandler::KeyCode::KEY_0: + case NAS2D::KeyCode::KEY_0: changeViewDepth(0); break; - case NAS2D::EventHandler::KeyCode::KEY_1: + case NAS2D::KeyCode::KEY_1: changeViewDepth(1); break; - case NAS2D::EventHandler::KeyCode::KEY_2: + case NAS2D::KeyCode::KEY_2: changeViewDepth(2); break; - case NAS2D::EventHandler::KeyCode::KEY_3: + case NAS2D::KeyCode::KEY_3: changeViewDepth(3); break; - case NAS2D::EventHandler::KeyCode::KEY_4: + case NAS2D::KeyCode::KEY_4: changeViewDepth(4); break; - case NAS2D::EventHandler::KeyCode::KEY_PAGEUP: + case NAS2D::KeyCode::KEY_PAGEUP: moveView(MapOffsetUp); break; - case NAS2D::EventHandler::KeyCode::KEY_PAGEDOWN: + case NAS2D::KeyCode::KEY_PAGEDOWN: moveView(MapOffsetDown); break; - case NAS2D::EventHandler::KeyCode::KEY_HOME: + case NAS2D::KeyCode::KEY_HOME: changeViewDepth(0); break; - case NAS2D::EventHandler::KeyCode::KEY_END: + case NAS2D::KeyCode::KEY_END: changeViewDepth(mTileMap->maxDepth()); break; - case NAS2D::EventHandler::KeyCode::KEY_F10: + case NAS2D::KeyCode::KEY_F10: if (NAS2D::Utility::get().control(mod) && NAS2D::Utility::get().shift(mod)) { mCheatMenu.show(); @@ -502,24 +502,24 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl } break; - case NAS2D::EventHandler::KeyCode::KEY_F2: + case NAS2D::KeyCode::KEY_F2: mFileIoDialog.scanDirectory(constants::SaveGamePath); mFileIoDialog.setMode(FileIo::FileOperation::Save); mFileIoDialog.show(); break; - case NAS2D::EventHandler::KeyCode::KEY_F3: + case NAS2D::KeyCode::KEY_F3: mFileIoDialog.scanDirectory(constants::SaveGamePath); mFileIoDialog.setMode(FileIo::FileOperation::Load); mFileIoDialog.show(); break; - case NAS2D::EventHandler::KeyCode::KEY_ESCAPE: + case NAS2D::KeyCode::KEY_ESCAPE: clearMode(); resetUi(); break; - case NAS2D::EventHandler::KeyCode::KEY_ENTER: + case NAS2D::KeyCode::KEY_ENTER: if (mBtnTurns.enabled()) { nextTurn(); } break; @@ -529,7 +529,7 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl } -void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void MapViewState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!active()) { return; } @@ -541,7 +541,7 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P return; } - if (button == NAS2D::EventHandler::MouseButton::Right || button == NAS2D::EventHandler::MouseButton::Middle) + if (button == NAS2D::MouseButton::Right || button == NAS2D::MouseButton::Middle) { if (mInsertMode != InsertMode::None) { @@ -554,12 +554,12 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P if (!mTileMap->isValidPosition(tilePosition)) { return; } const bool inspectModifier = NAS2D::Utility::get().shift() || - button == NAS2D::EventHandler::MouseButton::Middle; + button == NAS2D::MouseButton::Middle; onInspect(tilePosition, inspectModifier); } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (mTooltipSystemButton.rect().contains(MOUSE_COORDS)) { @@ -585,11 +585,11 @@ void MapViewState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::P } -void MapViewState::onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, NAS2D::Point /*position*/) +void MapViewState::onMouseDoubleClick(NAS2D::MouseButton button, NAS2D::Point /*position*/) { if (!active()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (mWindowStack.pointInWindow(MOUSE_COORDS)) { return; } if (!mDetailMap->isMouseOverTile()) { return; } @@ -625,9 +625,9 @@ void MapViewState::onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, N } -void MapViewState::onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void MapViewState::onMouseUp(NAS2D::MouseButton button, NAS2D::Point position) { - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { mMiniMap->onMouseUp(button, position); } diff --git a/appOPHD/States/MapViewState.h b/appOPHD/States/MapViewState.h index fa3bc1d11..ff44d796e 100644 --- a/appOPHD/States/MapViewState.h +++ b/appOPHD/States/MapViewState.h @@ -137,10 +137,10 @@ class MapViewState : public Wrapper // EVENT HANDLERS void onActivate(bool newActiveValue); - void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - void onMouseDoubleClick(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); + void onMouseDoubleClick(NAS2D::MouseButton button, NAS2D::Point position); + void onMouseUp(NAS2D::MouseButton button, NAS2D::Point position); void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void onMouseWheel(NAS2D::Vector changeAmount); void onWindowResized(NAS2D::Vector newSize); diff --git a/appOPHD/States/PlanetSelectState.cpp b/appOPHD/States/PlanetSelectState.cpp index c272bc536..562e0123d 100644 --- a/appOPHD/States/PlanetSelectState.cpp +++ b/appOPHD/States/PlanetSelectState.cpp @@ -129,7 +129,7 @@ NAS2D::State* PlanetSelectState::update() } -void PlanetSelectState::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void PlanetSelectState::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { for (std::size_t i = 0; i < mPlanets.size(); ++i) { diff --git a/appOPHD/States/PlanetSelectState.h b/appOPHD/States/PlanetSelectState.h index 2859501f1..e79bd52c6 100644 --- a/appOPHD/States/PlanetSelectState.h +++ b/appOPHD/States/PlanetSelectState.h @@ -28,7 +28,7 @@ class PlanetSelectState : public NAS2D::State State* update() override; private: - void onMouseDown(NAS2D::EventHandler::MouseButton, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton, NAS2D::Point position); void onMousePlanetEnter(); void onMousePlanetExit(); diff --git a/appOPHD/States/SplashState.cpp b/appOPHD/States/SplashState.cpp index 197290cfd..e09dbccee 100644 --- a/appOPHD/States/SplashState.cpp +++ b/appOPHD/States/SplashState.cpp @@ -159,13 +159,13 @@ NAS2D::State* SplashState::update() } -void SplashState::onKeyDown(NAS2D::EventHandler::KeyCode /*key*/, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/) +void SplashState::onKeyDown(NAS2D::KeyCode /*key*/, NAS2D::KeyModifier /*mod*/, bool /*repeat*/) { skipSplash(); } -void SplashState::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void SplashState::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { skipSplash(); } diff --git a/appOPHD/States/SplashState.h b/appOPHD/States/SplashState.h index 44bf4703d..492943afa 100644 --- a/appOPHD/States/SplashState.h +++ b/appOPHD/States/SplashState.h @@ -20,8 +20,8 @@ class SplashState : public NAS2D::State NAS2D::State* update() override; private: - void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); void skipSplash(); diff --git a/appOPHD/UI/FileIo.cpp b/appOPHD/UI/FileIo.cpp index 6641c35d3..37367a2cd 100644 --- a/appOPHD/UI/FileIo.cpp +++ b/appOPHD/UI/FileIo.cpp @@ -60,7 +60,7 @@ FileIo::~FileIo() } -void FileIo::onDoubleClick(EventHandler::MouseButton /*button*/, NAS2D::Point position) +void FileIo::onDoubleClick(MouseButton /*button*/, NAS2D::Point position) { if (!visible()) { return; } // ignore key presses when hidden. @@ -77,18 +77,18 @@ void FileIo::onDoubleClick(EventHandler::MouseButton /*button*/, NAS2D::Point position); - void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); + void onDoubleClick(NAS2D::MouseButton button, NAS2D::Point position); + void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); private: void onOpenFolder() const; diff --git a/appOPHD/UI/IconGrid.cpp b/appOPHD/UI/IconGrid.cpp index d7e2e76fe..5f6c155d8 100644 --- a/appOPHD/UI/IconGrid.cpp +++ b/appOPHD/UI/IconGrid.cpp @@ -64,12 +64,12 @@ void IconGrid::updateGrid() } -void IconGrid::onMouseDown(EventHandler::MouseButton button, NAS2D::Point position) +void IconGrid::onMouseDown(MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } // Don't respond to anything unless it's the left mouse button. - if (button != EventHandler::MouseButton::Left) { return; } + if (button != MouseButton::Left) { return; } if (!visible()) { diff --git a/appOPHD/UI/IconGrid.h b/appOPHD/UI/IconGrid.h index a44a4466f..8a387cbae 100644 --- a/appOPHD/UI/IconGrid.h +++ b/appOPHD/UI/IconGrid.h @@ -77,7 +77,7 @@ class IconGrid : public Control protected: - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); virtual void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void onResize() override; diff --git a/appOPHD/UI/MiniMap.cpp b/appOPHD/UI/MiniMap.cpp index d5fb1da12..39fe91075 100644 --- a/appOPHD/UI/MiniMap.cpp +++ b/appOPHD/UI/MiniMap.cpp @@ -125,15 +125,15 @@ void MiniMap::onActivate() } -void MiniMap::onMouseUp(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void MiniMap::onMouseUp(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { mLeftButtonDown = false; } -void MiniMap::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void MiniMap::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { mLeftButtonDown = true; if (mRect.contains(position)) diff --git a/appOPHD/UI/MiniMap.h b/appOPHD/UI/MiniMap.h index 11fc58a06..06f035ab8 100644 --- a/appOPHD/UI/MiniMap.h +++ b/appOPHD/UI/MiniMap.h @@ -32,8 +32,8 @@ class MiniMap : public Control protected: friend MapViewState; void onActivate(); - void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onMouseUp(NAS2D::MouseButton button, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void onSetView(NAS2D::Point mousePixel); diff --git a/appOPHD/UI/NotificationArea.cpp b/appOPHD/UI/NotificationArea.cpp index 448b8578d..da7692a21 100644 --- a/appOPHD/UI/NotificationArea.cpp +++ b/appOPHD/UI/NotificationArea.cpp @@ -103,10 +103,10 @@ std::size_t NotificationArea::notificationIndex(NAS2D::Point pixelPosition) } -void NotificationArea::onMouseDown(EventHandler::MouseButton button, NAS2D::Point position) +void NotificationArea::onMouseDown(MouseButton button, NAS2D::Point position) { - if (button != EventHandler::MouseButton::Left && - button != EventHandler::MouseButton::Right) + if (button != MouseButton::Left && + button != MouseButton::Right) { return; } @@ -114,7 +114,7 @@ void NotificationArea::onMouseDown(EventHandler::MouseButton button, NAS2D::Poin const auto index = notificationIndex(position); if (index != NoSelection) { - if (button == EventHandler::MouseButton::Left) + if (button == MouseButton::Left) { mNotificationClicked(mNotificationList.at(index)); } diff --git a/appOPHD/UI/NotificationArea.h b/appOPHD/UI/NotificationArea.h index 1350b8617..5c1cadfc9 100644 --- a/appOPHD/UI/NotificationArea.h +++ b/appOPHD/UI/NotificationArea.h @@ -58,7 +58,7 @@ class NotificationArea : public Control NAS2D::Rectangle notificationRect(std::size_t index); std::size_t notificationIndex(NAS2D::Point pixelPosition); - void onMouseDown(NAS2D::EventHandler::MouseButton, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton, NAS2D::Point position); void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); private: diff --git a/appOPHD/UI/Reports/ResearchReport.cpp b/appOPHD/UI/Reports/ResearchReport.cpp index 9c47876ab..647b88d45 100644 --- a/appOPHD/UI/Reports/ResearchReport.cpp +++ b/appOPHD/UI/Reports/ResearchReport.cpp @@ -173,11 +173,11 @@ void ResearchReport::onResize() } -void ResearchReport::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ResearchReport::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!visible() || !rect().contains(position) || - button != NAS2D::EventHandler::MouseButton::Left) + button != NAS2D::MouseButton::Left) { return; } diff --git a/appOPHD/UI/Reports/ResearchReport.h b/appOPHD/UI/Reports/ResearchReport.h index fc163cf08..737b91da2 100644 --- a/appOPHD/UI/Reports/ResearchReport.h +++ b/appOPHD/UI/Reports/ResearchReport.h @@ -44,7 +44,7 @@ class ResearchReport : public ReportInterface private: void onResize() override; - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; void handleMouseDownInCategories(NAS2D::Point& position); void setIconPositions(); diff --git a/appOPHD/UI/Reports/SatellitesReport.cpp b/appOPHD/UI/Reports/SatellitesReport.cpp index aec73b3f2..ab48bf8e1 100644 --- a/appOPHD/UI/Reports/SatellitesReport.cpp +++ b/appOPHD/UI/Reports/SatellitesReport.cpp @@ -56,7 +56,7 @@ void SatellitesReport::onResize() } -void SatellitesReport::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void SatellitesReport::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { } diff --git a/appOPHD/UI/Reports/SatellitesReport.h b/appOPHD/UI/Reports/SatellitesReport.h index 4beaf59c7..c825a4727 100644 --- a/appOPHD/UI/Reports/SatellitesReport.h +++ b/appOPHD/UI/Reports/SatellitesReport.h @@ -26,7 +26,7 @@ class SatellitesReport : public ReportInterface private: void onResize() override; - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; void draw() const override; diff --git a/appOPHD/UI/Reports/SpaceportsReport.cpp b/appOPHD/UI/Reports/SpaceportsReport.cpp index e3dc014f8..6395c5802 100644 --- a/appOPHD/UI/Reports/SpaceportsReport.cpp +++ b/appOPHD/UI/Reports/SpaceportsReport.cpp @@ -54,7 +54,7 @@ void SpaceportsReport::onResize() } -void SpaceportsReport::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void SpaceportsReport::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { } diff --git a/appOPHD/UI/Reports/SpaceportsReport.h b/appOPHD/UI/Reports/SpaceportsReport.h index fd65a5b75..ed6dd2267 100644 --- a/appOPHD/UI/Reports/SpaceportsReport.h +++ b/appOPHD/UI/Reports/SpaceportsReport.h @@ -26,7 +26,7 @@ class SpaceportsReport : public ReportInterface private: void onResize() override; - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; void draw() const override; diff --git a/appOPHD/UI/Reports/WarehouseReport.cpp b/appOPHD/UI/Reports/WarehouseReport.cpp index ea9f45203..4a113165e 100644 --- a/appOPHD/UI/Reports/WarehouseReport.cpp +++ b/appOPHD/UI/Reports/WarehouseReport.cpp @@ -183,10 +183,10 @@ void WarehouseReport::fillListDisabled() } -void WarehouseReport::onDoubleClick(EventHandler::MouseButton button, NAS2D::Point position) +void WarehouseReport::onDoubleClick(MouseButton button, NAS2D::Point position) { if (!visible()) { return; } - if (button != EventHandler::MouseButton::Left) { return; } + if (button != MouseButton::Left) { return; } if (selectedWarehouse && lstStructures.rect().contains(position)) { diff --git a/appOPHD/UI/Reports/WarehouseReport.h b/appOPHD/UI/Reports/WarehouseReport.h index bb2c4403b..f2c243839 100644 --- a/appOPHD/UI/Reports/WarehouseReport.h +++ b/appOPHD/UI/Reports/WarehouseReport.h @@ -56,7 +56,7 @@ class WarehouseReport : public ReportInterface void fillListEmpty(); void fillListDisabled(); - void onDoubleClick(NAS2D::EventHandler::MouseButton, NAS2D::Point position); + void onDoubleClick(NAS2D::MouseButton, NAS2D::Point position); void onStructureSelectionChange(); diff --git a/appOPHD/UI/ResourceInfoBar.cpp b/appOPHD/UI/ResourceInfoBar.cpp index 96b98672b..37dbda45e 100644 --- a/appOPHD/UI/ResourceInfoBar.cpp +++ b/appOPHD/UI/ResourceInfoBar.cpp @@ -193,11 +193,11 @@ void ResourceInfoBar::draw() const } -void ResourceInfoBar::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ResourceInfoBar::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { UIContainer::onMouseDown(button, position); - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (RESOURCE_PANEL_PIN.contains(MOUSE_COORDS)) { mPinResourcePanel = !mPinResourcePanel; } if (POPULATION_PANEL_PIN.contains(MOUSE_COORDS)) { mPinPopulationPanel = !mPinPopulationPanel; } diff --git a/appOPHD/UI/ResourceInfoBar.h b/appOPHD/UI/ResourceInfoBar.h index 6dff8b649..4240bac83 100644 --- a/appOPHD/UI/ResourceInfoBar.h +++ b/appOPHD/UI/ResourceInfoBar.h @@ -29,7 +29,7 @@ class ResourceInfoBar : public UIContainer void draw() const override; protected: - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; int totalStorage(Structure::StructureClass, int) const; diff --git a/libControls/Button.cpp b/libControls/Button.cpp index 2e55b2444..1026e3b68 100644 --- a/libControls/Button.cpp +++ b/libControls/Button.cpp @@ -118,11 +118,11 @@ bool Button::hasImage() const } -void Button::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void Button::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (mRect.contains(position)) { @@ -140,11 +140,11 @@ void Button::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void Button::onMouseUp(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (mType == Type::Push) { diff --git a/libControls/Button.h b/libControls/Button.h index 416e69814..e5337e5d4 100644 --- a/libControls/Button.h +++ b/libControls/Button.h @@ -52,8 +52,8 @@ class Button: public TextControl void update() override; protected: - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - virtual void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); + virtual void onMouseUp(NAS2D::MouseButton button, NAS2D::Point position); virtual void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void draw() const override; diff --git a/libControls/CheckBox.cpp b/libControls/CheckBox.cpp index 8c55b645c..5929307b7 100644 --- a/libControls/CheckBox.cpp +++ b/libControls/CheckBox.cpp @@ -67,11 +67,11 @@ CheckBox::ClickSignal::Source& CheckBox::click() } -void CheckBox::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void CheckBox::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left && mRect.contains(position)) + if (button == NAS2D::MouseButton::Left && mRect.contains(position)) { mChecked = !mChecked; mSignal(); diff --git a/libControls/CheckBox.h b/libControls/CheckBox.h index 28c37b93f..11cbbf1ef 100644 --- a/libControls/CheckBox.h +++ b/libControls/CheckBox.h @@ -34,7 +34,7 @@ class CheckBox : public TextControl void draw() const override; protected: - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); void onResize() override; void onTextChange() override; diff --git a/libControls/ComboBox.cpp b/libControls/ComboBox.cpp index 56c0e00a2..e50040973 100644 --- a/libControls/ComboBox.cpp +++ b/libControls/ComboBox.cpp @@ -79,13 +79,13 @@ void ComboBox::onMove(NAS2D::Vector displacement) } -void ComboBox::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ComboBox::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { UIContainer::onMouseDown(button, position); if (!enabled() || !visible()) { return; } - if (button != NAS2D::EventHandler::MouseButton::Left) { return; } + if (button != NAS2D::MouseButton::Left) { return; } if (mBarRect.contains(position)) { diff --git a/libControls/ComboBox.h b/libControls/ComboBox.h index 16f26a366..b2125dac7 100644 --- a/libControls/ComboBox.h +++ b/libControls/ComboBox.h @@ -47,7 +47,7 @@ class ComboBox : public UIContainer void onListSelectionChange(); void onMouseWheel(NAS2D::Vector scrollAmount); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; Button btnDown; ListBox<> lstItems; diff --git a/libControls/ListBox.h b/libControls/ListBox.h index 7e28f02f0..972d2bed3 100644 --- a/libControls/ListBox.h +++ b/libControls/ListBox.h @@ -228,7 +228,7 @@ class ListBox : public Control protected: - virtual void onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point position) + virtual void onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point position) { if (!visible() || mHighlightIndex == NoSelection || mHighlightIndex >= mItems.size() || !mClientRect.contains(position)) { diff --git a/libControls/ListBoxBase.cpp b/libControls/ListBoxBase.cpp index 594db98c6..bfda5b851 100644 --- a/libControls/ListBoxBase.cpp +++ b/libControls/ListBoxBase.cpp @@ -95,13 +95,13 @@ void ListBoxBase::onResize() } -void ListBoxBase::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ListBoxBase::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (isEmpty() || button == NAS2D::EventHandler::MouseButton::Middle) { return; } + if (isEmpty() || button == NAS2D::MouseButton::Middle) { return; } - if (button == NAS2D::EventHandler::MouseButton::Right && mRect.contains(position)) + if (button == NAS2D::MouseButton::Right && mRect.contains(position)) { setSelection(NoSelection); return; diff --git a/libControls/ListBoxBase.h b/libControls/ListBoxBase.h index dea1829bb..86ab225fd 100644 --- a/libControls/ListBoxBase.h +++ b/libControls/ListBoxBase.h @@ -88,7 +88,7 @@ class ListBoxBase : public Control private: void onSlideChange(ScrollBar::ValueType newPosition); - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void onMouseWheel(NAS2D::Vector scrollAmount); diff --git a/libControls/RadioButton.cpp b/libControls/RadioButton.cpp index 3a5435847..b830978d7 100644 --- a/libControls/RadioButton.cpp +++ b/libControls/RadioButton.cpp @@ -81,11 +81,11 @@ void RadioButtonGroup::RadioButton::onTextChange() } -void RadioButtonGroup::RadioButton::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void RadioButtonGroup::RadioButton::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left && mRect.contains(position)) + if (button == NAS2D::MouseButton::Left && mRect.contains(position)) { mParentContainer.select(*this); mSignal(); diff --git a/libControls/RadioButtonGroup.h b/libControls/RadioButtonGroup.h index a82610474..68b169716 100644 --- a/libControls/RadioButtonGroup.h +++ b/libControls/RadioButtonGroup.h @@ -39,7 +39,7 @@ class RadioButtonGroup : public Control protected: void onResize() override; void onTextChange(); - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); private: const NAS2D::Font& mFont; diff --git a/libControls/ScrollBar.cpp b/libControls/ScrollBar.cpp index 0ab4e6476..74a722c5f 100644 --- a/libControls/ScrollBar.cpp +++ b/libControls/ScrollBar.cpp @@ -213,11 +213,11 @@ void ScrollBar::onButtonClick(bool& buttonFlag, ValueType value) } -void ScrollBar::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ScrollBar::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } - if (button == NAS2D::EventHandler::MouseButton::Left) + if (button == NAS2D::MouseButton::Left) { if (mThumbRect.contains(position)) { @@ -235,9 +235,9 @@ void ScrollBar::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Poin } -void ScrollBar::onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void ScrollBar::onMouseUp(NAS2D::MouseButton button, NAS2D::Point position) { - if (button != NAS2D::EventHandler::MouseButton::Left) { return; } + if (button != NAS2D::MouseButton::Left) { return; } mButtonDecreaseHeld = false; mButtonIncreaseHeld = false; diff --git a/libControls/ScrollBar.h b/libControls/ScrollBar.h index 623e0e2df..49ddb77a5 100644 --- a/libControls/ScrollBar.h +++ b/libControls/ScrollBar.h @@ -47,8 +47,8 @@ class ScrollBar : public Control protected: void onButtonClick(bool& buttonFlag, ValueType value); - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - virtual void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); + virtual void onMouseUp(NAS2D::MouseButton button, NAS2D::Point position); virtual void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); void onMove(NAS2D::Vector displacement) override; diff --git a/libControls/TextField.cpp b/libControls/TextField.cpp index 9dcadf1f0..72f9c334b 100644 --- a/libControls/TextField.cpp +++ b/libControls/TextField.cpp @@ -148,14 +148,14 @@ void TextField::onTextInput(const std::string& newTextInput) } -void TextField::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool /*repeat*/) +void TextField::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool /*repeat*/) { if (!hasFocus() || !editable() || !visible()) { return; } switch(key) { // COMMAND KEYS - case NAS2D::EventHandler::KeyCode::KEY_BACKSPACE: + case NAS2D::KeyCode::KEY_BACKSPACE: if (!text().empty() && mCursorPosition > 0) { mCursorPosition--; @@ -164,15 +164,15 @@ void TextField::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler: } break; - case NAS2D::EventHandler::KeyCode::KEY_HOME: + case NAS2D::KeyCode::KEY_HOME: mCursorPosition = 0; break; - case NAS2D::EventHandler::KeyCode::KEY_END: + case NAS2D::KeyCode::KEY_END: mCursorPosition = text().length(); break; - case NAS2D::EventHandler::KeyCode::KEY_DELETE: + case NAS2D::KeyCode::KEY_DELETE: if (text().length() > 0) { mText = mText.erase(mCursorPosition, 1); @@ -181,30 +181,30 @@ void TextField::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler: break; // ARROW KEYS - case NAS2D::EventHandler::KeyCode::KEY_LEFT: + case NAS2D::KeyCode::KEY_LEFT: if (mCursorPosition > 0) --mCursorPosition; break; - case NAS2D::EventHandler::KeyCode::KEY_RIGHT: + case NAS2D::KeyCode::KEY_RIGHT: if (mCursorPosition < text().length()) ++mCursorPosition; break; // KEYPAD ARROWS - case NAS2D::EventHandler::KeyCode::KEY_KP4: + case NAS2D::KeyCode::KEY_KP4: if ((mCursorPosition > 0) && !NAS2D::EventHandler::numlock(mod)) --mCursorPosition; break; - case NAS2D::EventHandler::KeyCode::KEY_KP6: + case NAS2D::KeyCode::KEY_KP6: if ((mCursorPosition < text().length()) && !NAS2D::EventHandler::numlock(mod)) ++mCursorPosition; break; // IGNORE ENTER/RETURN KEY - case NAS2D::EventHandler::KeyCode::KEY_ENTER: - case NAS2D::EventHandler::KeyCode::KEY_KP_ENTER: + case NAS2D::KeyCode::KEY_ENTER: + case NAS2D::KeyCode::KEY_KP_ENTER: break; // REGULAR KEYS @@ -214,7 +214,7 @@ void TextField::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler: } -void TextField::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point position) +void TextField::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point position) { hasFocus(mRect.contains(position)); // This is a very useful check, should probably include this in all controls. diff --git a/libControls/TextField.h b/libControls/TextField.h index 9cf39695a..d9968ee2f 100644 --- a/libControls/TextField.h +++ b/libControls/TextField.h @@ -61,8 +61,8 @@ class TextField : public TextControl void draw() const override; protected: - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); - virtual void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); + virtual void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat); void onTextInput(const std::string& newTextInput); private: diff --git a/libControls/UIContainer.cpp b/libControls/UIContainer.cpp index cfb65f5ff..f530c19d4 100644 --- a/libControls/UIContainer.cpp +++ b/libControls/UIContainer.cpp @@ -82,7 +82,7 @@ void UIContainer::onMove(NAS2D::Vector displacement) } -void UIContainer::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point position) +void UIContainer::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point position) { if (!visible()) { return; } diff --git a/libControls/UIContainer.h b/libControls/UIContainer.h index b82bfc800..fb7242d81 100644 --- a/libControls/UIContainer.h +++ b/libControls/UIContainer.h @@ -34,7 +34,7 @@ class UIContainer : public Control void onVisibilityChange(bool visible) override; void onMove(NAS2D::Vector displacement) override; - virtual void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + virtual void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position); private: std::vector mControls; diff --git a/libControls/Window.cpp b/libControls/Window.cpp index f9e8076c8..153a59e7d 100644 --- a/libControls/Window.cpp +++ b/libControls/Window.cpp @@ -38,18 +38,18 @@ Window::~Window() } -void Window::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) +void Window::onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) { if (!enabled() || !visible()) { return; } UIContainer::onMouseDown(button, position); const auto titleBarBounds = NAS2D::Rectangle{mRect.position, {mRect.size.x, sWindowTitleBarHeight}}; - mMouseDrag = (button == NAS2D::EventHandler::MouseButton::Left && titleBarBounds.contains(position)); + mMouseDrag = (button == NAS2D::MouseButton::Left && titleBarBounds.contains(position)); } -void Window::onMouseUp(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point /*position*/) +void Window::onMouseUp(NAS2D::MouseButton /*button*/, NAS2D::Point /*position*/) { mMouseDrag = false; } diff --git a/libControls/Window.h b/libControls/Window.h index 66183cad0..e380f1922 100644 --- a/libControls/Window.h +++ b/libControls/Window.h @@ -33,8 +33,8 @@ class Window : public UIContainer virtual void onTitleChanged() { mTitleChanged(this); } protected: - void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point position) override; - void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point position); + void onMouseDown(NAS2D::MouseButton button, NAS2D::Point position) override; + void onMouseUp(NAS2D::MouseButton button, NAS2D::Point position); void onMouseMove(NAS2D::Point position, NAS2D::Vector relative); static constexpr int sWindowTitleBarHeight = 20; From ccc41d2b4199a6ecb84a25e74d2f8ffa0ffcc2bf Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 15:59:21 -0700 Subject: [PATCH 3/4] Update NAS2D submodule The `EventHandler` enum header files were renamed. --- appOPHD/States/MainReportsUiState.cpp | 4 ++-- appOPHD/States/MapViewState.cpp | 4 ++-- appOPHD/UI/FileIo.cpp | 2 +- appOPHD/UI/IconGrid.cpp | 2 +- appOPHD/UI/MiniMap.cpp | 2 +- appOPHD/UI/NotificationArea.cpp | 2 +- appOPHD/UI/Reports/ResearchReport.cpp | 2 +- appOPHD/UI/Reports/WarehouseReport.cpp | 2 +- appOPHD/UI/ResourceInfoBar.cpp | 2 +- libControls/Button.cpp | 2 +- libControls/CheckBox.cpp | 2 +- libControls/ComboBox.cpp | 2 +- libControls/ListBoxBase.cpp | 2 +- libControls/RadioButton.cpp | 2 +- libControls/ScrollBar.cpp | 2 +- libControls/TextField.cpp | 2 +- libControls/Window.cpp | 2 +- nas2d-core | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/appOPHD/States/MainReportsUiState.cpp b/appOPHD/States/MainReportsUiState.cpp index 90470dfb9..bee2ba371 100644 --- a/appOPHD/States/MainReportsUiState.cpp +++ b/appOPHD/States/MainReportsUiState.cpp @@ -12,8 +12,8 @@ #include "../UI/Reports/SpaceportsReport.h" #include "../UI/Reports/WarehouseReport.h" -#include -#include +#include +#include #include #include diff --git a/appOPHD/States/MapViewState.cpp b/appOPHD/States/MapViewState.cpp index d78a84da9..aee6a83cc 100644 --- a/appOPHD/States/MapViewState.cpp +++ b/appOPHD/States/MapViewState.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/appOPHD/UI/FileIo.cpp b/appOPHD/UI/FileIo.cpp index 37367a2cd..70c69eb2e 100644 --- a/appOPHD/UI/FileIo.cpp +++ b/appOPHD/UI/FileIo.cpp @@ -6,7 +6,7 @@ #include "MessageBox.h" -#include +#include #include #include diff --git a/appOPHD/UI/IconGrid.cpp b/appOPHD/UI/IconGrid.cpp index 5f6c155d8..96303bb11 100644 --- a/appOPHD/UI/IconGrid.cpp +++ b/appOPHD/UI/IconGrid.cpp @@ -3,7 +3,7 @@ #include "../Cache.h" #include "../Constants/UiConstants.h" -#include +#include #include #include diff --git a/appOPHD/UI/MiniMap.cpp b/appOPHD/UI/MiniMap.cpp index 39fe91075..b8b9512c8 100644 --- a/appOPHD/UI/MiniMap.cpp +++ b/appOPHD/UI/MiniMap.cpp @@ -8,7 +8,7 @@ #include "../States/Route.h" #include "../StructureManager.h" -#include +#include #include #include #include diff --git a/appOPHD/UI/NotificationArea.cpp b/appOPHD/UI/NotificationArea.cpp index da7692a21..5c0d16b50 100644 --- a/appOPHD/UI/NotificationArea.cpp +++ b/appOPHD/UI/NotificationArea.cpp @@ -3,7 +3,7 @@ #include "../Cache.h" #include "../Constants/UiConstants.h" -#include +#include #include #include #include diff --git a/appOPHD/UI/Reports/ResearchReport.cpp b/appOPHD/UI/Reports/ResearchReport.cpp index 647b88d45..4d8c4a441 100644 --- a/appOPHD/UI/Reports/ResearchReport.cpp +++ b/appOPHD/UI/Reports/ResearchReport.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include "../../Constants/Strings.h" diff --git a/appOPHD/UI/Reports/WarehouseReport.cpp b/appOPHD/UI/Reports/WarehouseReport.cpp index 4a113165e..ad296dae9 100644 --- a/appOPHD/UI/Reports/WarehouseReport.cpp +++ b/appOPHD/UI/Reports/WarehouseReport.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/appOPHD/UI/ResourceInfoBar.cpp b/appOPHD/UI/ResourceInfoBar.cpp index 37dbda45e..5e091ce25 100644 --- a/appOPHD/UI/ResourceInfoBar.cpp +++ b/appOPHD/UI/ResourceInfoBar.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/libControls/Button.cpp b/libControls/Button.cpp index 1026e3b68..f3e725548 100644 --- a/libControls/Button.cpp +++ b/libControls/Button.cpp @@ -1,6 +1,6 @@ #include "Button.h" -#include +#include #include #include diff --git a/libControls/CheckBox.cpp b/libControls/CheckBox.cpp index 5929307b7..2f8c17196 100644 --- a/libControls/CheckBox.cpp +++ b/libControls/CheckBox.cpp @@ -14,7 +14,7 @@ #include "CheckBox.h" -#include +#include #include #include #include diff --git a/libControls/ComboBox.cpp b/libControls/ComboBox.cpp index e50040973..b5788908a 100644 --- a/libControls/ComboBox.cpp +++ b/libControls/ComboBox.cpp @@ -1,6 +1,6 @@ #include "ComboBox.h" -#include +#include #include #include diff --git a/libControls/ListBoxBase.cpp b/libControls/ListBoxBase.cpp index bfda5b851..73e650a81 100644 --- a/libControls/ListBoxBase.cpp +++ b/libControls/ListBoxBase.cpp @@ -1,7 +1,7 @@ #include "ListBoxBase.h" -#include +#include #include #include #include diff --git a/libControls/RadioButton.cpp b/libControls/RadioButton.cpp index b830978d7..874deb4da 100644 --- a/libControls/RadioButton.cpp +++ b/libControls/RadioButton.cpp @@ -1,6 +1,6 @@ #include "RadioButtonGroup.h" -#include +#include #include diff --git a/libControls/ScrollBar.cpp b/libControls/ScrollBar.cpp index 74a722c5f..c1e921fc3 100644 --- a/libControls/ScrollBar.cpp +++ b/libControls/ScrollBar.cpp @@ -1,6 +1,6 @@ #include "ScrollBar.h" -#include +#include #include #include diff --git a/libControls/TextField.cpp b/libControls/TextField.cpp index 72f9c334b..98db6ff00 100644 --- a/libControls/TextField.cpp +++ b/libControls/TextField.cpp @@ -7,7 +7,7 @@ #include "TextField.h" -#include +#include #include #include #include diff --git a/libControls/Window.cpp b/libControls/Window.cpp index 153a59e7d..1f4ebb9db 100644 --- a/libControls/Window.cpp +++ b/libControls/Window.cpp @@ -1,6 +1,6 @@ #include "Window.h" -#include +#include #include #include diff --git a/nas2d-core b/nas2d-core index 006a1a52c..23a6376e7 160000 --- a/nas2d-core +++ b/nas2d-core @@ -1 +1 @@ -Subproject commit 006a1a52caddfc28fc440f02c25439ffe140002a +Subproject commit 23a6376e7033e5bdcd992eff4d30da2a167c596a From d0479547737bcae2bfad291308ddd2c60b6a5a4b Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 16:00:49 -0700 Subject: [PATCH 4/4] Update NAS2D submodule Update to merge commit of PR that moves the `EventHandler` enums out of the `EventHandler` class. --- nas2d-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nas2d-core b/nas2d-core index 23a6376e7..ad3970615 160000 --- a/nas2d-core +++ b/nas2d-core @@ -1 +1 @@ -Subproject commit 23a6376e7033e5bdcd992eff4d30da2a167c596a +Subproject commit ad397061535aec41568c3f501d0bab6f4dabe3ce