Changeset 846 for trunk/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/shared/qdesigner_propertycommand_p.h (modified) (9 diffs)

trunk/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -59 +59 @@
 #include <QtCore/QList>
 #include <QtCore/QPair>
+
 
 QT_BEGIN_NAMESPACE
@@ -78 +79 @@
 enum SpecialProperty getSpecialProperty(const QString& propertyName);
 
-
 // A helper class for applying properties to objects.
 // Can be used for Set commands (setValue(), restoreOldValue()) or
 // Reset Commands     restoreDefaultValue(), restoreOldValue()).
-class PropertyHelper {
+//
+class QDESIGNER_SHARED_EXPORT PropertyHelper {
+    Q_DISABLE_COPY(PropertyHelper)
 public:
     // A pair of Value and changed flag
@@ -93 +95 @@
                    QDesignerPropertySheetExtension *sheet,
                    int index);
+
 
     QObject *object() const { return m_object; }
     SpecialProperty specialProperty() const { return m_specialProperty; }
-    // set a new value
-    Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask);
+    // set a new value. Can be overwritten to perform a transformation (see
+    // handling of Arrow key move in FormWindow class).
+    virtual Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask);
 
     // restore old value
@@ -148 +152 @@
     typedef QList<QObject *> ObjectList;
 
-    explicit PropertyListCommand(QDesignerFormWindowInterface *formWindow);
+    explicit PropertyListCommand(QDesignerFormWindowInterface *formWindow);
 
     QObject* object(int index = 0) const;
@@ -160 +164 @@
 
 protected:
-    typedef QList<PropertyHelper> PropertyHelperList;
-
+    typedef Q;
+    typedef QList<PropertyHelperPtr> PropertyHelperList;
 
     // add an object
@@ -205 +209 @@
     const PropertyDescription &propertyDescription() const { return  m_propertyDescription; }
 
+
+
+
+
 private:
     PropertyDescription m_propertyDescription;
@@ -216 +224 @@
     typedef QList<QObject *> ObjectList;
 
-    explicit SetPropertyCommand(QDesignerFormWindowInterface *formWindow);
+    explicit SetPropertyCommand(QDesignerFormWindowInterface *formWindow);
 
     bool init(QObject *object, const QString &propertyName, const QVariant &newValue);
@@ -233 +241 @@
 
     virtual void redo();
+
+
+
+
 private:
     unsigned subPropertyMask(const QVariant &newValue, QObject *referenceObject);