Browse Source

web_browser: Rename OpenPage to OpenPageLocal

This is more representative of what actually occurs, as web does support remote URLs which wouldn't need a romfs callback. This paves for easy future support of this with a call like 'OpenPageRemote' or similar.
pull/15/merge
Zach Hilman 7 years ago
parent
commit
6ff9008230
  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. 2
      src/yuzu/applets/web_browser.h

2
src/core/frontend/applets/web_browser.cpp

@ -11,7 +11,7 @@ WebBrowserApplet::~WebBrowserApplet() = default;
DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default;
void DefaultWebBrowserApplet::OpenPage(std::string_view filename,
void DefaultWebBrowserApplet::OpenPageLocal(std::string_view filename,
std::function<void()> unpack_romfs_callback, std::function<void()> unpack_romfs_callback,
std::function<void()> finished_callback) { std::function<void()> finished_callback) {
LOG_INFO(Service_AM, LOG_INFO(Service_AM,

4
src/core/frontend/applets/web_browser.h

@ -13,7 +13,7 @@ class WebBrowserApplet {
public: public:
virtual ~WebBrowserApplet(); virtual ~WebBrowserApplet();
virtual void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
virtual void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
std::function<void()> finished_callback) = 0; std::function<void()> finished_callback) = 0;
}; };
@ -21,7 +21,7 @@ class DefaultWebBrowserApplet final : public WebBrowserApplet {
public: public:
~DefaultWebBrowserApplet() override; ~DefaultWebBrowserApplet() override;
void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
std::function<void()> finished_callback) override; std::function<void()> finished_callback) override;
}; };

2
src/yuzu/applets/web_browser.cpp

@ -87,7 +87,7 @@ QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {
QtWebBrowser::~QtWebBrowser() = default; QtWebBrowser::~QtWebBrowser() = default;
void QtWebBrowser::OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
void QtWebBrowser::OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
std::function<void()> finished_callback) { std::function<void()> finished_callback) {
this->unpack_romfs_callback = std::move(unpack_romfs_callback); this->unpack_romfs_callback = std::move(unpack_romfs_callback);
this->finished_callback = std::move(finished_callback); this->finished_callback = std::move(finished_callback);

2
src/yuzu/applets/web_browser.h

@ -37,7 +37,7 @@ public:
explicit QtWebBrowser(GMainWindow& main_window); explicit QtWebBrowser(GMainWindow& main_window);
~QtWebBrowser() override; ~QtWebBrowser() override;
void OpenPage(std::string_view url, std::function<void()> unpack_romfs_callback,
void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
std::function<void()> finished_callback) override; std::function<void()> finished_callback) override;
signals: signals:

Loading…
Cancel
Save