From 80762583c29af1ae256ef507f2a21740cf2d9f48 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sat, 18 Feb 2017 02:30:29 -0800
Subject: Qt: Move some connections from .ui file to code

---
 src/citra_qt/main.cpp |  3 +++
 src/citra_qt/main.ui  | 38 --------------------------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 05709fcb0..513da8001 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -248,6 +248,7 @@ void GMainWindow::ConnectMenuEvents() {
             &GMainWindow::OnMenuLoadSymbolMap);
     connect(ui.action_Select_Game_List_Root, &QAction::triggered, this,
             &GMainWindow::OnMenuSelectGameListRoot);
+    connect(ui.action_Exit, &QAction::triggered, this, &QMainWindow::close);
 
     // Emulation
     connect(ui.action_Start, &QAction::triggered, this, &GMainWindow::OnStartGame);
@@ -258,6 +259,8 @@ void GMainWindow::ConnectMenuEvents() {
     // View
     connect(ui.action_Single_Window_Mode, &QAction::triggered, this,
             &GMainWindow::ToggleWindowMode);
+    connect(ui.action_Display_Dock_Widget_Headers, &QAction::triggered, this,
+            &GMainWindow::OnDisplayTitleBars);
 }
 
 void GMainWindow::OnDisplayTitleBars(bool show) {
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index fba493a84..4a95cda9a 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -182,42 +182,4 @@
   </action>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>action_Exit</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>367</x>
-     <y>314</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>action_Display_Dock_Widget_Headers</sender>
-   <signal>triggered(bool)</signal>
-   <receiver>MainWindow</receiver>
-   <slot>OnDisplayTitleBars(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>540</x>
-     <y>364</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>OnConfigure()</slot>
-  <slot>OnDisplayTitleBars(bool)</slot>
- </slots>
 </ui>
-- 
cgit v1.2.3