update for vendor updates

pqrs-org · Nov 4, 2018 · c88a7bb · c88a7bb
1 parent 0b03b94
commit c88a7bb
Show file tree

Hide file tree

Showing 34 changed files with 592 additions and 550 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,5 +5,10 @@
         "**/build/": true,
         "**/build_xcode/": true,
         ".vscode/browse.*": true
+    },
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/bower_components": true,
+        "**/vendor": true
     }
 }
diff --git a/src/bin/cli/src/main.cpp b/src/bin/cli/src/main.cpp
@@ -1,6 +1,6 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#include "cxxopts/cxxopts.hpp"
+#include <cxxopts.hpp>
 #pragma clang diagnostic pop
 
 #include "constants.hpp"

diff --git a/src/common.cmake b/src/common.cmake
@@ -8,6 +8,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED on)
 include_directories(SYSTEM /opt/local/include)
 include_directories(SYSTEM /usr/local/include)
 include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/vendor)
+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/vendor/cget/include)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/share)
 
 add_compile_options(-Wall)

diff --git a/src/core/grabber/include/device_grabber.hpp b/src/core/grabber/include/device_grabber.hpp
@@ -25,7 +25,7 @@
 #include <boost/algorithm/string.hpp>
 #include <deque>
 #include <fstream>
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 #include <thread>
 #include <time.h>
 
