Fix an issue with code classes where parameters containing other code…

… classes could not be used
Jmgr · May 26, 2024 · 018d9a3 · 018d9a3
1 parent a088db4
commit 018d9a3
Show file tree

Hide file tree

Showing 38 changed files with 75 additions and 1 deletion.
diff --git a/actions/data/src/actions/readregistryinstance.cpp b/actions/data/src/actions/readregistryinstance.cpp
@@ -19,9 +19,9 @@
 */
 
 #include "readregistryinstance.hpp"
+#include "actiontools/scriptengine.hpp"
 
 #ifdef Q_OS_WIN
-#include <QJSEngine>
 #include <Windows.h>
 #endif
 

diff --git a/actions/data/src/code/clipboard.cpp b/actions/data/src/code/clipboard.cpp
@@ -95,6 +95,8 @@ namespace Code
 
     void Clipboard::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Clipboard*>("const Clipboard *");
+
         CodeClass::registerClass<Clipboard>(QStringLiteral("Clipboard"), scriptEngine);
     }
 

diff --git a/actions/data/src/code/file.cpp b/actions/data/src/code/file.cpp
@@ -127,6 +127,8 @@ namespace Code
 
     void File::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<File*>("const File *");
+
         CodeClass::registerClassWithStaticFunctions<File, StaticFile>(QStringLiteral("File"), {QStringLiteral("copy"), QStringLiteral("move"), QStringLiteral("rename"), QStringLiteral("remove"), QStringLiteral("exists")}, scriptEngine);
     }
 

diff --git a/actions/data/src/code/inifile.cpp b/actions/data/src/code/inifile.cpp
@@ -238,6 +238,8 @@ namespace Code
 
     void IniFile::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<IniFile*>("const IniFile *");
+
         CodeClass::registerClass<IniFile>(QStringLiteral("IniFile"), scriptEngine);
     }
 }
diff --git a/actions/data/src/code/mail.cpp b/actions/data/src/code/mail.cpp
@@ -169,6 +169,8 @@ namespace Code
 
     void Mail::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Mail*>("const Mail *");
+
         CodeClass::registerClass<Mail>(QStringLiteral("Mail"), scriptEngine);
     }
 

diff --git a/actions/data/src/code/mailattachment.cpp b/actions/data/src/code/mailattachment.cpp
@@ -88,6 +88,8 @@ namespace Code
 
     void MailAttachment::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<MailAttachment*>("const MailAttachment *");
+
         CodeClass::registerClass<MailAttachment>(QStringLiteral("MailAttachment"), scriptEngine);
     }
 }
diff --git a/actions/data/src/code/mailmessage.cpp b/actions/data/src/code/mailmessage.cpp
@@ -100,6 +100,8 @@ namespace Code
 
     void MailMessage::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<MailMessage*>("const MailMessage *");
+
         CodeClass::registerClass<MailMessage>(QStringLiteral("MailMessage"), scriptEngine);
     }
 }
diff --git a/actions/data/src/code/registry.cpp b/actions/data/src/code/registry.cpp
@@ -476,6 +476,8 @@ namespace Code
 
     void Registry::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Registry*>("const Registry *");
+
         CodeClass::registerClass<Registry>(QStringLiteral("Registry"), scriptEngine);
     }
 }
diff --git a/actions/data/src/code/sql.cpp b/actions/data/src/code/sql.cpp
@@ -224,6 +224,8 @@ namespace Code
 
     void Sql::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Sql*>("const Sql *");
+
         CodeClass::registerClassWithStaticFunctions<Sql, StaticSql>(QStringLiteral("Sql"),  {QStringLiteral("drivers")}, scriptEngine);
     }
 

diff --git a/actions/data/src/code/tcp.cpp b/actions/data/src/code/tcp.cpp
@@ -160,6 +160,8 @@ namespace Code
 
     void Tcp::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Tcp*>("const Tcp *");
+
         CodeClass::registerClass<Tcp>(QStringLiteral("Tcp"), scriptEngine);
     }
 

diff --git a/actions/data/src/code/tcpserver.cpp b/actions/data/src/code/tcpserver.cpp
@@ -96,6 +96,8 @@ namespace Code
 
     void TcpServer::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<TcpServer*>("const TcpServer *");
+
         CodeClass::registerClass<TcpServer>(QStringLiteral("TcpServer"), scriptEngine);
     }
 

diff --git a/actions/data/src/code/udp.cpp b/actions/data/src/code/udp.cpp
@@ -142,6 +142,8 @@ namespace Code
 
     void Udp::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Udp*>("const Udp *");
+
         CodeClass::registerClass<Udp>(QStringLiteral("Udp"), scriptEngine);
     }
 

diff --git a/actions/data/src/code/web.cpp b/actions/data/src/code/web.cpp
@@ -217,6 +217,8 @@ namespace Code
 
     void Web::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Web*>("const Web *");
