Settings: Move into config folder

src/citra_qt/CMakeLists.txt

@@ -2,6 +2,8 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SRCS
+            config/inputs.cpp
+            config/QLineEditKeyConfig.cpp
             config/controller_config.cpp
             config/controller_config_util.cpp
             config.cpp
@@ -19,14 +21,14 @@ set(SRCS
             debugger/registers.cpp
             util/spinbox.cpp
             bootmanager.cpp
-            hotkeys.cpp
+            hotkeys.cpp            
-            inputs.cpp
-            QLineEditKeyConfig.cpp
             main.cpp
             citra-qt.rc
             )
 
 set(HEADERS
+            config/inputs.h
+            config/QLineEditKeyConfig.h
             config/controller_config.h
             config/controller_config_util.h
             config.h
@@ -45,21 +47,19 @@ set(HEADERS
             debugger/registers.h
             util/spinbox.h
             bootmanager.h
-            hotkeys.h
+            hotkeys.h            
-            inputs.h
-            QLineEditKeyConfig.h
             main.h
             version.h
             )
 
 set(UIS
             config/controller_config.ui
+            config/inputs.ui
             debugger/callstack.ui
             debugger/disassembler.ui
             debugger/profiler.ui
             debugger/registers.ui
-            hotkeys.ui
+            hotkeys.ui            
-            inputs.ui
             main.ui
             )
 

src/citra_qt/config/QLineEditKeyConfig.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <QLineEditKeyConfig.h>
+#include "QLineEditKeyConfig.h"
-#include <inputs.h>
+#include "inputs.h"
 #include <QKeyEvent>
 #include <QLineEdit>
 
@@ -72,4 +72,4 @@ void QLineEditKeyConfig::keyPressEvent(QKeyEvent* event) {
     default:
         break;
     }
-}
+}

src/citra_qt/config/inputs.h

@@ -6,7 +6,7 @@
 
 #include <QDialog>
 
-#include "core/settings.h"
+#include "../core/settings.h"
 #include "ui_inputs.h"
 
 /// The input configuration dialog

src/citra_qt/config/inputs.ui

@@ -544,7 +544,7 @@
   <customwidget>
    <class>QLineEditKeyConfig</class>
    <extends>QLineEdit</extends>
-   <header>QLineEditKeyConfig.h</header>
+   <header>config/QLineEditKeyConfig.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/citra_qt/main.cpp

@@ -22,7 +22,7 @@
 
 #include "bootmanager.h"
 #include "hotkeys.h"
-#include "inputs.h"
+#include "config/inputs.h"
 
 //debugger
 #include "debugger/disassembler.h"