add missing type QList<QHostAddress> (module :network)

helper/README.txt

@@ -1,3 +1,6 @@
+WARNING: PLEASE DON'T USE THIS CURRENTLY. IT NEEDS TO BE UPDATED!
+
+
 HOWTO
 =====
 

helper/generate.lisp

@@ -1,4 +1,4 @@
-;;; copyright (c) Polos Ruetz
+;;; WARNING: WIP! DON'T CURRENTLY USE!
 
 (load "../src/lisp/x")
 (load "load-modules")
@@ -798,6 +798,7 @@
                ~%#include \"_main_n_methods.h\"~
                ~%#include \"../eql5/dyn_object.h\"~
                ~%#include \"../eql5/eql.h\"~
+               ~%#include \"../module_interface.h\"~
                ~%~
                ~%int LObjects::T_QAudioDeviceInfo = -1;~
                ~%int LObjects::T_QList_QAudioDeviceInfo = -1;~
@@ -810,6 +811,7 @@
                ~%int LObjects::T_QHelpSearchQuery = -1;~
                ~%int LObjects::T_QList_QHelpSearchQuery = -1;~
                ~%int LObjects::T_QHostAddress = -1;~
+               ~%int LObjects::T_QList_QHostAddress = -1;~
                ~%int LObjects::T_QHostInfo = -1;~
                ~%int LObjects::T_QHttpPart = -1;~
                ~%int LObjects::T_QImageEncoderSettings = -1;~
@@ -868,23 +870,6 @@
                ~%QHash<QByteArray, uint> LObjects::override_function_ids;~
                ~%QHash<quint64, void*> LObjects::override_lisp_functions;~%"
             +message-generated+)
