summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-03-12 00:34:23 +0100
committerZach Hilman <zachhilman@gmail.com>2019-04-17 17:35:24 +0200
commitf7540157e41f7ebcf06baed66947567a3a46019f (patch)
treed869d4a8389ac7786c6153ee62acff108a4546c7
parentcore: Remove specific applets in favor of AppletManager (diff)
downloadyuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.gz
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.bz2
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.lz
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.xz
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.zst
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.zip
-rw-r--r--src/core/frontend/applets/web_browser.cpp2
-rw-r--r--src/core/frontend/applets/web_browser.h4
-rw-r--r--src/yuzu/applets/web_browser.cpp2
-rw-r--r--src/yuzu/applets/web_browser.h6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp
index 3a3d3d0bf..6a36b4b8f 100644
--- a/src/core/frontend/applets/web_browser.cpp
+++ b/src/core/frontend/applets/web_browser.cpp
@@ -13,7 +13,7 @@ DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default;
void DefaultWebBrowserApplet::OpenPage(std::string_view filename,
std::function<void()> unpack_romfs_callback,
- std::function<void()> finished_callback) {
+ std::function<void()> finished_callback) const {
LOG_INFO(Service_AM,
"(STUBBED) called - No suitable web browser implementation found to open website page "
"at '{}'!",
diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index f952856af..41d272d26 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -14,7 +14,7 @@ public:
virtual ~WebBrowserApplet();
virtual void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
- std::function<void()> finished_callback) = 0;
+ std::function<void()> finished_callback) const = 0;
};
class DefaultWebBrowserApplet final : public WebBrowserApplet {
@@ -22,7 +22,7 @@ public:
~DefaultWebBrowserApplet() override;
void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
- std::function<void()> finished_callback) override;
+ std::function<void()> finished_callback) const override;
};
} // namespace Core::Frontend
diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/web_browser.cpp
index ac80b2fa2..5b7b73518 100644
--- a/src/yuzu/applets/web_browser.cpp
+++ b/src/yuzu/applets/web_browser.cpp
@@ -88,7 +88,7 @@ QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {
QtWebBrowser::~QtWebBrowser() = default;
void QtWebBrowser::OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
- std::function<void()> finished_callback) {
+ std::function<void()> finished_callback) const {
this->unpack_romfs_callback = std::move(unpack_romfs_callback);
this->finished_callback = std::move(finished_callback);
diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/web_browser.h
index 1a3d67353..983886586 100644
--- a/src/yuzu/applets/web_browser.h
+++ b/src/yuzu/applets/web_browser.h
@@ -38,7 +38,7 @@ public:
~QtWebBrowser() override;
void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
- std::function<void()> finished_callback) override;
+ std::function<void()> finished_callback) const override;
signals:
void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const;
@@ -47,6 +47,6 @@ private:
void MainWindowUnpackRomFS();
void MainWindowFinishedBrowsing();
- std::function<void()> unpack_romfs_callback;
- std::function<void()> finished_callback;
+ mutable std::function<void()> unpack_romfs_callback;
+ mutable std::function<void()> finished_callback;
};