From e4fa77ef6ac42d36c880db1658dfdd67dcf5d025 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 11:08:02 -0500 Subject: yuzu/web_browser: Make slot functions private These currently aren't used by anything other than the QtWebBrowser class itself, and can be made private. --- src/yuzu/applets/web_browser.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/yuzu/applets/web_browser.h') diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/web_browser.h index bba273767..983886586 100644 --- a/src/yuzu/applets/web_browser.h +++ b/src/yuzu/applets/web_browser.h @@ -43,11 +43,10 @@ public: signals: void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const; -public slots: +private: void MainWindowUnpackRomFS(); void MainWindowFinishedBrowsing(); -private: mutable std::function unpack_romfs_callback; mutable std::function finished_callback; }; -- cgit v1.2.3 From a661025637f301013d9da781e67334853162c6b3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 11:19:44 -0500 Subject: core/frontend/applets/web_browser: Make OpenPage() non-const This is a function that definitely doesn't always have a non-modifying behavior across all implementations, so this should be made non-const. This gets rid of the need to mark data members as mutable to work around the fact mutating data members needs to occur. --- src/yuzu/applets/web_browser.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/yuzu/applets/web_browser.h') diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/web_browser.h index 983886586..1a3d67353 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 unpack_romfs_callback, - std::function finished_callback) const override; + std::function finished_callback) override; signals: void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const; @@ -47,6 +47,6 @@ private: void MainWindowUnpackRomFS(); void MainWindowFinishedBrowsing(); - mutable std::function unpack_romfs_callback; - mutable std::function finished_callback; + std::function unpack_romfs_callback; + std::function finished_callback; }; -- cgit v1.2.3