feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Lua: Dissolve LuaEngine class

Browse Source 
It was mostly used as namespace.

Change-Id: Ice6cdd1581d7dd70b09f6d82891b874a206a1ca0
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2024-07-26 14:49:40 +02:00
parent e429a11fd7
commit fa0bfa8660
21 changed files with 166 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/lua/luaplugin.cpp
View File

@@ -125,10 +125,9 @@ public:
QFile f(":/lua/scripts/ilua.lua");
f.open(QIODevice::ReadOnly);
const auto ilua = QString::fromUtf8(f.readAll());
m_luaState = LuaEngine::instance().runScript(ilua, "ilua.lua", [this](sol::state &lua) {
m_luaState = runScript(ilua, "ilua.lua", [this](sol::state &lua) {
lua["print"] = [this](sol::variadic_args va) {
const QString msgs
= LuaEngine::variadicToStringList(va).join("\t").replace("\r\n", "\n");
const QString msgs = variadicToStringList(va).join("\t").replace("\r\n", "\n");
m_model.setStringList(m_model.stringList() << msgs);
scrollToBottom();
};
@@ -239,7 +238,6 @@ class LuaPlugin : public IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Lua.json")
private:
std::unique_ptr<LuaEngine> m_luaEngine;
LuaPane *m_pane = nullptr;
public:
@@ -247,7 +245,7 @@ public:
void initialize() final
{
m_luaEngine.reset(new LuaEngine());
setupLuaEngine(this);
setupActionModule();
setupAsyncModule();
@@ -288,7 +286,7 @@ public:
if (!script.exists())
continue;
const expected_str<LuaPluginSpec *> result = m_luaEngine->loadPlugin(script);
const expected_str<LuaPluginSpec *> result = loadPlugin(script);
if (!result) {
qWarning() << "Failed to load plugin" << script << ":" << result.error();