@@ -315,7 +315,7 @@ class device_grabber final : public pqrs::dispatcher::extra::dispatcher_client {
 
   void async_unset_profile(void) {
     enqueue_to_dispatcher([this] {
-      profile_ = core_configuration::core_configuration::profile(nlohmann::json());
+      profile_ = core_configuration::details::profile(nlohmann::json());
 
       manipulator_managers_connector_.invalidate_manipulators();
     });
@@ -799,7 +799,7 @@ class device_grabber final : public pqrs::dispatcher::extra::dispatcher_client {
     }
   }
 
-  void set_profile(const core_configuration::core_configuration::profile& profile) {
+  void set_profile(const core_configuration::details::profile& profile) {
     profile_ = profile;
 
     update_simple_modifications_manipulators();
@@ -1032,7 +1032,7 @@ class device_grabber final : public pqrs::dispatcher::extra::dispatcher_client {
   std::unordered_map<registry_entry_id, std::shared_ptr<hid_grabber>> hid_grabbers_;
   std::unordered_map<registry_entry_id, std::shared_ptr<device_state>> device_states_;
 
-  core_configuration::core_configuration::profile profile_;
+  core_configuration::details::profile profile_;
   system_preferences system_preferences_;
 
   manipulator::manipulator_managers_connector manipulator_managers_connector_;

diff --git a/src/core/grabber/include/grabber_alerts_manager.hpp b/src/core/grabber/include/grabber_alerts_manager.hpp
@@ -5,7 +5,7 @@
 #include "filesystem.hpp"
 #include "json_utility.hpp"
 #include "logger.hpp"
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 #include <unordered_set>
 
 namespace krbn {

diff --git a/src/core/grabber/include/manipulator/details/basic.hpp b/src/core/grabber/include/manipulator/details/basic.hpp
@@ -6,7 +6,7 @@
 #include "manipulator/details/base.hpp"
 #include "manipulator/details/types.hpp"
 #include "time_utility.hpp"
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 #include <unordered_set>
 #include <vector>
 
@@ -22,10 +22,10 @@ class basic final : public base, public pqrs::dispatcher::extra::dispatcher_clie
 #include "basic/to_if_held_down.hpp"
 
   basic(const nlohmann::json& json,
-        const core_configuration::details::complex_modifications::parameters& parameters) : base(),
-                                                                                            dispatcher_client(),
-                                                                                            parameters_(parameters),
-                                                                                            from_(json_utility::find_copy(json, "from", nlohmann::json())) {
+        const core_configuration::details::complex_modifications_parameters& parameters) : base(),
+                                                                                           dispatcher_client(),
+                                                                                           parameters_(parameters),
+                                                                                           from_(json_utility::find_copy(json, "from", nlohmann::json())) {
     for (auto it = std::begin(json); it != std::end(json); std::advance(it, 1)) {
       // it.key() is always std::string.
       const auto& key = it.key();
@@ -972,7 +972,7 @@ class basic final : public base, public pqrs::dispatcher::extra::dispatcher_clie
     }
   }
 
-  core_configuration::details::complex_modifications::parameters parameters_;
+  core_configuration::details::complex_modifications_parameters parameters_;
 
   from_event_definition from_;
   std::vector<to_event_definition> to_;

diff --git a/src/core/grabber/include/manipulator/details/types.hpp b/src/core/grabber/include/manipulator/details/types.hpp
@@ -7,7 +7,7 @@
 #include "stream_utility.hpp"
 #include <boost/optional.hpp>
 #include <boost/variant.hpp>
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 #include <unordered_set>
 
 namespace krbn {

diff --git a/src/core/grabber/include/manipulator/manipulator_factory.hpp b/src/core/grabber/include/manipulator/manipulator_factory.hpp
@@ -19,7 +19,7 @@ namespace manipulator {
 class manipulator_factory final {
 public:
   static std::shared_ptr<details::base> make_manipulator(const nlohmann::json& json,
-                                                         const core_configuration::details::complex_modifications::parameters& parameters) {
+                                                         const core_configuration::details::complex_modifications_parameters& parameters) {
     try {
       {
         if (auto value = json_utility::find_optional<std::string>(json, "type")) {

diff --git a/src/core/grabber/include/manipulator/manipulator_manager.hpp b/src/core/grabber/include/manipulator/manipulator_manager.hpp
@@ -15,7 +15,7 @@ class manipulator_manager final {
   }
 
   void push_back_manipulator(const nlohmann::json& json,
-                             const core_configuration::details::complex_modifications::parameters& parameters) {
+                             const core_configuration::details::complex_modifications_parameters& parameters) {
     auto m = manipulator_factory::make_manipulator(json,
                                                    parameters);
 

diff --git a/src/lib/libkrbn/src/libkrbn.cpp b/src/lib/libkrbn/src/libkrbn.cpp
@@ -11,7 +11,7 @@
 #include "update_utility.hpp"
 #include <fstream>
 #include <iostream>
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 void libkrbn_initialize(void) {

diff --git a/src/lib/libkrbn/src/libkrbn_complex_modifications_assets_manager.cpp b/src/lib/libkrbn/src/libkrbn_complex_modifications_assets_manager.cpp
@@ -3,7 +3,7 @@
 
 // libkrbn_configuration.cpp
 void libkrbn_core_configuration_push_back_complex_modifications_rule_to_selected_profile(libkrbn_core_configuration* p,
-                                                                                         const krbn::core_configuration::details::complex_modifications::rule& rule);
+                                                                                         const krbn::core_configuration::details::complex_modifications_rule& rule);
 
 bool libkrbn_complex_modifications_assets_manager_initialize(libkrbn_complex_modifications_assets_manager** out) {
   if (!out) return false;
@@ -45,8 +45,8 @@ const krbn::complex_modifications_assets_manager::file* get_file(libkrbn_complex
   return nullptr;
 }
 
-const std::vector<krbn::core_configuration::details::complex_modifications::rule>* get_rules(libkrbn_complex_modifications_assets_manager* p,
-                                                                                             size_t index) {
+const std::vector<krbn::core_configuration::details::complex_modifications_rule>* get_rules(libkrbn_complex_modifications_assets_manager* p,
+                                                                                            size_t index) {
   if (auto files = get_files(p)) {
     if (index < files->size()) {
       auto& f = (*files)[index];
@@ -56,9 +56,9 @@ const std::vector<krbn::core_configuration::details::complex_modifications::rule
   return nullptr;
 }
 
-const krbn::core_configuration::details::complex_modifications::rule* get_rule(libkrbn_complex_modifications_assets_manager* p,
-                                                                               size_t file_index,
-                                                                               size_t index) {
+const krbn::core_configuration::details::complex_modifications_rule* get_rule(libkrbn_complex_modifications_assets_manager* p,
+                                                                              size_t file_index,
+                                                                              size_t index) {
   if (auto rules = get_rules(p, file_index)) {
     if (index < rules->size()) {
       return &((*rules)[index]);

diff --git a/src/lib/libkrbn/src/libkrbn_configuration.cpp b/src/lib/libkrbn/src/libkrbn_configuration.cpp
@@ -250,7 +250,7 @@ size_t libkrbn_core_configuration_get_selected_profile_complex_modifications_rul
 }
 
 void libkrbn_core_configuration_push_back_complex_modifications_rule_to_selected_profile(libkrbn_core_configuration* p,
-                                                                                         const krbn::core_configuration::details::complex_modifications::rule& rule) {
+                                                                                         const krbn::core_configuration::details::complex_modifications_rule& rule) {
   if (auto c = reinterpret_cast<libkrbn_cpp::libkrbn_core_configuration_class*>(p)) {
     c->get_core_configuration().get_selected_profile().push_back_complex_modifications_rule(rule);
   }

diff --git a/src/share/complex_modifications_assets_manager.hpp b/src/share/complex_modifications_assets_manager.hpp
@@ -25,7 +25,7 @@ class complex_modifications_assets_manager final {
         }
 
         if (auto v = json_utility::find_array(json, "rules")) {
-          core_configuration::details::complex_modifications::parameters parameters;
+          core_configuration::details::complex_modifications_parameters parameters;
           for (const auto& j : *v) {
             rules_.emplace_back(j, parameters);
           }
@@ -41,11 +41,11 @@ class complex_modifications_assets_manager final {
       return title_;
     }
 
-    const std::vector<core_configuration::details::complex_modifications::rule>& get_rules(void) const {
+    const std::vector<core_configuration::details::complex_modifications_rule>& get_rules(void) const {
       return rules_;
     }
 
-    void push_back_rule_to_core_configuration_profile(core_configuration::core_configuration::profile& profile,
+    void push_back_rule_to_core_configuration_profile(core_configuration::details::profile& profile,
                                                       size_t index) {
       if (index < rules_.size()) {
         profile.push_back_complex_modifications_rule(rules_[index]);
@@ -63,7 +63,7 @@ class complex_modifications_assets_manager final {
   private:
     std::string file_path_;
     std::string title_;
-    std::vector<core_configuration::details::complex_modifications::rule> rules_;
+    std::vector<core_configuration::details::complex_modifications_rule> rules_;
   };
 
   void reload(const std::string& directory, bool load_system_example_file = true) {

diff --git a/src/share/connected_devices/connected_devices.hpp b/src/share/connected_devices/connected_devices.hpp
@@ -7,7 +7,7 @@
 #include "types.hpp"
 #include <algorithm>
 #include <fstream>
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 
 // Json example:
 //