new version number 19.9.1: modules can now be integrated statically (needed for iOS; for experts only!)
This commit is contained in:
polos
parent
ae674491e1
commit
eb9eba1869
56 changed files with 918 additions and 824 deletions
229
src/ecl_fun.cpp
229
src/ecl_fun.cpp
|
|
@ -6,8 +6,20 @@
|
|||
#include "gen/_lobjects.h"
|
||||
#include "ui_loader.h"
|
||||
#include "single_shot.h"
|
||||
#include "module_interface.h"
|
||||
#include <QLibrary>
|
||||
|
||||
#ifdef STATIC_MODULES
|
||||
#include "gen/help/_ini.h"
|
||||
#include "gen/network/_ini.h"
|
||||
#include "gen/multimedia/_ini.h"
|
||||
#include "gen/quick/_ini.h"
|
||||
#include "gen/sql/_ini.h"
|
||||
#include "gen/svg/_ini.h"
|
||||
#include "gen/webengine/_ini.h"
|
||||
#include "gen/webkit/_ini.h"
|
||||
#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
// switches
|
||||
|
|
@ -1337,20 +1349,20 @@ static MetaArg toMetaArg(const QByteArray& sType, cl_object l_arg) {
|
|||
// module types
|
||||
else {
|
||||
bool found = false;
|
||||
if(LObjects::toMetaArg_help) {
|
||||
p = LObjects::toMetaArg_help(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_multimedia) {
|
||||
p = LObjects::toMetaArg_multimedia(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_network) {
|
||||
p = LObjects::toMetaArg_network(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_quick) {
|
||||
p = LObjects::toMetaArg_quick(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_sql) {
|
||||
p = LObjects::toMetaArg_sql(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_webengine) {
|
||||
p = LObjects::toMetaArg_webengine(n, l_arg, &found); }
|
||||
if(!found && LObjects::toMetaArg_webkit) {
|
||||
p = LObjects::toMetaArg_webkit(n, l_arg, &found); }
|
||||
if(ModuleInterface::help) {
|
||||
p = ModuleInterface::help->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::multimedia) {
|
||||
p = ModuleInterface::multimedia->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::network) {
|
||||
p = ModuleInterface::network->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::quick) {
|
||||
p = ModuleInterface::quick->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::sql) {
|
||||
p = ModuleInterface::sql->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::webengine) {
|
||||
p = ModuleInterface::webengine->toMetaArg(n, l_arg, &found); }
|
||||
if(!found && ModuleInterface::webkit) {
|
||||
p = ModuleInterface::webkit->toMetaArg(n, l_arg, &found); }
|
||||
if(!found) {
|
||||
// enum
|
||||
if(!sType.endsWith('>') && sType.contains(':')) {
|
||||
|
|
@ -1512,20 +1524,20 @@ cl_object to_lisp_arg(const MetaArg& arg) {
|
|||
// module types
|
||||
else {
|
||||
bool found = false;
|
||||
if(LObjects::to_lisp_arg_help) {
|
||||
l_ret = LObjects::to_lisp_arg_help(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_multimedia) {
|
||||
l_ret = LObjects::to_lisp_arg_multimedia(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_network) {
|
||||
l_ret = LObjects::to_lisp_arg_network(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_quick) {
|
||||
l_ret = LObjects::to_lisp_arg_quick(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_sql) {
|
||||
l_ret = LObjects::to_lisp_arg_sql(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_webengine) {
|
||||
l_ret = LObjects::to_lisp_arg_webengine(n, p, &found); }
|
||||
if(!found && LObjects::to_lisp_arg_webkit) {
|
||||
l_ret = LObjects::to_lisp_arg_webkit(n, p, &found); }
|
||||
if(ModuleInterface::help) {
|
||||
l_ret = ModuleInterface::help->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::multimedia) {
|
||||
l_ret = ModuleInterface::multimedia->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::network) {
|
||||
l_ret = ModuleInterface::network->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::quick) {
|
||||
l_ret = ModuleInterface::quick->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::sql) {
|
||||
l_ret = ModuleInterface::sql->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::webengine) {
|
||||
l_ret = ModuleInterface::webengine->to_lisp_arg(n, p, &found); }
|
||||
if(!found && ModuleInterface::webkit) {
|
||||
l_ret = ModuleInterface::webkit->to_lisp_arg(n, p, &found); }
|
||||
// enum
|
||||
if(!found) {
|
||||
if(!sType.endsWith('>') && sType.contains(':')) {
|
||||
|
|
@ -2429,9 +2441,9 @@ cl_object qclear_event_filters() {
|
|||
return Ct; }
|
||||
|
||||
cl_object qrequire2(cl_object l_name, cl_object l_quiet) { /// qrequire
|
||||
/// args: (module &optional quiet)
|
||||
/// Loads an EQL module, corresponding to a Qt module.<br>Returns the module name if both loading and initializing have been successful.<br>If the <code>quiet</code> argument is not <code>NIL</code>, no error message will be shown on failure.<br><br>Currently available modules: <code>:help :multimedia :network :quick :sql :svg :webengine :webkit</code>
|
||||
/// (qrequire :network)
|
||||
/// args: (module &optional quiet)
|
||||
/// Loads an EQL module, corresponding to a Qt module.<br>Returns the module name if both loading and initializing have been successful.<br>If the <code>quiet</code> argument is not <code>NIL</code>, no error message will be shown on failure.<br><br>Currently available modules: <code>:help :multimedia :network :quick :sql :svg :webengine :webkit</code>
|
||||
/// (qrequire :network)
|
||||
ecl_process_env()->nvalues = 1;
|
||||
QString name = symbolName(l_name);
|
||||
QString file("eql5_" + name);
|
||||
|
|
@ -2442,75 +2454,98 @@ cl_object qrequire2(cl_object l_name, cl_object l_quiet) { /// qrequire
|
|||
if(appPath.contains(".app/")) {
|
||||
path = appPath + "/../libs/"; }
|
||||
#endif
|
||||
#ifdef STATIC_MODULES
|
||||
if("help" == name) {
|
||||
if(!ModuleInterface::help) {
|
||||
ModuleInterface::help = new ModuleHelp; }}
|
||||
else if("multimedia" == name) {
|
||||
if(!ModuleInterface::multimedia) {
|
||||
ModuleInterface::multimedia = new ModuleMultimedia; }}
|
||||
else if("network" == name) {
|
||||
if(!ModuleInterface::network) {
|
||||
ModuleInterface::network = new ModuleNetwork; }}
|
||||
else if("quick" == name) {
|
||||
if(!ModuleInterface::quick) {
|
||||
ModuleInterface::quick = new ModuleQuick; }}
|
||||
else if("sql" == name) {
|
||||
if(!ModuleInterface::sql) {
|
||||
ModuleInterface::sql = new ModuleSql; }}
|
||||
else if("svg" == name) {
|
||||
if(!ModuleInterface::svg) {
|
||||
ModuleInterface::svg = new ModuleSvg; }}
|
||||
else if("webengine" == name) {
|
||||
if(!ModuleInterface::webengine) {
|
||||
ModuleInterface::webengine = new ModuleWebengine; }}
|
||||
/* (uncomment if needed)
|
||||
else if("webkit" == name) {
|
||||
if(!ModuleInterface::webkit) {
|
||||
ModuleInterface::webkit = new ModuleWebkit; }} */
|
||||
else if(l_quiet == Cnil) {
|
||||
error_msg("QREQUIRE", LIST1(l_name)); }
|
||||
return l_name;
|
||||
#else
|
||||
QLibrary lib(path + file);
|
||||
if(!lib.load()) {
|
||||
lib.setFileName(file); } // use default library paths
|
||||
typedef void (*Ini)();
|
||||
Ini ini = (Ini)lib.resolve("ini");
|
||||
if(ini) {
|
||||
ini();
|
||||
StaticMetaObject meta = (StaticMetaObject)lib.resolve("staticMetaObject");
|
||||
DeleteNObject del = (DeleteNObject)lib.resolve("deleteNObject");
|
||||
Override over = (Override)lib.resolve("overrideFunctions");
|
||||
if(meta && del && over) {
|
||||
if("svg" == name) {
|
||||
LObjects::staticMetaObject_svg = meta;
|
||||
LObjects::deleteNObject_svg = del;
|
||||
LObjects::override_svg = over;
|
||||
return l_name; }
|
||||
else {
|
||||
ToMetaArg metaArg = (ToMetaArg)lib.resolve("toMetaArg");
|
||||
To_lisp_arg lispArg = (To_lisp_arg)lib.resolve("to_lisp_arg");
|
||||
if(metaArg && lispArg) {
|
||||
if("help" == name) {
|
||||
LObjects::staticMetaObject_help = meta;
|
||||
LObjects::deleteNObject_help = del;
|
||||
LObjects::override_help = over;
|
||||
LObjects::toMetaArg_help = metaArg;
|
||||
LObjects::to_lisp_arg_help = lispArg;
|
||||
return l_name; }
|
||||
else if("multimedia" == name) {
|
||||
LObjects::staticMetaObject_multimedia = meta;
|
||||
LObjects::deleteNObject_multimedia = del;
|
||||
LObjects::override_multimedia = over;
|
||||
LObjects::toMetaArg_multimedia = metaArg;
|
||||
LObjects::to_lisp_arg_multimedia = lispArg;
|
||||
return l_name; }
|
||||
else if("network" == name) {
|
||||
LObjects::staticMetaObject_network = meta;
|
||||
LObjects::deleteNObject_network = del;
|
||||
LObjects::override_network = over;
|
||||
LObjects::toMetaArg_network = metaArg;
|
||||
LObjects::to_lisp_arg_network = lispArg;
|
||||
return l_name; }
|
||||
else if("quick" == name) {
|
||||
LObjects::staticMetaObject_quick = meta;
|
||||
LObjects::deleteNObject_quick = del;
|
||||
LObjects::override_quick = over;
|
||||
LObjects::toMetaArg_quick = metaArg;
|
||||
LObjects::to_lisp_arg_quick = lispArg;
|
||||
return l_name; }
|
||||
else if("sql" == name) {
|
||||
LObjects::staticMetaObject_sql = meta;
|
||||
LObjects::deleteNObject_sql = del;
|
||||
LObjects::override_sql = over;
|
||||
LObjects::toMetaArg_sql = metaArg;
|
||||
LObjects::to_lisp_arg_sql = lispArg;
|
||||
return l_name; }
|
||||
else if("webengine" == name) {
|
||||
LObjects::staticMetaObject_webengine = meta;
|
||||
LObjects::deleteNObject_webengine = del;
|
||||
LObjects::override_webengine = over;
|
||||
LObjects::toMetaArg_webengine = metaArg;
|
||||
LObjects::to_lisp_arg_webengine = lispArg;
|
||||
return l_name; }
|
||||
else if("webkit" == name) {
|
||||
LObjects::staticMetaObject_webkit = meta;
|
||||
LObjects::deleteNObject_webkit = del;
|
||||
LObjects::override_webkit = over;
|
||||
LObjects::toMetaArg_webkit = metaArg;
|
||||
LObjects::to_lisp_arg_webkit = lispArg;
|
||||
return l_name; }}}}}
|
||||
typedef ModuleInterface* (*Ini)();
|
||||
Ini ini = 0;
|
||||
if("help" == name) {
|
||||
if(ModuleInterface::help) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("help_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::help = ini();
|
||||
return l_name; }}
|
||||
else if("multimedia" == name) {
|
||||
if(ModuleInterface::multimedia) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("multimedia_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::multimedia = ini();
|
||||
return l_name; }}
|
||||
else if("network" == name) {
|
||||
if(ModuleInterface::network) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("network_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::network = ini();
|
||||
return l_name; }}
|
||||
else if("quick" == name) {
|
||||
if(ModuleInterface::quick) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("quick_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::quick = ini();
|
||||
return l_name; }}
|
||||
else if("sql" == name) {
|
||||
if(ModuleInterface::sql) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("sql_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::sql = ini();
|
||||
return l_name; }}
|
||||
else if("svg" == name) {
|
||||
if(ModuleInterface::svg) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("svg_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::svg = ini();
|
||||
return l_name; }}
|
||||
else if("webengine" == name) {
|
||||
if(ModuleInterface::webengine) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("webengine_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::webengine = ini();
|
||||
return l_name; }}
|
||||
else if("webkit" == name) {
|
||||
if(ModuleInterface::webkit) {
|
||||
return l_name; }
|
||||
ini = (Ini)lib.resolve("webkit_ini");
|
||||
if(ini) {
|
||||
ModuleInterface::webkit = ini();
|
||||
return l_name; }}
|
||||
#endif
|
||||
if(l_quiet == Cnil) {
|
||||
error_msg("QREQUIRE", LIST1(l_name)); }
|
||||
return Cnil; }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include <QTimer>
|
||||
#include <QStringList>
|
||||
|
||||
const char EQL::version[] = "19.2.1"; // February 2019
|
||||
const char EQL::version[] = "19.9.1"; // September 2019
|
||||
|
||||
extern "C" void ini_EQL(cl_object);
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,13 @@ DESTDIR = ../
|
|||
OBJECTS_DIR = ./tmp/
|
||||
MOC_DIR = ./tmp/
|
||||
|
||||
# static modules (optional) *** warning: only use them if you know what you are doing! ***
|
||||
#DEFINES += STATIC_MODULES
|
||||
#QT += network quick quickwidgets qml # (base for iOS)
|
||||
#LIBS += -L.. -leql5_network -leql5_quick # (base for iOS)
|
||||
#QT += help multimedia multimediawidgets sql svg webengine webenginewidgets # webkit webkitwidgets
|
||||
#LIBS += -L.. -leql5_help -leql5_multimedia -leql5_sql -leql5_svg -leql5_webengine # -leql5_webkit
|
||||
|
||||
include.files = eql5/*
|
||||
|
||||
linux {
|
||||
|
|
@ -44,6 +51,7 @@ HEADERS += gen/_lobjects.h \
|
|||
eql5/eql_fun.h \
|
||||
eql5/eql_global.h \
|
||||
eql5/dyn_object.h \
|
||||
module_interface.h \
|
||||
qt_eql.h \
|
||||
ui_loader.h \
|
||||
single_shot.h \
|
||||
|
|
@ -51,6 +59,7 @@ HEADERS += gen/_lobjects.h \
|
|||
extras.h
|
||||
|
||||
SOURCES += gen/_lobjects.cpp \
|
||||
module_interface.cpp \
|
||||
qt_eql.cpp \
|
||||
dyn_object.cpp \
|
||||
ecl_fun.cpp \
|
||||
|
|
|
|||
|
|
@ -7,6 +7,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;
|
||||
|
|
@ -77,45 +78,6 @@ QMap<QByteArray, int> LObjects::n_names;
|
|||
QHash<QByteArray, uint> LObjects::override_function_ids;
|
||||
QHash<quint64, void*> LObjects::override_lisp_functions;
|
||||
|
||||
StaticMetaObject LObjects::staticMetaObject_help = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_multimedia = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_network = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_quick = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_sql = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_svg = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_webengine = 0;
|
||||
StaticMetaObject LObjects::staticMetaObject_webkit = 0;
|
||||
DeleteNObject LObjects::deleteNObject_help = 0;
|
||||
DeleteNObject LObjects::deleteNObject_multimedia = 0;
|
||||
DeleteNObject LObjects::deleteNObject_network = 0;
|
||||
DeleteNObject LObjects::deleteNObject_quick = 0;
|
||||
DeleteNObject LObjects::deleteNObject_sql = 0;
|
||||
DeleteNObject LObjects::deleteNObject_svg = 0;
|
||||
DeleteNObject LObjects::deleteNObject_webengine = 0;
|
||||
DeleteNObject LObjects::deleteNObject_webkit = 0;
|
||||
Override LObjects::override_help = 0;
|
||||
Override LObjects::override_multimedia = 0;
|
||||
Override LObjects::override_network = 0;
|
||||
Override LObjects::override_quick = 0;
|
||||
Override LObjects::override_sql = 0;
|
||||
Override LObjects::override_svg = 0;
|
||||
Override LObjects::override_webengine = 0;
|
||||
Override LObjects::override_webkit = 0;
|
||||
ToMetaArg LObjects::toMetaArg_help = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_help = 0;
|
||||
ToMetaArg LObjects::toMetaArg_multimedia = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_multimedia = 0;
|
||||
ToMetaArg LObjects::toMetaArg_network = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_network = 0;
|
||||
ToMetaArg LObjects::toMetaArg_quick = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_quick = 0;
|
||||
ToMetaArg LObjects::toMetaArg_sql = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_sql = 0;
|
||||
ToMetaArg LObjects::toMetaArg_webengine = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_webengine = 0;
|
||||
ToMetaArg LObjects::toMetaArg_webkit = 0;
|
||||
To_lisp_arg LObjects::to_lisp_arg_webkit = 0;
|
||||
|
||||
NumList LAbstractAnimation::overrideIds = NumList() << 1 << 2 << 3 << 4;
|
||||
NumList LAbstractButton::overrideIds = NumList() << 9 << 10 << 11 << 12 << 13 << 14 << 15 << 16 << 17 << 18 << 19 << 20 << 8;
|
||||
NumList LAbstractItemDelegate::overrideIds = NumList() << 46 << 47 << 48 << 49 << 50 << 51 << 52 << 53 << 54;
|
||||
|
|
@ -2915,8 +2877,8 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 100:
|
||||
case 101:
|
||||
case 102:
|
||||
if(staticMetaObject_help) {
|
||||
m = staticMetaObject_help(n); }
|
||||
if(ModuleInterface::help) {
|
||||
m = ModuleInterface::help->staticMetaObject(n); }
|
||||
break;
|
||||
case 18:
|
||||
case 23:
|
||||
|
|
@ -2937,8 +2899,8 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 187:
|
||||
case 263:
|
||||
case 264:
|
||||
if(staticMetaObject_multimedia) {
|
||||
m = staticMetaObject_multimedia(n); }
|
||||
if(ModuleInterface::multimedia) {
|
||||
m = ModuleInterface::multimedia->staticMetaObject(n); }
|
||||
break;
|
||||
case 7:
|
||||
case 12:
|
||||
|
|
@ -2952,8 +2914,8 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 237:
|
||||
case 238:
|
||||
case 256:
|
||||
if(staticMetaObject_network) {
|
||||
m = staticMetaObject_network(n); }
|
||||
if(ModuleInterface::network) {
|
||||
m = ModuleInterface::network->staticMetaObject(n); }
|
||||
break;
|
||||
case 112:
|
||||
case 168:
|
||||
|
|
@ -2979,22 +2941,22 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 192:
|
||||
case 193:
|
||||
case 194:
|
||||
if(staticMetaObject_quick) {
|
||||
m = staticMetaObject_quick(n); }
|
||||
if(ModuleInterface::quick) {
|
||||
m = ModuleInterface::quick->staticMetaObject(n); }
|
||||
break;
|
||||
case 211:
|
||||
case 212:
|
||||
case 213:
|
||||
case 214:
|
||||
case 215:
|
||||
if(staticMetaObject_sql) {
|
||||
m = staticMetaObject_sql(n); }
|
||||
if(ModuleInterface::sql) {
|
||||
m = ModuleInterface::sql->staticMetaObject(n); }
|
||||
break;
|
||||
case 83:
|
||||
case 226:
|
||||
case 227:
|
||||
if(staticMetaObject_svg) {
|
||||
m = staticMetaObject_svg(n); }
|
||||
if(ModuleInterface::svg) {
|
||||
m = ModuleInterface::svg->staticMetaObject(n); }
|
||||
break;
|
||||
case 265:
|
||||
case 266:
|
||||
|
|
@ -3004,8 +2966,8 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 270:
|
||||
case 271:
|
||||
case 272:
|
||||
if(staticMetaObject_webengine) {
|
||||
m = staticMetaObject_webengine(n); }
|
||||
if(ModuleInterface::webengine) {
|
||||
m = ModuleInterface::webengine->staticMetaObject(n); }
|
||||
break;
|
||||
case 88:
|
||||
case 273:
|
||||
|
|
@ -3014,8 +2976,8 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
|
|||
case 276:
|
||||
case 277:
|
||||
case 278:
|
||||
if(staticMetaObject_webkit) {
|
||||
m = staticMetaObject_webkit(n); }
|
||||
if(ModuleInterface::webkit) {
|
||||
m = ModuleInterface::webkit->staticMetaObject(n); }
|
||||
break; }
|
||||
return m; }
|
||||
|
||||
|
|
@ -3215,8 +3177,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 280: if(gc) delete (QWindowStateChangeEvent*)p; else delete (LWindowStateChangeEvent*)p; break;
|
||||
case 86:
|
||||
case 88:
|
||||
if(deleteNObject_help) {
|
||||
deleteNObject_help(n, p, gc); }
|
||||
if(ModuleInterface::help) {
|
||||
ModuleInterface::help->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 18:
|
||||
case 19:
|
||||
|
|
@ -3229,8 +3191,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 261:
|
||||
case 262:
|
||||
case 263:
|
||||
if(deleteNObject_multimedia) {
|
||||
deleteNObject_multimedia(n, p, gc); }
|
||||
if(ModuleInterface::multimedia) {
|
||||
ModuleInterface::multimedia->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 21:
|
||||
case 90:
|
||||
|
|
@ -3250,8 +3212,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 206:
|
||||
case 207:
|
||||
case 208:
|
||||
if(deleteNObject_network) {
|
||||
deleteNObject_network(n, p, gc); }
|
||||
if(ModuleInterface::network) {
|
||||
ModuleInterface::network->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 104:
|
||||
case 105:
|
||||
|
|
@ -3282,8 +3244,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 186:
|
||||
case 187:
|
||||
case 188:
|
||||
if(deleteNObject_quick) {
|
||||
deleteNObject_quick(n, p, gc); }
|
||||
if(ModuleInterface::quick) {
|
||||
ModuleInterface::quick->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 196:
|
||||
case 197:
|
||||
|
|
@ -3293,12 +3255,12 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 201:
|
||||
case 202:
|
||||
case 203:
|
||||
if(deleteNObject_sql) {
|
||||
deleteNObject_sql(n, p, gc); }
|
||||
if(ModuleInterface::sql) {
|
||||
ModuleInterface::sql->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 217:
|
||||
if(deleteNObject_svg) {
|
||||
deleteNObject_svg(n, p, gc); }
|
||||
if(ModuleInterface::svg) {
|
||||
ModuleInterface::svg->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 267:
|
||||
case 268:
|
||||
|
|
@ -3306,8 +3268,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 270:
|
||||
case 271:
|
||||
case 272:
|
||||
if(deleteNObject_webengine) {
|
||||
deleteNObject_webengine(n, p, gc); }
|
||||
if(ModuleInterface::webengine) {
|
||||
ModuleInterface::webengine->deleteNObject(n, p, gc); }
|
||||
break;
|
||||
case 264:
|
||||
case 265:
|
||||
|
|
@ -3315,8 +3277,8 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
|
|||
case 273:
|
||||
case 274:
|
||||
case 275:
|
||||
if(deleteNObject_webkit) {
|
||||
deleteNObject_webkit(n, p, gc); }
|
||||
if(ModuleInterface::webkit) {
|
||||
ModuleInterface::webkit->deleteNObject(n, p, gc); }
|
||||
break; }}
|
||||
|
||||
const char* LObjects::nObjectSuperClass(const QByteArray& name) {
|
||||
|
|
@ -3626,8 +3588,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 100:
|
||||
case 101:
|
||||
case 102:
|
||||
if(override_help) {
|
||||
NumList* _ids = override_help(name);
|
||||
if(ModuleInterface::help) {
|
||||
NumList* _ids = ModuleInterface::help->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3650,8 +3612,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 187:
|
||||
case 263:
|
||||
case 264:
|
||||
if(override_multimedia) {
|
||||
NumList* _ids = override_multimedia(name);
|
||||
if(ModuleInterface::multimedia) {
|
||||
NumList* _ids = ModuleInterface::multimedia->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3667,8 +3629,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 237:
|
||||
case 238:
|
||||
case 256:
|
||||
if(override_network) {
|
||||
NumList* _ids = override_network(name);
|
||||
if(ModuleInterface::network) {
|
||||
NumList* _ids = ModuleInterface::network->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3696,8 +3658,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 192:
|
||||
case 193:
|
||||
case 194:
|
||||
if(override_quick) {
|
||||
NumList* _ids = override_quick(name);
|
||||
if(ModuleInterface::quick) {
|
||||
NumList* _ids = ModuleInterface::quick->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3706,16 +3668,16 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 213:
|
||||
case 214:
|
||||
case 215:
|
||||
if(override_sql) {
|
||||
NumList* _ids = override_sql(name);
|
||||
if(ModuleInterface::sql) {
|
||||
NumList* _ids = ModuleInterface::sql->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
case 83:
|
||||
case 226:
|
||||
case 227:
|
||||
if(override_svg) {
|
||||
NumList* _ids = override_svg(name);
|
||||
if(ModuleInterface::svg) {
|
||||
NumList* _ids = ModuleInterface::svg->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3727,8 +3689,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 270:
|
||||
case 271:
|
||||
case 272:
|
||||
if(override_webengine) {
|
||||
NumList* _ids = override_webengine(name);
|
||||
if(ModuleInterface::webengine) {
|
||||
NumList* _ids = ModuleInterface::webengine->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3739,8 +3701,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 276:
|
||||
case 277:
|
||||
case 278:
|
||||
if(override_webkit) {
|
||||
NumList* _ids = override_webkit(name);
|
||||
if(ModuleInterface::webkit) {
|
||||
NumList* _ids = ModuleInterface::webkit->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break; }}
|
||||
|
|
@ -3941,8 +3903,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 280: ids = LWindowStateChangeEvent::overrideIds; break;
|
||||
case 86:
|
||||
case 88:
|
||||
if(override_help) {
|
||||
NumList* _ids = override_help(name);
|
||||
if(ModuleInterface::help) {
|
||||
NumList* _ids = ModuleInterface::help->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3957,8 +3919,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 261:
|
||||
case 262:
|
||||
case 263:
|
||||
if(override_multimedia) {
|
||||
NumList* _ids = override_multimedia(name);
|
||||
if(ModuleInterface::multimedia) {
|
||||
NumList* _ids = ModuleInterface::multimedia->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -3980,8 +3942,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 206:
|
||||
case 207:
|
||||
case 208:
|
||||
if(override_network) {
|
||||
NumList* _ids = override_network(name);
|
||||
if(ModuleInterface::network) {
|
||||
NumList* _ids = ModuleInterface::network->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -4014,8 +3976,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 186:
|
||||
case 187:
|
||||
case 188:
|
||||
if(override_quick) {
|
||||
NumList* _ids = override_quick(name);
|
||||
if(ModuleInterface::quick) {
|
||||
NumList* _ids = ModuleInterface::quick->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -4027,14 +3989,14 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 201:
|
||||
case 202:
|
||||
case 203:
|
||||
if(override_sql) {
|
||||
NumList* _ids = override_sql(name);
|
||||
if(ModuleInterface::sql) {
|
||||
NumList* _ids = ModuleInterface::sql->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
case 217:
|
||||
if(override_svg) {
|
||||
NumList* _ids = override_svg(name);
|
||||
if(ModuleInterface::svg) {
|
||||
NumList* _ids = ModuleInterface::svg->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -4044,8 +4006,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 270:
|
||||
case 271:
|
||||
case 272:
|
||||
if(override_webengine) {
|
||||
NumList* _ids = override_webengine(name);
|
||||
if(ModuleInterface::webengine) {
|
||||
NumList* _ids = ModuleInterface::webengine->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break;
|
||||
|
|
@ -4055,8 +4017,8 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
|
|||
case 273:
|
||||
case 274:
|
||||
case 275:
|
||||
if(override_webkit) {
|
||||
NumList* _ids = override_webkit(name);
|
||||
if(ModuleInterface::webkit) {
|
||||
NumList* _ids = ModuleInterface::webkit->overrideIds(name);
|
||||
if(_ids) {
|
||||
ids = *_ids; }}
|
||||
break; }}
|
||||
|
|
|
|||
|
|
@ -33,13 +33,6 @@ typedef QList<QByteArray> StrList;
|
|||
class EQL;
|
||||
class DynObject;
|
||||
|
||||
// functions from EQL modules
|
||||
typedef const QMetaObject* (*StaticMetaObject)(int);
|
||||
typedef void (*DeleteNObject)(int, void*, int);
|
||||
typedef NumList* (*Override)(const QByteArray&);
|
||||
typedef void* (*ToMetaArg)(int, cl_object, bool*);
|
||||
typedef cl_object (*To_lisp_arg)(int, void*, bool*);
|
||||
|
||||
class EQL_EXPORT LObjects {
|
||||
public:
|
||||
static int T_QAudioDeviceInfo;
|
||||
|
|
@ -147,45 +140,6 @@ public:
|
|||
.toLatin1().constData(),
|
||||
Cnil);
|
||||
return false; }
|
||||
|
||||
static StaticMetaObject staticMetaObject_help;
|
||||
static StaticMetaObject staticMetaObject_multimedia;
|
||||
static StaticMetaObject staticMetaObject_network;
|
||||
static StaticMetaObject staticMetaObject_quick;
|
||||
static StaticMetaObject staticMetaObject_sql;
|
||||
static StaticMetaObject staticMetaObject_svg;
|
||||
static StaticMetaObject staticMetaObject_webengine;
|
||||
static StaticMetaObject staticMetaObject_webkit;
|
||||
static DeleteNObject deleteNObject_help;
|
||||
static DeleteNObject deleteNObject_multimedia;
|
||||
static DeleteNObject deleteNObject_network;
|
||||
static DeleteNObject deleteNObject_quick;
|
||||
static DeleteNObject deleteNObject_sql;
|
||||
static DeleteNObject deleteNObject_svg;
|
||||
static DeleteNObject deleteNObject_webengine;
|
||||
static DeleteNObject deleteNObject_webkit;
|
||||
static Override override_help;
|
||||
static Override override_multimedia;
|
||||
static Override override_network;
|
||||
static Override override_quick;
|
||||
static Override override_sql;
|
||||
static Override override_svg;
|
||||
static Override override_webengine;
|
||||
static Override override_webkit;
|
||||
static ToMetaArg toMetaArg_help;
|
||||
static To_lisp_arg to_lisp_arg_help;
|
||||
static ToMetaArg toMetaArg_multimedia;
|
||||
static To_lisp_arg to_lisp_arg_multimedia;
|
||||
static ToMetaArg toMetaArg_network;
|
||||
static To_lisp_arg to_lisp_arg_network;
|
||||
static ToMetaArg toMetaArg_quick;
|
||||
static To_lisp_arg to_lisp_arg_quick;
|
||||
static ToMetaArg toMetaArg_sql;
|
||||
static To_lisp_arg to_lisp_arg_sql;
|
||||
static ToMetaArg toMetaArg_webengine;
|
||||
static To_lisp_arg to_lisp_arg_webengine;
|
||||
static ToMetaArg toMetaArg_webkit;
|
||||
static To_lisp_arg to_lisp_arg_webkit;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -6,6 +6,14 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR2 (QHelpSearchQuery, qhelpsearchquery)
|
||||
|
||||
TO_QT_LIST_VAL (QHelpSearchQuery)
|
||||
|
||||
TO_CL_LIST_VAL (QHelpSearchQuery, qhelpsearchquery)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LHelpContentModel::overrideIds = NumList() << 58 << 59 << 65 << 73 << 77;
|
||||
NumList LHelpContentWidget::overrideIds = NumList();
|
||||
NumList LHelpEngineCore::overrideIds = NumList();
|
||||
|
|
@ -16,9 +24,10 @@ NumList LHelpSearchResultWidget::overrideIds = NumList();
|
|||
NumList LHelpContentItem::overrideIds = NumList();
|
||||
NumList LHelpSearchQuery::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* help_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleHelp* module = new ModuleHelp;
|
||||
module->ini2();
|
||||
LObjects::Q[94] = new Q95;
|
||||
LObjects::Q[95] = new Q96;
|
||||
LObjects::Q[96] = new Q97;
|
||||
|
|
@ -28,9 +37,37 @@ void ini() {
|
|||
LObjects::Q[100] = new Q101;
|
||||
LObjects::Q[101] = new Q102;
|
||||
LObjects::N[85] = new N86;
|
||||
LObjects::N[87] = new N88; }
|
||||
LObjects::N[87] = new N88;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleHelp::ModuleHelp() {
|
||||
help_ini(); }
|
||||
|
||||
void ModuleHelp::ini2() {
|
||||
META_TYPE_(LObjects::T_QHelpSearchQuery, QHelpSearchQuery)
|
||||
META_TYPE_(LObjects::T_QList_QHelpSearchQuery, QList<QHelpSearchQuery>) }
|
||||
|
||||
void* ModuleHelp::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHelpSearchQuery == n) { p = new QHelpSearchQuery(*toQHelpSearchQueryPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QHelpSearchQuery == n) { p = new QList<QHelpSearchQuery>(toQHelpSearchQueryList(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleHelp::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquery(*(QHelpSearchQuery*)p); }
|
||||
else if(LObjects::T_QList_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquerylist(*(QList<QHelpSearchQuery>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleHelp::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 95: m = &QHelpContentModel::staticMetaObject; break;
|
||||
|
|
@ -43,12 +80,12 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 102: m = &QHelpSearchResultWidget::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleHelp::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 86: if(gc) delete (QHelpContentItem*)p; else delete (LHelpContentItem*)p; break;
|
||||
case 88: if(gc) delete (QHelpSearchQuery*)p; else delete (LHelpSearchQuery*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleHelp::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_HELP_INI_H
|
||||
#define MODULE_HELP_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtHelp>
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -14,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* help_ini();
|
||||
|
||||
class ModuleHelp : public ModuleInterface {
|
||||
public:
|
||||
ModuleHelp();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,44 +2,7 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR2 (QHelpSearchQuery, qhelpsearchquery)
|
||||
|
||||
TO_QT_LIST_VAL (QHelpSearchQuery)
|
||||
|
||||
TO_CL_LIST_VAL (QHelpSearchQuery, qhelpsearchquery)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
META_TYPE_(LObjects::T_QHelpSearchQuery, QHelpSearchQuery)
|
||||
META_TYPE_(LObjects::T_QList_QHelpSearchQuery, QList<QHelpSearchQuery>) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHelpSearchQuery == n) { p = new QHelpSearchQuery(*toQHelpSearchQueryPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QHelpSearchQuery == n) { p = new QList<QHelpSearchQuery>(toQHelpSearchQueryList(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquery(*(QHelpSearchQuery*)p); }
|
||||
else if(LObjects::T_QList_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquerylist(*(QList<QHelpSearchQuery>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtHelp>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtHelp>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtHelp>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,25 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QAudioDeviceInfo, qaudiodeviceinfo)
|
||||
TO_QT_TYPE_PTR (QAudioEncoderSettings, qaudioencodersettings)
|
||||
TO_QT_TYPE_PTR (QAudioFormat, qaudioformat)
|
||||
TO_QT_TYPE_PTR (QCameraInfo, qcamerainfo)
|
||||
TO_QT_TYPE_PTR (QCameraViewfinderSettings, qcameraviewfindersettings)
|
||||
TO_QT_TYPE_PTR (QImageEncoderSettings, qimageencodersettings)
|
||||
TO_QT_TYPE_PTR2 (QMediaContent, qmediacontent)
|
||||
TO_QT_TYPE_PTR (QVideoEncoderSettings, qvideoencodersettings)
|
||||
TO_QT_TYPE_PTR (QVideoSurfaceFormat, qvideosurfaceformat)
|
||||
|
||||
TO_QT_LIST_VAL (QMediaContent)
|
||||
|
||||
TO_CL_LIST_VAL (QAudioDeviceInfo, qaudiodeviceinfo)
|
||||
TO_CL_LIST_VAL (QCameraInfo, qcamerainfo)
|
||||
TO_CL_LIST_VAL (QCameraViewfinderSettings, qcameraviewfindersettings)
|
||||
TO_CL_LIST_VAL (QMediaContent, qmediacontent)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LAudioOutput::overrideIds = NumList();
|
||||
NumList LAudioRecorder::overrideIds = NumList();
|
||||
NumList LCamera::overrideIds = NumList() << 179;
|
||||
|
|
@ -32,9 +51,10 @@ NumList LVideoEncoderSettings::overrideIds = NumList();
|
|||
NumList LVideoFrame::overrideIds = NumList();
|
||||
NumList LVideoSurfaceFormat::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* multimedia_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleMultimedia* module = new ModuleMultimedia;
|
||||
module->ini2();
|
||||
LObjects::Q[17] = new Q18;
|
||||
LObjects::Q[22] = new Q23;
|
||||
LObjects::Q[23] = new Q24;
|
||||
|
|
@ -64,9 +84,67 @@ void ini() {
|
|||
LObjects::N[117] = new N118;
|
||||
LObjects::N[260] = new N261;
|
||||
LObjects::N[261] = new N262;
|
||||
LObjects::N[262] = new N263; }
|
||||
LObjects::N[262] = new N263;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleMultimedia::ModuleMultimedia() {
|
||||
multimedia_ini(); }
|
||||
|
||||
void ModuleMultimedia::ini2() {
|
||||
META_TYPE_(LObjects::T_QAudioDeviceInfo, QAudioDeviceInfo)
|
||||
META_TYPE_(LObjects::T_QList_QAudioDeviceInfo, QList<QAudioDeviceInfo>)
|
||||
META_TYPE_(LObjects::T_QAudioEncoderSettings, QAudioEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QAudioFormat, QAudioFormat)
|
||||
META_TYPE_(LObjects::T_QCameraInfo, QCameraInfo)
|
||||
META_TYPE_(LObjects::T_QList_QCameraInfo, QList<QCameraInfo>)
|
||||
META_TYPE_(LObjects::T_QCameraViewfinderSettings, QCameraViewfinderSettings)
|
||||
META_TYPE_(LObjects::T_QList_QCameraViewfinderSettings, QList<QCameraViewfinderSettings>)
|
||||
META_TYPE_(LObjects::T_QImageEncoderSettings, QImageEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QMediaContent, QMediaContent)
|
||||
META_TYPE_(LObjects::T_QList_QMediaContent, QList<QMediaContent>)
|
||||
META_TYPE_(LObjects::T_QVideoEncoderSettings, QVideoEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QVideoSurfaceFormat, QVideoSurfaceFormat) }
|
||||
|
||||
void* ModuleMultimedia::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QAudioDeviceInfo == n) { p = new QAudioDeviceInfo(*toQAudioDeviceInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QAudioEncoderSettings == n) { p = new QAudioEncoderSettings(*toQAudioEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QAudioFormat == n) { p = new QAudioFormat(*toQAudioFormatPointer(l_arg)); }
|
||||
else if(LObjects::T_QCameraInfo == n) { p = new QCameraInfo(*toQCameraInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QCameraViewfinderSettings == n) { p = new QCameraViewfinderSettings(*toQCameraViewfinderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QImageEncoderSettings == n) { p = new QImageEncoderSettings(*toQImageEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QMediaContent == n) { p = new QMediaContent(*toQMediaContentPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QMediaContent == n) { p = new QList<QMediaContent>(toQMediaContentList(l_arg)); }
|
||||
else if(LObjects::T_QVideoEncoderSettings == n) { p = new QVideoEncoderSettings(*toQVideoEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QVideoSurfaceFormat == n) { p = new QVideoSurfaceFormat(*toQVideoSurfaceFormatPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleMultimedia::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QAudioDeviceInfo == n) { l_ret = from_qaudiodeviceinfo(*(QAudioDeviceInfo*)p); }
|
||||
else if(LObjects::T_QList_QAudioDeviceInfo == n) { l_ret = from_qaudiodeviceinfolist(*(QList<QAudioDeviceInfo>*)p); }
|
||||
else if(LObjects::T_QAudioEncoderSettings == n) { l_ret = from_qaudioencodersettings(*(QAudioEncoderSettings*)p); }
|
||||
else if(LObjects::T_QAudioFormat == n) { l_ret = from_qaudioformat(*(QAudioFormat*)p); }
|
||||
else if(LObjects::T_QCameraInfo == n) { l_ret = from_qcamerainfo(*(QCameraInfo*)p); }
|
||||
else if(LObjects::T_QList_QCameraInfo == n) { l_ret = from_qcamerainfolist(*(QList<QCameraInfo>*)p); }
|
||||
else if(LObjects::T_QCameraViewfinderSettings == n) { l_ret = from_qcameraviewfindersettings(*(QCameraViewfinderSettings*)p); }
|
||||
else if(LObjects::T_QList_QCameraViewfinderSettings == n) { l_ret = from_qcameraviewfindersettingslist(*(QList<QCameraViewfinderSettings>*)p); }
|
||||
else if(LObjects::T_QImageEncoderSettings == n) { l_ret = from_qimageencodersettings(*(QImageEncoderSettings*)p); }
|
||||
else if(LObjects::T_QMediaContent == n) { l_ret = from_qmediacontent(*(QMediaContent*)p); }
|
||||
else if(LObjects::T_QList_QMediaContent == n) { l_ret = from_qmediacontentlist(*(QList<QMediaContent>*)p); }
|
||||
else if(LObjects::T_QVideoEncoderSettings == n) { l_ret = from_qvideoencodersettings(*(QVideoEncoderSettings*)p); }
|
||||
else if(LObjects::T_QVideoSurfaceFormat == n) { l_ret = from_qvideosurfaceformat(*(QVideoSurfaceFormat*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleMultimedia::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 18: m = &QAbstractVideoSurface::staticMetaObject; break;
|
||||
|
|
@ -90,7 +168,7 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 264: m = &QVideoWidgetControl::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleMultimedia::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 18: if(gc) delete (QAudioDeviceInfo*)p; else delete (LAudioDeviceInfo*)p; break;
|
||||
case 19: if(gc) delete (QAudioEncoderSettings*)p; else delete (LAudioEncoderSettings*)p; break;
|
||||
|
|
@ -104,7 +182,7 @@ void deleteNObject(int n, void* p, int gc) {
|
|||
case 262: if(gc) delete (QVideoFrame*)p; else delete (LVideoFrame*)p; break;
|
||||
case 263: if(gc) delete (QVideoSurfaceFormat*)p; else delete (LVideoSurfaceFormat*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleMultimedia::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_MULTIMEDIA_INI_H
|
||||
#define MODULE_MULTIMEDIA_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtMultimedia>
|
||||
#include <QtMultimediaWidgets>
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -15,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* multimedia_ini();
|
||||
|
||||
class ModuleMultimedia : public ModuleInterface {
|
||||
public:
|
||||
ModuleMultimedia();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,85 +2,7 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QAudioDeviceInfo, qaudiodeviceinfo)
|
||||
TO_QT_TYPE_PTR (QAudioEncoderSettings, qaudioencodersettings)
|
||||
TO_QT_TYPE_PTR (QAudioFormat, qaudioformat)
|
||||
TO_QT_TYPE_PTR (QCameraInfo, qcamerainfo)
|
||||
TO_QT_TYPE_PTR (QCameraViewfinderSettings, qcameraviewfindersettings)
|
||||
TO_QT_TYPE_PTR (QImageEncoderSettings, qimageencodersettings)
|
||||
TO_QT_TYPE_PTR2 (QMediaContent, qmediacontent)
|
||||
TO_QT_TYPE_PTR (QVideoEncoderSettings, qvideoencodersettings)
|
||||
TO_QT_TYPE_PTR (QVideoSurfaceFormat, qvideosurfaceformat)
|
||||
|
||||
TO_QT_LIST_VAL (QMediaContent)
|
||||
|
||||
TO_CL_LIST_VAL (QAudioDeviceInfo, qaudiodeviceinfo)
|
||||
TO_CL_LIST_VAL (QCameraInfo, qcamerainfo)
|
||||
TO_CL_LIST_VAL (QCameraViewfinderSettings, qcameraviewfindersettings)
|
||||
TO_CL_LIST_VAL (QMediaContent, qmediacontent)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
META_TYPE_(LObjects::T_QAudioDeviceInfo, QAudioDeviceInfo)
|
||||
META_TYPE_(LObjects::T_QList_QAudioDeviceInfo, QList<QAudioDeviceInfo>)
|
||||
META_TYPE_(LObjects::T_QAudioEncoderSettings, QAudioEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QAudioFormat, QAudioFormat)
|
||||
META_TYPE_(LObjects::T_QCameraInfo, QCameraInfo)
|
||||
META_TYPE_(LObjects::T_QList_QCameraInfo, QList<QCameraInfo>)
|
||||
META_TYPE_(LObjects::T_QCameraViewfinderSettings, QCameraViewfinderSettings)
|
||||
META_TYPE_(LObjects::T_QList_QCameraViewfinderSettings, QList<QCameraViewfinderSettings>)
|
||||
META_TYPE_(LObjects::T_QImageEncoderSettings, QImageEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QMediaContent, QMediaContent)
|
||||
META_TYPE_(LObjects::T_QList_QMediaContent, QList<QMediaContent>)
|
||||
META_TYPE_(LObjects::T_QVideoEncoderSettings, QVideoEncoderSettings)
|
||||
META_TYPE_(LObjects::T_QVideoSurfaceFormat, QVideoSurfaceFormat) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QAudioDeviceInfo == n) { p = new QAudioDeviceInfo(*toQAudioDeviceInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QAudioEncoderSettings == n) { p = new QAudioEncoderSettings(*toQAudioEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QAudioFormat == n) { p = new QAudioFormat(*toQAudioFormatPointer(l_arg)); }
|
||||
else if(LObjects::T_QCameraInfo == n) { p = new QCameraInfo(*toQCameraInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QCameraViewfinderSettings == n) { p = new QCameraViewfinderSettings(*toQCameraViewfinderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QImageEncoderSettings == n) { p = new QImageEncoderSettings(*toQImageEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QMediaContent == n) { p = new QMediaContent(*toQMediaContentPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QMediaContent == n) { p = new QList<QMediaContent>(toQMediaContentList(l_arg)); }
|
||||
else if(LObjects::T_QVideoEncoderSettings == n) { p = new QVideoEncoderSettings(*toQVideoEncoderSettingsPointer(l_arg)); }
|
||||
else if(LObjects::T_QVideoSurfaceFormat == n) { p = new QVideoSurfaceFormat(*toQVideoSurfaceFormatPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QAudioDeviceInfo == n) { l_ret = from_qaudiodeviceinfo(*(QAudioDeviceInfo*)p); }
|
||||
else if(LObjects::T_QList_QAudioDeviceInfo == n) { l_ret = from_qaudiodeviceinfolist(*(QList<QAudioDeviceInfo>*)p); }
|
||||
else if(LObjects::T_QAudioEncoderSettings == n) { l_ret = from_qaudioencodersettings(*(QAudioEncoderSettings*)p); }
|
||||
else if(LObjects::T_QAudioFormat == n) { l_ret = from_qaudioformat(*(QAudioFormat*)p); }
|
||||
else if(LObjects::T_QCameraInfo == n) { l_ret = from_qcamerainfo(*(QCameraInfo*)p); }
|
||||
else if(LObjects::T_QList_QCameraInfo == n) { l_ret = from_qcamerainfolist(*(QList<QCameraInfo>*)p); }
|
||||
else if(LObjects::T_QCameraViewfinderSettings == n) { l_ret = from_qcameraviewfindersettings(*(QCameraViewfinderSettings*)p); }
|
||||
else if(LObjects::T_QList_QCameraViewfinderSettings == n) { l_ret = from_qcameraviewfindersettingslist(*(QList<QCameraViewfinderSettings>*)p); }
|
||||
else if(LObjects::T_QImageEncoderSettings == n) { l_ret = from_qimageencodersettings(*(QImageEncoderSettings*)p); }
|
||||
else if(LObjects::T_QMediaContent == n) { l_ret = from_qmediacontent(*(QMediaContent*)p); }
|
||||
else if(LObjects::T_QList_QMediaContent == n) { l_ret = from_qmediacontentlist(*(QList<QMediaContent>*)p); }
|
||||
else if(LObjects::T_QVideoEncoderSettings == n) { l_ret = from_qvideoencodersettings(*(QVideoEncoderSettings*)p); }
|
||||
else if(LObjects::T_QVideoSurfaceFormat == n) { l_ret = from_qvideosurfaceformat(*(QVideoSurfaceFormat*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtMultimedia>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtMultimedia>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtMultimediaWidgets>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,32 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QHostAddress, qhostaddress)
|
||||
TO_QT_TYPE_PTR (QHostInfo, qhostinfo)
|
||||
TO_QT_TYPE_PTR (QHttpPart, qhttppart)
|
||||
TO_QT_TYPE_PTR (QNetworkAddressEntry, qnetworkaddressentry)
|
||||
TO_QT_TYPE_PTR (QNetworkCacheMetaData, qnetworkcachemetadata)
|
||||
TO_QT_TYPE_PTR2 (QNetworkConfiguration, qnetworkconfiguration)
|
||||
TO_QT_TYPE_PTR2 (QNetworkCookie, qnetworkcookie)
|
||||
TO_QT_TYPE_PTR (QNetworkInterface, qnetworkinterface)
|
||||
TO_QT_TYPE_PTR (QNetworkProxy, qnetworkproxy)
|
||||
TO_QT_TYPE_PTR (QNetworkRequest, qnetworkrequest)
|
||||
TO_QT_TYPE_PTR (QSslCertificate, qsslcertificate)
|
||||
TO_QT_TYPE_PTR (QSslCipher, qsslcipher)
|
||||
TO_QT_TYPE_PTR (QSslConfiguration, qsslconfiguration)
|
||||
TO_QT_TYPE_PTR (QSslKey, qsslkey)
|
||||
|
||||
TO_QT_LIST_VAL (QNetworkConfiguration)
|
||||
TO_QT_LIST_VAL (QNetworkCookie)
|
||||
|
||||
TO_CL_LIST_VAL (QNetworkAddressEntry, qnetworkaddressentry)
|
||||
TO_CL_LIST_VAL (QNetworkConfiguration, qnetworkconfiguration)
|
||||
TO_CL_LIST_VAL (QNetworkCookie, qnetworkcookie)
|
||||
TO_CL_LIST_VAL (QNetworkInterface, qnetworkinterface)
|
||||
TO_CL_LIST_VAL (QNetworkProxy, qnetworkproxy)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LAbstractSocket::overrideIds = NumList() << 118 << 119 << 120 << 121 << 122 << 123 << 124 << 125 << 126 << 127 << 128 << 129 << 130 << 131 << 132 << 133 << 134 << 135 << 136 << 137;
|
||||
NumList LHttpMultiPart::overrideIds = NumList();
|
||||
NumList LLocalServer::overrideIds = NumList() << 286 << 287;
|
||||
|
|
@ -35,9 +61,10 @@ NumList LSslConfiguration::overrideIds = NumList();
|
|||
NumList LSslError::overrideIds = NumList();
|
||||
NumList LSslKey::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* network_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleNetwork* module = new ModuleNetwork;
|
||||
module->ini2();
|
||||
LObjects::Q[6] = new Q7;
|
||||
LObjects::Q[11] = new Q12;
|
||||
LObjects::Q[103] = new Q104;
|
||||
|
|
@ -67,9 +94,85 @@ void ini() {
|
|||
LObjects::N[204] = new N205;
|
||||
LObjects::N[205] = new N206;
|
||||
LObjects::N[206] = new N207;
|
||||
LObjects::N[207] = new N208; }
|
||||
LObjects::N[207] = new N208;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleNetwork::ModuleNetwork() {
|
||||
network_ini(); }
|
||||
|
||||
void ModuleNetwork::ini2() {
|
||||
META_TYPE_(LObjects::T_QHostAddress, QHostAddress)
|
||||
META_TYPE_(LObjects::T_QHostInfo, QHostInfo)
|
||||
META_TYPE_(LObjects::T_QHttpPart, QHttpPart)
|
||||
META_TYPE_(LObjects::T_QNetworkAddressEntry, QNetworkAddressEntry)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkAddressEntry, QList<QNetworkAddressEntry>)
|
||||
META_TYPE_(LObjects::T_QNetworkCacheMetaData, QNetworkCacheMetaData)
|
||||
META_TYPE_(LObjects::T_QNetworkConfiguration, QNetworkConfiguration)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkConfiguration, QList<QNetworkConfiguration>)
|
||||
META_TYPE_(LObjects::T_QNetworkCookie, QNetworkCookie)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkCookie, QList<QNetworkCookie>)
|
||||
META_TYPE_(LObjects::T_QNetworkInterface, QNetworkInterface)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkInterface, QList<QNetworkInterface>)
|
||||
META_TYPE_(LObjects::T_QNetworkProxy, QNetworkProxy)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkProxy, QList<QNetworkProxy>)
|
||||
META_TYPE_(LObjects::T_QNetworkRequest, QNetworkRequest)
|
||||
META_TYPE_(LObjects::T_QSslCertificate, QSslCertificate)
|
||||
META_TYPE_(LObjects::T_QSslCipher, QSslCipher)
|
||||
META_TYPE_(LObjects::T_QSslConfiguration, QSslConfiguration)
|
||||
META_TYPE_(LObjects::T_QSslKey, QSslKey) }
|
||||
|
||||
void* ModuleNetwork::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHostAddress == n) { p = new QHostAddress(*toQHostAddressPointer(l_arg)); }
|
||||
else if(LObjects::T_QHostInfo == n) { p = new QHostInfo(*toQHostInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QHttpPart == n) { p = new QHttpPart(*toQHttpPartPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkAddressEntry == n) { p = new QNetworkAddressEntry(*toQNetworkAddressEntryPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkCacheMetaData == n) { p = new QNetworkCacheMetaData(*toQNetworkCacheMetaDataPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkConfiguration == n) { p = new QNetworkConfiguration(*toQNetworkConfigurationPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QNetworkConfiguration == n) { p = new QList<QNetworkConfiguration>(toQNetworkConfigurationList(l_arg)); }
|
||||
else if(LObjects::T_QNetworkCookie == n) { p = new QNetworkCookie(*toQNetworkCookiePointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QNetworkCookie == n) { p = new QList<QNetworkCookie>(toQNetworkCookieList(l_arg)); }
|
||||
else if(LObjects::T_QNetworkInterface == n) { p = new QNetworkInterface(*toQNetworkInterfacePointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkProxy == n) { p = new QNetworkProxy(*toQNetworkProxyPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkRequest == n) { p = new QNetworkRequest(*toQNetworkRequestPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslCertificate == n) { p = new QSslCertificate(*toQSslCertificatePointer(l_arg)); }
|
||||
else if(LObjects::T_QSslCipher == n) { p = new QSslCipher(*toQSslCipherPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslConfiguration == n) { p = new QSslConfiguration(*toQSslConfigurationPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslKey == n) { p = new QSslKey(*toQSslKeyPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
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_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); }
|
||||
else if(LObjects::T_QList_QNetworkAddressEntry == n) { l_ret = from_qnetworkaddressentrylist(*(QList<QNetworkAddressEntry>*)p); }
|
||||
else if(LObjects::T_QNetworkCacheMetaData == n) { l_ret = from_qnetworkcachemetadata(*(QNetworkCacheMetaData*)p); }
|
||||
else if(LObjects::T_QNetworkConfiguration == n) { l_ret = from_qnetworkconfiguration(*(QNetworkConfiguration*)p); }
|
||||
else if(LObjects::T_QList_QNetworkConfiguration == n) { l_ret = from_qnetworkconfigurationlist(*(QList<QNetworkConfiguration>*)p); }
|
||||
else if(LObjects::T_QNetworkCookie == n) { l_ret = from_qnetworkcookie(*(QNetworkCookie*)p); }
|
||||
else if(LObjects::T_QList_QNetworkCookie == n) { l_ret = from_qnetworkcookielist(*(QList<QNetworkCookie>*)p); }
|
||||
else if(LObjects::T_QNetworkInterface == n) { l_ret = from_qnetworkinterface(*(QNetworkInterface*)p); }
|
||||
else if(LObjects::T_QList_QNetworkInterface == n) { l_ret = from_qnetworkinterfacelist(*(QList<QNetworkInterface>*)p); }
|
||||
else if(LObjects::T_QNetworkProxy == n) { l_ret = from_qnetworkproxy(*(QNetworkProxy*)p); }
|
||||
else if(LObjects::T_QList_QNetworkProxy == n) { l_ret = from_qnetworkproxylist(*(QList<QNetworkProxy>*)p); }
|
||||
else if(LObjects::T_QNetworkRequest == n) { l_ret = from_qnetworkrequest(*(QNetworkRequest*)p); }
|
||||
else if(LObjects::T_QSslCertificate == n) { l_ret = from_qsslcertificate(*(QSslCertificate*)p); }
|
||||
else if(LObjects::T_QSslCipher == n) { l_ret = from_qsslcipher(*(QSslCipher*)p); }
|
||||
else if(LObjects::T_QSslConfiguration == n) { l_ret = from_qsslconfiguration(*(QSslConfiguration*)p); }
|
||||
else if(LObjects::T_QSslKey == n) { l_ret = from_qsslkey(*(QSslKey*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleNetwork::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 7: m = &QAbstractNetworkCache::staticMetaObject; break;
|
||||
|
|
@ -86,7 +189,7 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 256: m = &QUdpSocket::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleNetwork::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 21: if(gc) delete (QAuthenticator*)p; else delete (LAuthenticator*)p; break;
|
||||
case 90: if(gc) delete (QHostAddress*)p; else delete (LHostAddress*)p; break;
|
||||
|
|
@ -107,7 +210,7 @@ void deleteNObject(int n, void* p, int gc) {
|
|||
case 207: if(gc) delete (QSslError*)p; else delete (LSslError*)p; break;
|
||||
case 208: if(gc) delete (QSslKey*)p; else delete (LSslKey*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleNetwork::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_NETWORK_INI_H
|
||||
#define MODULE_NETWORK_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtNetwork>
|
||||
|
||||
Q_DECLARE_METATYPE(QNetworkCacheMetaData)
|
||||
Q_DECLARE_METATYPE(QList<QNetworkProxy>)
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -17,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* network_ini();
|
||||
|
||||
class ModuleNetwork : public ModuleInterface {
|
||||
public:
|
||||
ModuleNetwork();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,110 +2,10 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
#include <QtNetwork>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QHostAddress, qhostaddress)
|
||||
TO_QT_TYPE_PTR (QHostInfo, qhostinfo)
|
||||
TO_QT_TYPE_PTR (QHttpPart, qhttppart)
|
||||
TO_QT_TYPE_PTR (QNetworkAddressEntry, qnetworkaddressentry)
|
||||
TO_QT_TYPE_PTR (QNetworkCacheMetaData, qnetworkcachemetadata)
|
||||
TO_QT_TYPE_PTR2 (QNetworkConfiguration, qnetworkconfiguration)
|
||||
TO_QT_TYPE_PTR2 (QNetworkCookie, qnetworkcookie)
|
||||
TO_QT_TYPE_PTR (QNetworkInterface, qnetworkinterface)
|
||||
TO_QT_TYPE_PTR (QNetworkProxy, qnetworkproxy)
|
||||
TO_QT_TYPE_PTR (QNetworkRequest, qnetworkrequest)
|
||||
TO_QT_TYPE_PTR (QSslCertificate, qsslcertificate)
|
||||
TO_QT_TYPE_PTR (QSslCipher, qsslcipher)
|
||||
TO_QT_TYPE_PTR (QSslConfiguration, qsslconfiguration)
|
||||
TO_QT_TYPE_PTR (QSslKey, qsslkey)
|
||||
|
||||
TO_QT_LIST_VAL (QNetworkConfiguration)
|
||||
TO_QT_LIST_VAL (QNetworkCookie)
|
||||
|
||||
TO_CL_LIST_VAL (QNetworkAddressEntry, qnetworkaddressentry)
|
||||
TO_CL_LIST_VAL (QNetworkConfiguration, qnetworkconfiguration)
|
||||
TO_CL_LIST_VAL (QNetworkCookie, qnetworkcookie)
|
||||
TO_CL_LIST_VAL (QNetworkInterface, qnetworkinterface)
|
||||
TO_CL_LIST_VAL (QNetworkProxy, qnetworkproxy)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
META_TYPE_(LObjects::T_QHostAddress, QHostAddress)
|
||||
META_TYPE_(LObjects::T_QHostInfo, QHostInfo)
|
||||
META_TYPE_(LObjects::T_QHttpPart, QHttpPart)
|
||||
META_TYPE_(LObjects::T_QNetworkAddressEntry, QNetworkAddressEntry)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkAddressEntry, QList<QNetworkAddressEntry>)
|
||||
META_TYPE_(LObjects::T_QNetworkCacheMetaData, QNetworkCacheMetaData)
|
||||
META_TYPE_(LObjects::T_QNetworkConfiguration, QNetworkConfiguration)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkConfiguration, QList<QNetworkConfiguration>)
|
||||
META_TYPE_(LObjects::T_QNetworkCookie, QNetworkCookie)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkCookie, QList<QNetworkCookie>)
|
||||
META_TYPE_(LObjects::T_QNetworkInterface, QNetworkInterface)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkInterface, QList<QNetworkInterface>)
|
||||
META_TYPE_(LObjects::T_QNetworkProxy, QNetworkProxy)
|
||||
META_TYPE_(LObjects::T_QList_QNetworkProxy, QList<QNetworkProxy>)
|
||||
META_TYPE_(LObjects::T_QNetworkRequest, QNetworkRequest)
|
||||
META_TYPE_(LObjects::T_QSslCertificate, QSslCertificate)
|
||||
META_TYPE_(LObjects::T_QSslCipher, QSslCipher)
|
||||
META_TYPE_(LObjects::T_QSslConfiguration, QSslConfiguration)
|
||||
META_TYPE_(LObjects::T_QSslKey, QSslKey) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QHostAddress == n) { p = new QHostAddress(*toQHostAddressPointer(l_arg)); }
|
||||
else if(LObjects::T_QHostInfo == n) { p = new QHostInfo(*toQHostInfoPointer(l_arg)); }
|
||||
else if(LObjects::T_QHttpPart == n) { p = new QHttpPart(*toQHttpPartPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkAddressEntry == n) { p = new QNetworkAddressEntry(*toQNetworkAddressEntryPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkCacheMetaData == n) { p = new QNetworkCacheMetaData(*toQNetworkCacheMetaDataPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkConfiguration == n) { p = new QNetworkConfiguration(*toQNetworkConfigurationPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QNetworkConfiguration == n) { p = new QList<QNetworkConfiguration>(toQNetworkConfigurationList(l_arg)); }
|
||||
else if(LObjects::T_QNetworkCookie == n) { p = new QNetworkCookie(*toQNetworkCookiePointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QNetworkCookie == n) { p = new QList<QNetworkCookie>(toQNetworkCookieList(l_arg)); }
|
||||
else if(LObjects::T_QNetworkInterface == n) { p = new QNetworkInterface(*toQNetworkInterfacePointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkProxy == n) { p = new QNetworkProxy(*toQNetworkProxyPointer(l_arg)); }
|
||||
else if(LObjects::T_QNetworkRequest == n) { p = new QNetworkRequest(*toQNetworkRequestPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslCertificate == n) { p = new QSslCertificate(*toQSslCertificatePointer(l_arg)); }
|
||||
else if(LObjects::T_QSslCipher == n) { p = new QSslCipher(*toQSslCipherPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslConfiguration == n) { p = new QSslConfiguration(*toQSslConfigurationPointer(l_arg)); }
|
||||
else if(LObjects::T_QSslKey == n) { p = new QSslKey(*toQSslKeyPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object 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_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); }
|
||||
else if(LObjects::T_QList_QNetworkAddressEntry == n) { l_ret = from_qnetworkaddressentrylist(*(QList<QNetworkAddressEntry>*)p); }
|
||||
else if(LObjects::T_QNetworkCacheMetaData == n) { l_ret = from_qnetworkcachemetadata(*(QNetworkCacheMetaData*)p); }
|
||||
else if(LObjects::T_QNetworkConfiguration == n) { l_ret = from_qnetworkconfiguration(*(QNetworkConfiguration*)p); }
|
||||
else if(LObjects::T_QList_QNetworkConfiguration == n) { l_ret = from_qnetworkconfigurationlist(*(QList<QNetworkConfiguration>*)p); }
|
||||
else if(LObjects::T_QNetworkCookie == n) { l_ret = from_qnetworkcookie(*(QNetworkCookie*)p); }
|
||||
else if(LObjects::T_QList_QNetworkCookie == n) { l_ret = from_qnetworkcookielist(*(QList<QNetworkCookie>*)p); }
|
||||
else if(LObjects::T_QNetworkInterface == n) { l_ret = from_qnetworkinterface(*(QNetworkInterface*)p); }
|
||||
else if(LObjects::T_QList_QNetworkInterface == n) { l_ret = from_qnetworkinterfacelist(*(QList<QNetworkInterface>*)p); }
|
||||
else if(LObjects::T_QNetworkProxy == n) { l_ret = from_qnetworkproxy(*(QNetworkProxy*)p); }
|
||||
else if(LObjects::T_QList_QNetworkProxy == n) { l_ret = from_qnetworkproxylist(*(QList<QNetworkProxy>*)p); }
|
||||
else if(LObjects::T_QNetworkRequest == n) { l_ret = from_qnetworkrequest(*(QNetworkRequest*)p); }
|
||||
else if(LObjects::T_QSslCertificate == n) { l_ret = from_qsslcertificate(*(QSslCertificate*)p); }
|
||||
else if(LObjects::T_QSslCipher == n) { l_ret = from_qsslcipher(*(QSslCipher*)p); }
|
||||
else if(LObjects::T_QSslConfiguration == n) { l_ret = from_qsslconfiguration(*(QSslConfiguration*)p); }
|
||||
else if(LObjects::T_QSslKey == n) { l_ret = from_qsslkey(*(QSslKey*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
Q_DECLARE_METATYPE(QNetworkCacheMetaData)
|
||||
Q_DECLARE_METATYPE(QList<QNetworkProxy>)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtNetwork>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtNetwork>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,22 @@
|
|||
#include "_q_methods.h"
|
||||
#include "_n_methods.h"
|
||||
#include "_ini2.h"
|
||||
#include "qml_lisp.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QJSValue, qjsvalue)
|
||||
TO_QT_TYPE_PTR (QQmlProperty, qqmlproperty)
|
||||
TO_QT_TYPE_PTR (QQmlScriptString, qqmlscriptstring)
|
||||
|
||||
FROM_QT_TYPE_ONLY (QQmlError, qqmlerror)
|
||||
|
||||
TO_CL_LIST_VAL (QQmlError, qqmlerror)
|
||||
|
||||
TO_CL_LIST_PTR (QQuickItem, qquickitem)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LJSEngine::overrideIds = NumList();
|
||||
NumList LQmlApplicationEngine::overrideIds = NumList();
|
||||
NumList LQmlComponent::overrideIds = NumList() << 323 << 324 << 325;
|
||||
|
|
@ -58,9 +71,10 @@ NumList LSGTextureMaterial::overrideIds = NumList();
|
|||
NumList LSGTransformNode::overrideIds = NumList();
|
||||
NumList LSGVertexColorMaterial::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* quick_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleQuick* module = new ModuleQuick;
|
||||
module->ini2();
|
||||
LObjects::Q[111] = new Q112;
|
||||
LObjects::Q[167] = new Q168;
|
||||
LObjects::Q[168] = new Q169;
|
||||
|
|
@ -113,9 +127,45 @@ void ini() {
|
|||
LObjects::N[184] = new N185;
|
||||
LObjects::N[185] = new N186;
|
||||
LObjects::N[186] = new N187;
|
||||
LObjects::N[187] = new N188; }
|
||||
LObjects::N[187] = new N188;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleQuick::ModuleQuick() {
|
||||
quick_ini(); }
|
||||
|
||||
void ModuleQuick::ini2() {
|
||||
META_TYPE_(LObjects::T_QJSValue, QJSValue)
|
||||
META_TYPE_(LObjects::T_QQmlProperty, QQmlProperty)
|
||||
META_TYPE_(LObjects::T_QQmlScriptString, QQmlScriptString)
|
||||
META_TYPE_(LObjects::T_QList_QQmlError, QList<QQmlError>)
|
||||
META_TYPE_(LObjects::T_QList_QQuickItem, QList<QQuickItem*>)
|
||||
iniQml(); }
|
||||
|
||||
void* ModuleQuick::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QJSValue == n) { p = new QJSValue(*toQJSValuePointer(l_arg)); }
|
||||
else if(LObjects::T_QQmlProperty == n) { p = new QQmlProperty(*toQQmlPropertyPointer(l_arg)); }
|
||||
else if(LObjects::T_QQmlScriptString == n) { p = new QQmlScriptString(*toQQmlScriptStringPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleQuick::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QJSValue == n) { l_ret = from_qjsvalue(*(QJSValue*)p); }
|
||||
else if(LObjects::T_QQmlProperty == n) { l_ret = from_qqmlproperty(*(QQmlProperty*)p); }
|
||||
else if(LObjects::T_QQmlScriptString == n) { l_ret = from_qqmlscriptstring(*(QQmlScriptString*)p); }
|
||||
else if(LObjects::T_QList_QQmlError == n) { l_ret = from_qqmlerrorlist(*(QList<QQmlError>*)p); }
|
||||
else if(LObjects::T_QList_QQuickItem == n) { l_ret = from_qquickitemlist(*(QList<QQuickItem*>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleQuick::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 112: m = &QJSEngine::staticMetaObject; break;
|
||||
|
|
@ -144,7 +194,7 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 194: m = &QSGTextureProvider::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleQuick::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 104: if(gc) delete (QJSValue*)p; else delete (LJSValue*)p; break;
|
||||
case 105: if(gc) delete (QJSValueIterator*)p; else delete (LJSValueIterator*)p; break;
|
||||
|
|
@ -175,7 +225,7 @@ void deleteNObject(int n, void* p, int gc) {
|
|||
case 187: if(gc) delete (QSGTransformNode*)p; else delete (LSGTransformNode*)p; break;
|
||||
case 188: if(gc) delete (QSGVertexColorMaterial*)p; else delete (LSGVertexColorMaterial*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleQuick::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_QUICK_INI_H
|
||||
#define MODULE_QUICK_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtQuick>
|
||||
#include <QtQuickWidgets>
|
||||
#include <QQmlError>
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -16,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* quick_ini();
|
||||
|
||||
class ModuleQuick : public ModuleInterface {
|
||||
public:
|
||||
ModuleQuick();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,57 +2,7 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "qml_lisp.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QJSValue, qjsvalue)
|
||||
TO_QT_TYPE_PTR (QQmlProperty, qqmlproperty)
|
||||
TO_QT_TYPE_PTR (QQmlScriptString, qqmlscriptstring)
|
||||
|
||||
FROM_QT_TYPE_ONLY (QQmlError, qqmlerror)
|
||||
|
||||
TO_CL_LIST_VAL (QQmlError, qqmlerror)
|
||||
|
||||
TO_CL_LIST_PTR (QQuickItem, qquickitem)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
META_TYPE_(LObjects::T_QJSValue, QJSValue)
|
||||
META_TYPE_(LObjects::T_QQmlProperty, QQmlProperty)
|
||||
META_TYPE_(LObjects::T_QQmlScriptString, QQmlScriptString)
|
||||
META_TYPE_(LObjects::T_QList_QQmlError, QList<QQmlError>)
|
||||
META_TYPE_(LObjects::T_QList_QQuickItem, QList<QQuickItem*>)
|
||||
iniQml(); }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QJSValue == n) { p = new QJSValue(*toQJSValuePointer(l_arg)); }
|
||||
else if(LObjects::T_QQmlProperty == n) { p = new QQmlProperty(*toQQmlPropertyPointer(l_arg)); }
|
||||
else if(LObjects::T_QQmlScriptString == n) { p = new QQmlScriptString(*toQQmlScriptStringPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QJSValue == n) { l_ret = from_qjsvalue(*(QJSValue*)p); }
|
||||
else if(LObjects::T_QQmlProperty == n) { l_ret = from_qqmlproperty(*(QQmlProperty*)p); }
|
||||
else if(LObjects::T_QQmlScriptString == n) { l_ret = from_qqmlscriptstring(*(QQmlScriptString*)p); }
|
||||
else if(LObjects::T_QList_QQmlError == n) { l_ret = from_qqmlerrorlist(*(QList<QQmlError>*)p); }
|
||||
else if(LObjects::T_QList_QQuickItem == n) { l_ret = from_qquickitemlist(*(QList<QQuickItem*>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtQuick>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtQuick>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtQuick>
|
||||
#include <QtQuickWidgets>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,16 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QSqlDatabase, qsqldatabase)
|
||||
TO_QT_TYPE_PTR (QSqlError, qsqlerror)
|
||||
TO_QT_TYPE_PTR (QSqlField, qsqlfield)
|
||||
TO_QT_TYPE_PTR (QSqlIndex, qsqlindex)
|
||||
TO_QT_TYPE_PTR (QSqlQuery, qsqlquery)
|
||||
TO_QT_TYPE_PTR (QSqlRecord, qsqlrecord)
|
||||
TO_QT_TYPE_PTR (QSqlRelation, qsqlrelation)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LSqlDriver::overrideIds = NumList() << 362 << 131 << 363 << 364 << 365 << 366 << 367 << 368 << 369 << 370 << 371 << 372 << 373 << 374 << 375 << 376 << 377 << 378 << 379 << 380 << 381 << 382 << 383;
|
||||
NumList LSqlQueryModel::overrideIds = NumList() << 220 << 384 << 385 << 57 << 59 << 61 << 64 << 66 << 74 << 77 << 79;
|
||||
NumList LSqlRelationalDelegate::overrideIds = NumList() << 46 << 52;
|
||||
|
|
@ -20,9 +30,10 @@ NumList LSqlRecord::overrideIds = NumList();
|
|||
NumList LSqlRelation::overrideIds = NumList();
|
||||
NumList LSqlResult::overrideIds = NumList() << 367 << 550 << 551 << 524 << 108 << 552 << 553 << 554 << 555 << 556 << 557 << 558 << 559 << 560 << 561 << 562 << 563 << 564 << 565 << 566 << 381 << 567 << 568 << 142;
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* sql_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleSql* module = new ModuleSql;
|
||||
module->ini2();
|
||||
LObjects::Q[210] = new Q211;
|
||||
LObjects::Q[211] = new Q212;
|
||||
LObjects::Q[212] = new Q213;
|
||||
|
|
@ -35,9 +46,52 @@ void ini() {
|
|||
LObjects::N[199] = new N200;
|
||||
LObjects::N[200] = new N201;
|
||||
LObjects::N[201] = new N202;
|
||||
LObjects::N[202] = new N203; }
|
||||
LObjects::N[202] = new N203;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleSql::ModuleSql() {
|
||||
sql_ini(); }
|
||||
|
||||
void ModuleSql::ini2() {
|
||||
META_TYPE_(LObjects::T_QSqlDatabase, QSqlDatabase)
|
||||
META_TYPE_(LObjects::T_QSqlError, QSqlError)
|
||||
META_TYPE_(LObjects::T_QSqlField, QSqlField)
|
||||
META_TYPE_(LObjects::T_QSqlIndex, QSqlIndex)
|
||||
META_TYPE_(LObjects::T_QSqlQuery, QSqlQuery)
|
||||
META_TYPE_(LObjects::T_QSqlRecord, QSqlRecord)
|
||||
META_TYPE_(LObjects::T_QSqlRelation, QSqlRelation) }
|
||||
|
||||
void* ModuleSql::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QSqlDatabase == n) { p = new QSqlDatabase(*toQSqlDatabasePointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlError == n) { p = new QSqlError(*toQSqlErrorPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlField == n) { p = new QSqlField(*toQSqlFieldPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlIndex == n) { p = new QSqlIndex(*toQSqlIndexPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlQuery == n) { p = new QSqlQuery(*toQSqlQueryPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlRecord == n) { p = new QSqlRecord(*toQSqlRecordPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlRelation == n) { p = new QSqlRelation(*toQSqlRelationPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleSql::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QSqlDatabase == n) { l_ret = from_qsqldatabase(*(QSqlDatabase*)p); }
|
||||
else if(LObjects::T_QSqlError == n) { l_ret = from_qsqlerror(*(QSqlError*)p); }
|
||||
else if(LObjects::T_QSqlField == n) { l_ret = from_qsqlfield(*(QSqlField*)p); }
|
||||
else if(LObjects::T_QSqlIndex == n) { l_ret = from_qsqlindex(*(QSqlIndex*)p); }
|
||||
else if(LObjects::T_QSqlQuery == n) { l_ret = from_qsqlquery(*(QSqlQuery*)p); }
|
||||
else if(LObjects::T_QSqlRecord == n) { l_ret = from_qsqlrecord(*(QSqlRecord*)p); }
|
||||
else if(LObjects::T_QSqlRelation == n) { l_ret = from_qsqlrelation(*(QSqlRelation*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleSql::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 211: m = &QSqlDriver::staticMetaObject; break;
|
||||
|
|
@ -47,7 +101,7 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 215: m = &QSqlTableModel::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleSql::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 196: if(gc) delete (QSqlDatabase*)p; else delete (LSqlDatabase*)p; break;
|
||||
case 197: if(gc) delete (QSqlError*)p; else delete (LSqlError*)p; break;
|
||||
|
|
@ -58,7 +112,7 @@ void deleteNObject(int n, void* p, int gc) {
|
|||
case 202: if(gc) delete (QSqlRelation*)p; else delete (LSqlRelation*)p; break;
|
||||
case 203: if(gc) delete (QSqlResult*)p; else delete (LSqlResult*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleSql::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_SQL_INI_H
|
||||
#define MODULE_SQL_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtSql>
|
||||
|
||||
Q_DECLARE_METATYPE(QSqlIndex)
|
||||
Q_DECLARE_METATYPE(QSqlRecord)
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -13,19 +10,23 @@ Q_DECLARE_METATYPE(QSqlRecord)
|
|||
#define LIB_EXPORT
|
||||
#endif
|
||||
|
||||
#define defaultConnection QSqlDatabase::defaultConnection
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* sql_ini();
|
||||
|
||||
class ModuleSql : public ModuleInterface {
|
||||
public:
|
||||
ModuleSql();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,61 +2,12 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
#include <QtSql>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
#define defaultConnection QSqlDatabase::defaultConnection
|
||||
|
||||
TO_QT_TYPE_PTR (QSqlDatabase, qsqldatabase)
|
||||
TO_QT_TYPE_PTR (QSqlError, qsqlerror)
|
||||
TO_QT_TYPE_PTR (QSqlField, qsqlfield)
|
||||
TO_QT_TYPE_PTR (QSqlIndex, qsqlindex)
|
||||
TO_QT_TYPE_PTR (QSqlQuery, qsqlquery)
|
||||
TO_QT_TYPE_PTR (QSqlRecord, qsqlrecord)
|
||||
TO_QT_TYPE_PTR (QSqlRelation, qsqlrelation)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
META_TYPE_(LObjects::T_QSqlDatabase, QSqlDatabase)
|
||||
META_TYPE_(LObjects::T_QSqlError, QSqlError)
|
||||
META_TYPE_(LObjects::T_QSqlField, QSqlField)
|
||||
META_TYPE_(LObjects::T_QSqlIndex, QSqlIndex)
|
||||
META_TYPE_(LObjects::T_QSqlQuery, QSqlQuery)
|
||||
META_TYPE_(LObjects::T_QSqlRecord, QSqlRecord)
|
||||
META_TYPE_(LObjects::T_QSqlRelation, QSqlRelation) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QSqlDatabase == n) { p = new QSqlDatabase(*toQSqlDatabasePointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlError == n) { p = new QSqlError(*toQSqlErrorPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlField == n) { p = new QSqlField(*toQSqlFieldPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlIndex == n) { p = new QSqlIndex(*toQSqlIndexPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlQuery == n) { p = new QSqlQuery(*toQSqlQueryPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlRecord == n) { p = new QSqlRecord(*toQSqlRecordPointer(l_arg)); }
|
||||
else if(LObjects::T_QSqlRelation == n) { p = new QSqlRelation(*toQSqlRelationPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QSqlDatabase == n) { l_ret = from_qsqldatabase(*(QSqlDatabase*)p); }
|
||||
else if(LObjects::T_QSqlError == n) { l_ret = from_qsqlerror(*(QSqlError*)p); }
|
||||
else if(LObjects::T_QSqlField == n) { l_ret = from_qsqlfield(*(QSqlField*)p); }
|
||||
else if(LObjects::T_QSqlIndex == n) { l_ret = from_qsqlindex(*(QSqlIndex*)p); }
|
||||
else if(LObjects::T_QSqlQuery == n) { l_ret = from_qsqlquery(*(QSqlQuery*)p); }
|
||||
else if(LObjects::T_QSqlRecord == n) { l_ret = from_qsqlrecord(*(QSqlRecord*)p); }
|
||||
else if(LObjects::T_QSqlRelation == n) { l_ret = from_qsqlrelation(*(QSqlRelation*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
Q_DECLARE_METATYPE(QSqlIndex)
|
||||
Q_DECLARE_METATYPE(QSqlRecord)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtSql>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
#ifndef N_METHODS_H
|
||||
#define N_METHODS_H
|
||||
|
||||
#include "_ini2.h"
|
||||
#include "_n_classes.h"
|
||||
#include "../_main_n_methods.h"
|
||||
#include <QtWidgets>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtSql>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -11,15 +11,28 @@ NumList LSvgRenderer::overrideIds = NumList();
|
|||
NumList LSvgWidget::overrideIds = NumList() << 25 << 20;
|
||||
NumList LSvgGenerator::overrideIds = NumList() << 528;
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* svg_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleSvg* module = new ModuleSvg;
|
||||
module->ini2();
|
||||
LObjects::Q[82] = new Q83;
|
||||
LObjects::Q[225] = new Q226;
|
||||
LObjects::Q[226] = new Q227;
|
||||
LObjects::N[216] = new N217; }
|
||||
LObjects::N[216] = new N217;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleSvg::ModuleSvg() {
|
||||
svg_ini(); }
|
||||
|
||||
void ModuleSvg::ini2() {}
|
||||
|
||||
void* ModuleSvg::toMetaArg(int, cl_object, bool*) {
|
||||
return 0; }
|
||||
|
||||
cl_object ModuleSvg::to_lisp_arg(int, void*, bool*) {
|
||||
return 0; }
|
||||
|
||||
const QMetaObject* ModuleSvg::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 83: m = &QGraphicsSvgItem::staticMetaObject; break;
|
||||
|
|
@ -27,11 +40,11 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 227: m = &QSvgWidget::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleSvg::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 217: if(gc) delete (QSvgGenerator*)p; else delete (LSvgGenerator*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleSvg::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_SVG_INI_H
|
||||
#define MODULE_SVG_INI_H
|
||||
|
||||
#include <QtSvg>
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -13,11 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&); }
|
||||
extern "C" LIB_EXPORT void* svg_ini();
|
||||
|
||||
class ModuleSvg : public ModuleInterface {
|
||||
public:
|
||||
ModuleSvg();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
#ifndef INI2_H
|
||||
#define INI2_H
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
void ini2() {}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtSvg>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtSvg>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtSvg>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,16 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR2 (QWebEngineScript, qwebenginescript)
|
||||
|
||||
TO_QT_LIST_VAL (QWebEngineScript)
|
||||
|
||||
TO_CL_LIST_VAL (QWebEngineScript, qwebenginescript)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LWebEngineCookieStore::overrideIds = NumList();
|
||||
NumList LWebEngineDownloadItem::overrideIds = NumList();
|
||||
NumList LWebEnginePage::overrideIds = NumList() << 432 << 433 << 434 << 435 << 436 << 437 << 438 << 439 << 440;
|
||||
|
|
@ -18,9 +28,10 @@ NumList LWebEngineCertificateError::overrideIds = NumList();
|
|||
NumList LWebEngineFullScreenRequest::overrideIds = NumList();
|
||||
NumList LWebEngineScript::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void* webengine_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleWebengine* module = new ModuleWebengine;
|
||||
module->ini2();
|
||||
LObjects::Q[264] = new Q265;
|
||||
LObjects::Q[265] = new Q266;
|
||||
LObjects::Q[266] = new Q267;
|
||||
|
|
@ -34,9 +45,38 @@ void ini() {
|
|||
LObjects::N[268] = new N269;
|
||||
LObjects::N[269] = new N270;
|
||||
LObjects::N[270] = new N271;
|
||||
LObjects::N[271] = new N272; }
|
||||
LObjects::N[271] = new N272;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleWebengine::ModuleWebengine() {
|
||||
webengine_ini(); }
|
||||
|
||||
void ModuleWebengine::ini2() {
|
||||
// note: QWebEngineHistoryItem can't be registered as QMetaType, lacking a public default constructor
|
||||
META_TYPE_(LObjects::T_QWebEngineScript, QWebEngineScript)
|
||||
META_TYPE_(LObjects::T_QList_QWebEngineScript, QList<QWebEngineScript>) }
|
||||
|
||||
void* ModuleWebengine::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebEngineScript == n) { p = new QWebEngineScript(*toQWebEngineScriptPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QWebEngineScript == n) { p = new QList<QWebEngineScript>(toQWebEngineScriptList(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleWebengine::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebEngineScript == n) { l_ret = from_qwebenginescript(*(QWebEngineScript*)p); }
|
||||
else if(LObjects::T_QList_QWebEngineScript == n) { l_ret = from_qwebenginescriptlist(*(QList<QWebEngineScript>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleWebengine::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case -268: m = &QWebEngineFullScreenRequest::staticMetaObject; break;
|
||||
|
|
@ -50,13 +90,13 @@ const QMetaObject* staticMetaObject(int n) {
|
|||
case 272: m = &QWebEngineView::staticMetaObject; break; }
|
||||
return m; }
|
||||
|
||||
void deleteNObject(int n, void* p, int gc) {
|
||||
void ModuleWebengine::deleteNObject(int n, void* p, int gc) {
|
||||
switch(n) {
|
||||
case 267: if(gc) delete (QWebEngineCertificateError*)p; else delete (LWebEngineCertificateError*)p; break;
|
||||
case 268: if(gc) delete (QWebEngineFullScreenRequest*)p; else delete (LWebEngineFullScreenRequest*)p; break;
|
||||
case 269: if(gc) delete (QWebEngineScript*)p; else delete (LWebEngineScript*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleWebengine::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_WEBENGINE_INI_H
|
||||
#define MODULE_WEBENGINE_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtWebEngineWidgets>
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -14,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* webengine_ini();
|
||||
|
||||
class ModuleWebengine : public ModuleInterface {
|
||||
public:
|
||||
ModuleWebengine();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,45 +2,7 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR2 (QWebEngineScript, qwebenginescript)
|
||||
|
||||
TO_QT_LIST_VAL (QWebEngineScript)
|
||||
|
||||
TO_CL_LIST_VAL (QWebEngineScript, qwebenginescript)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
// note: QWebEngineHistoryItem can't be registered as QMetaType, lacking a public default constructor
|
||||
META_TYPE_(LObjects::T_QWebEngineScript, QWebEngineScript)
|
||||
META_TYPE_(LObjects::T_QList_QWebEngineScript, QList<QWebEngineScript>) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebEngineScript == n) { p = new QWebEngineScript(*toQWebEngineScriptPointer(l_arg)); }
|
||||
else if(LObjects::T_QList_QWebEngineScript == n) { p = new QList<QWebEngineScript>(toQWebEngineScriptList(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebEngineScript == n) { l_ret = from_qwebenginescript(*(QWebEngineScript*)p); }
|
||||
else if(LObjects::T_QList_QWebEngineScript == n) { l_ret = from_qwebenginescriptlist(*(QList<QWebEngineScript>*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtWebEngine>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtWebEngine>
|
||||
#include <QtWebEngineWidgets>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtWebEngine>
|
||||
#include <QtWebEngineWidgets>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,14 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QWebElement, qwebelement)
|
||||
TO_QT_TYPE_PTR (QWebElementCollection, qwebelementcollection)
|
||||
TO_QT_TYPE_PTR (QWebHitTestResult, qwebhittestresult)
|
||||
|
||||
TO_CL_LIST_VAL (QWebElement, qwebelement)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
NumList LGraphicsWebView::overrideIds = NumList() << 23 << 244 << 232 << 233 << 250 << 264 << 235 << 236 << 237 << 238 << 239 << 13 << 34 << 14 << 242 << 243 << 36 << 15 << 16 << 245 << 246 << 247 << 248 << 263 << 252;
|
||||
NumList LWebHistoryInterface::overrideIds = NumList() << 444 << 445;
|
||||
NumList LWebInspector::overrideIds = NumList() << 25 << 27 << 35 << 40 << 41;
|
||||
|
|
@ -18,9 +26,10 @@ NumList LWebElementCollection::overrideIds = NumList();
|
|||
NumList LWebHitTestResult::overrideIds = NumList();
|
||||
NumList LWebSecurityOrigin::overrideIds = NumList();
|
||||
|
||||
void ini() {
|
||||
static bool _ = false; if(_) return; _ = true;
|
||||
ini2();
|
||||
void webkit_ini() {
|
||||
static bool _ = false; if(_) return 0; _ = true;
|
||||
ModuleWebkit* module = new ModuleWebkit;
|
||||
module->ini2();
|
||||
LObjects::Q[87] = new Q88;
|
||||
LObjects::Q[272] = new Q273;
|
||||
LObjects::Q[273] = new Q274;
|
||||
|
|
@ -33,9 +42,43 @@ void ini() {
|
|||
LObjects::N[265] = new N266;
|
||||
LObjects::N[272] = new N273;
|
||||
LObjects::N[273] = new N274;
|
||||
LObjects::N[274] = new N275; }
|
||||
LObjects::N[274] = new N275;
|
||||
return module; }
|
||||
|
||||
const QMetaObject* staticMetaObject(int n) {
|
||||
ModuleWebkit::ModuleWebkit() {
|
||||
webkit_ini(); }
|
||||
|
||||
void ModuleWebkit::ini2() {
|
||||
// note: QWebHistoryItem can't be registered as QMetaType, lacking a public default constructor
|
||||
META_TYPE_(LObjects::T_QWebElement, QWebElement)
|
||||
META_TYPE_(LObjects::T_QList_QWebElement, QList<QWebElement>)
|
||||
META_TYPE_(LObjects::T_QWebElementCollection, QWebElementCollection)
|
||||
META_TYPE_(LObjects::T_QWebHitTestResult, QWebHitTestResult) }
|
||||
|
||||
void* ModuleWebkit::toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebElement == n) { p = new QWebElement(*toQWebElementPointer(l_arg)); }
|
||||
else if(LObjects::T_QWebElementCollection == n) { p = new QWebElementCollection(*toQWebElementCollectionPointer(l_arg)); }
|
||||
else if(LObjects::T_QWebHitTestResult == n) { p = new QWebHitTestResult(*toQWebHitTestResultPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object ModuleWebkit::to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebElement == n) { l_ret = from_qwebelement(*(QWebElement*)p); }
|
||||
else if(LObjects::T_QList_QWebElement == n) { l_ret = from_qwebelementlist(*(QList<QWebElement>*)p); }
|
||||
else if(LObjects::T_QWebElementCollection == n) { l_ret = from_qwebelementcollection(*(QWebElementCollection*)p); }
|
||||
else if(LObjects::T_QWebHitTestResult == n) { l_ret = from_qwebhittestresult(*(QWebHitTestResult*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
const QMetaObject* ModuleWebkit::staticMetaObject(int n) {
|
||||
const QMetaObject* m = 0;
|
||||
switch(n) {
|
||||
case 88: m = &QGraphicsWebView::staticMetaObject; break;
|
||||
|
|
@ -55,7 +98,7 @@ void deleteNObject(int n, void* p, int gc) {
|
|||
case 273: if(gc) delete (QWebHitTestResult*)p; else delete (LWebHitTestResult*)p; break;
|
||||
case 274: if(gc) delete (QWebSecurityOrigin*)p; else delete (LWebSecurityOrigin*)p; break; }}
|
||||
|
||||
NumList* overrideFunctions(const QByteArray& name) {
|
||||
NumList* ModuleWebkit::overrideIds(const QByteArray& name) {
|
||||
NumList* ids = 0;
|
||||
int n = LObjects::q_names.value(name, -1);
|
||||
if(n != -1) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
#ifndef INI_H
|
||||
#define INI_H
|
||||
#ifndef MODULE_WEBKIT_INI_H
|
||||
#define MODULE_WEBKIT_INI_H
|
||||
|
||||
#include "../../ecl_fun.h"
|
||||
#include <QtWebKitWidgets>
|
||||
|
||||
Q_DECLARE_METATYPE(QList<QWebPluginFactory::Plugin>)
|
||||
#include "../../module_interface.h"
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#define LIB_EXPORT __declspec(dllexport)
|
||||
|
|
@ -16,13 +14,19 @@ QT_BEGIN_NAMESPACE
|
|||
|
||||
typedef QList<int> NumList;
|
||||
|
||||
extern "C" {
|
||||
LIB_EXPORT void ini();
|
||||
LIB_EXPORT const QMetaObject* staticMetaObject(int);
|
||||
LIB_EXPORT void deleteNObject(int, void*, int);
|
||||
LIB_EXPORT NumList* overrideFunctions(const QByteArray&);
|
||||
LIB_EXPORT void* toMetaArg(int, cl_object, bool*);
|
||||
LIB_EXPORT cl_object to_lisp_arg(int, void*, bool*); }
|
||||
extern "C" LIB_EXPORT void* webkit_ini();
|
||||
|
||||
class ModuleWebkit : public ModuleInterface {
|
||||
public:
|
||||
ModuleWebkit();
|
||||
|
||||
void ini2();
|
||||
const QMetaObject* staticMetaObject(int);
|
||||
void deleteNObject(int, void*, int);
|
||||
NumList* overrideIds(const QByteArray&);
|
||||
void* toMetaArg(int, cl_object, bool*);
|
||||
cl_object to_lisp_arg(int, void*, bool*);
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -2,50 +2,7 @@
|
|||
#define INI2_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <eql5/eql.h>
|
||||
#include <QtGui>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
TO_QT_TYPE_PTR (QWebElement, qwebelement)
|
||||
TO_QT_TYPE_PTR (QWebElementCollection, qwebelementcollection)
|
||||
TO_QT_TYPE_PTR (QWebHitTestResult, qwebhittestresult)
|
||||
|
||||
TO_CL_LIST_VAL (QWebElement, qwebelement)
|
||||
|
||||
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
|
||||
|
||||
void ini2() {
|
||||
// note: QWebHistoryItem can't be registered as QMetaType, lacking a public default constructor
|
||||
META_TYPE_(LObjects::T_QWebElement, QWebElement)
|
||||
META_TYPE_(LObjects::T_QList_QWebElement, QList<QWebElement>)
|
||||
META_TYPE_(LObjects::T_QWebElementCollection, QWebElementCollection)
|
||||
META_TYPE_(LObjects::T_QWebHitTestResult, QWebHitTestResult) }
|
||||
|
||||
void* toMetaArg(int n, cl_object l_arg, bool* found) {
|
||||
void* p = 0;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebElement == n) { p = new QWebElement(*toQWebElementPointer(l_arg)); }
|
||||
else if(LObjects::T_QWebElementCollection == n) { p = new QWebElementCollection(*toQWebElementCollectionPointer(l_arg)); }
|
||||
else if(LObjects::T_QWebHitTestResult == n) { p = new QWebHitTestResult(*toQWebHitTestResultPointer(l_arg)); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return p; }
|
||||
|
||||
cl_object to_lisp_arg(int n, void* p, bool* found) {
|
||||
cl_object l_ret = Cnil;
|
||||
bool _found = true;
|
||||
if(LObjects::T_QWebElement == n) { l_ret = from_qwebelement(*(QWebElement*)p); }
|
||||
else if(LObjects::T_QList_QWebElement == n) { l_ret = from_qwebelementlist(*(QList<QWebElement>*)p); }
|
||||
else if(LObjects::T_QWebElementCollection == n) { l_ret = from_qwebelementcollection(*(QWebElementCollection*)p); }
|
||||
else if(LObjects::T_QWebHitTestResult == n) { l_ret = from_qwebhittestresult(*(QWebHitTestResult*)p); }
|
||||
else { _found = false; }
|
||||
if(_found) {
|
||||
*found = true; }
|
||||
return l_ret; }
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <QtWebKit>
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "_ini.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtWebKit>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#ifndef Q_CLASSES_H
|
||||
#define Q_CLASSES_H
|
||||
|
||||
#include "_ini.h"
|
||||
#include "_ini2.h"
|
||||
#include "../../ecl_fun.h"
|
||||
#include "../_lobjects.h"
|
||||
#include <QtWebKit>
|
||||
#include <QtWidgets>
|
||||
#include <QtPrintSupport>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += help printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_help
|
||||
|
|
|
|||
10
src/module_interface.cpp
Normal file
10
src/module_interface.cpp
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
#include "module_interface.h"
|
||||
|
||||
ModuleInterface* ModuleInterface::help = 0;
|
||||
ModuleInterface* ModuleInterface::network = 0;
|
||||
ModuleInterface* ModuleInterface::multimedia = 0;
|
||||
ModuleInterface* ModuleInterface::quick = 0;
|
||||
ModuleInterface* ModuleInterface::sql = 0;
|
||||
ModuleInterface* ModuleInterface::svg = 0;
|
||||
ModuleInterface* ModuleInterface::webkit = 0;
|
||||
ModuleInterface* ModuleInterface::webengine = 0;
|
||||
33
src/module_interface.h
Normal file
33
src/module_interface.h
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
#ifndef MODULE_INTERFACE_H
|
||||
#define MODULE_INTERFACE_H
|
||||
|
||||
#include <ecl/ecl.h>
|
||||
#include <QByteArray>
|
||||
#include <QList>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QMetaObject;
|
||||
|
||||
class ModuleInterface {
|
||||
public:
|
||||
virtual void ini2() = 0;
|
||||
virtual const QMetaObject* staticMetaObject(int) = 0;
|
||||
virtual void deleteNObject(int, void*, int) = 0;
|
||||
virtual QList<int>* overrideIds(const QByteArray&) = 0;
|
||||
virtual void* toMetaArg(int, cl_object, bool*) = 0;
|
||||
virtual cl_object to_lisp_arg(int, void*, bool*) = 0;
|
||||
|
||||
static ModuleInterface* help;
|
||||
static ModuleInterface* multimedia;
|
||||
static ModuleInterface* network;
|
||||
static ModuleInterface* quick;
|
||||
static ModuleInterface* sql;
|
||||
static ModuleInterface* svg;
|
||||
static ModuleInterface* webengine;
|
||||
static ModuleInterface* webkit;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
QT += multimedia multimediawidgets printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_multimedia
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += network printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_network
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += quick quickwidgets qml printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_quick
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += sql printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_sql
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += svg printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_svg
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += webenginewidgets printsupport uitools
|
||||
QT += webengine webenginewidgets printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_webengine
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
QT += webkitwidgets printsupport uitools
|
||||
QT += webkit webkitwidgets printsupport uitools
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin no_keywords release
|
||||
CONFIG += no_keywords release
|
||||
CONFIG += plugin
|
||||
#CONFIG += static
|
||||
INCLUDEPATH += ../src /usr/local/include
|
||||
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
|
||||
TARGET = eql5_webkit
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue