Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-29 20:55:28 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up formatJsonString()

Browse Source
This commit is contained in:
WarmUpTill
2021-12-30 23:29:15 +01:00
committed by WarmUpTill
parent ba111c6caa
commit fbdaffcbf6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utility.cpp
View File

@@ -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)