Style changes in advanced-scene-switcher.hpp

src/advanced-scene-switcher.cpp

@@ -34,7 +34,7 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 	ui->setupUi(this);
 	std::lock_guard<std::mutex> lock(switcher->m);
 	switcher->Prune();
-	loadUI();
+	LoadUI();
 }
 
 AdvSceneSwitcher::~AdvSceneSwitcher()
@@ -86,35 +86,35 @@ static void DisplayMissingDataDirWarning()
 	DisplayMessage(msg);
 }
 
-void AdvSceneSwitcher::loadUI()
+void AdvSceneSwitcher::LoadUI()
 {
 	DisplayMissingDataDirWarning();
 	DisplayMissingDependencyWarning();
 
-	setupGeneralTab();
-	setupTitleTab();
-	setupExecutableTab();
-	setupRegionTab();
-	setupPauseTab();
-	setupSequenceTab();
-	setupTransitionsTab();
-	setupIdleTab();
-	setupRandomTab();
-	setupMediaTab();
-	setupFileTab();
-	setupTimeTab();
-	setupAudioTab();
-	setupVideoTab();
-	setupNetworkTab();
-	setupSceneGroupTab();
-	setupTriggerTab();
-	setupMacroTab();
+	SetupGeneralTab();
+	SetupTitleTab();
+	SetupExecutableTab();
+	SetupRegionTab();
+	SetupPauseTab();
+	SetupSequenceTab();
+	SetupTransitionsTab();
+	SetupIdleTab();
+	SetupRandomTab();
+	SetupMediaTab();
+	SetupFileTab();
+	SetupTimeTab();
+	SetupAudioTab();
+	SetupVideoTab();
+	SetupNetworkTab();
+	SetupSceneGroupTab();
+	SetupTriggerTab();
+	SetupMacroTab();
 
-	setDeprecationWarnings();
-	setTabOrder();
-	setCurrentTab();
-	restoreWindowGeo();
-	checkFirstTimeSetup();
+	SetDeprecationWarnings();
+	SetTabOrder();
+	SetCurrentTab();
+	RestoreWindowGeo();
+	CheckFirstTimeSetup();
 
 	loading = false;
 }

src/advanced-scene-switcher.hpp

@@ -36,17 +36,18 @@ public:
 	void reject() override;
 	void closeEvent(QCloseEvent *event) override;
 
-	void loadUI();
+	void LoadUI();
 
-	void setTabOrder();
-	void setCurrentTab();
-	void restoreWindowGeo();
-	void checkFirstTimeSetup();
+	void SetTabOrder();
+	void SetCurrentTab();
+	void RestoreWindowGeo();
+	void CheckFirstTimeSetup();
 
 	/* --- Begin of general tab section --- */
 public:
-	void setupGeneralTab();
+	void SetupGeneralTab();
 	void UpdateNonMatchingScene(const QString &name);
+	void SetDeprecationWarnings();
 
 public slots:
 	void on_noMatchDontSwitch_clicked();
@@ -76,13 +77,13 @@ public slots:
 
 	/* --- Begin of macro tab section --- */
 public:
