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

signal an error if QVARIANT-FROM-VALUE failes because of invalid type name

Browse source
This commit is contained in:
polos 2017-01-22 17:22:55 +01:00
parent d2d86849ce
commit 322dcfe01a
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ecl_fun.cpp
View file

@ -864,10 +864,13 @@ TO_QT_VECTOR_VAL2 (float, Float)
TO_QT_VECTOR_VAL2 (int, Int)
TO_QT_VECTOR_VAL2 (qreal, Real)
QVariant toQVariant(cl_object l_obj, const char* s_type, int type) {
QVariant toQVariant(cl_object l_obj, const char* s_type, int type, bool* ok) {
QVariant var;
if(type == -1) {
type = QVariant::nameToType(s_type); }
if(type == QVariant::Invalid) {
*ok = false;
return var; }
switch(type) {
case QVariant::Bool: var = (l_obj != Cnil); break;
case QVariant::Brush: var = toQBrush(l_obj); break;
@ -1898,9 +1901,12 @@ cl_object qvariant_from_value(cl_object l_val, cl_object l_type) {
ecl_process_env()->nvalues = 1;
QByteArray typeName(toCString(l_type));
if(!typeName.isEmpty()) {
QVariant* v = new QVariant(toQVariant(l_val, typeName));
cl_object l_ret = qt_object_from_name("QVariant", v);
return l_ret; }
bool ok = true;
QVariant var(toQVariant(l_val, typeName, -1, &ok));
if(ok) {
QVariant* p = new QVariant(var);
cl_object l_ret = qt_object_from_name("QVariant", p);
return l_ret; }}
error_msg("QVARIANT-FROM-VALUE", LIST2(l_val, l_type));
return Cnil; }