mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2025-12-06 10:31:34 -08:00
Code Issues Projects Releases Packages Wiki Activity

prepare for SailfishOS (Qt5.15 libs & qt-runner)

Browse source
This commit is contained in:
pls.153 2023-10-08 15:46:12 +02:00
parent 8cc84acbcc
commit b07152d7d4
28 changed files with 99 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cpp/ecl_fun_plugin.h
View file

@ -321,7 +321,7 @@ cl_object from_cstring(const QByteArray& s) {
cl_object from_qbytearray(const QByteArray& ba) {
STATIC_SYMBOL_PKG (s_make_byte_vector, "%MAKE-BYTE-VECTOR", "QML") // see 'ini.lisp'
cl_object l_list = Cnil;
cl_object l_list = ECL_NIL;
for (int i = 0; i < ba.size(); i++) {
l_list = CONS(ecl_make_fixnum(static_cast<uchar>(ba.at(i))), l_list);
}
@ -409,7 +409,7 @@ cl_object from_qvariant(const QVariant& var) {
QHash<QByteArray, void*> lisp_functions;
cl_object lisp_apply(cl_object l_fun, cl_object l_args) {
cl_object l_ret = Cnil;
cl_object l_ret = ECL_NIL;
const cl_env_ptr l_env = ecl_process_env();
CL_CATCH_ALL_BEGIN(l_env) {
CL_UNWIND_PROTECT_BEGIN(l_env) {
@ -469,17 +469,17 @@ QVariant ecl_fun(const QByteArray& pkgFun,
QByteArray pkg = (p == -1) ? "qml-user" : pkgFun.left(p);
QByteArray fun = pkgFun.mid(pkgFun.lastIndexOf(':') + 1);
cl_object l_pkg = cl_find_package(make_constant_base_string(pkg.toUpper().constData()));
if (l_pkg != Cnil) {
if (l_pkg != ECL_NIL) {
cl_object l_sym = cl_find_symbol(2,
make_constant_base_string(fun.toUpper().constData()),
l_pkg);
if (cl_fboundp(l_sym) != Cnil) {
if (cl_fboundp(l_sym) != ECL_NIL) {
symbol = l_sym;
lisp_functions[pkgFun] = symbol;
}
}
}
cl_object l_args = Cnil;
cl_object l_args = ECL_NIL;
if (!a1.isNull()) { PUSH_ARG(a1);
if (!a2.isNull()) { PUSH_ARG(a2);
if (!a3.isNull()) { PUSH_ARG(a3);