summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-03-11 19:34:23 -0400
committerGravatar Zach Hilman2019-04-17 11:35:24 -0400
commitf7540157e41f7ebcf06baed66947567a3a46019f (patch)
treed869d4a8389ac7786c6153ee62acff108a4546c7 /src
parentcore: Remove specific applets in favor of AppletManager (diff)
downloadyuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.gz
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.tar.xz
yuzu-f7540157e41f7ebcf06baed66947567a3a46019f.zip
web_browser: Make OpenPage const
Diffstat (limited to 'src')
-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;
13 13
14void DefaultWebBrowserApplet::OpenPage(std::string_view filename, 14void DefaultWebBrowserApplet::OpenPage(std::string_view filename,
15 std::function<void()> unpack_romfs_callback, 15 std::function<void()> unpack_romfs_callback,
16 std::function<void()> finished_callback) { 16 std::function<void()> finished_callback) const {
17 LOG_INFO(Service_AM, 17 LOG_INFO(Service_AM,
18 "(STUBBED) called - No suitable web browser implementation found to open website page " 18 "(STUBBED) called - No suitable web browser implementation found to open website page "
19 "at '{}'!", 19 "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:
14 virtual ~WebBrowserApplet(); 14 virtual ~WebBrowserApplet();
15 15
16 virtual void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, 16 virtual void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
17 std::function<void()> finished_callback) = 0; 17 std::function<void()> finished_callback) const = 0;
18}; 18};
19 19
20class DefaultWebBrowserApplet final : public WebBrowserApplet { 20class DefaultWebBrowserApplet final : public WebBrowserApplet {
@@ -22,7 +22,7 @@ public:
22 ~DefaultWebBrowserApplet() override; 22 ~DefaultWebBrowserApplet() override;
23 23
24 void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, 24 void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
25 std::function<void()> finished_callback) override; 25 std::function<void()> finished_callback) const override;
26}; 26};
27 27
28} // namespace Core::Frontend 28} // 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) {
88QtWebBrowser::~QtWebBrowser() = default; 88QtWebBrowser::~QtWebBrowser() = default;
89 89
90void QtWebBrowser::OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, 90void QtWebBrowser::OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
91 std::function<void()> finished_callback) { 91 std::function<void()> finished_callback) const {
92 this->unpack_romfs_callback = std::move(unpack_romfs_callback); 92 this->unpack_romfs_callback = std::move(unpack_romfs_callback);
93 this->finished_callback = std::move(finished_callback); 93 this->finished_callback = std::move(finished_callback);
94 94
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:
38 ~QtWebBrowser() override; 38 ~QtWebBrowser() override;
39 39
40 void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback, 40 void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
41 std::function<void()> finished_callback) override; 41 std::function<void()> finished_callback) const override;
42 42
43signals: 43signals:
44 void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const; 44 void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const;
@@ -47,6 +47,6 @@ private:
47 void MainWindowUnpackRomFS(); 47 void MainWindowUnpackRomFS();
48 void MainWindowFinishedBrowsing(); 48 void MainWindowFinishedBrowsing();
49 49
50 std::function<void()> unpack_romfs_callback; 50 mutable std::function<void()> unpack_romfs_callback;
51 std::function<void()> finished_callback; 51 mutable std::function<void()> finished_callback;
52}; 52};