#63 - json_test builds again.

PerMalmberg · Aug 31, 2019 · bd7ed05 · bd7ed05
1 parent bad38d1
commit bd7ed05
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/lib/smooth/core/json/JsonFile.cpp b/lib/smooth/core/json/JsonFile.cpp
@@ -15,11 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <smooth/core/json/JsonFile.h>
-#include <cJSON.h>
-
 #include <memory>
 #include <vector>
-#include <iostream>
 
 namespace smooth::core::json
 {

diff --git a/lib/smooth/include/smooth/core/json/JsonFile.h b/lib/smooth/include/smooth/core/json/JsonFile.h
@@ -1,5 +1,4 @@
 // Smooth - C++ framework for writing applications based on Espressif's ESP-IDF.
-
 // Copyright (C) 2017 Per Malmberg (https://github.com/PerMalmberg)
 //
 // This program is free software: you can redistribute it and/or modify
@@ -26,11 +25,11 @@ namespace smooth::core::json
     class JsonFile
     {
         public:
-            JsonFile(std::string full_path);
+            explicit JsonFile(std::string full_path);
 
-            bool save() const;
+            [[nodiscard]] bool save() const;
 
-            bool exists() const
+            [[nodiscard]] bool exists() const
             {
                 return f.exists();
             }

diff --git a/lib/smooth/include/smooth/core/json/Value.h b/lib/smooth/include/smooth/core/json/Value.h
@@ -101,19 +101,19 @@ namespace smooth::core::json
 
             explicit operator bool() const;
 
-            std::string get_string(const std::string& default_value_value) const;
+            [[nodiscard]] std::string get_string(const std::string& default_value_value) const;
 
-            int get_int(int default_value) const;
+            [[nodiscard]] int get_int(int default_value) const;
 
-            bool get_bool(bool default_value) const;
+            [[nodiscard]] bool get_bool(bool default_value) const;
 
-            int get_array_size() const;
+            [[nodiscard]] int get_array_size() const;
 
-            std::string get_name() const;
+            [[nodiscard]] std::string get_name() const;
 
             void get_member_names(std::vector<std::string>& names) const;
 
-            std::string to_string() const;
+            [[nodiscard]] std::string to_string() const;
 
             // Deletes named object
             void erase(const std::string& name);

diff --git a/test/json_test/json_test.cpp b/test/json_test/json_test.cpp
@@ -19,8 +19,7 @@
 #include <algorithm>
 #include <fstream>
 #include <cassert>
-#include <unistd.h>
-#include <json/cJSON/cJSON.h>
+#include <cJSON.h>
 #include <smooth/core/task_priorities.h>
 #include <smooth/core/json/Value.h>
 #include "test_example.json.h"