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

fix return value of QVARIANT-VALUE to work with QT-OBJECTs

Browse source
This commit is contained in:
polos 2017-01-22 11:24:01 +01:00
parent b33a987248
commit d2d86849ce
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ecl_fun.cpp
View file

@ -973,9 +973,7 @@ static cl_object from_qcolor(const QColor& col) {
cl_object l_ret = Cnil;
if(col.isValid()) { // return NIL for invalid QColors
if(EQL::return_value_p) {
l_ret = qt_object_from_name("QColor", new QColor(col), 0, true); }
else {
l_ret = qt_object_from_name("QColor", (void*)&col); }}
l_ret = qt_object_from_name("QColor", new QColor(col), 0, true); }}
return l_ret; }
static cl_object from_qpolygon(const QPolygon& p) {
@ -1886,7 +1884,9 @@ cl_object qvariant_value(cl_object l_obj) {
QtObject o = toQtObject(l_obj);
if("QVariant" == o.className() && o.pointer) {
QVariant* p = (QVariant*)o.pointer;
EQL::return_value_p = true;
cl_object l_ret = from_qvariant_value(*p);
EQL::return_value_p = false;
return l_ret; }
error_msg("QVARIANT-VALUE", LIST1(l_obj));
return Cnil; }

4
src/ecl_fun.h
View file

@ -100,8 +100,6 @@ static cl_object from_##name(const cap_name& x) { \
cl_object l_ret = Cnil; \
if(EQL::return_value_p) { \
l_ret = qt_object_from_name(#cap_name, new cap_name(x), 0, true); } \
else { \
l_ret = qt_object_from_name(#cap_name, (void*)&x); } \
return l_ret; }
#define FROM_QT_TYPE_ONLY(cap_name, name) \
@ -109,8 +107,6 @@ static cl_object from_##name(const cap_name& x) { \
cl_object l_ret = Cnil; \
if(EQL::return_value_p) { \
l_ret = qt_object_from_name(#cap_name, new cap_name(x), 0, true); } \
else { \
l_ret = qt_object_from_name(#cap_name, (void*)&x); } \
return l_ret; }
#define TO_QT_TYPE_PTR2(cap_name, name) \

2
src/eql.cpp
View file

@ -7,7 +7,7 @@
#include <QTimer>
#include <QStringList>
const char EQL::version[] = "17.1.5"; // Jan 2017
const char EQL::version[] = "17.1.6"; // Jan 2017
extern "C" void ini_EQL(cl_object);