Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-27 18:01:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

re-apply: Cleaner qobject2qvariant().

Browse Source
This commit is contained in:
Francois Ferrand 2013-04-11 20:42:00 +02:00 committed by Keith Bennett
parent c570a13a1f
commit 21204971ff
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/qjson/src/qobjecthelper.cpp
View File

@ -41,7 +41,7 @@ QObjectHelper::~QObjectHelper()
delete d; delete d;
} }
QVariantMap QObjectHelper::qobject2qvariant( const QObject* object, QVariantMap QObjectHelper::qobject2qvariant(const QObject* object, Flags flags,
const QStringList& ignoredProperties) const QStringList& ignoredProperties)
{ {
QVariantMap result; QVariantMap result;
@ -55,11 +55,20 @@ QVariantMap QObjectHelper::qobject2qvariant( const QObject* object,
continue; continue;
QVariant value = object->property(name); QVariant value = object->property(name);
if (value.isNull() && !flags.testFlag(Flag_StoreNullVariants))
continue;
if (!value.isValid() && !flags.testFlag(Flag_StoreInvalidVariants))
continue;
result[QLatin1String(name)] = value; result[QLatin1String(name)] = value;
} }
return result; return result;
} }
QVariantMap QObjectHelper::qobject2qvariant(const QObject *object, const QStringList &ignoredProperties)
{
return qobject2qvariant(object, Flag_All, ignoredProperties);
}
void QObjectHelper::qvariant2qobject(const QVariantMap& variant, QObject* object) void QObjectHelper::qvariant2qobject(const QVariantMap& variant, QObject* object)
{ {
const QMetaObject *metaobject = object->metaObject(); const QMetaObject *metaobject = object->metaObject();

12
src/http/qjson/src/qobjecthelper.h
View File

@ -120,14 +120,24 @@ namespace QJson {
QObjectHelper(); QObjectHelper();
~QObjectHelper(); ~QObjectHelper();
enum Flag {
Flag_None,
Flag_StoreNullVariants,
Flag_StoreInvalidVariants,
Flag_All = Flag_StoreNullVariants | Flag_StoreInvalidVariants
};
Q_DECLARE_FLAGS(Flags, Flag)
/** /**
* This method converts a QObject instance into a QVariantMap. * This method converts a QObject instance into a QVariantMap.
* *
* @param object The QObject instance to be converted. * @param object The QObject instance to be converted.
* @param ignoredProperties Properties that won't be converted. * @param ignoredProperties Properties that won't be converted.
*/ */
static QVariantMap qobject2qvariant( const QObject* object, static QVariantMap qobject2qvariant(const QObject* object, Flags flags = Flag_All,
const QStringList& ignoredProperties = QStringList(QString(QLatin1String("objectName")))); const QStringList& ignoredProperties = QStringList(QString(QLatin1String("objectName"))));
static QVariantMap qobject2qvariant(const QObject* object,
const QStringList& ignoredProperties);
/** /**
* This method converts a QVariantMap instance into a QObject * This method converts a QVariantMap instance into a QObject