[cleanup] Remove unused methods from JSON

Hide `cJSON` from public API

Author: Jarod42

CodeLite/JSON.cpp

@@ -25,24 +25,16 @@
 
 #include "JSON.h"
 
-#include "clFontHelper.h"
 #include "fileutils.h"
 
 #include <wx/filename.h>
 
 JSON::JSON(const wxString& text)
-    : m_json(NULL)
 {
     m_json = cJSON_Parse(text.mb_str(wxConvUTF8).data());
 }
 
-JSON::JSON(JSONItem item)
-    : m_json(item.release())
-{
-}
-
 JSON::JSON(JsonType type)
-    : m_json(NULL)
 {
     if (type == JsonType::Array)
         m_json = cJSON_CreateArray();
@@ -53,7 +45,6 @@ JSON::JSON(JsonType type)
 }
 
 JSON::JSON(const wxFileName& filename)
-    : m_json(NULL)
 {
     wxString content;
     if (!FileUtils::ReadFileContent(filename, content)) {
@@ -68,7 +59,7 @@ JSON::~JSON()
 {
     if (m_json) {
         cJSON_Delete(m_json);
-        m_json = NULL;
+        m_json = nullptr;
     }
 }
 
@@ -84,42 +75,28 @@ void JSON::save(const wxFileName& fn) const
 JSONItem JSON::toElement() const
 {
     if (!m_json) {
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
     }
     return JSONItem(m_json);
 }
 
 JSONItem JSONItem::namedObject(const wxString& name) const
 {
     if (!m_json) {
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
     }
 
     cJSON* obj = cJSON_GetObjectItem(m_json, name.mb_str(wxConvUTF8).data());
     if (!obj) {
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
     }
     return JSONItem(obj);
 }
 
-void JSON::clear()
-{
-    int type = cJSON_Object;
-    if (m_json) {
-        type = m_json->type;
-        cJSON_Delete(m_json);
-        m_json = NULL;
-    }
-    if (type == cJSON_Array)
-        m_json = cJSON_CreateArray();
-    else
-        m_json = cJSON_CreateObject();
-}
-
 cJSON* JSON::release()
 {
     cJSON* p = m_json;
-    m_json = NULL;
+    m_json = nullptr;
     return p;
 }
 
@@ -135,7 +112,7 @@ JSONItem JSONItem::operator[](int index) const
     if (isArray()) {
         return arrayItem(index);
     }
-    return JSONItem(NULL);
+    return JSONItem(nullptr);
 }
 
 std::unordered_map<std::string_view, JSONItem> JSONItem::GetAsMap() const
@@ -175,15 +152,15 @@ JSONItem JSONItem::operator[](const wxString& name) const { return namedObject(n
 JSONItem JSONItem::arrayItem(int pos) const
 {
     if (!m_json) {
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
     }
 
     if (m_json->type != cJSON_Array)
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
 
     int size = cJSON_GetArraySize(m_json);
     if (pos >= size)
-        return JSONItem(NULL);
+        return JSONItem(nullptr);
 
     return JSONItem(cJSON_GetArrayItem(m_json, pos));
 }
@@ -249,7 +226,7 @@ void JSONItem::arrayAppend(const char* value)
     cJSON_AddItemToArray(m_json, p);
 }
 
-void JSONItem::arrayAppend(const std::string& value) { arrayAppend((const char*)value.c_str()); }
+void JSONItem::arrayAppend(const std::string& value) { arrayAppend(value.c_str()); }
 
 void JSONItem::arrayAppend(double number)
 {
@@ -262,7 +239,7 @@ void JSONItem::arrayAppend(double number)
 
 void JSONItem::arrayAppend(int number) { arrayAppend((double)number); }
 
-void JSONItem::arrayAppend(const wxString& value) { arrayAppend((const char*)value.mb_str(wxConvUTF8).data()); }
+void JSONItem::arrayAppend(const wxString& value) { arrayAppend(value.mb_str(wxConvUTF8).data()); }
 
 void JSONItem::arrayAppend(JSONItem&& element)
 {
@@ -289,7 +266,7 @@ JSONItem JSONItem::createObject()
 char* JSONItem::FormatRawString(bool formatted) const
 {
     if (!m_json) {
-        return NULL;
+        return nullptr;
     }
 
     if (formatted) {
@@ -443,15 +420,9 @@ bool JSONItem::hasNamedObject(const wxString& name) const
     }
 
     cJSON* obj = cJSON_GetObjectItem(m_json, name.mb_str(wxConvUTF8).data());
-    return obj != NULL;
+    return obj != nullptr;
 }
 #if wxUSE_GUI
-JSONItem& JSONItem::addProperty(const wxString& name, const wxPoint& pt)
-{
-    wxString szStr;
-    szStr << pt.x << "," << pt.y;
-    return addProperty(name, szStr);
-}
 
 JSONItem& JSONItem::addProperty(const wxString& name, const wxSize& sz)
 {
@@ -460,14 +431,14 @@ JSONItem& JSONItem::addProperty(const wxString& name, const wxSize& sz)
     return addProperty(name, szStr);
 }
 
-wxPoint JSONItem::toPoint() const
+wxSize JSONItem::toSize() const
 {
     if (!m_json) {
-        return wxDefaultPosition;
+        return wxDefaultSize;
     }
 
     if (m_json->type != cJSON_String) {
-        return wxDefaultPosition;
+        return wxDefaultSize;
     }
 
     wxString str = m_json->valuestring;
@@ -476,28 +447,11 @@ wxPoint JSONItem::toPoint() const
 
     long nX(-1), nY(-1);
     if (!x.ToLong(&nX) || !y.ToLong(&nY))
-        return wxDefaultPosition;
-
-    return wxPoint(nX, nY);
-}
-
-wxColour JSONItem::toColour(const wxColour& defaultColour) const
-{
-    if (!m_json) {
-        return defaultColour;
-    }
+        return wxDefaultSize;
 
-    if (m_json->type != cJSON_String) {
-        return defaultColour;
-    }
-    return wxColour(m_json->valuestring);
+    return wxSize(nX, nY);
 }
 
-wxSize JSONItem::toSize() const
-{
-    wxPoint pt = toPoint();
-    return wxSize(pt.x, pt.y);
-}
 #endif
 
 JSONItem& JSONItem::addProperty(const wxString& name, const JSONItem& element)
@@ -551,17 +505,6 @@ wxStringMap_t JSONItem::toStringMap(const wxStringMap_t& default_map) const
 
 JSONItem& JSONItem::addProperty(const wxString& name, size_t value) { return addProperty(name, (int)value); }
 
-#if wxUSE_GUI
-JSONItem& JSONItem::addProperty(const wxString& name, const wxColour& colour)
-{
-    wxString colourValue;
-    if (colour.IsOk()) {
-        colourValue = colour.GetAsString(wxC2S_HTML_SYNTAX);
-    }
-    return addProperty(name, colourValue);
-}
-#endif
-
 JSONItem& JSONItem::addNull(const wxString& name)
 {
     if (m_json) {
@@ -575,22 +518,6 @@ JSONItem& JSONItem::addProperty(const wxString& name, const char* value, const w
     return addProperty(name, wxString(value, conv));
 }
 
-#if wxUSE_GUI
-JSONItem& JSONItem::addProperty(const wxString& name, const wxFont& font)
-{
-    return addProperty(name, clFontHelper::ToString(font));
-}
-
-wxFont JSONItem::toFont(const wxFont& defaultFont) const
-{
-    wxString str = toString();
-    if (str.IsEmpty())
-        return defaultFont;
-    wxFont f = clFontHelper::FromString(str);
-    return f;
-}
-#endif
-
 bool JSONItem::isArray() const
 {
     if (!m_json) {

CodeLite/JSON.h

@@ -30,20 +30,17 @@
 #include "macros.h"
 
 #include <cJSON.h>
-#include <map>
 #include <string_view>
 #include <type_traits>
+#include <unordered_map>
 #include <vector>
 #include <wx/filename.h>
 #include <wx/gdicmn.h>
 #include <wx/string.h>
-#include <wx/variant.h>
 #include <wx/vector.h>
 
 #if wxUSE_GUI
 #include <wx/arrstr.h>
-#include <wx/colour.h>
-#include <wx/font.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -56,7 +53,7 @@ class WXDLLIMPEXP_CL JSONItem
     friend JSON;
 
 public:
-    explicit JSONItem(cJSON* json);
+    explicit JSONItem(std::nullptr_t) {}
     JSONItem() = default;
     virtual ~JSONItem() = default;
 
@@ -104,11 +101,12 @@ class WXDLLIMPEXP_CL JSONItem
     int arraySize() const;
     int toInt(int defaultVal = -1) const;
 
-    /// Convert the value into `T` from
-    template <typename T>
-    T fromNumber(T default_value) const
+    /// Convert the value into `E` from
+    template <typename E>
+        requires(std::is_enum_v<E>)
+    E fromNumber(E default_value) const
     {
-        return static_cast<T>(toInt((int)default_value));
+        return static_cast<E>(toInt(static_cast<int>(default_value)));
     }
 
     template <typename T>
@@ -135,10 +133,7 @@ class WXDLLIMPEXP_CL JSONItem
     size_t toSize_t(size_t defaultVal = 0) const;
     double toDouble(double defaultVal = -1.0) const;
 
-    wxColour toColour(const wxColour& defaultColour = wxNullColour) const;
-    wxFont toFont(const wxFont& defaultFont = wxNullFont) const;
     wxSize toSize() const;
-    wxPoint toPoint() const;
 
     wxStringMap_t toStringMap(const wxStringMap_t& default_map = {}) const;
 
@@ -165,6 +160,8 @@ class WXDLLIMPEXP_CL JSONItem
      */
     JSONItem AddObject(const wxString& name);
 
+    JSONItem& addNull(const wxString& name);
+
     JSONItem& addProperty(const wxString& name, const wxString& value);
     JSONItem& addProperty(const wxString& name, const std::string& value);
     JSONItem& addProperty(const wxString& name, const wxChar* value);
@@ -183,15 +180,11 @@ class WXDLLIMPEXP_CL JSONItem
     }
 
     JSONItem& addProperty(const wxString& name, const wxSize& sz);
-    JSONItem& addProperty(const wxString& name, const wxPoint& pt);
-    JSONItem& addProperty(const wxString& name, const wxColour& colour);
-    JSONItem& addProperty(const wxString& name, const wxFont& font);
 
     JSONItem& addProperty(const wxString& name, const wxArrayString& arr);
     JSONItem& addProperty(const wxString& name, const wxStringMap_t& stringMap);
     JSONItem& addProperty(const wxString& name, const JSONItem& element);
     JSONItem& addProperty(const wxString& name, const char* value, const wxMBConv& conv = wxConvUTF8);
-    JSONItem& addNull(const wxString& name);
 
     /**
      * @brief delete property by name
@@ -213,9 +206,11 @@ class WXDLLIMPEXP_CL JSONItem
     void arrayAppend(int number);
     void arrayAppend(double number);
 
-    bool isOk() const { return m_json != NULL; }
+    bool isOk() const { return m_json != nullptr; }
 
 private:
+    explicit JSONItem(cJSON* json);
+
     /**
      * @brief release the internal pointer
      */
@@ -240,26 +235,27 @@ enum class JsonType {
 
 class WXDLLIMPEXP_CL JSON
 {
+    friend JSONItem;
+
 public:
     explicit JSON(JsonType type);
     explicit JSON(const wxString& text);
     explicit JSON(const wxFileName& filename);
-    explicit JSON(JSONItem item);
 
     // Make this class not copyable
     JSON(const JSON&) = delete;
     JSON& operator=(const JSON&) = delete;
-    virtual ~JSON();
+    ~JSON();
 
     void save(const wxFileName& fn) const;
-    bool isOk() const { return m_json != NULL; }
+    bool isOk() const { return m_json != nullptr; }
 
     JSONItem toElement() const;
 
-    void clear();
+private:
     cJSON* release();
 
-protected:
+private:
     cJSON* m_json = nullptr;
 };
 

CodeLite/LSP/CompletionItem.cpp

@@ -1,6 +1,6 @@
 #include "CompletionItem.h"
 
-JSONItem LSP::CompletionItem::ToJSON() const { return JSONItem(NULL); }
+JSONItem LSP::CompletionItem::ToJSON() const { return JSONItem(nullptr); }
 
 void LSP::CompletionItem::FromJSON(const JSONItem& json)
 {

CodeLite/cl_config.h

@@ -33,6 +33,7 @@
 #include <map>
 #include <memory>
 #include <wx/filename.h>
+#include <wx/colour.h>
 
 ////////////////////////////////////////////////////////