-	void setupMacroTab();
-	bool addNewMacro(std::shared_ptr<Macro> &res, std::string &name,
+	void SetupMacroTab();
+	bool AddNewMacro(std::shared_ptr<Macro> &res, std::string &name,
 			 std::string format = "");
 	void RemoveMacro(std::shared_ptr<Macro> &);
 	void RenameMacro(std::shared_ptr<Macro> &, const QString &name);
-	std::shared_ptr<Macro> getSelectedMacro();
-	std::vector<std::shared_ptr<Macro>> getSelectedMacros();
+	std::shared_ptr<Macro> GetSelectedMacro();
+	std::vector<std::shared_ptr<Macro>> GetSelectedMacros();
 	void SetEditMacro(Macro &m);
 	void SetMacroEditAreaDisabled(bool);
 	void HighlightAction(int idx, QColor color = QColor(Qt::green));
@@ -181,16 +182,14 @@ private:
 
 	/* --- Begin of legacy tab section --- */
 public:
-	void clearFrames(QListWidget *list);
+	void ClearFrames(QListWidget *list);
 	int IgnoreWindowsFindByData(const QString &window);
 	int IgnoreIdleWindowsFindByData(const QString &window);
 	void OpenSequenceExtendEdit(SequenceWidget *sw);
 
-	void setDeprecationWarnings();
-
 	// Window tab
 public:
-	void setupTitleTab();
+	void SetupTitleTab();
 public slots:
 	void on_windowUp_clicked();
 	void on_windowDown_clicked();
@@ -202,7 +201,7 @@ public slots:
 
 	// Screen region tab
 public:
-	void setupRegionTab();
+	void SetupRegionTab();
 public slots:
 	void SetShowFrames();
 	void SetHideFrames();
@@ -216,7 +215,7 @@ public slots:
 
 	// Pause tab
 public:
-	void setupPauseTab();
+	void SetupPauseTab();
 public slots:
 	void on_pauseUp_clicked();
 	void on_pauseDown_clicked();
@@ -225,7 +224,7 @@ public slots:
 
 	// Sequence tab
 public:
-	void setupSequenceTab();
+	void SetupSequenceTab();
 public slots:
 	void on_sceneSequenceAdd_clicked();
 	void on_sceneSequenceRemove_clicked();
@@ -238,7 +237,7 @@ public slots:
 
 	// Transition tab
 public:
-	void setupTransitionsTab();
+	void SetupTransitionsTab();
 public slots:
 	void on_transitionsAdd_clicked();
 	void on_transitionsRemove_clicked();
@@ -250,11 +249,11 @@ public slots:
 	void on_defaultTransitionsDown_clicked();
 	void on_transitionOverridecheckBox_stateChanged(int state);
 	void on_adjustActiveTransitionType_stateChanged(int state);
-	void defTransitionDelayValueChanged(int value);
+	void DefTransitionDelayValueChanged(int value);
 
 	// Executable tab
 public:
-	void setupExecutableTab();
+	void SetupExecutableTab();
 public slots:
 	void on_executableUp_clicked();
 	void on_executableDown_clicked();
@@ -263,7 +262,7 @@ public slots:
 
 	// Idle tab
 public:
-	void setupIdleTab();
+	void SetupIdleTab();
 public slots:
 	void on_idleCheckBox_stateChanged(int state);
 	void on_ignoreIdleWindows_currentRowChanged(int idx);
@@ -272,14 +271,14 @@ public slots:
 
 	// Random tab
 public:
-	void setupRandomTab();
+	void SetupRandomTab();
 public slots:
 	void on_randomAdd_clicked();
 	void on_randomRemove_clicked();
 
 	// File tab
 public:
-	void setupFileTab();
+	void SetupFileTab();
 public slots:
 	void on_fileAdd_clicked();
 	void on_fileRemove_clicked();
@@ -294,7 +293,7 @@ public slots:
 
 	// Media tab
 public:
-	void setupMediaTab();
+	void SetupMediaTab();
 public slots:
 	void on_mediaAdd_clicked();
 	void on_mediaRemove_clicked();
@@ -303,7 +302,7 @@ public slots:
 
 	// Time tab
 public:
-	void setupTimeTab();
+	void SetupTimeTab();
 public slots:
 	void on_timeAdd_clicked();
 	void on_timeRemove_clicked();
@@ -312,7 +311,7 @@ public slots:
 
 	// Video tab
 public:
-	void setupAudioTab();
+	void SetupAudioTab();
 public slots:
 	void on_audioAdd_clicked();
 	void on_audioRemove_clicked();
@@ -322,7 +321,7 @@ public slots:
 
 	// Video tab
 public:
-	void setupVideoTab();
+	void SetupVideoTab();
 public slots:
 	void on_videoAdd_clicked();
 	void on_videoRemove_clicked();
@@ -332,13 +331,13 @@ public slots:
 
 	// Scene group tab
 public:
-	void setupNetworkTab();
+	void SetupNetworkTab();
 public slots:
 	void on_serverSettings_toggled(bool on);
 	void on_serverPort_valueChanged(int value);
 	void on_lockToIPv4_stateChanged(int state);
 	void on_serverRestart_clicked();
-	void updateServerStatus();
+	void UpdateServerStatus();
 	void on_clientSettings_toggled(bool on);
 	void on_clientHostname_textChanged(const QString &text);
 	void on_clientPort_valueChanged(int value);
@@ -346,12 +345,12 @@ public slots:
 	void on_restrictSend_stateChanged(int state);
 	void on_sendPreview_stateChanged(int state);
 	void on_clientReconnect_clicked();
-	void updateClientStatus();
+	void UpdateClientStatus();
 
 	// Scene group tab
 public:
+	void SetupSceneGroupTab();
 	void SetEditSceneGroup(SceneGroup &sg);
-	void setupSceneGroupTab();
 public slots:
 	void on_sceneGroupAdd_clicked();
 	void on_sceneGroupRemove_clicked();
@@ -371,7 +370,7 @@ signals:
 
 	// Trigger tab
 public:
-	void setupTriggerTab();
+	void SetupTriggerTab();
 public slots:
 	void on_triggerAdd_clicked();
 	void on_triggerRemove_clicked();

src/general.cpp

@@ -228,7 +228,7 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 	}
 }
 
