Remove some references to nlohmann json

mls-m5 · Jul 25, 2024 · a4cdc88 · a4cdc88
1 parent 5416874
commit a4cdc88
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 18 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -75,7 +75,7 @@ target_link_libraries(
     PUBLIC
         medit_common
         medit_core
-        nlohmann_json::nlohmann_json
+        # nlohmann_json::nlohmann_json
     PRIVATE
     )
 

diff --git a/src/pch.hpp b/src/pch.hpp
@@ -2,7 +2,6 @@
 
 /// This file is used as a precompiled header
 
-#include "nlohmann/json.hpp"
 #include <filesystem>
 #include <functional>
 #include <iostream>

diff --git a/src/screen/deserializescreen.cpp b/src/screen/deserializescreen.cpp
@@ -115,11 +115,6 @@ void DeserializeScreen::handle(std::string_view str) {
             oarch.set("value", _screen->clipboardData());
         }
         send(oss.str());
-
-        //        send(nlohmann::json{
-        //            {"id", id},
-        //            {"value", _screen->clipboardData()},
-        //        });
         return;
     }
 }
@@ -149,6 +144,4 @@ void DeserializeScreen::screenCallback(IScreen::EventListT list) {
         oarch("events", list);
     }
     send(ss.str());
-
-    //    send(nlohmann::json{{"events", list}});
 }
diff --git a/src/screen/serializescreen.h b/src/screen/serializescreen.h
@@ -46,19 +46,15 @@ class SerializeScreen : public IScreen {
     volatile std::atomic_long _currentRequest = 1;
     volatile std::atomic_long _receivedRequest = 0;
 
-    //    void send(const nlohmann::json &);
     void send(std::string_view str);
     std::string request(std::string_view method);
 
     //! Where the remote data enters this class
-    //    void receive(const nlohmann::json &);
-    //    void receive(Archive &);
     void receive(std::string_view data);
 
     std::mutex _mutex;
     std::condition_variable _cv;
 
-    //    nlohmann::json _receivedData;
     std::string _receivedData;
 
     CallbackT _callback;

diff --git a/src/syntax/color.h b/src/syntax/color.h
@@ -74,6 +74,4 @@ class Color {
         }
         return 0;
     }
-
-    //    NLOHMANN_DEFINE_TYPE_INTRUSIVE(Color, _r, _g, _b)
 };
diff --git a/src/syntax/palette.h b/src/syntax/palette.h
@@ -99,9 +99,6 @@ class Palette /*: public IPalette*/ {
     };
 
     void visit(Archive &arch);
-
-    // TODO: Deprecated, remove this
-    //    NLOHMANN_DEFINE_TYPE_INTRUSIVE(Palette, _palette, _styles)
 };
 
 void visit(Archive &arch, std::map<std::string, Color> &);
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,4 @@ class Color { @@
             }
             return 0;
         }
-        //    NLOHMANN_DEFINE_TYPE_INTRUSIVE(Color, _r, _g, _b)
     };