mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2026-01-14 13:21:13 -08:00
Code Issues Projects Releases Packages Wiki Activity

revisions

Browse source
This commit is contained in:
pls.153 2022-03-20 00:07:39 +01:00
parent 0a94884736
commit a8698e1ad4
9 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/cpp/marshal.cpp
View file

@ -5,6 +5,15 @@
QT_BEGIN_NAMESPACE
static void warning_msg(const char* message, cl_object l_args) {
STATIC_SYMBOL (s_error_output, "*ERROR-OUTPUT*")
cl_format(4,
cl_symbol_value(s_error_output),
STRING("~%[LQML:warning] ~A ~S~%"),
STRING(message),
l_args);
}
// *** Lisp to Qt ***
template<typename T>
@ -194,12 +203,17 @@ QString toCamelCase(const QString& name) {
QVariant toQVariantMap(cl_object l_list) {
// special case for JS dictionary, for e.g. populating a Model in QML
QVariantMap map;
if (cl_keywordp(cl_first(l_list)) == ECL_T) {
cl_object l_do_args = l_list;
while (l_do_args != ECL_NIL) {
map.insert(toCamelCase(toQString(cl_symbol_name(cl_first(l_do_args))).toLower()),
cl_object l_do_args = l_list;
while (l_do_args != ECL_NIL) {
cl_object l_keyword = cl_first(l_do_args);
if (cl_keywordp(l_keyword) == ECL_T) {
map.insert(toCamelCase(toQString(cl_symbol_name(l_keyword)).toLower()),
toQVariant(cl_second(l_do_args)));
l_do_args = cl_cddr(l_do_args);
} else {
// might not be an error, e.g. unintended return value of Lisp.call()
warning_msg("conversion to QVariantMap failed", l_list);
break;
}
}
return map;

3
src/cpp/qml_ext.cpp
View file

@ -37,8 +37,7 @@ QVariant Lisp::call(const QJSValue& caller_or_function,
if (caller_or_function.isQObject()) {
caller = caller_or_function.toQObject();
function = function_or_arg0.toString();
}
else if (caller_or_function.isString()) {
} else if (caller_or_function.isString()) {
function = caller_or_function.toString();
if (!function_or_arg0.isUndefined()) {
arguments << function_or_arg0.toVariant();