gui/mainwindows.cpp: use picojson to generate JSON

danmar · Nov 29, 2023 · 51d8b67 · 51d8b67
1 parent 277de41
commit 51d8b67
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -42,6 +42,7 @@ CheckOptions:
     else()
         target_include_directories(cppcheck-gui SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
     endif()
+    target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
         target_precompile_headers(cppcheck-gui PRIVATE precompiled.h)
     endif()

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -94,6 +94,8 @@
 #include <QVariant>
 #include <Qt>
 
+#include "json.h"
+
 static const QString compile_commands_json("compile_commands.json");
 
 static QString fromNativePath(const QString& p) {
@@ -1002,24 +1004,28 @@ Settings MainWindow::getCppcheckSettings()
 
             addonFilePath.replace(QChar('\\'), QChar('/'));
 
-            // TODO: use picojson to generate the JSON
-            QString json;
-            json += "{ \"script\":\"" + addonFilePath + "\"";
+            picojson::value json;
+            json.set(picojson::object());
+            auto& obj = json.get<picojson::object>();
+            obj["script"] = picojson::value(addonFilePath.toStdString());
             if (!pythonCmd.isEmpty())
-                json += ", \"python\":\"" + pythonCmd + "\"";
-            const QString misraFile = fromNativePath(mSettings->value(SETTINGS_MISRA_FILE).toString());
-            if (!isCppcheckPremium() && addon == "misra" && !misraFile.isEmpty()) {
-                QString arg;
-                if (misraFile.endsWith(".pdf", Qt::CaseInsensitive))
-                    arg = "--misra-pdf=" + misraFile;
-                else
-                    arg = "--rule-texts=" + misraFile;
-                json += ", \"args\":[\"" + arg + "\"]";
+                obj["python"] = picojson::value(pythonCmd.toStdString());
+
+            if (!isCppcheckPremium() && addon == "misra") {
+                const QString misraFile = fromNativePath(mSettings->value(SETTINGS_MISRA_FILE).toString());
+                if (!misraFile.isEmpty()) {
+                    QString arg;
+                    if (misraFile.endsWith(".pdf", Qt::CaseInsensitive))
+                        arg = "--misra-pdf=" + misraFile;
+                    else
+                        arg = "--rule-texts=" + misraFile;
+                    obj["args"] = picojson::value(arg.toStdString());
+                }
             }
-            json += " }";
-            result.addons.emplace(json.toStdString());
+            const std::string json_str = json.serialize();
+            result.addons.emplace(json_str);
             AddonInfo addonInfo;
-            addonInfo.getAddonInfo(json.toStdString(), result.exename);
+            addonInfo.getAddonInfo(json_str, result.exename);
             result.addonInfos.emplace_back(std::move(addonInfo));
         }