jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed QVariant conversion for dictionary.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2011-04-27 15:02:10 -03:00
commit 75bcc4dbdd
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PySide/QtCore/qvariant_conversions.h
View file

@ -97,7 +97,9 @@ struct Converter<QVariant>
//sequence and dictornay //sequence and dictornay
if (PyDict_Check(pyObj)) { if (PyDict_Check(pyObj)) {
return convertToVariantMap(pyObj); QVariant ret = convertToVariantMap(pyObj);
if (ret.isValid())
return ret;
} else if (PySequence_Check(pyObj)) { } else if (PySequence_Check(pyObj)) {
return convertToVariantList(pyObj); return convertToVariantList(pyObj);
} }
@ -170,7 +172,7 @@ struct Converter<QVariant>
ret.insert(Converter<QString>::toCpp(key), toCpp(value)); ret.insert(Converter<QString>::toCpp(key), toCpp(value));
return QVariant(ret); return QVariant(ret);
} else { } else {
return toCpp(map); return QVariant();
} }
} }