deps: Update cpp-httplib to v0.46.0

Resize of vector could invalidate the this pointers passed to the
PostLoad step lambdas

data/locale/en-US.ini

@@ -47,13 +47,6 @@ AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs="Always show all feature tabs"
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip="Show tabs that are normally hidden until first used in a macro (e.g. Action Queues, Variables, Twitch, Websockets)."
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock="Lock settings dialog with password"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title="Settings Locked"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel="Enter password:"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword="Wrong password!"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel="New password:"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel="Confirm password:"
-AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch="Passwords do not match!"
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"

forms/advanced-scene-switcher.ui

@@ -258,13 +258,6 @@
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QCheckBox" name="settingsLock">
-                <property name="text">
-                 <string>AdvSceneSwitcher.generalTab.generalBehavior.settingsLock</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
            </item>

lib/advanced-scene-switcher.cpp

@@ -19,10 +19,8 @@
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
-#include <QInputDialog>
 #include <QLibrary>
 #include <QMainWindow>
-#include <QMessageBox>
 #include <QTextStream>
 #include <regex>
 
@@ -720,54 +718,19 @@ static void LoadPlugins()
 	}
 }
 
-static bool settingsPasswordIsCorrect(QWidget *parent)
-{
-	bool ok;
-	QString input = QInputDialog::getText(
-		parent,
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel"),
-		QLineEdit::Password, QString(), &ok);
-
-	if (!ok) {
-		return false;
-	}
-
-	if (input.toStdString() == switcher->settingsLockPassword) {
-		return true;
-	}
-
-	QMessageBox::warning(
-		parent,
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword"));
-	return false;
-}
-
 void OpenSettingsWindow()
 {
 	if (switcher->settingsWindowOpened) {
 		AdvSceneSwitcher::window->show();
 		AdvSceneSwitcher::window->raise();
 		AdvSceneSwitcher::window->activateWindow();
-		return;
+	} else {
+		AdvSceneSwitcher::window =
+			new AdvSceneSwitcher(static_cast<QMainWindow *>(
+				obs_frontend_get_main_window()));
+		AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
+		AdvSceneSwitcher::window->show();
 	}
-
-	auto parent =
-		static_cast<QMainWindow *>(obs_frontend_get_main_window());
-	if (switcher->settingsLockEnabled &&
-	    !switcher->settingsLockPassword.empty() &&
-	    !settingsPasswordIsCorrect(parent)) {
-		return;
-	}
-
-	AdvSceneSwitcher::window = new AdvSceneSwitcher(parent);
-	AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
-	AdvSceneSwitcher::window->show();
 }
 
 void AdvSceneSwitcher::HighlightMacroSettingsButton(bool enable)

lib/advanced-scene-switcher.hpp

@@ -68,7 +68,6 @@ public slots:
 	void on_warnPluginLoadFailure_stateChanged(int state);
 	void on_suppressCrashRecoveryDialog_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
-	void on_settingsLock_stateChanged(int state);
 	void on_priorityUp_clicked();
 	void on_priorityDown_clicked();
 	void on_threadPriority_currentTextChanged(const QString &text);

lib/general.cpp

@@ -19,8 +19,6 @@
 
 #include <obs-frontend-api.h>
 #include <QFileDialog>
-#include <QInputDialog>
-#include <QMessageBox>
 
 namespace advss {
 
@@ -245,64 +243,6 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 	ui->priorityBox->setVisible(!switcher->hideLegacyTabs);
 }
 
-void AdvSceneSwitcher::on_settingsLock_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	if (!state) {
-		switcher->settingsLockEnabled = false;
-		switcher->settingsLockPassword = "";
-		return;
-	}
-
-	bool ok;
-	QString newPassword = QInputDialog::getText(
-		this,
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel"),
-		QLineEdit::Password, QString(), &ok);
-
-	const auto disablePassword = [this]() {
-		QSignalBlocker blocker(ui->settingsLock);
-		ui->settingsLock->setChecked(false);
-		ui->settingsLock->setCheckState(Qt::Unchecked);
-		switcher->settingsLockEnabled = false;
-		switcher->settingsLockPassword = "";
-	};
-
-	if (!ok || newPassword.isEmpty()) {
-		disablePassword();
-		return;
-	}
-
-	QString confirm = QInputDialog::getText(
-		this,
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel"),
-		QLineEdit::Password, QString(), &ok);
-	if (!ok || newPassword != confirm) {
-		if (ok) {
-			QMessageBox::warning(
-				this,
-				obs_module_text(
-					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
-				obs_module_text(
-					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch"));
-		}
-		disablePassword();
-		return;
-	}
-
-	switcher->settingsLockEnabled = true;
-	switcher->settingsLockPassword = newPassword.toStdString();
-}
-
 void AdvSceneSwitcher::SetDeprecationWarnings()
 {
 	QString toolTip =
@@ -627,9 +567,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 			  disableFilterComboboxFilter);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);
-	obs_data_set_bool(obj, "settingsLockEnabled", settingsLockEnabled);
-	obs_data_set_string(obj, "settingsLockPassword",
-			    settingsLockPassword.c_str());
 
 	SaveFunctionPriorities(obj, functionNamesByPriority);
 
@@ -701,8 +638,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
 	hideLegacyTabs = obs_data_get_bool(obj, "hideLegacyTabs");
-	settingsLockEnabled = obs_data_get_bool(obj, "settingsLockEnabled");
-	settingsLockPassword = obs_data_get_string(obj, "settingsLockPassword");
 
 	SetDefaultFunctionPriorities(obj);
 	LoadFunctionPriorities(obj, functionNamesByPriority);
@@ -1025,7 +960,6 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
 	ui->suppressCrashRecoveryDialog->setChecked(GetSuppressCrashDialog());
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);
-	ui->settingsLock->setChecked(switcher->settingsLockEnabled);
 
 	populatePriorityFunctionList(ui->priorityList);
 	populateThreadPriorityList(ui->threadPriority);

lib/macro/macro-ref.cpp

@@ -74,11 +74,11 @@ void LoadMacroList(obs_data_t *obj, std::vector<MacroRef> &macros,
 {
 	obs_data_array_t *array = obs_data_get_array(obj, name.c_str());
 	size_t count = obs_data_array_count(array);
+	macros.reserve(macros.size() + count);
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj = obs_data_array_item(array, i);
-		MacroRef ref;
-		ref.Load(array_obj);
-		macros.push_back(ref);
+		macros.emplace_back();
+		macros.back().Load(array_obj);
 		obs_data_release(array_obj);
 	}
 	obs_data_array_release(array);

lib/switcher-data.hpp

@@ -163,8 +163,6 @@ public:
 	bool disableHints = false;
 	bool disableFilterComboboxFilter = false;
 	bool hideLegacyTabs = true;
-	bool settingsLockEnabled = false;
-	std::string settingsLockPassword;
 	bool saveWindowGeo = false;
 	QPoint windowPos = {};
 	QSize windowSize = {};