Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

GreaseMonkey: Disable building JSObject

Browse Source
This commit is contained in:
David Rosca 2015-05-25 10:46:30 +02:00
parent bb995d7984
commit f95d46953f
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/GreaseMonkey/GreaseMonkey.pro
View File

@ -15,7 +15,7 @@ SOURCES += gm_plugin.cpp \
settings/gm_settingslistdelegate.cpp \ settings/gm_settingslistdelegate.cpp \
settings/gm_settingsscriptinfo.cpp \ settings/gm_settingsscriptinfo.cpp \
settings/gm_settingslistwidget.cpp \ settings/gm_settingslistwidget.cpp \
gm_jsobject.cpp \ # gm_jsobject.cpp \
gm_icon.cpp gm_icon.cpp
HEADERS += gm_plugin.h \ HEADERS += gm_plugin.h \
@ -29,7 +29,7 @@ HEADERS += gm_plugin.h \
settings/gm_settingslistdelegate.h \ settings/gm_settingslistdelegate.h \
settings/gm_settingsscriptinfo.h \ settings/gm_settingsscriptinfo.h \
settings/gm_settingslistwidget.h \ settings/gm_settingslistwidget.h \
gm_jsobject.h \ # gm_jsobject.h \
gm_icon.h gm_icon.h
FORMS += \ FORMS += \

5
src/plugins/GreaseMonkey/gm_manager.cpp
View File

@ -18,7 +18,6 @@
#include "gm_manager.h" #include "gm_manager.h"
#include "gm_script.h" #include "gm_script.h"
#include "gm_downloader.h" #include "gm_downloader.h"
#include "gm_jsobject.h"
#include "gm_icon.h" #include "gm_icon.h"
#include "settings/gm_settings.h" #include "settings/gm_settings.h"
@ -38,7 +37,7 @@
GM_Manager::GM_Manager(const QString &sPath, QObject* parent) GM_Manager::GM_Manager(const QString &sPath, QObject* parent)
: QObject(parent) : QObject(parent)
, m_settingsPath(sPath) , m_settingsPath(sPath)
, m_jsObject(new GM_JSObject(this)) //, m_jsObject(new GM_JSObject(this))
{ {
QTimer::singleShot(0, this, SLOT(load())); QTimer::singleShot(0, this, SLOT(load()));
} }
@ -215,7 +214,7 @@ void GM_Manager::load()
} }
m_bootstrap = QzTools::readAllFileContents(":gm/data/bootstrap.min.js"); 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) bool GM_Manager::canRunOnScheme(const QString &scheme)

3
src/plugins/GreaseMonkey/gm_manager.h
View File

@ -29,7 +29,6 @@ class QNetworkRequest;
class BrowserWindow; class BrowserWindow;
class GM_Script; class GM_Script;
class GM_JSObject;
class GM_Settings; class GM_Settings;
class GM_Icon; class GM_Icon;
@ -77,7 +76,7 @@ private:
QPointer<GM_Settings> m_settings; QPointer<GM_Settings> m_settings;
QStringList m_disabledScripts; QStringList m_disabledScripts;
GM_JSObject* m_jsObject; //GM_JSObject* m_jsObject;
QList<GM_Script*> m_scripts; QList<GM_Script*> m_scripts;
QHash<BrowserWindow*, GM_Icon*> m_windows; QHash<BrowserWindow*, GM_Icon*> m_windows;