From ccb439efb088c990b41a6ceb5b1b330c8c27a1aa Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sun, 8 Nov 2020 07:17:12 -0500
Subject: applets: Remove the previous web browser applet implementation

---
 src/yuzu/applets/web_browser.cpp | 108 +--------------------------------------
 src/yuzu/applets/web_browser.h   |  31 +----------
 2 files changed, 3 insertions(+), 136 deletions(-)

(limited to 'src/yuzu/applets')

diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/web_browser.cpp
index 9fd8d6326..92b53fed0 100644
--- a/src/yuzu/applets/web_browser.cpp
+++ b/src/yuzu/applets/web_browser.cpp
@@ -1,115 +1,11 @@
-// Copyright 2018 yuzu Emulator Project
+// Copyright 2020 yuzu Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <mutex>
-
-#include <QKeyEvent>
-
 #include "core/hle/lock.h"
 #include "yuzu/applets/web_browser.h"
 #include "yuzu/main.h"
 
-#ifdef YUZU_USE_QT_WEB_ENGINE
-
-constexpr char NX_SHIM_INJECT_SCRIPT[] = R"(
-    window.nx = {};
-    window.nx.playReport = {};
-    window.nx.playReport.setCounterSetIdentifier = function () {
-        console.log("nx.playReport.setCounterSetIdentifier called - unimplemented");
-    };
-
-    window.nx.playReport.incrementCounter = function () {
-        console.log("nx.playReport.incrementCounter called - unimplemented");
-    };
-
-    window.nx.footer = {};
-    window.nx.footer.unsetAssign = function () {
-        console.log("nx.footer.unsetAssign called - unimplemented");
-    };
-
-    var yuzu_key_callbacks = [];
-    window.nx.footer.setAssign = function(key, discard1, func, discard2) {
-        switch (key) {
-        case 'A':
-            yuzu_key_callbacks[0] = func;
-            break;
-        case 'B':
-            yuzu_key_callbacks[1] = func;
-            break;
-        case 'X':
-            yuzu_key_callbacks[2] = func;
-            break;
-        case 'Y':
-            yuzu_key_callbacks[3] = func;
-            break;
-        case 'L':
-            yuzu_key_callbacks[6] = func;
-            break;
-        case 'R':
-            yuzu_key_callbacks[7] = func;
-            break;
-        }
-    };
-
-    var applet_done = false;
-    window.nx.endApplet = function() {
-        applet_done = true;
-    };
-
-    window.onkeypress = function(e) { if (e.keyCode === 13) { applet_done = true; } };
-)";
-
-QString GetNXShimInjectionScript() {
-    return QString::fromStdString(NX_SHIM_INJECT_SCRIPT);
-}
-
-NXInputWebEngineView::NXInputWebEngineView(QWidget* parent) : QWebEngineView(parent) {}
-
-void NXInputWebEngineView::keyPressEvent(QKeyEvent* event) {
-    parent()->event(event);
-}
-
-void NXInputWebEngineView::keyReleaseEvent(QKeyEvent* event) {
-    parent()->event(event);
-}
-
-#endif
-
-QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {
-    connect(this, &QtWebBrowser::MainWindowOpenPage, &main_window, &GMainWindow::WebBrowserOpenPage,
-            Qt::QueuedConnection);
-    connect(&main_window, &GMainWindow::WebBrowserUnpackRomFS, this,
-            &QtWebBrowser::MainWindowUnpackRomFS, Qt::QueuedConnection);
-    connect(&main_window, &GMainWindow::WebBrowserFinishedBrowsing, this,
-            &QtWebBrowser::MainWindowFinishedBrowsing, Qt::QueuedConnection);
-}
+QtWebBrowser::QtWebBrowser(GMainWindow& main_window) {}
 
 QtWebBrowser::~QtWebBrowser() = default;
-
-void QtWebBrowser::OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback_,
-                                 std::function<void()> finished_callback_) {
-    unpack_romfs_callback = std::move(unpack_romfs_callback_);
-    finished_callback = std::move(finished_callback_);
-
-    const auto index = url.find('?');
-    if (index == std::string::npos) {
-        emit MainWindowOpenPage(url, "");
-    } else {
-        const auto front = url.substr(0, index);
-        const auto back = url.substr(index);
-        emit MainWindowOpenPage(front, back);
-    }
-}
-
-void QtWebBrowser::MainWindowUnpackRomFS() {
-    // Acquire the HLE mutex
-    std::lock_guard lock{HLE::g_hle_lock};
-    unpack_romfs_callback();
-}
-
-void QtWebBrowser::MainWindowFinishedBrowsing() {
-    // Acquire the HLE mutex
-    std::lock_guard lock{HLE::g_hle_lock};
-    finished_callback();
-}
diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/web_browser.h
index f801846cf..af053ace7 100644
--- a/src/yuzu/applets/web_browser.h
+++ b/src/yuzu/applets/web_browser.h
@@ -1,10 +1,9 @@
-// Copyright 2018 yuzu Emulator Project
+// Copyright 2020 yuzu Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
-#include <functional>
 #include <QObject>
 
 #ifdef YUZU_USE_QT_WEB_ENGINE
@@ -15,38 +14,10 @@
 
 class GMainWindow;
 
-#ifdef YUZU_USE_QT_WEB_ENGINE
-
-QString GetNXShimInjectionScript();
-
-class NXInputWebEngineView : public QWebEngineView {
-public:
-    explicit NXInputWebEngineView(QWidget* parent = nullptr);
-
-protected:
-    void keyPressEvent(QKeyEvent* event) override;
-    void keyReleaseEvent(QKeyEvent* event) override;
-};
-
-#endif
-
 class QtWebBrowser final : public QObject, public Core::Frontend::WebBrowserApplet {
     Q_OBJECT
 
 public:
     explicit QtWebBrowser(GMainWindow& main_window);
     ~QtWebBrowser() override;
-
-    void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback_,
-                       std::function<void()> finished_callback_) override;
-
-signals:
-    void MainWindowOpenPage(std::string_view filename, std::string_view additional_args) const;
-
-private:
-    void MainWindowUnpackRomFS();
-    void MainWindowFinishedBrowsing();
-
-    std::function<void()> unpack_romfs_callback;
-    std::function<void()> finished_callback;
 };
-- 
cgit v1.2.3