citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #2353 from CaptV0rt3x/code-cleanup 

Code cleanup
This commit is contained in:
bunnei 2016-12-18 16:07:26 -05:00 committed by GitHub
parent 20b832cfc1 393a0f99da
commit 4d22e15308
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/citra_qt/bootmanager.cpp
View File

@ -19,11 +19,6 @@
#include "video_core/debug_utils/debug_utils.h" #include "video_core/debug_utils/debug_utils.h"
#include "video_core/video_core.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) EmuThread::EmuThread(GRenderWindow* render_window)
: exec_step(false), running(false), stop_run(false), render_window(render_window) {} : exec_step(false), running(false), stop_run(false), render_window(render_window) {}

2
src/citra_qt/main.cpp
View File

@ -212,7 +212,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
SLOT(OnMenuLoadFile())); SLOT(OnMenuLoadFile()));
connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
SLOT(OnStartGame())); 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())); SLOT(OnSwapScreens()));
std::string window_title = std::string window_title =

2
src/common/scm_rev.cpp.in
View File

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