Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/libinputactions/config/ConfigIssue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,4 @@ YamlCppConfigException::YamlCppConfigException(TextPosition position, QString me
m_message += ".";
}

ScriptingDisabledConfigException::ScriptingDisabledConfigException()
: ConfigException(TextPosition())
{
}

QString ScriptingDisabledConfigException::message() const
{
return "Scripting is currently not available in the standalone implementation for security reasons. Remove all scripts from the configuration.";
}

}
10 changes: 0 additions & 10 deletions src/libinputactions/config/ConfigIssue.h
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,4 @@ class YamlCppConfigException
QString m_message;
};

class ScriptingDisabledConfigException
: public ConfigException
, public virtual Copyable<ScriptingDisabledConfigException, ConfigIssue>
{
public:
ScriptingDisabledConfigException();

QString message() const override;
};

}
5 changes: 0 additions & 5 deletions src/libinputactions/scripting/ScriptingEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "modules/fs/FSModule.h"
#include "modules/main/MainModule.h"
#include <libinputactions/InputActionsMain.h>
#include <libinputactions/config/ConfigIssue.h>
#include <libinputactions/globals.h>
#include <libinputactions/helpers/QString.h>
#include <libinputactions/helpers/QThread.h>
Expand Down Expand Up @@ -232,10 +231,6 @@ Promise ScriptingEngine::newPromise()

QJSEngine &ScriptingEngine::ensureEngine()
{
if (disabled) {
throw ScriptingDisabledConfigException();
}

if (!m_engine) {
initialize();
}
Expand Down
2 changes: 0 additions & 2 deletions src/libinputactions/scripting/ScriptingEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ class ScriptingEngine : public QObject
static QString errorToString(const QJSValue &error);
static void logError(const QJSValue &error);

static inline bool disabled = false; // temporary

private slots:
void onWatchdogRestartTimerTick();

Expand Down