core/core: Remove unnecessary includes
The contents of these includes aren't used anywhere in this translation unit.
This commit is contained in:
parent
c6f05b586f
commit
8bbe930fac
3 changed files with 37 additions and 13 deletions
|
@ -18,11 +18,6 @@
|
||||||
#include "core/file_sys/registered_cache.h"
|
#include "core/file_sys/registered_cache.h"
|
||||||
#include "core/file_sys/vfs_concat.h"
|
#include "core/file_sys/vfs_concat.h"
|
||||||
#include "core/file_sys/vfs_real.h"
|
#include "core/file_sys/vfs_real.h"
|
||||||
#include "core/frontend/applets/error.h"
|
|
||||||
#include "core/frontend/applets/general_frontend.h"
|
|
||||||
#include "core/frontend/applets/profile_select.h"
|
|
||||||
#include "core/frontend/applets/software_keyboard.h"
|
|
||||||
#include "core/frontend/applets/web_browser.h"
|
|
||||||
#include "core/gdbstub/gdbstub.h"
|
#include "core/gdbstub/gdbstub.h"
|
||||||
#include "core/hle/kernel/client_port.h"
|
#include "core/hle/kernel/client_port.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
|
@ -37,9 +32,6 @@
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
#include "core/telemetry_session.h"
|
#include "core/telemetry_session.h"
|
||||||
#include "file_sys/cheat_engine.h"
|
#include "file_sys/cheat_engine.h"
|
||||||
#include "frontend/applets/profile_select.h"
|
|
||||||
#include "frontend/applets/software_keyboard.h"
|
|
||||||
#include "frontend/applets/web_browser.h"
|
|
||||||
#include "video_core/debug_utils/debug_utils.h"
|
#include "video_core/debug_utils/debug_utils.h"
|
||||||
#include "video_core/renderer_base.h"
|
#include "video_core/renderer_base.h"
|
||||||
#include "video_core/video_core.h"
|
#include "video_core/video_core.h"
|
||||||
|
|
|
@ -121,6 +121,21 @@ void Applet::Initialize() {
|
||||||
initialized = true;
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AppletFrontendSet::AppletFrontendSet() = default;
|
||||||
|
|
||||||
|
AppletFrontendSet::AppletFrontendSet(ErrorApplet error, PhotoViewer photo_viewer,
|
||||||
|
ProfileSelect profile_select,
|
||||||
|
SoftwareKeyboard software_keyboard, WebBrowser web_browser)
|
||||||
|
: error{std::move(error)}, photo_viewer{std::move(photo_viewer)}, profile_select{std::move(
|
||||||
|
profile_select)},
|
||||||
|
software_keyboard{std::move(software_keyboard)}, web_browser{std::move(web_browser)} {}
|
||||||
|
|
||||||
|
AppletFrontendSet::~AppletFrontendSet() = default;
|
||||||
|
|
||||||
|
AppletFrontendSet::AppletFrontendSet(AppletFrontendSet&&) noexcept = default;
|
||||||
|
|
||||||
|
AppletFrontendSet& AppletFrontendSet::operator=(AppletFrontendSet&&) noexcept = default;
|
||||||
|
|
||||||
AppletManager::AppletManager() = default;
|
AppletManager::AppletManager() = default;
|
||||||
|
|
||||||
AppletManager::~AppletManager() = default;
|
AppletManager::~AppletManager() = default;
|
||||||
|
|
|
@ -137,11 +137,28 @@ protected:
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AppletFrontendSet {
|
struct AppletFrontendSet {
|
||||||
std::unique_ptr<Core::Frontend::ErrorApplet> error;
|
using ErrorApplet = std::unique_ptr<Core::Frontend::ErrorApplet>;
|
||||||
std::unique_ptr<Core::Frontend::PhotoViewerApplet> photo_viewer;
|
using PhotoViewer = std::unique_ptr<Core::Frontend::PhotoViewerApplet>;
|
||||||
std::unique_ptr<Core::Frontend::ProfileSelectApplet> profile_select;
|
using ProfileSelect = std::unique_ptr<Core::Frontend::ProfileSelectApplet>;
|
||||||
std::unique_ptr<Core::Frontend::SoftwareKeyboardApplet> software_keyboard;
|
using SoftwareKeyboard = std::unique_ptr<Core::Frontend::SoftwareKeyboardApplet>;
|
||||||
std::unique_ptr<Core::Frontend::WebBrowserApplet> web_browser;
|
using WebBrowser = std::unique_ptr<Core::Frontend::WebBrowserApplet>;
|
||||||
|
|
||||||
|
AppletFrontendSet();
|
||||||
|
AppletFrontendSet(ErrorApplet error, PhotoViewer photo_viewer, ProfileSelect profile_select,
|
||||||
|
SoftwareKeyboard software_keyboard, WebBrowser web_browser);
|
||||||
|
~AppletFrontendSet();
|
||||||
|
|
||||||
|
AppletFrontendSet(const AppletFrontendSet&) = delete;
|
||||||
|
AppletFrontendSet& operator=(const AppletFrontendSet&) = delete;
|
||||||
|
|
||||||
|
AppletFrontendSet(AppletFrontendSet&&) noexcept;
|
||||||
|
AppletFrontendSet& operator=(AppletFrontendSet&&) noexcept;
|
||||||
|
|
||||||
|
ErrorApplet error;
|
||||||
|
PhotoViewer photo_viewer;
|
||||||
|
ProfileSelect profile_select;
|
||||||
|
SoftwareKeyboard software_keyboard;
|
||||||
|
WebBrowser web_browser;
|
||||||
};
|
};
|
||||||
|
|
||||||
class AppletManager {
|
class AppletManager {
|
||||||
|
|
Loading…
Reference in a new issue