remove json

fs814 · Jan 22, 2024 · c7a2186 · c7a2186
1 parent 67f5330
commit c7a2186
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 360 deletions.
diff --git a/vcpkg.json b/vcpkg.json
@@ -17,8 +17,5 @@
   }, {
     "name" : "vcpkg-cmake",
     "version>=" : "2023-05-04"
-  }, {
-    "name" : "nlohmann-json",
-    "version>=" : "3.11.3"
   } ]
 }
diff --git a/viewport/CMakeLists.txt b/viewport/CMakeLists.txt
@@ -8,8 +8,6 @@ cmake_minimum_required(VERSION 3.16)
 
 project(viewport LANGUAGES C CXX)
 
-find_package(nlohmann_json CONFIG REQUIRED)
-
 set(COMMON_FILES
         swapchain.h
         swapchain.cpp
@@ -30,8 +28,6 @@ set(COMMON_FILES
         selection_data_model.cpp
         view_settings_data_model.h
         view_settings_data_model.cpp
-        settings.h
-        settings.cpp
         custom_attributes.h
         custom_attributes.cpp
 )
@@ -53,7 +49,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} .
 target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt::Core
         Qt::Widgets
-        nlohmann_json::nlohmann_json
         fmt::fmt
         spdlog::spdlog
         metal-cpp

diff --git a/viewport/settings.cpp b/viewport/settings.cpp
diff --git a/viewport/settings.h b/viewport/settings.h
diff --git a/viewport/stage_view.h b/viewport/stage_view.h
@@ -101,7 +101,7 @@ class StageView : public QWidget {
     struct DefaultDataModel : public RootDataModel {
         DefaultDataModel()
             : _selectionDataModel(*this),
-              _viewSettingsDataModel(*this, nullptr) {}
+              _viewSettingsDataModel(*this) {}
 
         inline SelectionDataModel &selection() {
             return _selectionDataModel;