Skip to content

Commit

Permalink
Remove QScriptEngineDebugger from SkinContext
Browse files Browse the repository at this point in the history
  • Loading branch information
ferranpujolcamins committed Nov 24, 2018
1 parent 5ed5280 commit b3380ba
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
14 changes: 0 additions & 14 deletions src/skin/skincontext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ SkinContext::SkinContext(UserSettingsPointer pConfig,
: m_xmlPath(xmlPath),
m_pConfig(pConfig),
m_pScriptEngine(new QScriptEngine()),
m_pScriptDebugger(new QScriptEngineDebugger()),
m_pSvgCache(new QHash<QString, QDomElement>()),
m_pSingletons(new SingletonMap()) {
enableDebugger(true);
// the extensions are imported once and will be passed to the children
// global object as properties of the parent's global object.
importScriptExtension("console");
Expand Down Expand Up @@ -45,7 +43,6 @@ SkinContext::SkinContext(const SkinContext& parent)
m_pConfig(parent.m_pConfig),
m_variables(parent.variables()),
m_pScriptEngine(parent.m_pScriptEngine),
m_pScriptDebugger(parent.m_pScriptDebugger),
m_parentGlobal(m_pScriptEngine->globalObject()),
m_hookRx(parent.m_hookRx),
m_pSvgCache(parent.m_pSvgCache),
Expand Down Expand Up @@ -235,17 +232,6 @@ const QSharedPointer<QScriptEngine> SkinContext::getScriptEngine() const {
return m_pScriptEngine;
}

void SkinContext::enableDebugger(bool state) const {
if (CmdlineArgs::Instance().getDeveloper() && m_pConfig != NULL &&
m_pConfig->getValueString(ConfigKey("[ScriptDebugger]", "Enabled")) == "1") {
if (state) {
m_pScriptDebugger->attachTo(m_pScriptEngine.data());
} else {
m_pScriptDebugger->detach();
}
}
}

QDebug SkinContext::logWarning(const char* file, const int line,
const QDomNode& node) const {
return qWarning() << QString("%1:%2 SKIN ERROR at %3:%4 <%5>:")
Expand Down
3 changes: 0 additions & 3 deletions src/skin/skincontext.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <QDomElement>
#include <QScriptEngine>
#include <QDir>
#include <QScriptEngineDebugger>
#include <QtDebug>
#include <QSharedPointer>
#include <QRegExp>
Expand Down Expand Up @@ -244,7 +243,6 @@ class SkinContext {
int lineNumber=1);
QScriptValue importScriptExtension(const QString& extensionName);
const QSharedPointer<QScriptEngine> getScriptEngine() const;
void enableDebugger(bool state) const;

QDebug logWarning(const char* file, const int line, const QDomNode& node) const;

Expand Down Expand Up @@ -283,7 +281,6 @@ class SkinContext {

QHash<QString, QString> m_variables;
QSharedPointer<QScriptEngine> m_pScriptEngine;
QSharedPointer<QScriptEngineDebugger> m_pScriptDebugger;
QScriptValue m_parentGlobal;
QRegExp m_hookRx;

Expand Down

0 comments on commit b3380ba

Please sign in to comment.