From 0db22eadd5e229663d797eb8fb49d156ece29110 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Sun, 18 Dec 2016 22:13:55 +0530 Subject: [PATCH 1/3] Fixed GPLv2 license text in the start. --- src/common/scm_rev.cpp.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 09366e801..79b404bb8 100644 --- a/src/common/scm_rev.cpp.in +++ b/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" From 77f474319956b62b9cad772c9d030650d1debd47 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Sun, 18 Dec 2016 22:32:09 +0530 Subject: [PATCH 2/3] screen swap - Hotkey mapping --- src/citra_qt/bootmanager.cpp | 4 ---- src/citra_qt/main.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 7699ca8d0..030432bfb 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -19,10 +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) {} diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index ad6221739..3e3c92f24 100644 --- a/src/citra_qt/main.cpp +++ b/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 = From 393a0f99dadde13fb39d623c493e00ef8ebdacba Mon Sep 17 00:00:00 2001 From: CaptV0rt3x Date: Mon, 19 Dec 2016 00:51:35 +0530 Subject: [PATCH 3/3] line fixup for travis ci --- src/citra_qt/bootmanager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 030432bfb..c7eb2aafc 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -19,7 +19,6 @@ #include "video_core/debug_utils/debug_utils.h" #include "video_core/video_core.h" - EmuThread::EmuThread(GRenderWindow* render_window) : exec_step(false), running(false), stop_run(false), render_window(render_window) {}