update version to 3.2beta

royqh1979 · Nov 2, 2024 · e7edb51 · e7edb51
1 parent 03f868d
commit e7edb51
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 28 deletions.
diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
@@ -14,7 +14,7 @@ CONFIG += embed_translations
 CONFIG += ENABLE_SDCC
 
 # uncomment the following line to enable Lua-based add-on support
-# CONFIG += ENABLE_LUA_ADDON
+CONFIG += ENABLE_LUA_ADDON
 
 APP_NAME = RedPandaCPP
 
@@ -242,9 +242,9 @@ SOURCES += \
 
 HEADERS += \
     SimpleIni.h \
-    addon/api.h \
-    addon/executor.h \
-    addon/runtime.h \
+    addon/luaapi.h \
+    addon/luaexecutor.h \
+    addon/luaruntime.h \
     autolinkmanager.h \
     caretlist.h \
     codesnippetsmanager.h \
@@ -451,14 +451,14 @@ ENABLE_LUA_ADDON {
     DEFINES += ENABLE_LUA_ADDON
 
     SOURCES += \
-        addon/api.cpp \
-        addon/executor.cpp \
-        addon/runtime.cpp
+    addon/luaapi.cpp \
+    addon/luaexecutor.cpp \
+    addon/luaruntime.cpp
 
     HEADERS += \
-        addon/api.h \
-        addon/executor.h \
-        addon/runtime.h
+    addon/luaapi.h \
+    addon/luaexecutor.h \
+    addon/luaruntime.h
 }
 
 ENABLE_VCS {

diff --git a/RedPandaIDE/addon/luaapi.cpp b/RedPandaIDE/addon/luaapi.cpp
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "api.h"
+#include "luaapi.h"
 
 #include <QtCore>
 #include <QApplication>
@@ -34,7 +34,7 @@
 #include "utils.h"
 #include "settings.h"
 #include "thememanager.h"
-#include "runtime.h"
+#include "luaruntime.h"
 
 #ifdef Q_OS_WINDOWS
 // added in Windows 11 21H2, declare our version to support old SDKs.

diff --git a/RedPandaIDE/addon/luaapi.h b/RedPandaIDE/addon/luaapi.h
@@ -14,8 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef ADDON_API_H
-#define ADDON_API_H
+#ifndef ADDON_LUA_API_H
+#define ADDON_LUA_API_H
 
 struct lua_State;
 
@@ -45,4 +45,4 @@ extern "C" int luaApi_System_readRegistry(lua_State *L) noexcept;
 
 extern "C" int luaApi_Util_format(lua_State *L) noexcept;
 
-#endif // ADDON_API_H
+#endif // ADDON_LUA_API_H
diff --git a/RedPandaIDE/addon/luaexecutor.cpp b/RedPandaIDE/addon/luaexecutor.cpp
@@ -14,15 +14,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "executor.h"
+#include "luaexecutor.h"
 
 #include <lua/lua.hpp>
 
-#include "api.h"
-#include "runtime.h"
+#include "luaapi.h"
+#include "luaruntime.h"
 
 namespace AddOn {
 
+namespace Lua {
+
 static QMap<QString, QMap<QString, lua_CFunction>> apiGroups{
     {"C_Debug",
      {
@@ -177,4 +179,5 @@ QJsonObject CompilerHintExecutor::operator()(const QByteArray &script) {
         throw LuaError("Compiler hint script must return an object.");
 }
 
+} //namespace Lua
 } // namespace AddOn
diff --git a/RedPandaIDE/addon/luaexecutor.h b/RedPandaIDE/addon/luaexecutor.h
@@ -14,15 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef ADDON_EXECUTOR_H
-#define ADDON_EXECUTOR_H
+#ifndef ADDON_LUA_EXECUTOR_H
+#define ADDON_LUA_EXECUTOR_H
 
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QStringList>
 #include <chrono>
 
 namespace AddOn {
+namespace Lua {
 
 // simple, stateless Lua executor
 class SimpleExecutor {
@@ -53,6 +54,7 @@ class CompilerHintExecutor : private SimpleExecutor {
     QJsonObject operator()(const QByteArray &script);
 };
 
-}
+} // Namespace Lua
+} // Namespace Addon
 
-#endif // ADDON_EXECUTOR_H
+#endif // ADDON_LUA_EXECUTOR_H
diff --git a/RedPandaIDE/addon/luaruntime.cpp b/RedPandaIDE/addon/luaruntime.cpp
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "runtime.h"
+#include "luaruntime.h"
 
 #include <lua/lua.hpp>
 

diff --git a/RedPandaIDE/addon/luaruntime.h b/RedPandaIDE/addon/luaruntime.h
@@ -14,8 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef ADDON_RUNTIME_H
-#define ADDON_RUNTIME_H
+#ifndef ADDON_LUA_RUNTIME_H
+#define ADDON_LUA_RUNTIME_H
 
 #include <chrono>
 
@@ -128,4 +128,4 @@ class RaiiLuaState {
 
 }
 
-#endif // ADDON_RUNTIME_H
+#endif // ADDON_LUA_RUNTIME_H
diff --git a/RedPandaIDE/thememanager.cpp b/RedPandaIDE/thememanager.cpp
@@ -241,7 +241,7 @@ AppTheme::AppTheme(const QString &filename, ThemeType type, ThemeCategory catego
         }
 #ifdef ENABLE_LUA_ADDON
         case ThemeType::Lua: {
-            obj = AddOn::ThemeExecutor{}(content, filename);
+            obj = AddOn::Lua::ThemeExecutor{}(content, filename);
             break;
         }
 #endif

diff --git a/version.inc b/version.inc
@@ -1,2 +1,2 @@
 APP_VERSION="3.2"
-APP_VERSION_SUFFIX="alpha"
+APP_VERSION_SUFFIX="beta"