From f95d46953f6fda01de493c60499de55e11b168a2 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 25 May 2015 10:46:30 +0200 Subject: [PATCH] GreaseMonkey: Disable building JSObject --- src/plugins/GreaseMonkey/GreaseMonkey.pro | 4 ++-- src/plugins/GreaseMonkey/gm_manager.cpp | 5 ++--- src/plugins/GreaseMonkey/gm_manager.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/GreaseMonkey/GreaseMonkey.pro b/src/plugins/GreaseMonkey/GreaseMonkey.pro index 3ece4d00c..1a4a76a70 100644 --- a/src/plugins/GreaseMonkey/GreaseMonkey.pro +++ b/src/plugins/GreaseMonkey/GreaseMonkey.pro @@ -15,7 +15,7 @@ SOURCES += gm_plugin.cpp \ settings/gm_settingslistdelegate.cpp \ settings/gm_settingsscriptinfo.cpp \ settings/gm_settingslistwidget.cpp \ - gm_jsobject.cpp \ +# gm_jsobject.cpp \ gm_icon.cpp HEADERS += gm_plugin.h \ @@ -29,7 +29,7 @@ HEADERS += gm_plugin.h \ settings/gm_settingslistdelegate.h \ settings/gm_settingsscriptinfo.h \ settings/gm_settingslistwidget.h \ - gm_jsobject.h \ +# gm_jsobject.h \ gm_icon.h FORMS += \ diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp index 27662c8bd..fea1f4319 100644 --- a/src/plugins/GreaseMonkey/gm_manager.cpp +++ b/src/plugins/GreaseMonkey/gm_manager.cpp @@ -18,7 +18,6 @@ #include "gm_manager.h" #include "gm_script.h" #include "gm_downloader.h" -#include "gm_jsobject.h" #include "gm_icon.h" #include "settings/gm_settings.h" @@ -38,7 +37,7 @@ GM_Manager::GM_Manager(const QString &sPath, QObject* parent) : QObject(parent) , m_settingsPath(sPath) - , m_jsObject(new GM_JSObject(this)) + //, m_jsObject(new GM_JSObject(this)) { QTimer::singleShot(0, this, SLOT(load())); } @@ -215,7 +214,7 @@ void GM_Manager::load() } m_bootstrap = QzTools::readAllFileContents(":gm/data/bootstrap.min.js"); - m_jsObject->setSettingsFile(m_settingsPath + QL1S("/extensions.ini")); + //m_jsObject->setSettingsFile(m_settingsPath + QL1S("/extensions.ini")); } bool GM_Manager::canRunOnScheme(const QString &scheme) diff --git a/src/plugins/GreaseMonkey/gm_manager.h b/src/plugins/GreaseMonkey/gm_manager.h index 3f47b657b..570f483e5 100644 --- a/src/plugins/GreaseMonkey/gm_manager.h +++ b/src/plugins/GreaseMonkey/gm_manager.h @@ -29,7 +29,6 @@ class QNetworkRequest; class BrowserWindow; class GM_Script; -class GM_JSObject; class GM_Settings; class GM_Icon; @@ -77,7 +76,7 @@ private: QPointer m_settings; QStringList m_disabledScripts; - GM_JSObject* m_jsObject; + //GM_JSObject* m_jsObject; QList m_scripts; QHash m_windows;