mirrors/EQL5
1
Fork 0
mirror of https://gitlab.com/eql/EQL5.git synced 2026-03-15 03:01:18 -07:00
Code Issues Projects Releases Packages Wiki Activity

review module :webengine, adding Qt/Lisp meta type for FunctorOrLambda

Browse source
This commit is contained in:
polos 2017-03-26 18:51:33 +02:00
parent 7ad19371fb
commit 64da2454ed
13 changed files with 117 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ecl_fun.cpp
View file

@ -33,6 +33,7 @@ META_TYPE (T_quint8, quint8)
META_TYPE (T_quint16, quint16)
META_TYPE (T_quint32, quint32)
META_TYPE (T_quint64, quint64)
META_TYPE (T_FunctorOrLambda, FunctorOrLambda)
META_TYPE (T_QFileInfo, QFileInfo)
META_TYPE (T_QFileInfoList, QFileInfoList)
META_TYPE (T_QGradient, QGradient)
@ -1162,6 +1163,14 @@ static cl_object from_qvariantlist(const QVariantList& l) {
l_list = cl_nreverse(l_list);
return l_list; }
static void* ensurePersistentFunction(cl_object l_fun) {
STATIC_SYMBOL_PKG (s_ensure_persistent_function, "%ENSURE-PERSISTENT-FUNCTION", "EQL") // see "lisp/ini.lisp"
cl_object l_ret = cl_funcall(2, s_ensure_persistent_function, l_fun);
return (Cnil == l_ret) ? 0 : (void*)l_ret; }
void FunctorOrLambda::operator()(const QVariant& var) {
cl_funcall(2, (cl_object)function, from_qvariant_value(var)); }
static MetaArg toMetaArg(const QByteArray& sType, cl_object l_arg) {
void* p = 0;
const int n = QMetaType::type(sType);
@ -1318,6 +1327,7 @@ static MetaArg toMetaArg(const QByteArray& sType, cl_object l_arg) {
else if(T_quint16 == n) p = new quint16(toUInt<quint16>(l_arg));
else if(T_quint32 == n) p = new quint32(toUInt<quint32>(l_arg));
else if(T_quint64 == n) p = new quint64(toUInt<quint64>(l_arg));
else if(T_FunctorOrLambda == n) p = new FunctorOrLambda(ensurePersistentFunction(l_arg));
// module types
else {
bool found = false;
@ -1534,7 +1544,6 @@ static void clearMetaArg(const MetaArg& arg, bool is_ret = false) {
// enums
else if(!sType.endsWith('>') && sType.contains(':')) {
delete (int*)p; }
// default
else {
QMetaType::destroy(n, p); }}
@ -2203,11 +2212,6 @@ ok3:
error_msg("QINVOKE-METHOD", LIST4(l_obj, l_cast, l_name, l_args));
return Cnil; }
static void* ensurePersistentFunction(cl_object l_fun) {
STATIC_SYMBOL_PKG (s_ensure_persistent_function, "%ENSURE-PERSISTENT-FUNCTION", "EQL") // see "lisp/ini.lisp"
cl_object l_ret = cl_funcall(2, s_ensure_persistent_function, l_fun);
return (Cnil == l_ret) ? 0 : (void*)l_ret; }
cl_object qconnect2(cl_object l_caller, cl_object l_signal, cl_object l_receiver, cl_object l_slot) {
/// args: (caller signal receiver/function &optional slot)
/// Connects either a Qt signal to a Qt slot, or a Qt signal to a Lisp function.