FCL/sf/mw/qt: comparison tools/designer/src/lib/shared/qdesigner

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 m_propertyName == p.m_propertyName && m_propertyGroup   == p.m_propertyGroup;
 }
 // ---- PropertyListCommand
-PropertyListCommand::PropertyListCommand(QDesignerFormWindowInterface *formWindow) :
+PropertyListCommand::PropertyListCommand(QDesignerFormWindowInterface *formWindow,
-QDesignerFormWindowCommand(QString(), formWindow)
+QUndoCommand *parent) :
+QDesignerFormWindowCommand(QString(), formWindow, parent)
 {
 }
 const QString PropertyListCommand::propertyName() const
 {
 // checks: mismatch or only one object in case of name
 const bool match = m_propertyDescription.equals(description);
 if (!match || m_propertyDescription.m_specialProperty == SP_ObjectName)
 return false;
 }
-m_propertyHelperList.push_back(PropertyHelper(object, m_propertyDescription.m_specialProperty, sheet, index));
+const PropertyHelperPtr ph(createPropertyHelper(object, m_propertyDescription.m_specialProperty, sheet, index));
+m_propertyHelperList.push_back(ph);
 return true;
 }
+PropertyHelper *PropertyListCommand::createPropertyHelper(QObject *object, SpecialProperty sp,
+QDesignerPropertySheetExtension *sheet, int sheetIndex) const
+{
+return new PropertyHelper(object, sp, sheet, sheetIndex);
+}
 // Init from a list and make sure referenceObject is added first to obtain the right property group
 bool PropertyListCommand::initList(const ObjectList &list, const QString &apropertyName, QObject *referenceObject)
 {
 propertyHelperList().clear();
 QObject* PropertyListCommand::object(int index) const
 {
 Q_ASSERT(index < m_propertyHelperList.size());
-return m_propertyHelperList[index].object();
+return m_propertyHelperList.at(index)->object();
 }
 QVariant PropertyListCommand::oldValue(int index) const
 {
 Q_ASSERT(index < m_propertyHelperList.size());
-return m_propertyHelperList[index].oldValue();
+return m_propertyHelperList.at(index)->oldValue();
 }
 void PropertyListCommand::setOldValue(const QVariant &oldValue, int index)
 {
 Q_ASSERT(index < m_propertyHelperList.size());
-m_propertyHelperList[index].setOldValue(oldValue);
+m_propertyHelperList.at(index)->setOldValue(oldValue);
 }
 // ----- SetValueFunction: Set a new value when applied to a PropertyHelper.
 class SetValueFunction {
 public:
 SetValueFunction(QDesignerFormWindowInterface *formWindow, const PropertyHelper::Value &newValue, unsigned subPropertyMask);
 unsigned updateMask = 0;
 QDesignerPropertyEditorInterface *propertyEditor = core->propertyEditor();
 bool updatedPropertyEditor = false;
 for (PropertyListIterator it = begin; it != end; ++it) {
-if (QObject* object = it->object()) { // Might have been deleted in the meantime
+PropertyHelper *ph = it->data();
-const PropertyHelper::Value newValue = function(*it);
+if (QObject* object = ph->object()) { // Might have been deleted in the meantime
-updateMask |= it->updateMask();
+const PropertyHelper::Value newValue = function( *ph );
+updateMask |= ph->updateMask();
 // Update property editor if it is the current object
 if (!updatedPropertyEditor && propertyEditor && object == propertyEditor->object()) {
 propertyEditor->setPropertyValue(propertyName, newValue.first,  newValue.second);
 updatedPropertyEditor = true;
 }
 // set a new value, return update mask
 unsigned PropertyListCommand::setValue(QVariant value, bool changed, unsigned subPropertyMask)
 {
 if(debugPropertyCommands)
-qDebug() << "PropertyListCommand::setValue(" << value <<  changed << subPropertyMask << ')';
+qDebug() << "PropertyListCommand::setValue(" << value
+<< changed << subPropertyMask << ')';
 return changePropertyList(formWindow()->core(),
-m_propertyDescription.m_propertyName, m_propertyHelperList.begin(), m_propertyHelperList.end(),
+m_propertyDescription.m_propertyName,
+m_propertyHelperList.begin(), m_propertyHelperList.end(),
 SetValueFunction(formWindow(), PropertyHelper::Value(value, changed), subPropertyMask));
 }
 // restore old value,  return update mask
 unsigned PropertyListCommand::restoreOldValue()
 bool PropertyListCommand::canMergeLists(const PropertyHelperList& other) const
 {
 if (m_propertyHelperList.size() !=  other.size())
 return false;
 for (int i = 0; i < m_propertyHelperList.size(); i++) {
-if (!m_propertyHelperList[i].canMerge(other[i]))
+if (!m_propertyHelperList.at(i)->canMerge(*other.at(i)))
 return false;
 }
 return true;
 }
 // ---- SetPropertyCommand ----
-SetPropertyCommand::SetPropertyCommand(QDesignerFormWindowInterface *formWindow)
+SetPropertyCommand::SetPropertyCommand(QDesignerFormWindowInterface *formWindow,
-:  PropertyListCommand(formWindow),
+QUndoCommand *parent)
+:  PropertyListCommand(formWindow, parent),
 m_subPropertyMask(SubPropertyAll)
 {
 }
 bool SetPropertyCommand::init(QObject *object, const QString &apropertyName, const QVariant &newValue)
 }
 void SetPropertyCommand::setDescription()
 {
 if (propertyHelperList().size() == 1) {
-setText(QApplication::translate("Command", "Changed '%1' of '%2'").arg(propertyName()).arg(propertyHelperList()[0].object()->objectName()));
+setText(QApplication::translate("Command", "Changed '%1' of '%2'").arg(propertyName()).arg(propertyHelperList().at(0)->object()->objectName()));
 } else {
 int count = propertyHelperList().size();
 setText(QApplication::translate("Command", "Changed '%1' of %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(propertyName()));
 }
 }
 int SetPropertyCommand::id() const
 {
 return 1976;
+}
+QVariant SetPropertyCommand::mergeValue(const QVariant &newValue)
+{
+return newValue;
 }
 bool SetPropertyCommand::mergeWith(const QUndoCommand *other)
 {
 if (id() != other->id() || !formWindow()->isDirty())
 if (!propertyDescription().equals(cmd->propertyDescription()) ||
 m_subPropertyMask  != cmd->m_subPropertyMask ||
 !canMergeLists(cmd->propertyHelperList()))
 return false;
-m_newValue = cmd->newValue();
+const QVariant newValue = mergeValue(cmd->newValue());
+if (!newValue.isValid())
+return false;
+m_newValue = newValue;
 m_subPropertyMask |= cmd->m_subPropertyMask;
 if(debugPropertyCommands)
 qDebug() << "SetPropertyCommand::mergeWith() succeeded " << propertyName();
 return true;
 }
 void ResetPropertyCommand::setDescription()
 {
 if (propertyHelperList().size() == 1) {
-setText(QApplication::translate("Command", "Reset '%1' of '%2'").arg(propertyName()).arg(propertyHelperList()[0].object()->objectName()));
+setText(QApplication::translate("Command", "Reset '%1' of '%2'").arg(propertyName()).arg(propertyHelperList().at(0)->object()->objectName()));
 } else {
 int count = propertyHelperList().size();
 setText(QApplication::translate("Command", "Reset '%1' of %n objects", "", QCoreApplication::UnicodeUTF8, count).arg(propertyName()));
 }
 }

changeset 30	5dc02b23752f
parent 18	2f34d5167611