From 473e24cc42b4c07ebff2c5e076e53a24f6232f29 Mon Sep 17 00:00:00 2001 From: Przemek Pawlas <3606072+Destroy666x@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:24:14 +0100 Subject: [PATCH] Use consistent function naming for setting widget visibility --- src/macro-core/macro-action-websocket.cpp | 8 ++++---- src/macro-core/macro-action-websocket.hpp | 2 +- src/macro-external/twitch/macro-action-twitch.cpp | 8 ++++---- src/macro-external/twitch/macro-action-twitch.hpp | 2 +- src/macro-external/twitch/macro-condition-twitch.cpp | 8 ++++---- src/macro-external/twitch/macro-condition-twitch.hpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/macro-core/macro-action-websocket.cpp b/src/macro-core/macro-action-websocket.cpp index 0f20573d..8699b1d3 100644 --- a/src/macro-core/macro-action-websocket.cpp +++ b/src/macro-core/macro-action-websocket.cpp @@ -192,7 +192,7 @@ void MacroActionWebsocketEdit::CheckForSettingsConflict() updateGeometry(); } -void MacroActionWebsocketEdit::SetupWidgetVisibility() +void MacroActionWebsocketEdit::SetWidgetVisibility() { _messageType->setVisible(_entryData->_api == MacroActionWebsocket::API::SCENE_SWITCHER); @@ -283,7 +283,7 @@ void MacroActionWebsocketEdit::UpdateEntryData() _message->setPlainText(_entryData->_message); _connection->SetConnection(_entryData->_connection); - SetupWidgetVisibility(); + SetWidgetVisibility(); } void MacroActionWebsocketEdit::APITypeChanged(int index) @@ -294,7 +294,7 @@ void MacroActionWebsocketEdit::APITypeChanged(int index) auto lock = LockContext(); _entryData->_api = static_cast(index); - SetupWidgetVisibility(); + SetWidgetVisibility(); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } @@ -308,7 +308,7 @@ void MacroActionWebsocketEdit::MessageTypeChanged(int index) auto lock = LockContext(); _entryData->_type = static_cast(index); - SetupWidgetVisibility(); + SetWidgetVisibility(); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } diff --git a/src/macro-core/macro-action-websocket.hpp b/src/macro-core/macro-action-websocket.hpp index 769bfc3c..9f4ff0a3 100644 --- a/src/macro-core/macro-action-websocket.hpp +++ b/src/macro-core/macro-action-websocket.hpp @@ -76,7 +76,7 @@ protected: private: void CheckForSettingsConflict(); - void SetupWidgetVisibility(); + void SetWidgetVisibility(); void SetupRequestEdit(); void SetupEventEdit(); void SetupGenericEdit(); diff --git a/src/macro-external/twitch/macro-action-twitch.cpp b/src/macro-external/twitch/macro-action-twitch.cpp index 5b739c39..8e4ddbc5 100644 --- a/src/macro-external/twitch/macro-action-twitch.cpp +++ b/src/macro-external/twitch/macro-action-twitch.cpp @@ -477,7 +477,7 @@ void MacroActionTwitchEdit::ActionChanged(int idx) auto lock = LockContext(); _entryData->_action = static_cast( _actions->itemData(idx).toInt()); - SetupWidgetVisibility(); + SetWidgetVisibility(); SetWidgetLayout(); } @@ -492,7 +492,7 @@ void MacroActionTwitchEdit::TwitchTokenChanged(const QString &token) _category->SetToken(_entryData->_token); _channel->SetToken(_entryData->_token); - SetupWidgetVisibility(); + SetWidgetVisibility(); emit(HeaderInfoChanged(token)); } @@ -580,7 +580,7 @@ void MacroActionTwitchEdit::AnnouncementColorChanged(int index) static_cast(index); } -void MacroActionTwitchEdit::SetupWidgetVisibility() +void MacroActionTwitchEdit::SetWidgetVisibility() { _streamTitle->setVisible(_entryData->_action == MacroActionTwitch::Action::TITLE); @@ -692,7 +692,7 @@ void MacroActionTwitchEdit::UpdateEntryData() _channel->SetChannel(_entryData->_channel); _chatMessage->setPlainText(_entryData->_chatMessage); - SetupWidgetVisibility(); + SetWidgetVisibility(); } } // namespace advss diff --git a/src/macro-external/twitch/macro-action-twitch.hpp b/src/macro-external/twitch/macro-action-twitch.hpp index 7459ab7a..efa413a0 100644 --- a/src/macro-external/twitch/macro-action-twitch.hpp +++ b/src/macro-external/twitch/macro-action-twitch.hpp @@ -119,7 +119,7 @@ protected: std::shared_ptr _entryData; private: - void SetupWidgetVisibility(); + void SetWidgetVisibility(); void SetWidgetLayout(); QHBoxLayout *_layout; diff --git a/src/macro-external/twitch/macro-condition-twitch.cpp b/src/macro-external/twitch/macro-condition-twitch.cpp index b63101cb..426c0fe4 100644 --- a/src/macro-external/twitch/macro-condition-twitch.cpp +++ b/src/macro-external/twitch/macro-condition-twitch.cpp @@ -1291,7 +1291,7 @@ void MacroConditionTwitchEdit::ConditionChanged(int idx) auto lock = LockContext(); _entryData->SetCondition(static_cast( _conditions->itemData(idx).toInt())); - SetupWidgetVisibility(); + SetWidgetVisibility(); emit TempVarsChanged(); } @@ -1308,7 +1308,7 @@ void MacroConditionTwitchEdit::TwitchTokenChanged(const QString &token) _pointsReward->SetToken(_entryData->_token); _entryData->ResetChatConnection(); - SetupWidgetVisibility(); + SetWidgetVisibility(); emit(HeaderInfoChanged(token)); } @@ -1399,7 +1399,7 @@ void MacroConditionTwitchEdit::CategoreyChanged(const TwitchCategory &category) _entryData->_category = category; } -void MacroConditionTwitchEdit::SetupWidgetVisibility() +void MacroConditionTwitchEdit::SetWidgetVisibility() { auto condition = _entryData->GetCondition(); @@ -1459,7 +1459,7 @@ void MacroConditionTwitchEdit::UpdateEntryData() _category->SetToken(_entryData->_token); _category->SetCategory(_entryData->_category); - SetupWidgetVisibility(); + SetWidgetVisibility(); } } // namespace advss diff --git a/src/macro-external/twitch/macro-condition-twitch.hpp b/src/macro-external/twitch/macro-condition-twitch.hpp index 884c5524..ed3fdd0a 100644 --- a/src/macro-external/twitch/macro-condition-twitch.hpp +++ b/src/macro-external/twitch/macro-condition-twitch.hpp @@ -170,7 +170,7 @@ protected: std::shared_ptr _entryData; private: - void SetupWidgetVisibility(); + void SetWidgetVisibility(); QHBoxLayout *_layout; FilterComboBox *_conditions;