-    (dolist (module *modules*)
-      (format s "~%StaticMetaObject LObjects::staticMetaObject_~(~A~) = 0;" module)
-      (format (module-stream module :ini) "~A~%~%#include \"_q_methods.h\"~
-                                           ~%#include \"_n_methods.h\"~
-                                           ~%#include \"_ini2.h\"~
-                                           ~%~
-                                           ~%QT_BEGIN_NAMESPACE~%~%"
-              +message-generated+))
-    (dolist (module *modules*)
-      (format s "~%DeleteNObject LObjects::deleteNObject_~(~A~) = 0;" module))
-    (dolist (module *modules*)
-      (format s "~%Override LObjects::override_~(~A~) = 0;" module))
-    (dolist (module (list :help :multimedia :network :quick :sql :webengine :webkit))
-      (format s "~%ToMetaArg LObjects::toMetaArg_~(~A~) = 0;~
-                 ~%To_lisp_arg LObjects::to_lisp_arg_~(~A~) = 0;"
-              module module))
-    (format s "~%~%")
     (dolist (ids *override-signature-ids*)
       (let* ((class (first ids))
              (module (class-module (l2q-name class))))
@@ -1000,8 +985,8 @@
           (when (eql module (class-module (trim* name)))
             (format s "~%        case ~D:" i)))
         (when (plusp i)
-          (format s "~%            if(staticMetaObject_~(~A~)) {~
+          (format s "~%            if(ModuleInterface::~(~A~)) {~
-                     ~%                m = staticMetaObject_~(~A~)(n); }~
+                     ~%                m = ModuleInterface::~(~A~)->staticMetaObject(n); }~
                      ~%            break;"
                   module module))))
     (dolist (module *all-modules*)
@@ -1037,8 +1022,9 @@
           (when (eql module (class-module (trim* name)))
             (format s "~%        case ~D:" i)))
         (when (plusp i)
-          (format s "~%            if(deleteNObject_~(~A~)) {~
+          (format s "~%            if(ModuleInterface::~(~A~)) {~
-                     ~%                deleteNObject_~(~A~)(n, p, gc); }~
+                     ~%                ModuleInterface::~(~A~)->deleteNObject(n, p, gc); }~
+
                      ~%            break;"
                   module module))))
     (format s " }}~
@@ -1087,8 +1073,8 @@
           (when (eql module (class-module (trim* name)))
             (format s "~%            case ~D:" i)))
         (when (plusp i)
-          (format s "~%                if(override_~(~A~)) {~
+          (format s "~%                if(ModuleInterface::~(~A~)) {~
-                     ~%                    NumList* _ids = override_~(~A~)(name);~
+                     ~%                    NumList* _ids = ModuleInterface::~(~A~)->overrideIds(name);~
                      ~%                    if(_ids) {~
                      ~%                        ids = *_ids; }}~
                      ~%                break;"
@@ -1120,8 +1106,9 @@
           (when (eql module (class-module (trim* name)))
             (format s "~%            case ~D:" i)))
         (when (plusp i)
-          (format s "~%                if(override_~(~A~)) {~
+          (format s "~%                if(ModuleInterface::~(~A~)) {~
-                     ~%                    NumList* _ids = override_~(~A~)(name);~
+                     ~%                    NumList* _ids = ModuleInterface::~(~A~)->overrideIds(name);~
+
                      ~%                    if(_ids) {~
                      ~%                        ids = *_ids; }}~
                      ~%                break;"

src/eql.cpp

@@ -8,7 +8,7 @@
 #include <QTimer>
 #include <QStringList>
 
-const char EQL::version[] = "19.9.1"; // September 2019
+const char EQL::version[] = "20.5.1"; // May 2020
 
 extern "C" void ini_EQL(cl_object);
 

src/gen/_lobjects.cpp

@@ -20,6 +20,7 @@ int LObjects::T_QList_QCameraViewfinderSettings = -1;
 int LObjects::T_QHelpSearchQuery = -1;
 int LObjects::T_QList_QHelpSearchQuery = -1;
 int LObjects::T_QHostAddress = -1;
+int LObjects::T_QList_QHostAddress = -1;
 int LObjects::T_QHostInfo = -1;
 int LObjects::T_QHttpPart = -1;
 int LObjects::T_QImageEncoderSettings = -1;

src/gen/_lobjects.h

@@ -46,6 +46,7 @@ public:
     static int T_QHelpSearchQuery;
     static int T_QList_QHelpSearchQuery;
     static int T_QHostAddress;
+    static int T_QList_QHostAddress;
     static int T_QHostInfo;
     static int T_QHttpPart;
     static int T_QImageEncoderSettings;

src/gen/network/_ini.cpp

@@ -24,6 +24,7 @@ TO_QT_TYPE_PTR  (QSslKey, qsslkey)
 TO_QT_LIST_VAL (QNetworkConfiguration)
 TO_QT_LIST_VAL (QNetworkCookie)
 
+TO_CL_LIST_VAL (QHostAddress, qhostaddress)
 TO_CL_LIST_VAL (QNetworkAddressEntry, qnetworkaddressentry)
 TO_CL_LIST_VAL (QNetworkConfiguration, qnetworkconfiguration)
 TO_CL_LIST_VAL (QNetworkCookie, qnetworkcookie)
@@ -102,6 +103,7 @@ ModuleNetwork::ModuleNetwork() {
 
 void ModuleNetwork::ini2() {
     META_TYPE_(LObjects::T_QHostAddress,                QHostAddress)
+    META_TYPE_(LObjects::T_QList_QHostAddress,          QList<QHostAddress>)
     META_TYPE_(LObjects::T_QHostInfo,                   QHostInfo)
     META_TYPE_(LObjects::T_QHttpPart,                   QHttpPart)
     META_TYPE_(LObjects::T_QNetworkAddressEntry,        QNetworkAddressEntry)
@@ -149,6 +151,7 @@ cl_object ModuleNetwork::to_lisp_arg(int n, void* p, bool* found) {
     cl_object l_ret = Cnil;
     bool _found = true;
     if(LObjects::T_QHostAddress == n)                     { l_ret = from_qhostaddress(*(QHostAddress*)p); }
+    else if(LObjects::T_QList_QHostAddress == n)          { l_ret = from_qhostaddresslist(*(QList<QHostAddress>*)p); }
     else if(LObjects::T_QHostInfo == n)                   { l_ret = from_qhostinfo(*(QHostInfo*)p); }
     else if(LObjects::T_QHttpPart == n)                   { l_ret = from_qhttppart(*(QHttpPart*)p); }
     else if(LObjects::T_QNetworkAddressEntry == n)        { l_ret = from_qnetworkaddressentry(*(QNetworkAddressEntry*)p); }

src/gen/network/_ini2.h

@@ -6,6 +6,7 @@
 #include <QtNetwork>
 
 Q_DECLARE_METATYPE(QNetworkCacheMetaData)
+Q_DECLARE_METATYPE(QList<QHostAddress>)
 Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 
 #endif