-void AdvSceneSwitcher::setDeprecationWarnings()
+void AdvSceneSwitcher::SetDeprecationWarnings()
 {
 	QString toolTip =
 		switcher->disableHints
@@ -448,7 +448,7 @@ int findTabIndex(QTabWidget *tabWidget, int pos)
 	return at;
 }
 
-void AdvSceneSwitcher::setTabOrder()
+void AdvSceneSwitcher::SetTabOrder()
 {
 	if (!switcher->tabOrderValid()) {
 		switcher->resetTabOrder();
@@ -466,14 +466,14 @@ void AdvSceneSwitcher::setTabOrder()
 	connect(bar, &QTabBar::tabMoved, this, &AdvSceneSwitcher::on_tabMoved);
 }
 
-void AdvSceneSwitcher::setCurrentTab()
+void AdvSceneSwitcher::SetCurrentTab()
 {
 	if (switcher->lastOpenedTab >= 0) {
 		ui->tabWidget->setCurrentIndex(switcher->lastOpenedTab);
 	}
 }
 
-void AdvSceneSwitcher::restoreWindowGeo()
+void AdvSceneSwitcher::RestoreWindowGeo()
 {
 	if (switcher->saveWindowGeo && windowPosValid(switcher->windowPos)) {
 		this->resize(switcher->windowSize);
@@ -481,7 +481,7 @@ void AdvSceneSwitcher::restoreWindowGeo()
 	}
 }
 
-void AdvSceneSwitcher::checkFirstTimeSetup()
+void AdvSceneSwitcher::CheckFirstTimeSetup()
 {
 	if (switcher->firstBoot && !switcher->disableHints) {
 		switcher->firstBoot = false;
@@ -502,7 +502,7 @@ void AdvSceneSwitcher::on_tabMoved(int from, int to)
 void AdvSceneSwitcher::on_tabWidget_currentChanged(int)
 {
 	switcher->showFrame = false;
-	clearFrames(ui->screenRegionSwitches);
+	ClearFrames(ui->screenRegionSwitches);
 	SetShowFrames();
 }
 
@@ -942,7 +942,7 @@ void populateAutoStartEventSelection(QComboBox *cb)
 		"AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming"));
 }
 
-void AdvSceneSwitcher::setupGeneralTab()
+void AdvSceneSwitcher::SetupGeneralTab()
 {
 	populateSceneSelection(ui->noMatchSwitchScene, false);
 

src/legacy/scene-trigger.cpp

@@ -351,7 +351,7 @@ void SwitcherData::loadSceneTriggers(obs_data_t *obj)
 	obs_data_array_release(triggerArray);
 }
 
-void AdvSceneSwitcher::setupTriggerTab()
+void AdvSceneSwitcher::SetupTriggerTab()
 {
 	for (auto &s : switcher->sceneTriggers) {
 		QListWidgetItem *item;

src/legacy/switch-audio.cpp

@@ -214,7 +214,7 @@ void SwitcherData::loadAudioSwitches(obs_data_t *obj)
 	audioFallback.load(obj);
 }
 
-void AdvSceneSwitcher::setupAudioTab()
+void AdvSceneSwitcher::SetupAudioTab()
 {
 	for (auto &s : switcher->audioSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-executable.cpp

@@ -158,7 +158,7 @@ void SwitcherData::loadExecutableSwitches(obs_data_t *obj)
 	obs_data_array_release(executableArray);
 }
 
-void AdvSceneSwitcher::setupExecutableTab()
+void AdvSceneSwitcher::SetupExecutableTab()
 {
 	for (auto &s : switcher->executableSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-file.cpp

@@ -413,7 +413,7 @@ void SwitcherData::loadFileSwitches(obs_data_t *obj)
 	fileIO.writePath = obs_data_get_string(obj, "writePath");
 }
 
-void AdvSceneSwitcher::setupFileTab()
+void AdvSceneSwitcher::SetupFileTab()
 {
 	ui->remoteFileWarningLabel->setText(
 		obs_module_text("AdvSceneSwitcher.fileTab.remoteFileWarning1") +

src/legacy/switch-idle.cpp

@@ -207,7 +207,7 @@ void SwitcherData::loadIdleSwitches(obs_data_t *obj)
 	idleData.load(obj);
 }
 
-void AdvSceneSwitcher::setupIdleTab()
+void AdvSceneSwitcher::SetupIdleTab()
 {
 	populateWindowSelection(ui->ignoreIdleWindowsWindows);
 

src/legacy/switch-media.cpp

@@ -234,7 +234,7 @@ void SwitcherData::loadMediaSwitches(obs_data_t *obj)
 	obs_data_array_release(mediaArray);
 }
 
-void AdvSceneSwitcher::setupMediaTab()
+void AdvSceneSwitcher::SetupMediaTab()
 {
 	for (auto &s : switcher->mediaSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-network.cpp

@@ -501,7 +501,7 @@ void SwitcherData::saveNetworkSwitches(obs_data_t *obj)
 	}
 }
 
-void AdvSceneSwitcher::setupNetworkTab()
+void AdvSceneSwitcher::SetupNetworkTab()
 {
 	ui->serverSettings->setChecked(switcher->networkConfig.ServerEnabled);
 	ui->serverPort->setValue(switcher->networkConfig.ServerPort);
@@ -519,9 +519,9 @@ void AdvSceneSwitcher::setupNetworkTab()
 
 	QTimer *statusTimer = new QTimer(this);
 	connect(statusTimer, SIGNAL(timeout()), this,
-		SLOT(updateClientStatus()));
+		SLOT(UpdateClientStatus()));
 	connect(statusTimer, SIGNAL(timeout()), this,
-		SLOT(updateServerStatus()));
+		SLOT(UpdateServerStatus()));
 	statusTimer->start(500);
 }
 
@@ -572,7 +572,7 @@ void AdvSceneSwitcher::on_serverRestart_clicked()
 			       switcher->networkConfig.LockToIPv4);
 }
 
