From e26c86a6e78f00ce6641fc65e7076cacc91e2137 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 5 Dec 2022 18:46:57 -0500
Subject: applets/web_browser: Use aliases for callbacks

Deduplicates a lot of long callback declarations
---
 src/core/frontend/applets/web_browser.cpp | 11 +++++------
 src/core/frontend/applets/web_browser.h   | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'src/core')

diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp
index 27c7086be..b09cb7102 100644
--- a/src/core/frontend/applets/web_browser.cpp
+++ b/src/core/frontend/applets/web_browser.cpp
@@ -10,18 +10,17 @@ WebBrowserApplet::~WebBrowserApplet() = default;
 
 DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default;
 
-void DefaultWebBrowserApplet::OpenLocalWebPage(
-    const std::string& local_url, std::function<void()> extract_romfs_callback,
-    std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const {
+void DefaultWebBrowserApplet::OpenLocalWebPage(const std::string& local_url,
+                                               ExtractROMFSCallback extract_romfs_callback,
+                                               OpenWebPageCallback callback) const {
     LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open local web page at {}",
                 local_url);
 
     callback(Service::AM::Applets::WebExitReason::WindowClosed, "http://localhost/");
 }
 
-void DefaultWebBrowserApplet::OpenExternalWebPage(
-    const std::string& external_url,
-    std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const {
+void DefaultWebBrowserApplet::OpenExternalWebPage(const std::string& external_url,
+                                                  OpenWebPageCallback callback) const {
     LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open external web page at {}",
                 external_url);
 
diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index 1411274f8..4f72284ad 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -11,29 +11,29 @@ namespace Core::Frontend {
 
 class WebBrowserApplet {
 public:
+    using ExtractROMFSCallback = std::function<void()>;
+    using OpenWebPageCallback =
+        std::function<void(Service::AM::Applets::WebExitReason, std::string)>;
+
     virtual ~WebBrowserApplet();
 
-    virtual void OpenLocalWebPage(
-        const std::string& local_url, std::function<void()> extract_romfs_callback,
-        std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0;
+    virtual void OpenLocalWebPage(const std::string& local_url,
+                                  ExtractROMFSCallback extract_romfs_callback,
+                                  OpenWebPageCallback callback) const = 0;
 
-    virtual void OpenExternalWebPage(
-        const std::string& external_url,
-        std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0;
+    virtual void OpenExternalWebPage(const std::string& external_url,
+                                     OpenWebPageCallback callback) const = 0;
 };
 
 class DefaultWebBrowserApplet final : public WebBrowserApplet {
 public:
     ~DefaultWebBrowserApplet() override;
 
-    void OpenLocalWebPage(const std::string& local_url,
-                          std::function<void()> extract_romfs_callback,
-                          std::function<void(Service::AM::Applets::WebExitReason, std::string)>
-                              callback) const override;
+    void OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback,
+                          OpenWebPageCallback callback) const override;
 
     void OpenExternalWebPage(const std::string& external_url,
-                             std::function<void(Service::AM::Applets::WebExitReason, std::string)>
-                                 callback) const override;
+                             OpenWebPageCallback callback) const override;
 };
 
 } // namespace Core::Frontend
-- 
cgit v1.2.3