Merge pull request #2353 from CaptV0rt3x/code-cleanup

Code cleanup

src/citra_qt/bootmanager.cpp

@@ -19,11 +19,6 @@
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/video_core.h"
 
-#define APP_NAME "citra"
-#define APP_VERSION "0.1-" VERSION
-#define APP_TITLE APP_NAME " " APP_VERSION
-#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
-
 EmuThread::EmuThread(GRenderWindow* render_window)
     : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
 

src/citra_qt/main.cpp

@@ -212,7 +212,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
             SLOT(OnMenuLoadFile()));
     connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
             SLOT(OnStartGame()));
-    connect(GetHotkey("Main Window", "Swap Screens", this), SIGNAL(activated()), this,
+    connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this,
             SLOT(OnSwapScreens()));
 
     std::string window_title =

src/common/scm_rev.cpp.in

@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #include "common/scm_rev.h"