From 6f5bede402251196ceeeceb6517dab07daa11463 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 23 Oct 2018 21:46:33 -0400
Subject: yuzu/configuration/config: Reorganize member variable and function
 layout

Makes the class layout consistent with the others.
---
 src/yuzu/configuration/config.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/yuzu/configuration/config.h')

diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index cbf745ea2..a1d0fbe7e 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -12,12 +12,6 @@
 class QSettings;
 
 class Config {
-    QSettings* qt_config;
-    std::string qt_config_loc;
-
-    void ReadValues();
-    void SaveValues();
-
 public:
     Config();
     ~Config();
@@ -27,4 +21,11 @@ public:
 
     static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
     static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;
+
+private:
+    void ReadValues();
+    void SaveValues();
+
+    QSettings* qt_config;
+    std::string qt_config_loc;
 };
-- 
cgit v1.2.3


From 6949f73149644820c678c1ffb57d18f21259740d Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 23 Oct 2018 21:49:50 -0400
Subject: yuzu/configuration/config: Use a std::unique_ptr for qt_config
 instead of a raw pointer

Same behavior, less code.
---
 src/yuzu/configuration/config.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/config.h')

diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index a1d0fbe7e..9c99c1b75 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include <string>
 #include <QVariant>
 #include "core/settings.h"
@@ -26,6 +27,6 @@ private:
     void ReadValues();
     void SaveValues();
 
-    QSettings* qt_config;
+    std::unique_ptr<QSettings> qt_config;
     std::string qt_config_loc;
 };
-- 
cgit v1.2.3