+
         CodeClass::registerClass<Web>(QStringLiteral("Web"), scriptEngine);
     }
 

diff --git a/actions/device/src/code/keyboard.cpp b/actions/device/src/code/keyboard.cpp
@@ -61,6 +61,8 @@ namespace Code
 
     void Keyboard::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Keyboard*>("const Keyboard *");
+
         CodeClass::registerClass<Keyboard>(QStringLiteral("Keyboard"), scriptEngine);
     }
 }
diff --git a/actions/device/src/code/mouse.cpp b/actions/device/src/code/mouse.cpp
@@ -109,6 +109,8 @@ namespace Code
 
     void Mouse::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Mouse*>("const Mouse *");
+
         CodeClass::registerClass<Mouse>(QStringLiteral("Mouse"), scriptEngine);
     }
 

diff --git a/actions/system/src/code/mediaplaylist.cpp b/actions/system/src/code/mediaplaylist.cpp
@@ -136,6 +136,8 @@ namespace Code
 
     void MediaPlaylist::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<MediaPlaylist*>("const MediaPlaylist *");
+
         CodeClass::registerClass<MediaPlaylist>(QStringLiteral("MediaPlaylist"), scriptEngine);
     }
 }
diff --git a/actions/system/src/code/notify.cpp b/actions/system/src/code/notify.cpp
@@ -122,6 +122,8 @@ namespace Code
 
     void Notify::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Notify*>("const Notify *");
+
         CodeClass::registerClass<Notify>(QStringLiteral("Notify"), scriptEngine);
     }
 }
diff --git a/actions/system/src/code/process.cpp b/actions/system/src/code/process.cpp
@@ -361,6 +361,8 @@ namespace Code
 
     void Process::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Process*>("const Process *");
+
         CodeClass::registerClassWithStaticFunctions<Process, StaticProcess>(QStringLiteral("Process"),
                                                                             {QStringLiteral("list"),
                                                                              QStringLiteral("startDetached"),

diff --git a/actions/system/src/code/system.cpp b/actions/system/src/code/system.cpp
@@ -326,6 +326,8 @@ namespace Code
 
     void System::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<System*>("const System *");
+
         CodeClass::registerClass<System>(QStringLiteral("System"), scriptEngine);
     }
 }
diff --git a/actions/windows/src/code/colordialog.cpp b/actions/windows/src/code/colordialog.cpp
@@ -116,6 +116,8 @@ namespace Code
 
     void ColorDialog::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<ColorDialog*>("const ColorDialog *");
+
         CodeClass::registerClass<ColorDialog>(QStringLiteral("ColorDialog"), scriptEngine);
     }
 

diff --git a/actions/windows/src/code/filedialog.cpp b/actions/windows/src/code/filedialog.cpp
@@ -287,6 +287,8 @@ namespace Code
 
     void FileDialog::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<FileDialog*>("const FileDialog *");
+
         CodeClass::registerClass<FileDialog>(QStringLiteral("FileDialog"), scriptEngine);
     }
 

diff --git a/actions/windows/src/code/inputdialog.cpp b/actions/windows/src/code/inputdialog.cpp
@@ -225,6 +225,8 @@ namespace Code
 
     void InputDialog::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<InputDialog*>("const InputDialog *");
+
         CodeClass::registerClass<InputDialog>(QStringLiteral("InputDialog"), scriptEngine);
     }
 

diff --git a/actions/windows/src/code/messagebox.cpp b/actions/windows/src/code/messagebox.cpp
@@ -178,6 +178,8 @@ namespace Code
 
     void MessageBox::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<MessageBox*>("const MessageBox *");
+
         CodeClass::registerClass<MessageBox>(QStringLiteral("MessageBox"), scriptEngine);
     }
 

diff --git a/actions/windows/src/code/progressdialog.cpp b/actions/windows/src/code/progressdialog.cpp
@@ -131,6 +131,8 @@ namespace Code
 
     void ProgressDialog::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<ProgressDialog*>("const ProgressDialog *");
+
         CodeClass::registerClass<ProgressDialog>(QStringLiteral("ProgressDialog"), scriptEngine);
     }
 

diff --git a/actiontools/src/code/algorithms.cpp b/actiontools/src/code/algorithms.cpp
@@ -97,6 +97,8 @@ namespace Code
 
     void Algorithms::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Algorithms*>("const Algorithms *");
+
         CodeClass::registerStaticClass<Algorithms>(QStringLiteral("Algorithms"), scriptEngine);
     }
 

diff --git a/actiontools/src/code/color.cpp b/actiontools/src/code/color.cpp
@@ -247,6 +247,8 @@ namespace Code
 
     void Color::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Color*>("const Color *");
