feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't interact with list there the interface is not fully implemented

Browse Source 
I changed this because we get "false" crash reports.

Reviewed-by: kkoehne
This commit is contained in:
Marco Bubke
2010-04-13 19:39:23 +02:00
committed by Kai Koehne
parent 3d2a83910d
commit 2eb96a8ed3
1 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
View File

@@ -59,9 +59,13 @@
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QPixmapCache> #include <QPixmapCache>
#include <QTextDocument>
#include <private/qdeclarativebinding_p.h> #include <private/qdeclarativebinding_p.h>
#include <private/qdeclarativemetatype_p.h> #include <private/qdeclarativemetatype_p.h>
#include <private/qdeclarativevaluetype_p.h> #include <private/qdeclarativevaluetype_p.h>
#include <private/qdeclarativetext_p.h>
#include <private/qdeclarativetext_p_p.h>
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal { namespace Internal {
@@ -331,38 +335,32 @@ static QVariant objectToVariant(QObject *object)
return QVariant::fromValue(object); return QVariant::fromValue(object);
} }
#ifndef QT_DEBUG
static bool hasFullImplementedListInterface(const QDeclarativeListReference &list) static bool hasFullImplementedListInterface(const QDeclarativeListReference &list)
{ {
return list.isValid() && list.canCount() && list.canAt() && list.canAppend() && list.canClear(); return list.isValid() && list.canCount() && list.canAt() && list.canAppend() && list.canClear();
} }
#endif
static void removeObjectFromList(const QDeclarativeProperty &metaProperty, QObject *objectToBeRemoved, QDeclarativeEngine * engine) static void removeObjectFromList(const QDeclarativeProperty &metaProperty, QObject *objectToBeRemoved, QDeclarativeEngine * engine)
{ {
QDeclarativeListReference listReference(metaProperty.object(), metaProperty.name().toLatin1(), engine); QDeclarativeListReference listReference(metaProperty.object(), metaProperty.name().toLatin1(), engine);
#ifndef QT_DEBUG if (!hasFullImplementedListInterface(listReference)) {
if (!hasFullImplementedListInterface(listReference)) qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!";
return; return;
#endif }
int count = listReference.count(); int count = listReference.count();
QObjectList objectList; QObjectList objectList;
Q_ASSERT(listReference.canCount());
Q_ASSERT(listReference.canAt());
for(int i = 0; i < count; i ++) { for(int i = 0; i < count; i ++) {
QObject *listItem = listReference.at(i); QObject *listItem = listReference.at(i);
if (listItem != objectToBeRemoved) if (listItem != objectToBeRemoved)
objectList.append(listItem); objectList.append(listItem);
} }
Q_ASSERT(listReference.canClear());
listReference.clear(); listReference.clear();
Q_ASSERT(listReference.canAppend());
foreach(QObject *object, objectList) foreach(QObject *object, objectList)
listReference.append(object); listReference.append(object);
} }
@@ -390,16 +388,16 @@ void ObjectNodeInstance::addToNewProperty(QObject *object, QObject *newParent, c
if (isList(metaProperty)) { if (isList(metaProperty)) {
QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read()); QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read());
#ifndef QT_DEBUG if (!hasFullImplementedListInterface(list)) {
if (!hasFullImplementedListInterface(list)) qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!";
return; return;
#endif }
Q_ASSERT(list.canAppend());
list.append(object); list.append(object);
} else if (isObject(metaProperty)) { } else if (isObject(metaProperty)) {
metaProperty.write(objectToVariant(object)); metaProperty.write(objectToVariant(object));
} }
object->setParent(newParent); object->setParent(newParent);
Q_ASSERT(objectToVariant(object).isValid()); Q_ASSERT(objectToVariant(object).isValid());
@@ -488,20 +486,15 @@ void ObjectNodeInstance::deleteObjectsInList(const QDeclarativeProperty &metaPro
QObjectList objectList; QObjectList objectList;
QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read()); QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read());
#ifndef QT_DEBUG if (!hasFullImplementedListInterface(list)) {
if (!hasFullImplementedListInterface(list)) qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!";
return; return;
#endif }
Q_ASSERT(list.canCount());
Q_ASSERT(list.canAt());
for(int i = 0; i < list.count(); i++) { for(int i = 0; i < list.count(); i++) {
objectList += list.at(i); objectList += list.at(i);
} }
Q_ASSERT(list.canClear());
list.clear(); list.clear();
} }
@@ -554,12 +547,12 @@ void ObjectNodeInstance::resetProperty(QObject *object, const QString &propertyN
{ {
m_modelAbstractPropertyHash.remove(propertyName); m_modelAbstractPropertyHash.remove(propertyName);
QDeclarativeProperty property(object, propertyName, context()); QDeclarativeProperty metaProperty(object, propertyName, context());
if (!property.isValid()) if (!metaProperty.isValid())
return; return;
QVariant oldValue = property.read(); QVariant oldValue = metaProperty.read();
if (oldValue.type() == QVariant::Url) { if (oldValue.type() == QVariant::Url) {
QUrl url = oldValue.toUrl(); QUrl url = oldValue.toUrl();
QString path = url.toLocalFile(); QString path = url.toLocalFile();
@@ -568,24 +561,26 @@ void ObjectNodeInstance::resetProperty(QObject *object, const QString &propertyN
} }
QDeclarativeAbstractBinding *binding = QDeclarativePropertyPrivate::binding(property); QDeclarativeAbstractBinding *binding = QDeclarativePropertyPrivate::binding(metaProperty);
if (binding) { if (binding) {
binding->setEnabled(false, 0); binding->setEnabled(false, 0);
binding->destroy(); binding->destroy();
} }
if (property.isResettable()) { if (metaProperty.isResettable()) {
property.reset(); metaProperty.reset();
} else if (property.isWritable()) { } else if (metaProperty.isWritable()) {
if (property.read() == resetValue(propertyName)) if (metaProperty.read() == resetValue(propertyName))
return; return;
property.write(resetValue(propertyName)); metaProperty.write(resetValue(propertyName));
} else if (property.propertyTypeCategory() == QDeclarativeProperty::List) { } else if (metaProperty.propertyTypeCategory() == QDeclarativeProperty::List) {
QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(property.read()); QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read());
#ifndef QT_DEBUG
if (!hasFullImplementedListInterface(list)) if (!hasFullImplementedListInterface(list)) {
qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!";
return; return;
#endif }
list.clear(); list.clear();
} }
} }
@@ -595,7 +590,6 @@ QVariant ObjectNodeInstance::property(const QString &name) const
if (m_modelAbstractPropertyHash.contains(name)) if (m_modelAbstractPropertyHash.contains(name))
return QVariant::fromValue(m_modelAbstractPropertyHash.value(name)); return QVariant::fromValue(m_modelAbstractPropertyHash.value(name));
// TODO: handle model nodes // TODO: handle model nodes
QDeclarativeProperty metaProperty(object(), name, context()); QDeclarativeProperty metaProperty(object(), name, context());