From fbdaffcbf68345ca9122b1ae435a6402cd6b1506 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Thu, 30 Dec 2021 23:29:15 +0100
Subject: [PATCH] Clean up formatJsonString()

---
 src/headers/utility.hpp |  4 ++--
 src/utility.cpp         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp
index 77116296..479a8a7b 100644
--- a/src/headers/utility.hpp
+++ b/src/headers/utility.hpp
@@ -27,13 +27,13 @@ std::string getSourceSettings(OBSWeakSource ws);
 void setSourceSettings(obs_source_t *s, const std::string &settings);
 bool compareSourceSettings(const OBSWeakSource &source,
 			   const std::string &settings, bool regex);
-std::vector<obs_scene_item *> getSceneItemsWithName(OBSScene scene,
+std::vector<obs_scene_item *> getSceneItemsWithName(obs_scene_t *scene,
 						    std::string &name);
 std::string getDataFilePath(const std::string &file);
 bool matchJson(const std::string &json1, const std::string &json2,
 	       bool useRegex);
 QString formatJsonString(std::string);
-QString formatJsonString(const char *);
+QString formatJsonString(QString);
 QString escapeForRegex(QString &s);
 void loadTransformState(obs_data_t *obj, struct obs_transform_info &info,
 			struct obs_sceneitem_crop &crop);
diff --git a/src/utility.cpp b/src/utility.cpp
index 94a4cd8c..e35701af 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -317,7 +317,7 @@ static bool getSceneItems(obs_scene_t *, obs_sceneitem_t *item, void *ptr)
 	return true;
 }
 
-std::vector<obs_scene_item *> getSceneItemsWithName(OBSScene scene,
+std::vector<obs_scene_item *> getSceneItemsWithName(obs_scene_t *scene,
 						    std::string &name)
 {
 	ItemInfo itemInfo = {name};
@@ -371,13 +371,13 @@ std::string getDataFilePath(const std::string &file)
 
 QString formatJsonString(std::string s)
 {
-	return formatJsonString(s.c_str());
+	return formatJsonString(QString::fromStdString(s));
 }
 
-QString formatJsonString(const char *json)
+QString formatJsonString(QString json)
 {
-	QJsonDocument doc = QJsonDocument::fromJson(json);
-	return doc.toJson(QJsonDocument::Indented);
+	QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8());
+	return QString::fromUtf8(doc.toJson(QJsonDocument::Indented));
 }
 
 QString escapeForRegex(QString &s)