fix warnings

moritz-h · Dec 28, 2024 · 58dace2 · 58dace2
1 parent 43be6c6
commit 58dace2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/libs/libs.cmake b/libs/libs.cmake
@@ -349,6 +349,7 @@ if (SATISFACTORY3DMAP_BUILD_APP)
   if (NOT portable_file_dialogs_POPULATED)
     message(STATUS "Fetch portable_file_dialogs ...")
     FetchContent_Populate(portable_file_dialogs)
+    file(COPY ${CMAKE_SOURCE_DIR}/libs/portable_file_dialogs/CMakeLists.txt DESTINATION ${portable_file_dialogs_SOURCE_DIR})
     add_subdirectory(${portable_file_dialogs_SOURCE_DIR} ${portable_file_dialogs_BINARY_DIR} EXCLUDE_FROM_ALL)
     mark_as_advanced(FORCE
       FETCHCONTENT_SOURCE_DIR_PORTABLE_FILE_DIALOGS

diff --git a/libs/portable_file_dialogs/CMakeLists.txt b/libs/portable_file_dialogs/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.21...3.29 FATAL_ERROR)
+
+project(portable_file_dialogs VERSION 1.0 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} INTERFACE)
+target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/map/src/MapWindow/BaseWindow.h b/map/src/MapWindow/BaseWindow.h
@@ -18,7 +18,7 @@ namespace Satisfactory3DMap {
     public:
         explicit BaseWindow(std::string title = "Window", int width = 1280, int height = 800,
             int openGLVersionMajor = 4, int openGLVersionMinor = 5, std::string imguiGlslVersion_ = "#version 450");
-        ~BaseWindow();
+        virtual ~BaseWindow();
 
         void run();
 

diff --git a/map/src/MapWindow/Config/Setting.h b/map/src/MapWindow/Config/Setting.h
@@ -12,6 +12,7 @@ namespace Satisfactory3DMap {
     class Setting {
     public:
         explicit Setting(std::string name) : name_(std::move(name)), hidden_(false) {}
+        virtual ~Setting() = default;
 
         virtual void accept(SettingVisitor& v) = 0;
 

diff --git a/map/src/MapWindow/Config/SettingVisitor.h b/map/src/MapWindow/Config/SettingVisitor.h
@@ -9,6 +9,8 @@
 namespace Satisfactory3DMap {
     class SettingVisitor {
     public:
+        virtual ~SettingVisitor() = default;
+
         virtual void visit(BoolSetting& s) = 0;
         virtual void visit(EnumSettingBase& s) = 0;
         virtual void visit(FloatSetting& s) = 0;

diff --git a/map/src/MapWindow/DataView/DataView.cpp b/map/src/MapWindow/DataView/DataView.cpp
@@ -169,7 +169,7 @@ void Satisfactory3DMap::DataView::openSave(const std::filesystem::path& file) {
                 std::dynamic_pointer_cast<SatisfactorySave::AFGLightweightBuildableSubsystem>(lbs[0]->Object);
         }
         if (lightweight_buildable_subsystem_ != nullptr) {
-            std::size_t next_id = proxy_list_.size();
+            int32_t next_id = static_cast<int32_t>(proxy_list_.size());
             auto& instanceMap = lightweight_buildable_subsystem_->mBuildableClassToInstanceArray;
             for (std::size_t i = 0; i < instanceMap.Keys.size(); i++) {
                 const auto& className = instanceMap.Keys[i];

diff --git a/map/src/MapWindow/MapWindow.h b/map/src/MapWindow/MapWindow.h
@@ -31,7 +31,7 @@ namespace Satisfactory3DMap {
     class MapWindow final : public BaseWindow {
     public:
         MapWindow();
-        ~MapWindow();
+        ~MapWindow() override;
 
         [[nodiscard]] const std::shared_ptr<DataView>& dataView() const {
             return dataView_;