From 426c4a2a5b65ce04a767e4c514aafc182b8d5a56 Mon Sep 17 00:00:00 2001
From: LittleWhite <lw.demoscene@googlemail.com>
Date: Sun, 24 Jan 2016 18:34:05 +0100
Subject: Add Configure widget

---
 src/citra_qt/configure_general.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/citra_qt/configure_general.h

(limited to 'src/citra_qt/configure_general.h')

diff --git a/src/citra_qt/configure_general.h b/src/citra_qt/configure_general.h
new file mode 100644
index 000000000..0f3b69332
--- /dev/null
+++ b/src/citra_qt/configure_general.h
@@ -0,0 +1,31 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#ifndef CONFIGURE_GENERAL_H
+#define CONFIGURE_GENERAL_H
+
+#include <QWidget>
+
+namespace Ui {
+class ConfigureGeneral;
+}
+
+class ConfigureGeneral : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ConfigureGeneral(QWidget *parent = 0);
+    ~ConfigureGeneral();
+
+    void applyConfiguration();
+
+private:
+    void setConfiguration();
+
+private:
+    Ui::ConfigureGeneral *ui;
+};
+
+#endif // CONFIGURE_GENERAL_H
-- 
cgit v1.2.3


From 3eb737a5f5b199fd3f9951a7060255f46011e9ff Mon Sep 17 00:00:00 2001
From: LittleWhite <lw.demoscene@googlemail.com>
Date: Sun, 24 Jan 2016 21:54:04 +0100
Subject: Add more stuff to configure.

---
 src/citra_qt/configure_general.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/citra_qt/configure_general.h')

diff --git a/src/citra_qt/configure_general.h b/src/citra_qt/configure_general.h
index 0f3b69332..a6c68e62d 100644
--- a/src/citra_qt/configure_general.h
+++ b/src/citra_qt/configure_general.h
@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#ifndef CONFIGURE_GENERAL_H
-#define CONFIGURE_GENERAL_H
+#pragma once
 
+#include <memory>
 #include <QWidget>
 
 namespace Ui {
@@ -16,7 +16,7 @@ class ConfigureGeneral : public QWidget
     Q_OBJECT
 
 public:
-    explicit ConfigureGeneral(QWidget *parent = 0);
+    explicit ConfigureGeneral(QWidget *parent = nullptr);
     ~ConfigureGeneral();
 
     void applyConfiguration();
@@ -25,7 +25,5 @@ private:
     void setConfiguration();
 
 private:
-    Ui::ConfigureGeneral *ui;
+    std::unique_ptr<Ui::ConfigureGeneral> ui;
 };
-
-#endif // CONFIGURE_GENERAL_H
-- 
cgit v1.2.3