From a24f7001769473e47984614b65fea74b96493ca2 Mon Sep 17 00:00:00 2001
From: lat9nq <lat9nq@virginia.edu>
Date: Thu, 9 Jul 2020 02:21:00 -0400
Subject: [PATCH] configuration_shared: address reviewer concerns except
 operator overrides

Dropping operator override usage in next commit.

Co-Authored-By: LC <lioncash@users.noreply.github.com>
---
 src/core/settings.h                           | 26 +++++--------------
 src/yuzu/configuration/config.h               |  2 +-
 .../configuration/configuration_shared.cpp    |  1 +
 src/yuzu/configuration/configuration_shared.h |  1 -
 src/yuzu/configuration/configure_per_game.cpp |  4 +--
 src/yuzu/main.cpp                             |  2 +-
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/core/settings.h b/src/core/settings.h
index cab55a424e..34844de5d0 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -387,43 +387,31 @@ extern bool configuring_global;
 template <typename Type>
 class Setting final {
 public:
-    Setting() {
-        use_global = true;
-    }
-    Setting(Type val) {
-        use_global = true;
-        global = val;
-    }
+    Setting() = default;
+    explicit Setting(Type val) : global{val} {}
     ~Setting() = default;
     void SetGlobal(bool to_global) {
         use_global = to_global;
-    };
+    }
     bool UsingGlobal() const {
         return use_global;
-    };
+    }
     Type GetValue(bool need_global = false) const {
         if (use_global || need_global) {
             return global;
         }
         return local;
-    };
+    }
     void SetValue(const Type& value) {
         if (use_global) {
             global = value;
         } else {
             local = value;
         }
-    };
-    operator Type() const {
-        return GetValue();
-    };
-    Type operator=(const Type& b) {
-        SetValue(b);
-        return b;
-    };
+    }
 
 private:
-    bool use_global{};
+    bool use_global = true;
     Type global{};
     Type local{};
 };
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 6ffb50fd96..681f0bca56 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -16,7 +16,7 @@ class QSettings;
 
 class Config {
 public:
-    Config(const std::string& config_loc = "qt-config.ini", bool is_global = true);
+    explicit Config(const std::string& config_loc = "qt-config.ini", bool is_global = true);
     ~Config();
 
     void Reload();
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 80d2c9c334..7b116f327c 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -69,6 +69,7 @@ void ConfigurationShared::SetPerGameSetting(
 }
 
 void ConfigurationShared::InsertGlobalItem(QComboBox* combobox) {
+    const QString use_global_text = tr("Use global configuration");
     combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX,
                          ConfigurationShared::use_global_text);
     combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX);
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index bf39c0c3de..b11b1b9502 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -14,7 +14,6 @@ namespace ConfigurationShared {
 constexpr int USE_GLOBAL_INDEX = 0;
 constexpr int USE_GLOBAL_SEPARATOR_INDEX = 1;
 constexpr int USE_GLOBAL_OFFSET = 2;
-static const QString use_global_text = QString::fromUtf8("Use global configuration");
 
 // Global-aware apply and set functions
 
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index 7ba1c841be..5bd66687e6 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -29,7 +29,7 @@
 
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id(title_id) {
-    game_config = std::make_unique<Config>(fmt::format("{:016X}", title_id) + ".ini", false);
+    game_config = std::make_unique<Config>(fmt::format("{:016X}.ini", title_id), false);
 
     Settings::configuring_global = false;
 
@@ -85,7 +85,7 @@ void ConfigurePerGame::LoadConfiguration() {
 
     ui->addonsTab->LoadFromFile(file);
 
-    ui->display_title_id->setText(QString::fromStdString(fmt::format("{:016X}", title_id)));
+    ui->display_title_id->setText(QStringLiteral("%1").arg(title_id, 16, 16, 0).toUpper());
 
     FileSys::PatchManager pm{title_id};
     const auto control = pm.GetControlMetadata();
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 618782aa78..4b946cda5b 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1045,7 +1045,7 @@ void GMainWindow::BootGame(const QString& filename) {
     const auto loader = Loader::GetLoader(v_file);
     if (!(loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success)) {
         // Load per game settings
-        Config per_game_config(fmt::format("{:016X}", title_id) + ".ini", false);
+        Config per_game_config(fmt::format("{:016X}.ini", title_id), false);
     }
 
     Settings::LogSettings();