Commit 39e55c91 authored by Marco Bubke's avatar Marco Bubke Committed by Alessandro Portale
Browse files

QmlDesigner.NodeInstances: Remove dead code

Change-Id: I181f365d40b9fcd6b09989ed54decd9720e1c27d
Reviewed-on: http://codereview.qt.nokia.com/1330


Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent da7b74ac
......@@ -46,134 +46,6 @@
namespace QmlDesigner {
namespace Internal {
//QmlPropertyChangesObject::QmlPropertyChangesObject() :
// QDeclarativeStateOperation(),
// m_restoreEntryValues(true),
// m_isExplicit(false)
//{
//}
//QDeclarativeStateOperation::ActionList QmlPropertyChangesObject::actions()
//{
// QMutableListIterator<QDeclarativeAction> actionIterator(m_qmlActionList);
// while (actionIterator.hasNext()) {
// QDeclarativeAction &action = actionIterator.next();
// action.fromBinding = QDeclarativePropertyPrivate::binding(action.property);
// action.fromValue = action.property.read();
// if (m_expressionHash.contains(action.specifiedProperty)) {
// if(m_expressionHash[action.specifiedProperty].second.isNull()) {
// if (targetObject()) {
// QDeclarativeBinding *binding = new QDeclarativeBinding(m_expressionHash[action.specifiedProperty].first, targetObject(), QDeclarativeEngine::contextForObject(targetObject()), this);
// binding->setTarget(action.property);
// binding->setNotifyOnValueChanged(true);
// action.toBinding = binding;
// action.toValue = binding->evaluate();
// m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding));
// } else {
// action.toBinding = 0;
// }
// } else {
// action.toBinding = m_expressionHash[action.specifiedProperty].second.data();
// action.toValue = m_expressionHash[action.specifiedProperty].second->evaluate();
// }
// } else {
// action.toBinding = 0;
// }
// }
// return m_qmlActionList;
//}
//QObject *QmlPropertyChangesObject::targetObject() const
//{
// return m_targetObject.data();
//}
//void QmlPropertyChangesObject::setTargetObject(QObject *object)
//{
// if (m_targetObject.data() == object)
// return;
// QMutableListIterator<QDeclarativeAction> actionIterator(m_qmlActionList);
// while (actionIterator.hasNext()) {
// QDeclarativeAction &qmlAction = actionIterator.next();
// if (m_expressionHash.contains(qmlAction.specifiedProperty) && m_expressionHash[qmlAction.specifiedProperty].second) {
// if (isActive()) {
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, 0, QDeclarativePropertyPrivate::DontRemoveBinding| QDeclarativePropertyPrivate::BypassInterceptor);
// qmlAction.property.write(qmlAction.fromValue);
// m_expressionHash[qmlAction.specifiedProperty].second.data()->destroy();
// }
// qmlAction.toBinding = 0;
// }
// if (isActive() && targetObject()) {
// updateRevertValueAndBinding(qmlAction.specifiedProperty);
// }
// }
// m_targetObject = object;
// actionIterator.toFront();
// while (actionIterator.hasNext()) {
// QDeclarativeAction &qmlAction = actionIterator.next();
// qmlAction.specifiedObject = object;
// qmlAction.property = createMetaProperty(qmlAction.specifiedProperty);
// qmlAction.fromValue = qmlAction.property.read();
// qmlAction.fromBinding = QDeclarativePropertyPrivate::binding(qmlAction.property);
// if (m_expressionHash.contains(qmlAction.specifiedProperty) && targetObject()) {
// QDeclarativeBinding *binding = new QDeclarativeBinding(m_expressionHash[qmlAction.specifiedProperty].first ,targetObject(), QDeclarativeEngine::contextForObject(targetObject()));
// binding->setTarget(qmlAction.property);
// binding->setNotifyOnValueChanged(true);
// qmlAction.toBinding = binding;
// m_expressionHash.insert(qmlAction.specifiedProperty, ExpressionPair(m_expressionHash[qmlAction.specifiedProperty].first, binding));
// if (isActive()) {
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, qmlAction.toBinding, QDeclarativePropertyPrivate::DontRemoveBinding| QDeclarativePropertyPrivate::BypassInterceptor);
// }
// }
// if (isActive() && targetObject()) {
// updateRevertValueAndBinding(qmlAction.specifiedProperty);
// }
// }
//}
//bool QmlPropertyChangesObject::restoreEntryValues() const
//{
// return m_restoreEntryValues;
//}
//void QmlPropertyChangesObject::setRestoreEntryValues(bool restore)
//{
// m_restoreEntryValues = restore;
//}
//bool QmlPropertyChangesObject::isExplicit() const
//{
// return m_isExplicit;
//}
//void QmlPropertyChangesObject::setIsExplicit(bool isExplicit)
//{
// m_isExplicit = isExplicit;
//}
//QDeclarativeProperty QmlPropertyChangesObject::createMetaProperty(const QString &property)
//{
// QDeclarativeProperty prop(m_targetObject.data(), property, QDeclarativeEngine::contextForObject(m_targetObject.data()));
// if (!prop.isValid()) {
// qWarning() << "Cannot assign to non-existent property" << property;
// return QDeclarativeProperty();
// } else if (!prop.isWritable()) {
// qWarning() << "Cannot assign to read-only property" << property;
// return QDeclarativeProperty();
// }
// return prop;
//}
QmlPropertyChangesNodeInstance::QmlPropertyChangesNodeInstance(QDeclarativePropertyChanges *propertyChangesObject) :
ObjectNodeInstance(propertyChangesObject)
{
......@@ -239,409 +111,11 @@ void QmlPropertyChangesNodeInstance::reparent(const ServerNodeInstance &oldParen
changesObject()->attachToState();
}
//QDeclarativeState *QmlPropertyChangesObject::state() const
//{
// if (!parent())
// return 0;
// Q_ASSERT(qobject_cast<QDeclarativeState*>(parent()));
// return static_cast<QDeclarativeState*>(parent());
//}
//QDeclarativeStateGroup *QmlPropertyChangesObject::stateGroup() const
//{
// if (!state())
// return 0;
// return state()->stateGroup();
//}
//QDeclarativeStatePrivate *QmlPropertyChangesObject::statePrivate() const
//{
// if (!parent() || QObjectPrivate::get(parent())->wasDeleted)
// return 0;
// Q_ASSERT(qobject_cast<QDeclarativeState*>(parent()));
// return static_cast<QDeclarativeStatePrivate*>(QObjectPrivate::get(parent()));
//}
QDeclarativePropertyChanges *QmlPropertyChangesNodeInstance::changesObject() const
{
Q_ASSERT(qobject_cast<QDeclarativePropertyChanges*>(object()));
return static_cast<QDeclarativePropertyChanges*>(object());
}
//QDeclarativeAction QmlPropertyChangesObject::createQDeclarativeAction(const QString &propertyName)
//{
// QDeclarativeProperty qmlMetaProperty = createMetaProperty(propertyName);
// QDeclarativeAction qmlAction;
// qmlAction.restore = true;
// qmlAction.property = qmlMetaProperty;
// qmlAction.fromValue = qmlMetaProperty.read();
// qmlAction.fromBinding = QDeclarativePropertyPrivate::binding(qmlMetaProperty);
// qmlAction.specifiedObject = m_targetObject.data();
// qmlAction.specifiedProperty = propertyName;
// qmlAction.event = 0;
// return qmlAction;
//}
//bool QmlPropertyChangesObject::hasActionForProperty(const QString &propertyName) const
//{
// for(ActionList::iterator actionIterator = m_qmlActionList.begin();
// actionIterator != m_qmlActionList.end();
// ++actionIterator) {
// QDeclarativeAction &qmlAction = *actionIterator;
// if (qmlAction.specifiedProperty == propertyName) {
// return true;
// }
// }
// return false;
//}
//QDeclarativeAction &QmlPropertyChangesObject::qmlActionForProperty(const QString &propertyName) const
//{
// for(ActionList::iterator actionIterator = m_qmlActionList.begin();
// actionIterator != m_qmlActionList.end();
// ++actionIterator) {
// QDeclarativeAction &qmlAction = *actionIterator;
// if (qmlAction.specifiedProperty == propertyName)
// return qmlAction;
// }
// Q_ASSERT(false);
// return m_qmlActionList[0];
//}
//void QmlPropertyChangesObject::removeActionForProperty(const QString &propertyName)
//{
// QMutableListIterator<QDeclarativeAction> actionIterator(m_qmlActionList);
// while (actionIterator.hasNext()) {
// QDeclarativeAction &qmlAction = actionIterator.next();
// if (qmlAction.specifiedProperty == propertyName)
// actionIterator.remove();
// }
// if (statePrivate()) {
// QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
// while (simpleActionIterator.hasNext()) {
// QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
// if (qmlSimpleAction.specifiedProperty == propertyName && qmlSimpleAction.specifiedObject == targetObject()) {
// simpleActionIterator.remove();
// }
// }
// }
//}
//bool QmlPropertyChangesObject::isActive() const
//{
// if (state() && stateGroup())
// return state()->name() == stateGroup()->state();
// return false;
//}
//QmlPropertyChangesObject::~QmlPropertyChangesObject()
//{
// removeFromStateRevertList();
//}
//void QmlPropertyChangesObject::removeFromStateRevertList()
//{
// if (statePrivate()) {
// QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
// while(simpleActionIterator.hasNext()) {
// QDeclarativeSimpleAction &simpleAction = simpleActionIterator.next();
// if (simpleAction.specifiedObject == targetObject()) {
// if (simpleAction.property.isValid()) {
// if (simpleAction.binding) {
// QDeclarativePropertyPrivate::setBinding(simpleAction.property, simpleAction.binding);
// } else if (simpleAction.value.isValid()) {
// QDeclarativePropertyPrivate::setBinding(simpleAction.property, 0);
// simpleAction.property.write(simpleAction.value);
// }
// }
// simpleActionIterator.remove();
// }
// }
// }
//}
//void QmlPropertyChangesObject::addToStateRevertList()
//{
// if (isActive() && statePrivate()) {
// QListIterator<QDeclarativeAction> actionIterator(m_qmlActionList);
// while (actionIterator.hasNext()) {
// const QDeclarativeAction &qmlAction = actionIterator.next();
// QDeclarativeSimpleAction simpleAction(qmlAction);
// simpleAction.binding = qmlAction.fromBinding;
// simpleAction.value = qmlAction.fromValue;
// statePrivate()->revertList.append(simpleAction);
// if (qmlAction.toBinding)
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, qmlAction.toBinding);
// else
// qmlAction.property.write(qmlAction.toValue);
// }
// }
//}
//void QmlPropertyChangesObject::updateRevertValueAndBinding(const QString &name)
//{
// if (isActive() && statePrivate()) {
// typedef QList<QDeclarativeSimpleAction> SimpleActionList;
// if (!statePrivate()->revertList.isEmpty()) {
// for(SimpleActionList::iterator actionIterator = statePrivate()->revertList.begin();
// actionIterator != statePrivate()->revertList.end();
// ++actionIterator) {
// //simple action defines values and bindings to revert current state
// QDeclarativeSimpleAction &simpleAction = *actionIterator;
// if (simpleAction.specifiedObject == targetObject()
// && simpleAction.specifiedProperty == name) {
// const QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// simpleAction.value = qmlAction.fromValue;
// simpleAction.binding = qmlAction.fromBinding;
// simpleAction.specifiedObject = qmlAction.specifiedObject;
// simpleAction.specifiedProperty = qmlAction.specifiedProperty;
// simpleAction.property = qmlAction.property;
// return; //return since we just had to update exisisting simple action
// }
// }
// }
// //simple action does not exist, yet
// const QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// QDeclarativeSimpleAction simpleAction(qmlAction);
// simpleAction.binding = qmlAction.fromBinding;
// simpleAction.value = qmlAction.fromValue;
// statePrivate()->revertList.append(simpleAction);
// }
//}
//void QmlPropertyChangesObject::setVariantValue(const QString &name, const QVariant & value)
//{
// if (!hasActionForProperty(name)) {
// m_qmlActionList.append(createQDeclarativeAction(name));
// }
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (qmlAction.fromBinding)
// qmlAction.fromBinding->setEnabled(false, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
// qmlAction.toValue = value;
//}
//void QmlPropertyChangesObject::setExpression(const QString &name, const QString &expression)
//{
// if (!hasActionForProperty(name)) {
// m_qmlActionList.append(createQDeclarativeAction(name));
// }
// QDeclarativeContext *context = QDeclarativeEngine::contextForObject(targetObject());
// QDeclarativeBinding *binding = 0;
// QDeclarativeProperty metaProperty(targetObject(), name, context);
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (m_expressionHash.contains(name) && m_expressionHash[name].second) {
// if (QDeclarativePropertyPrivate::binding(metaProperty) == m_expressionHash[name].second.data())
// QDeclarativePropertyPrivate::setBinding(metaProperty, 0, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
// m_expressionHash.take(name).second->destroy();
// qmlAction.toBinding = 0;
// }
// if (metaProperty.isValid() && metaProperty.isProperty()) {
// binding = new QDeclarativeBinding(expression, targetObject(), context, this);
// binding->setTarget(metaProperty);
// binding->setNotifyOnValueChanged(true);
// qmlAction.toBinding = binding;
// m_expressionHash.insert(name, ExpressionPair(expression, binding));
// } else {
// m_expressionHash.insert(name, ExpressionPair(expression, static_cast<QDeclarativeBinding*>(0)));
// }
// updateRevertValueAndBinding(name);
// if (isActive() && binding)
// QDeclarativePropertyPrivate::setBinding(metaProperty, binding, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
//}
//void QmlPropertyChangesObject::removeVariantValue(const QString &name)
//{
// if (hasActionForProperty(name)) {
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (hasExpression(name)) {
// qmlAction.toValue = QVariant();
// updateRevertValueAndBinding(name);
// } else {
// if (qmlAction.fromBinding)
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, qmlAction.fromBinding);
// else
// qmlAction.property.write(qmlAction.fromValue);
// removeActionForProperty(name);
// }
// }
//}
//void QmlPropertyChangesObject::removeExpression(const QString &name)
//{
// if (hasActionForProperty(name)) {
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (hasVariantValue(name)) {
// ExpressionPair expr = m_expressionHash.take(name);
// if (expr.second)
// expr.second.data()->destroy();
// qmlAction.toBinding = 0;
// updateRevertValueAndBinding(name);
// qmlAction.property.write(qmlAction.toValue);
// } else {
// if (qmlAction.fromBinding)
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, qmlAction.fromBinding);
// else
// qmlAction.property.write(qmlAction.fromValue);
// removeActionForProperty(name);
// }
// }
//}
//void QmlPropertyChangesObject::resetProperty(const QString &name)
//{
// if (statePrivate()) {
// QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
// while (simpleActionIterator.hasNext()) {
// QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
// if (qmlSimpleAction.specifiedProperty == name && qmlSimpleAction.specifiedObject == targetObject()) {
// if (qmlSimpleAction.binding) {
// qDebug() << qmlSimpleAction.binding->expression();
// QDeclarativePropertyPrivate::setBinding(qmlSimpleAction.property, qmlSimpleAction.binding);
// } else {
// QDeclarativePropertyPrivate::setBinding(qmlSimpleAction.property, 0);
// qmlSimpleAction.property.write(qmlSimpleAction.value);
// }
// }
// }
// }
// if (m_expressionHash.contains(name)) {
// if (m_expressionHash[name].second) {
// QDeclarativeProperty metaProperty(targetObject(), name, QDeclarativeEngine::contextForObject(targetObject()));
// if (metaProperty.isValid() && QDeclarativePropertyPrivate::binding(metaProperty) == m_expressionHash[name].second.data())
// QDeclarativePropertyPrivate::setBinding(metaProperty, 0, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
// m_expressionHash[name].second.data()->destroy();
// }
// m_expressionHash.remove(name);
// }
// if (hasActionForProperty(name)) {
// removeActionForProperty(name);
// }
//}
//QVariant QmlPropertyChangesObject::variantValue(const QString &name) const
//{
// if (hasActionForProperty(name)) {
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// return qmlAction.toValue;
// }
// return QVariant();
//}
//QString QmlPropertyChangesObject::expression(const QString &name) const
//{
// if (hasActionForProperty(name)) {
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (qmlAction.toBinding)
// return qmlAction.toBinding->expression();
// }
// return QString();
//}
//bool QmlPropertyChangesObject::hasVariantValue(const QString &name) const
//{
// if (hasActionForProperty(name))
// return qmlActionForProperty(name).toValue.isValid();
// return false;
//}
//bool QmlPropertyChangesObject::hasExpression(const QString &name) const
//{
// return m_expressionHash.contains(name);
//}
//bool QmlPropertyChangesObject::updateStateVariant(const QString &name, const QVariant &value)
//{
// if (hasActionForProperty(name)) {
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (qmlAction.fromValue.isValid()) {
// qmlAction.fromValue = value;
// updateRevertValueAndBinding(name);
// return true;
// }
// }
// return false;
//}
//bool QmlPropertyChangesObject::updateStateBinding(const QString &name, const QString &expression)
//{
// if (hasActionForProperty(name)) {
// QDeclarativeContext *context = QDeclarativeEngine::contextForObject(targetObject());
// QDeclarativeProperty metaProperty(targetObject(), name, context);
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (qmlAction.fromBinding) {
// if (QDeclarativePropertyPrivate::binding(qmlAction.property) == qmlAction.fromBinding)
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, 0);
// qmlAction.fromBinding->destroy();
// }
// QDeclarativeBinding *binding = new QDeclarativeBinding(expression, targetObject(), context, this);
// binding->setTarget(metaProperty);
// binding->setNotifyOnValueChanged(true);
// qmlAction.fromBinding = binding;
// if (m_expressionHash.contains(name))
// QDeclarativePropertyPrivate::setBinding(qmlAction.property, binding);
// updateRevertValueAndBinding(name);
// return true;
// }
// return false;
//}
//bool QmlPropertyChangesObject::resetStateProperty(const QString &name, const QVariant &resetValue)
//{
// if (hasActionForProperty(name)) {
// QDeclarativeContext *context = QDeclarativeEngine::contextForObject(targetObject());
// QDeclarativeProperty metaProperty(targetObject(), name, context);
// QDeclarativeAction &qmlAction = qmlActionForProperty(name);
// if (m_expressionHash.contains(name) && m_expressionHash[name].second) {
// m_expressionHash[name].second.data()->destroy();
// qmlAction.toBinding = 0;
// }
// qmlAction.fromValue = resetValue;
// updateRevertValueAndBinding(name);
// removeActionForProperty(name);
// return true;
// }
// return false;
//}
} // namespace Internal
} // namespace QmlDesigner
......@@ -50,77 +50,6 @@ namespace Internal {
class QmlPropertyChangesNodeInstance;
// Original QmlPropertyChanges class requires a custom parser
// work around this by writing a replacement class
//class QmlPropertyChangesObject : public QDeclarativeStateOperation
//{
// Q_OBJECT
// Q_PROPERTY(QObject *target READ targetObject WRITE setTargetObject)
// Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
// Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit)
// typedef QPair<QString, QWeakPointer<QDeclarativeBinding> > ExpressionPair;
//public:
// ~QmlPropertyChangesObject();
// QObject *targetObject() const;
// void setTargetObject(QObject *object);
// bool restoreEntryValues() const;
// void setRestoreEntryValues(bool restore);
// bool isExplicit() const;
// void setIsExplicit(bool isExplicit);
// virtual ActionList actions();
// void setVariantValue(const QString &name, const QVariant & value);
// void setExpression(const QString &name, const QString &expression);
// void removeVariantValue(const QString &name);
// void removeExpression(const QString &name);
// void resetProperty(const QString &name);
// QVariant variantValue(const QString &name) const;
// QString expression(const QString &name) const;
// bool hasVariantValue(const QString &name) const;
// bool hasExpression(const QString &name) const;
// QmlPropertyChangesObject();
// bool updateStateVariant(const QString &propertyName, const QVariant &value);
// bool updateStateBinding(const QString &propertyName, const QString &expression);
// bool resetStateProperty(const QString &propertyName, const QVariant &resetValue);
// QDeclarativeState *state() const;
// void updateRevertValueAndBinding(const QString &name);
// void removeFromStateRevertList();
// void addToStateRevertList();
//private: // functions
// bool isActive() const;
// QDeclarativeStatePrivate *statePrivate() const;