office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-01 05:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the last references to kjs from the JS executor

Browse source
This commit is contained in:
Volker Krause 2023-06-22 17:45:08 +02:00
parent ec0e848c58
commit fd459910b9
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/script/executor_js.cpp
View file

@ -31,15 +31,15 @@
using namespace Okular; using namespace Okular;
class Okular::ExecutorKJSPrivate class Okular::ExecutorJSPrivate
{ {
public: public:
explicit ExecutorKJSPrivate(DocumentPrivate *doc) explicit ExecutorJSPrivate(DocumentPrivate *doc)
: m_doc(doc) : m_doc(doc)
{ {
initTypes(); initTypes();
} }
~ExecutorKJSPrivate() ~ExecutorJSPrivate()
{ {
m_watchdogTimer->deleteLater(); m_watchdogTimer->deleteLater();
m_watchdogThread.quit(); m_watchdogThread.quit();
@ -55,7 +55,7 @@ public:
QTimer *m_watchdogTimer = nullptr; QTimer *m_watchdogTimer = nullptr;
}; };
void ExecutorKJSPrivate::initTypes() void ExecutorJSPrivate::initTypes()
{ {
m_watchdogThread.start(); m_watchdogThread.start();
m_watchdogTimer = new QTimer; m_watchdogTimer = new QTimer;
@ -73,19 +73,19 @@ void ExecutorKJSPrivate::initTypes()
m_interpreter.globalObject().setProperty(QStringLiteral("util"), m_interpreter.newQObject(new JSUtil)); m_interpreter.globalObject().setProperty(QStringLiteral("util"), m_interpreter.newQObject(new JSUtil));
} }
ExecutorKJS::ExecutorKJS(DocumentPrivate *doc) ExecutorJS::ExecutorJS(DocumentPrivate *doc)
: d(new ExecutorKJSPrivate(doc)) : d(new ExecutorJSPrivate(doc))
{ {
} }
ExecutorKJS::~ExecutorKJS() ExecutorJS::~ExecutorJS()
{ {
JSField::clearCachedFields(); JSField::clearCachedFields();
JSApp::clearCachedFields(); JSApp::clearCachedFields();
delete d; delete d;
} }
void ExecutorKJS::execute(const QString &script, Event *event) void ExecutorJS::execute(const QString &script, Event *event)
{ {
const auto eventVal = event ? d->m_interpreter.newQObject(new JSEvent(event)) : QJSValue(QJSValue::UndefinedValue); const auto eventVal = event ? d->m_interpreter.newQObject(new JSEvent(event)) : QJSValue(QJSValue::UndefinedValue);
d->m_interpreter.globalObject().setProperty(QStringLiteral("event"), eventVal); d->m_interpreter.globalObject().setProperty(QStringLiteral("event"), eventVal);

16
core/script/executor_js_p.h
View file

@ -12,23 +12,23 @@ class QString;
namespace Okular namespace Okular
{ {
class DocumentPrivate; class DocumentPrivate;
class ExecutorKJSPrivate; class ExecutorJSPrivate;
class Event; class Event;
class ExecutorKJS class ExecutorJS
{ {
public: public:
explicit ExecutorKJS(DocumentPrivate *doc); explicit ExecutorJS(DocumentPrivate *doc);
~ExecutorKJS(); ~ExecutorJS();
ExecutorKJS(const ExecutorKJS &) = delete; ExecutorJS(const ExecutorJS &) = delete;
ExecutorKJS &operator=(const ExecutorKJS &) = delete; ExecutorJS &operator=(const ExecutorJS &) = delete;
void execute(const QString &script, Event *event); void execute(const QString &script, Event *event);
private: private:
friend class ExecutorKJSPrivate; friend class ExecutorJSPrivate;
ExecutorKJSPrivate *d; ExecutorJSPrivate *d;
}; };
} }

10
core/scripter.cpp
View file

@ -22,7 +22,7 @@ public:
explicit ScripterPrivate(DocumentPrivate *doc) explicit ScripterPrivate(DocumentPrivate *doc)
: m_doc(doc) : m_doc(doc)
#if HAVE_JS #if HAVE_JS
, m_kjs(nullptr) , m_js(nullptr)
#endif #endif
, m_event(nullptr) , m_event(nullptr)
{ {
@ -30,7 +30,7 @@ public:
DocumentPrivate *m_doc; DocumentPrivate *m_doc;
#if HAVE_JS #if HAVE_JS
QScopedPointer<ExecutorKJS> m_kjs; QScopedPointer<ExecutorJS> m_js;
#endif #endif
Event *m_event; Event *m_event;
}; };
@ -62,10 +62,10 @@ void Scripter::execute(ScriptType type, const QString &script)
switch (type) { switch (type) {
case JavaScript: case JavaScript:
if (!d->m_kjs) { if (!d->m_js) {
d->m_kjs.reset(new ExecutorKJS(d->m_doc)); d->m_js.reset(new ExecutorJS(d->m_doc));
} }
d->m_kjs->execute(builtInScript + script, d->m_event); d->m_js->execute(builtInScript + script, d->m_event);
} }
#endif #endif
} }