From 6cd4614371f67e3afc3a4cdb16419e36581f2d0d Mon Sep 17 00:00:00 2001 From: Syping Date: Wed, 22 Aug 2018 21:42:39 +0200 Subject: [PATCH] improve pushEngine --- .gitignore | 11 +++++++---- src/luaenginegui/luaengine/LuaEngineGui.cpp | 6 +++--- src/luaenginegui/luaengine/LuaEngineGui.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 259148f..fcd678b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Prerequisites -*.d - # Compiled Object files *.slo *.lo @@ -18,7 +15,6 @@ # Fortran module files *.mod -*.smod # Compiled Static libraries *.lai @@ -30,3 +26,10 @@ *.exe *.out *.app + +# Qt project user file +*.pro.user + +# Gettext translation files +*.po +*.pot diff --git a/src/luaenginegui/luaengine/LuaEngineGui.cpp b/src/luaenginegui/luaengine/LuaEngineGui.cpp index df0aa6e..57a7a21 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui.cpp +++ b/src/luaenginegui/luaengine/LuaEngineGui.cpp @@ -34,12 +34,12 @@ LuaEngineGui::LuaEngineGui(QObject *parent, bool loadBaseLibraries) : LuaEngine( { L = luaState(); pushClass(L); - pushEngine(); + pushEngine(L); } -void LuaEngineGui::pushEngine() +void LuaEngineGui::pushEngine(lua_State *L_p) { - pushPointer("__LuaEngineGui", (void*)this); + pushPointer(L_p, "__LuaEngineGui", (void*)this); } void LuaEngineGui::pushClass(lua_State *L_p) diff --git a/src/luaenginegui/luaengine/LuaEngineGui.h b/src/luaenginegui/luaengine/LuaEngineGui.h index ca5c936..fd5ab5f 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui.h +++ b/src/luaenginegui/luaengine/LuaEngineGui.h @@ -28,7 +28,7 @@ class LUAENGINEGUISHARED_EXPORT LuaEngineGui : public LuaEngine Q_OBJECT public: LuaEngineGui(QObject *parent = nullptr, bool loadBaseLibraries = true); - void pushEngine(); + void pushEngine(lua_State *L_p); static void pushClass(lua_State *L_p); static void pushClass(LuaEngine *luaEngine); static int showMessageBox(lua_State *L_p);