-void AdvSceneSwitcher::updateServerStatus()
+void AdvSceneSwitcher::UpdateServerStatus()
 {
 	switch (switcher->serverStatus) {
 	case ServerStatus::NOT_RUNNING:
@@ -670,7 +670,7 @@ void AdvSceneSwitcher::on_clientReconnect_clicked()
 	switcher->client.connect(switcher->networkConfig.GetClientUri());
 }
 
-void AdvSceneSwitcher::updateClientStatus()
+void AdvSceneSwitcher::UpdateClientStatus()
 {
 	switch (switcher->clientStatus) {
 	case ClientStatus::DISCONNECTED:

src/legacy/switch-pause.cpp

@@ -246,7 +246,7 @@ void SwitcherData::loadPauseSwitches(obs_data_t *obj)
 	obs_data_array_release(pauseArray);
 }
 
-void AdvSceneSwitcher::setupPauseTab()
+void AdvSceneSwitcher::SetupPauseTab()
 {
 	for (auto &s : switcher->pauseEntries) {
 		QListWidgetItem *item;

src/legacy/switch-random.cpp

@@ -115,7 +115,7 @@ void SwitcherData::loadRandomSwitches(obs_data_t *obj)
 	obs_data_array_release(randomArray);
 }
 
-void AdvSceneSwitcher::setupRandomTab()
+void AdvSceneSwitcher::SetupRandomTab()
 {
 	for (auto &s : switcher->randomSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-screen-region.cpp

@@ -8,7 +8,7 @@ namespace advss {
 bool ScreenRegionSwitch::pause = false;
 static QMetaObject::Connection addPulse;
 
-void AdvSceneSwitcher::clearFrames(QListWidget *list)
+void AdvSceneSwitcher::ClearFrames(QListWidget *list)
 {
 	for (int i = 0; i < list->count(); ++i) {
 		ScreenRegionWidget *sw =
@@ -50,7 +50,7 @@ void AdvSceneSwitcher::on_showFrame_clicked()
 		showCurrentFrame(ui->screenRegionSwitches);
 	} else {
 		SetShowFrames();
-		clearFrames(ui->screenRegionSwitches);
+		ClearFrames(ui->screenRegionSwitches);
 	}
 }
 
@@ -61,7 +61,7 @@ void AdvSceneSwitcher::on_screenRegionSwitches_currentRowChanged(int idx)
 	}
 
 	if (switcher->showFrame) {
-		clearFrames(ui->screenRegionSwitches);
+		ClearFrames(ui->screenRegionSwitches);
 		showCurrentFrame(ui->screenRegionSwitches);
 	}
 }
@@ -230,7 +230,7 @@ void SwitcherData::loadScreenRegionSwitches(obs_data_t *obj)
 	obs_data_array_release(screenRegionArray);
 }
 
-void AdvSceneSwitcher::setupRegionTab()
+void AdvSceneSwitcher::SetupRegionTab()
 {
 	for (auto &s : switcher->screenRegionSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-sequence.cpp

@@ -280,7 +280,7 @@ void SwitcherData::loadSceneSequenceSwitches(obs_data_t *obj)
 	obs_data_array_release(sceneSequenceArray);
 }
 
-void AdvSceneSwitcher::setupSequenceTab()
+void AdvSceneSwitcher::SetupSequenceTab()
 {
 	for (auto &s : switcher->sceneSequenceSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-time.cpp

@@ -181,7 +181,7 @@ void SwitcherData::loadTimeSwitches(obs_data_t *obj)
 	obs_data_array_release(timeArray);
 }
 
-void AdvSceneSwitcher::setupTimeTab()
+void AdvSceneSwitcher::SetupTimeTab()
 {
 	for (auto &s : switcher->timeSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-transitions.cpp

@@ -171,7 +171,7 @@ void SwitcherData::checkDefaultSceneTransitions()
 	}
 }
 
-void AdvSceneSwitcher::defTransitionDelayValueChanged(int value)
+void AdvSceneSwitcher::DefTransitionDelayValueChanged(int value)
 {
 	if (loading) {
 		return;
@@ -351,7 +351,7 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
 		obs_data_get_int(obj, "defTransitionDelay");
 }
 
-void AdvSceneSwitcher::setupTransitionsTab()
+void AdvSceneSwitcher::SetupTransitionsTab()
 {
 	for (auto &s : switcher->sceneTransitions) {
 		QListWidgetItem *item;
@@ -399,7 +399,7 @@ void AdvSceneSwitcher::setupTransitionsTab()
 		"AdvSceneSwitcher.transitionTab.defaultTransition.delay.help"));
 
 	QWidget::connect(defTransitionDelay, SIGNAL(valueChanged(int)), this,
-			 SLOT(defTransitionDelayValueChanged(int)));
+			 SLOT(DefTransitionDelayValueChanged(int)));
 
 	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{defTransitionDelay}}", defTransitionDelay}};

src/legacy/switch-video.cpp

@@ -184,7 +184,7 @@ void SwitcherData::loadVideoSwitches(obs_data_t *obj)
 	obs_data_array_release(videoArray);
 }
 
-void AdvSceneSwitcher::setupVideoTab()
+void AdvSceneSwitcher::SetupVideoTab()
 {
 	for (auto &s : switcher->videoSwitches) {
 		QListWidgetItem *item;

src/legacy/switch-window.cpp

@@ -317,7 +317,7 @@ void SwitcherData::loadWindowTitleSwitches(obs_data_t *obj)
 	obs_data_array_release(ignoreWindowsArray);
 }
 
-void AdvSceneSwitcher::setupTitleTab()
+void AdvSceneSwitcher::SetupTitleTab()
 {
 	for (auto &s : switcher->windowSwitches) {
 		QListWidgetItem *item;

src/macro-core/macro-action-edit.cpp

@@ -156,7 +156,7 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data()
 
 void AdvSceneSwitcher::AddMacroAction(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -195,7 +195,7 @@ void AdvSceneSwitcher::AddMacroAction(int idx)
 
 void AdvSceneSwitcher::on_actionAdd_clicked()
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -213,7 +213,7 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
 
 void AdvSceneSwitcher::RemoveMacroAction(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -239,7 +239,7 @@ void AdvSceneSwitcher::RemoveMacroAction(int idx)
 void AdvSceneSwitcher::on_actionRemove_clicked()
 {
 	if (currentActionIdx == -1) {
-		auto macro = getSelectedMacro();
+		auto macro = GetSelectedMacro();
 		if (!macro) {
 			return;
 		}
@@ -291,7 +291,7 @@ void AdvSceneSwitcher::SwapActions(Macro *m, int pos1, int pos2)
 
 void AdvSceneSwitcher::MoveMacroActionUp(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -306,7 +306,7 @@ void AdvSceneSwitcher::MoveMacroActionUp(int idx)
 
 void AdvSceneSwitcher::MoveMacroActionDown(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -321,7 +321,7 @@ void AdvSceneSwitcher::MoveMacroActionDown(int idx)
 
 void AdvSceneSwitcher::MacroActionSelectionChanged(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -341,7 +341,7 @@ void AdvSceneSwitcher::MacroActionSelectionChanged(int idx)
 
 void AdvSceneSwitcher::MacroActionReorder(int to, int from)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}

src/macro-core/macro-condition-edit.cpp

@@ -345,7 +345,7 @@ std::shared_ptr<MacroSegment> MacroConditionEdit::Data()
 
 void AdvSceneSwitcher::AddMacroCondition(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -393,7 +393,7 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 
 void AdvSceneSwitcher::on_conditionAdd_clicked()
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -411,7 +411,7 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
 
 void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -442,7 +442,7 @@ void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 void AdvSceneSwitcher::on_conditionRemove_clicked()
 {
 	if (currentConditionIdx == -1) {
-		auto macro = getSelectedMacro();
+		auto macro = GetSelectedMacro();
 		if (!macro) {
 			return;
 		}
@@ -509,7 +509,7 @@ void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
 
 void AdvSceneSwitcher::MoveMacroConditionUp(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -524,7 +524,7 @@ void AdvSceneSwitcher::MoveMacroConditionUp(int idx)
 
 void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -539,7 +539,7 @@ void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
 
 void AdvSceneSwitcher::MacroConditionSelectionChanged(int idx)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -559,7 +559,7 @@ void AdvSceneSwitcher::MacroConditionSelectionChanged(int idx)
 
 void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}

src/macro-core/macro-tab.cpp

@@ -22,7 +22,7 @@ bool macroNameExists(std::string name)
 	return !!GetMacroByName(name.c_str());
 }
 
-bool AdvSceneSwitcher::addNewMacro(std::shared_ptr<Macro> &res,
+bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr<Macro> &res,
 				   std::string &name, std::string format)
 {
 	QString fmt;
@@ -72,7 +72,7 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 {
 	std::string name;
 	std::shared_ptr<Macro> newMacro;
-	if (!addNewMacro(newMacro, name)) {
+	if (!AddNewMacro(newMacro, name)) {
 		return;
 	}
 
@@ -121,7 +121,7 @@ void AdvSceneSwitcher::RenameMacro(std::shared_ptr<Macro> &macro,
 
 void AdvSceneSwitcher::on_macroRemove_clicked()
 {
-	auto macros = getSelectedMacros();
+	auto macros = GetSelectedMacros();
 	if (macros.empty()) {
 		return;
 	}
@@ -152,7 +152,7 @@ void AdvSceneSwitcher::on_macroRemove_clicked()
 void AdvSceneSwitcher::on_macroUp_clicked()
 {
 	std::lock_guard<std::mutex> lock(switcher->m);
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -162,7 +162,7 @@ void AdvSceneSwitcher::on_macroUp_clicked()
 void AdvSceneSwitcher::on_macroDown_clicked()
 {
 	std::lock_guard<std::mutex> lock(switcher->m);
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -180,7 +180,7 @@ static bool newMacroNameValid(const std::string &name)
 
 void AdvSceneSwitcher::RenameCurrentMacro()
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -203,7 +203,7 @@ void AdvSceneSwitcher::RenameCurrentMacro()
 
 void AdvSceneSwitcher::on_macroName_editingFinished()
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -221,7 +221,7 @@ void AdvSceneSwitcher::on_macroName_editingFinished()
 
 void AdvSceneSwitcher::on_runMacro_clicked()
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -236,7 +236,7 @@ void AdvSceneSwitcher::on_runMacro_clicked()
 
 void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -246,7 +246,7 @@ void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value)
 
 void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value)
 {
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -361,12 +361,12 @@ void AdvSceneSwitcher::HighlightCondition(int idx, QColor color)
 	conditionsList->Highlight(idx, color);
 }
 
-std::shared_ptr<Macro> AdvSceneSwitcher::getSelectedMacro()
+std::shared_ptr<Macro> AdvSceneSwitcher::GetSelectedMacro()
 {
 	return ui->macros->GetCurrentMacro();
 }
 
-std::vector<std::shared_ptr<Macro>> AdvSceneSwitcher::getSelectedMacros()
+std::vector<std::shared_ptr<Macro>> AdvSceneSwitcher::GetSelectedMacros()
 {
 	return ui->macros->GetCurrentMacros();
 }
@@ -378,7 +378,7 @@ void AdvSceneSwitcher::MacroSelectionChanged(const QItemSelection &,
 		return;
 	}
 
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		SetMacroEditAreaDisabled(true);
 		conditionsList->Clear();
@@ -397,7 +397,7 @@ void AdvSceneSwitcher::HighlightOnChange()
 		return;
 	}
 
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -412,7 +412,7 @@ void AdvSceneSwitcher::on_macroProperties_clicked()
 {
 	MacroProperties prop = switcher->macroProperties;
 	bool accepted = MacroPropertiesDialog::AskForSettings(
-		this, prop, getSelectedMacro().get());
+		this, prop, GetSelectedMacro().get());
 	if (!accepted) {
 		return;
 	}
@@ -437,7 +437,7 @@ bool shouldResotreSplitterPos(const QList<int> &pos)
 	return true;
 }
 
-void AdvSceneSwitcher::setupMacroTab()
+void AdvSceneSwitcher::SetupMacroTab()
 {
 	if (switcher->macros.size() == 0 && !switcher->disableHints) {
 		addPulse = PulseWidget(ui->macroAdd, QColor(Qt::green));
@@ -594,7 +594,7 @@ void AdvSceneSwitcher::ShowMacroConditionsContextMenu(const QPoint &pos)
 
 void AdvSceneSwitcher::CopyMacro()
 {
-	const auto macro = getSelectedMacro();
+	const auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -602,7 +602,7 @@ void AdvSceneSwitcher::CopyMacro()
 	std::string format = macro->Name() + " %1";
 	std::string name;
 	std::shared_ptr<Macro> newMacro;
-	if (!addNewMacro(newMacro, name, format)) {
+	if (!AddNewMacro(newMacro, name, format)) {
 		return;
 	}
 
@@ -620,7 +620,7 @@ void AdvSceneSwitcher::CopyMacro()
 
 void AdvSceneSwitcher::ExpandAllActions()
 {
-	auto m = getSelectedMacro();
+	auto m = GetSelectedMacro();
 	if (!m) {
 		return;
 	}
@@ -629,7 +629,7 @@ void AdvSceneSwitcher::ExpandAllActions()
 
 void AdvSceneSwitcher::ExpandAllConditions()
 {
-	auto m = getSelectedMacro();
+	auto m = GetSelectedMacro();
 	if (!m) {
 		return;
 	}
@@ -638,7 +638,7 @@ void AdvSceneSwitcher::ExpandAllConditions()
 
 void AdvSceneSwitcher::CollapseAllActions()
 {
-	auto m = getSelectedMacro();
+	auto m = GetSelectedMacro();
 	if (!m) {
 		return;
 	}
@@ -647,7 +647,7 @@ void AdvSceneSwitcher::CollapseAllActions()
 
 void AdvSceneSwitcher::CollapseAllConditions()
 {
-	auto m = getSelectedMacro();
+	auto m = GetSelectedMacro();
 	if (!m) {
 		return;
 	}
@@ -686,7 +686,7 @@ void AdvSceneSwitcher::UpMacroSegementHotkey()
 		return;
 	}
 
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}
@@ -742,7 +742,7 @@ void AdvSceneSwitcher::DownMacroSegementHotkey()
 		return;
 	}
 
-	auto macro = getSelectedMacro();
+	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
 	}

src/scene-group.cpp

@@ -489,7 +489,7 @@ void SwitcherData::loadSceneGroups(obs_data_t *obj)
 	obs_data_array_release(sceneGroupArray);
 }
 
-void AdvSceneSwitcher::setupSceneGroupTab()
+void AdvSceneSwitcher::SetupSceneGroupTab()
 {
 	populateSceneSelection(ui->sceneGroupSceneSelection);