Merge pull request #4738 from FearlessTobi/port-1020-new

Port yuzu-emu/yuzu#1020: "core: Namespace EmuWindow"
2019-04-26 08:58:09 -06:00
parent b9e51f0a0b 6e22891761
commit 3f2c7eb471
14 changed files with 39 additions and 20 deletions
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -103,7 +103,7 @@ signals:
    void ErrorThrown(Core::System::ResultStatus, std::string);
 };

-class GRenderWindow : public QWidget, public EmuWindow {
+class GRenderWindow : public QWidget, public Frontend::EmuWindow {
    Q_OBJECT

 public: