From af854835b2c172a32738bf223e37ec33d855126a Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Thu, 23 Apr 2020 18:17:31 +0200
Subject: [PATCH] Qt: Rename some functions in settings_dialog

---
 rpcs3/rpcs3qt/settings_dialog.cpp | 16 ++++++++--------
 rpcs3/rpcs3qt/settings_dialog.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp
index 83d835071b..74e2233e3a 100644
--- a/rpcs3/rpcs3qt/settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/settings_dialog.cpp
@@ -1526,7 +1526,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			// Only attempt to load a config if changes occurred.
 			if (m_current_gui_config != ui->combo_configs->currentText())
 			{
-				OnApplyConfig();
+				OnApplyGuiConfig();
 			}
 			if (m_current_stylesheet != m_gui_settings->GetValue(gui::m_currentStylesheet).toString())
 			{
@@ -1547,14 +1547,14 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 				apply_gui_options(true);
 				m_gui_settings->Reset(true);
 				Q_EMIT GuiSettingsSyncRequest(true);
-				AddConfigs();
+				AddGuiConfigs();
 				AddStylesheets();
 				apply_gui_options();
 			}
 		});
 
-		connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentConfig);
-		connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyConfig);
+		connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentGuiConfig);
+		connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyGuiConfig);
 		connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
 
 		connect(ui->pb_open_folder, &QAbstractButton::clicked, [=, this]()
@@ -1630,7 +1630,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			color_dialog(gui::tr_icon_color, tr("Choose trophy manager icon color", "Settings: color dialog"), ui->pb_tr_icon_color);
 		});
 
-		AddConfigs();
+		AddGuiConfigs();
 		AddStylesheets();
 	}
 
@@ -1744,7 +1744,7 @@ void settings_dialog::SnapSlider(QSlider *slider, int interval)
 	});
 }
 
-void settings_dialog::AddConfigs()
+void settings_dialog::AddGuiConfigs()
 {
 	ui->combo_configs->clear();
 
@@ -1794,7 +1794,7 @@ void settings_dialog::AddStylesheets()
 	}
 }
 
-void settings_dialog::OnBackupCurrentConfig()
+void settings_dialog::OnBackupCurrentGuiConfig()
 {
 	QInputDialog* dialog = new QInputDialog(this);
 	dialog->setWindowTitle(tr("Choose a unique name", "Backup GUI config"));
@@ -1831,7 +1831,7 @@ void settings_dialog::OnBackupCurrentConfig()
 	}
 }
 
-void settings_dialog::OnApplyConfig()
+void settings_dialog::OnApplyGuiConfig()
 {
 	const QString new_config = ui->combo_configs->currentText();
 
diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h
index 5e9be518f8..dad9630fcc 100644
--- a/rpcs3/rpcs3qt/settings_dialog.h
+++ b/rpcs3/rpcs3qt/settings_dialog.h
@@ -31,8 +31,8 @@ Q_SIGNALS:
 	void GuiRepaintRequest();
 	void EmuSettingsApplied();
 private Q_SLOTS:
-	void OnBackupCurrentConfig();
-	void OnApplyConfig();
+	void OnBackupCurrentGuiConfig();
+	void OnApplyGuiConfig();
 	void OnApplyStylesheet();
 private:
 	void EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text);
@@ -42,7 +42,7 @@ private:
 	QSlider* m_current_slider = nullptr;
 
 	// Emulator tab
-	void AddConfigs();
+	void AddGuiConfigs();
 	void AddStylesheets();
 	QString m_current_stylesheet;
 	QString m_current_gui_config;