octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #286 from N00byKing/citratoyuzuagain 

main.h: Add pragma once, remove ifndef
This commit is contained in:
bunnei 2018-03-27 19:57:58 -04:00 committed by GitHub
parent b30aa7007e 16b14aa7e3
commit be4c7ed082
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yuzu/main.h
View File

@ -2,8 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#ifndef _CITRA_QT_MAIN_HXX_
#define _CITRA_QT_MAIN_HXX_
#pragma once
#include <memory>
#include <QMainWindow>
@ -153,7 +152,7 @@ private:
std::unique_ptr<Config> config;
// Whether emulation is currently running in Citra.
// Whether emulation is currently running in yuzu.
bool emulation_running = false;
std::unique_ptr<EmuThread> emu_thread;
@ -172,5 +171,3 @@ protected:
void dragEnterEvent(QDragEnterEvent* event) override;
void dragMoveEvent(QDragMoveEvent* event) override;
};
#endif // _CITRA_QT_MAIN_HXX_