Browse Source

web_browser: Make OpenPage const

nce_cpp
Zach Hilman 7 years ago
parent
commit
663b24e0d2
  1. 2
      src/core/frontend/applets/web_browser.cpp
  2. 4
      src/core/frontend/applets/web_browser.h
  3. 2
      src/yuzu/applets/web_browser.cpp
  4. 6
      src/yuzu/applets/web_browser.h

2
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 '{}'!",

4
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

2
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);

6
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;
};
Loading…
Cancel
Save