summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-11 22:40:08 -0400
committerGitHub <noreply@github.com>2018-08-11 22:40:08 -0400
commitee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch)
treee4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/core.h
parent9c977d221505fe6c604aea4f55c837cf10c555bb (diff)
parent0a93b45b6a2662c69320e6c69f8024e26909a168 (diff)
Merge pull request #1020 from lioncash/namespace
core: Namespace EmuWindow
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 2944b09cd..d98b15a71 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -22,9 +22,12 @@
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/gpu.h"
-class EmuWindow;
class ARM_Interface;
+namespace Core::Frontend {
+class EmuWindow;
+}
+
namespace Service::SM {
class ServiceManager;
}
@@ -99,7 +102,7 @@ public:
* @param filepath String path to the executable application to load on the host file system.
* @returns ResultStatus code, indicating if the operation succeeded.
*/
- ResultStatus Load(EmuWindow& emu_window, const std::string& filepath);
+ ResultStatus Load(Frontend::EmuWindow& emu_window, const std::string& filepath);
/**
* Indicates if the emulated system is powered on (all subsystems initialized and able to run an
@@ -227,7 +230,7 @@ private:
* input.
* @return ResultStatus code, indicating if the operation succeeded.
*/
- ResultStatus Init(EmuWindow& emu_window);
+ ResultStatus Init(Frontend::EmuWindow& emu_window);
/// RealVfsFilesystem instance
FileSys::VirtualFilesystem virtual_filesystem;