From 7b2c2e91dba7f8e22c4807126e0aeb02c654f71a Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 7 Aug 2021 09:16:15 +0200 Subject: [PATCH] Rename function --- src/headers/utility.hpp | 4 ++-- src/macro-action-filter.cpp | 2 +- src/macro-action-scene-transform.cpp | 4 ++-- src/macro-action-source.cpp | 2 +- src/macro-condition-filter.cpp | 2 +- src/macro-condition-source.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp index 39a03117..25597046 100644 --- a/src/headers/utility.hpp +++ b/src/headers/utility.hpp @@ -30,8 +30,8 @@ bool compareSourceSettings(const OBSWeakSource &source, std::vector getSceneItemsWithName(OBSScene scene, std::string &name); std::string getDataFilePath(const std::string &file); -QString fromatJsonString(std::string); -QString fromatJsonString(const char *); +QString formatJsonString(std::string); +QString formatJsonString(const char *); /** * Populate layout with labels and widgets based on provided text diff --git a/src/macro-action-filter.cpp b/src/macro-action-filter.cpp index e3a48bce..cc028d25 100644 --- a/src/macro-action-filter.cpp +++ b/src/macro-action-filter.cpp @@ -198,7 +198,7 @@ void MacroActionFilterEdit::GetSettingsClicked() } _settings->setPlainText( - fromatJsonString(getSourceSettings(_entryData->_filter))); + formatJsonString(getSourceSettings(_entryData->_filter))); } void MacroActionFilterEdit::SettingsChanged() diff --git a/src/macro-action-scene-transform.cpp b/src/macro-action-scene-transform.cpp index 40f65845..22cc7aaf 100644 --- a/src/macro-action-scene-transform.cpp +++ b/src/macro-action-scene-transform.cpp @@ -201,7 +201,7 @@ void MacroActionSceneTransformEdit::UpdateEntryData() GetWeakSourceName(_entryData->_source).c_str()); if (_entryData->_source) { _settings->setPlainText( - fromatJsonString(_entryData->GetSettings())); + formatJsonString(_entryData->GetSettings())); } } @@ -255,7 +255,7 @@ void MacroActionSceneTransformEdit::GetSettingsClicked() auto data = obs_data_create(); save_transform_state(data, info, crop); auto json = obs_data_get_json(data); - _settings->setPlainText(fromatJsonString(json)); + _settings->setPlainText(formatJsonString(json)); obs_data_release(data); } diff --git a/src/macro-action-source.cpp b/src/macro-action-source.cpp index 77bda080..a2776827 100644 --- a/src/macro-action-source.cpp +++ b/src/macro-action-source.cpp @@ -173,7 +173,7 @@ void MacroActionSourceEdit::GetSettingsClicked() } _settings->setPlainText( - fromatJsonString(getSourceSettings(_entryData->_source))); + formatJsonString(getSourceSettings(_entryData->_source))); } void MacroActionSourceEdit::SettingsChanged() diff --git a/src/macro-condition-filter.cpp b/src/macro-condition-filter.cpp index c524df75..fad2bf50 100644 --- a/src/macro-condition-filter.cpp +++ b/src/macro-condition-filter.cpp @@ -192,7 +192,7 @@ void MacroConditionFilterEdit::GetSettingsClicked() } _settings->setPlainText( - fromatJsonString(getSourceSettings(_entryData->_filter))); + formatJsonString(getSourceSettings(_entryData->_filter))); } void MacroConditionFilterEdit::SettingsChanged() diff --git a/src/macro-condition-source.cpp b/src/macro-condition-source.cpp index e23dde04..8be55c56 100644 --- a/src/macro-condition-source.cpp +++ b/src/macro-condition-source.cpp @@ -171,7 +171,7 @@ void MacroConditionSourceEdit::GetSettingsClicked() } _settings->setPlainText( - fromatJsonString(getSourceSettings(_entryData->_source))); + formatJsonString(getSourceSettings(_entryData->_source))); } void MacroConditionSourceEdit::SettingsChanged()