+
         CodeClass::registerClass<Color>(QStringLiteral("Color"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/image.cpp b/actiontools/src/code/image.cpp
@@ -539,6 +539,8 @@ namespace Code
 
     void Image::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Image*>("const Image *");
+
         CodeClass::registerClassWithStaticFunctions<Image, StaticImage>(
             QStringLiteral("Image"),
             {QStringLiteral("takeScreenshot"), QStringLiteral("takeScreenshotUsingScreenIndex")},

diff --git a/actiontools/src/code/point.cpp b/actiontools/src/code/point.cpp
@@ -125,6 +125,8 @@ namespace Code
 
     void Point::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Point*>("const Point *");
+
         CodeClass::registerClass<Point>(QStringLiteral("Point"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/processhandle.cpp b/actiontools/src/code/processhandle.cpp
@@ -246,6 +246,8 @@ namespace Code
 
     void ProcessHandle::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<ProcessHandle*>("const ProcessHandle *");
+
         CodeClass::registerClass<ProcessHandle>(QStringLiteral("ProcessHandle"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/rawdata.cpp b/actiontools/src/code/rawdata.cpp
@@ -225,6 +225,8 @@ namespace Code
 
     void RawData::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<RawData*>("const RawData *");
+
         CodeClass::registerClass<RawData>(QStringLiteral("RawData"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/rect.cpp b/actiontools/src/code/rect.cpp
@@ -285,6 +285,8 @@ namespace Code
 
     void Rect::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Rect*>("const Rect *");
+
         CodeClass::registerClass<Rect>(QStringLiteral("Rect"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/size.cpp b/actiontools/src/code/size.cpp
@@ -126,6 +126,8 @@ namespace Code
 
     void Size::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Size*>("const Size *");
+
         CodeClass::registerClass<Size>(QStringLiteral("Size"), scriptEngine);
     }
 }
diff --git a/actiontools/src/code/window.cpp b/actiontools/src/code/window.cpp
@@ -225,6 +225,8 @@ namespace Code
 
     void Window::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<Window*>("const Window *");
+
         CodeClass::registerClassWithStaticFunctions<Window, StaticWindow>(
             QStringLiteral("Window"),
             {QStringLiteral("all"), QStringLiteral("find"), QStringLiteral("foreground")},

diff --git a/execution/src/codeactiona.cpp b/execution/src/codeactiona.cpp
@@ -30,6 +30,8 @@ namespace Execution
 
     void CodeActiona::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<CodeActiona*>("const Actiona *");
+
         CodeClass::registerClassWithStaticFunctions<CodeActiona, StaticCodeActiona>(
             QStringLiteral("Actiona"),
             {QStringLiteral("version"), QStringLiteral("scriptVersion"), QStringLiteral("isActExec"), QStringLiteral("isActiona")},

diff --git a/execution/src/codeconsole.cpp b/execution/src/codeconsole.cpp
@@ -30,6 +30,8 @@ namespace Execution
 {
     void CodeConsole::registerClass(ActionTools::ScriptEngine &scriptEngine, Executer &executer)
     {
+        qRegisterMetaType<CodeConsole*>("const Console *");
+
         CodeClass::registerStaticClass<CodeConsole>(QStringLiteral("Console"), scriptEngine, executer);
     }
 

diff --git a/execution/src/codeexecution.cpp b/execution/src/codeexecution.cpp
@@ -26,6 +26,8 @@ namespace Execution
 {
     void CodeExecution::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<CodeExecution*>("const Execution *");
+
         CodeClass::registerClassWithStaticFunctions<CodeExecution, StaticCodeExecution>(
             QStringLiteral("Execution"),
             {QStringLiteral("pause"), QStringLiteral("sleep"), QStringLiteral("stop")},

diff --git a/execution/src/codescript.cpp b/execution/src/codescript.cpp
@@ -26,6 +26,8 @@ namespace Execution
 {
     void CodeScript::registerClass(ActionTools::ScriptEngine &scriptEngine, Executer &executer)
     {
+        qRegisterMetaType<CodeScript*>("const Script *");
+
         CodeClass::registerStaticClass<CodeScript>(QStringLiteral("Script"), scriptEngine, executer);
     }
 

diff --git a/execution/src/codestdio.cpp b/execution/src/codestdio.cpp
@@ -26,6 +26,8 @@ namespace Execution
 {
     void CodeStdio::registerClass(ActionTools::ScriptEngine &scriptEngine)
     {
+        qRegisterMetaType<CodeStdio*>("const Stdio *");
+
         CodeClass::registerClassWithStaticFunctions<CodeStdio, StaticCodeStdio>(
             QStringLiteral("Stdio"),
             {QStringLiteral("print"), QStringLiteral("println"), QStringLiteral("printWarning"), QStringLiteral("printlnWarning"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,8 @@ namespace Code @@
         void Clipboard::registerClass(ActionTools::ScriptEngine &scriptEngine)
         {
+            qRegisterMetaType<Clipboard*>("const Clipboard *");
             CodeClass::registerClass<Clipboard>(QStringLiteral("Clipboard"), scriptEngine);
         }
@@ Expand Down @@