Unregister scheme handler / extra js objects by pointer not name

src/lib/network/networkmanager.cpp

@@ -236,9 +236,9 @@ void NetworkManager::registerExtensionSchemeHandler(const QString &name, Extensi
     m_extensionScheme->registerHandler(name, handler);
 }
 
-void NetworkManager::unregisterExtensionSchemeHandler(const QString &name)
+void NetworkManager::unregisterExtensionSchemeHandler(ExtensionSchemeHandler *handler)
 {
-    m_extensionScheme->unregisterHandler(name);
+    m_extensionScheme->unregisterHandler(handler);
 }
 
 void NetworkManager::loadSettings()

src/lib/network/networkmanager.h

@@ -43,7 +43,7 @@ public:
     void removeUrlInterceptor(UrlInterceptor *interceptor);
 
     void registerExtensionSchemeHandler(const QString &name, ExtensionSchemeHandler *handler);
-    void unregisterExtensionSchemeHandler(const QString &name);
+    void unregisterExtensionSchemeHandler(ExtensionSchemeHandler *handler);
 
     void loadSettings();
     void shutdown();

src/lib/network/schemehandlers/extensionschemehandler.cpp

@@ -52,7 +52,7 @@ void ExtensionSchemeManager::registerHandler(const QString &name, ExtensionSchem
     m_handlers[name] = handler;
 }
 
-void ExtensionSchemeManager::unregisterHandler(const QString &name)
+void ExtensionSchemeManager::unregisterHandler(ExtensionSchemeHandler *handler)
 {
-    m_handlers.remove(name);
+    m_handlers.remove(m_handlers.key(handler));
 }

src/lib/network/schemehandlers/extensionschemehandler.h

@@ -40,7 +40,7 @@ public:
     void requestStarted(QWebEngineUrlRequestJob *job) override;
 
     void registerHandler(const QString &name, ExtensionSchemeHandler *handler);
-    void unregisterHandler(const QString &name);
+    void unregisterHandler(ExtensionSchemeHandler *handler);
 
 private:
     QHash<QString, ExtensionSchemeHandler*> m_handlers;

src/lib/webengine/javascript/externaljsobject.cpp

@@ -56,9 +56,9 @@ void ExternalJsObject::registerExtraObject(const QString &id, QObject *object)
 }
 
 // static
-void ExternalJsObject::unregisterExtraObject(const QString &id)
+void ExternalJsObject::unregisterExtraObject(QObject *object)
 {
-    s_extraObjects.remove(id);
+    s_extraObjects.remove(s_extraObjects.key(object));
 }
 
 QObject *ExternalJsObject::speedDial() const

src/lib/webengine/javascript/externaljsobject.h

@@ -42,7 +42,7 @@ public:
     static void setupWebChannel(QWebChannel *webChannel, WebPage *page);
 
     static void registerExtraObject(const QString &id, QObject *object);
-    static void unregisterExtraObject(const QString &id);
+    static void unregisterExtraObject(QObject *object);
 
 private:
     QObject *speedDial() const;

src/plugins/GreaseMonkey/gm_manager.cpp

@@ -49,7 +49,7 @@ GM_Manager::GM_Manager(const QString &sPath, QObject* parent)
 
 GM_Manager::~GM_Manager()
 {
-    ExternalJsObject::unregisterExtraObject(QSL("greasemonkey"));
+    ExternalJsObject::unregisterExtraObject(m_jsObject);
 }
 
 void GM_Manager::showSettings(QWidget* parent)

src/plugins/VerticalTabs/verticaltabsplugin.cpp

@@ -65,8 +65,10 @@ void VerticalTabsPlugin::init(InitState state, const QString &settingsPath)
     m_controller = new VerticalTabsController(this);
     SideBarManager::addSidebar(QSL("VerticalTabs"), m_controller);
 
+    m_schemeHandler = new VerticalTabsSchemeHandler(this);
+    mApp->networkManager()->registerExtensionSchemeHandler(QSL("verticaltabs"), m_schemeHandler);
+
     mApp->plugins()->registerAppEventHandler(PluginProxy::KeyPressHandler, this);
-    mApp->networkManager()->registerExtensionSchemeHandler(QSL("verticaltabs"), new VerticalTabsSchemeHandler);
 
     setWebTabBehavior(m_addChildBehavior);
     loadStyleSheet(m_theme);
@@ -89,7 +91,7 @@ void VerticalTabsPlugin::unload()
     delete m_controller;
     m_controller = nullptr;
 
-    mApp->networkManager()->unregisterExtensionSchemeHandler(QSL("verticaltabs"));
+    mApp->networkManager()->unregisterExtensionSchemeHandler(m_schemeHandler);
 }
 
 bool VerticalTabsPlugin::testPlugin()

src/plugins/VerticalTabs/verticaltabsplugin.h

@@ -22,6 +22,7 @@
 class BrowserWindow;
 
 class VerticalTabsController;
+class VerticalTabsSchemeHandler;
 
 class VerticalTabsPlugin : public QObject, public PluginInterface
 {
@@ -76,6 +77,7 @@ private:
 
     QString m_settingsPath;
     VerticalTabsController *m_controller = nullptr;
+    VerticalTabsSchemeHandler *m_schemeHandler = nullptr;
     ViewType m_viewType = TabListView;
     bool m_replaceTabBar = false;
     AddChildBehavior m_addChildBehavior = AppendChild;