diff options
Diffstat (limited to 'src/corelib/doc/src')
| -rw-r--r-- | src/corelib/doc/src/objectmodel/object.qdoc | 4 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/properties.qdoc | 6 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/signalsandslots.qdoc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc index 1d33c14d0f..89a781da39 100644 --- a/src/corelib/doc/src/objectmodel/object.qdoc +++ b/src/corelib/doc/src/objectmodel/object.qdoc @@ -71,7 +71,7 @@ \section1 Important Classes These classes form the basis of the Qt Object Model. - + \annotatedlist objectmodel \target Identity vs Value @@ -108,7 +108,7 @@ at runtime that are not declared in the C++ class. If we copy a Qt Object, should the copy include the properties that were added to the original? - + \endlist For these reasons, Qt Objects should be treated as identities, not diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 37f54621a1..721b98c0f7 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -62,7 +62,7 @@ A property behaves like a class data member, but it has additional features accessible through the \l {Meta-Object System}. - \list + \list \li A \c READ accessor function is required if no \c MEMBER variable was specified. It is for reading the property value. Ideally, a const function @@ -130,7 +130,7 @@ gets and sets a widget's \c USER property. \li The presence of the \c CONSTANT attibute indicates that the property - value is constant. For a given object instance, the READ method of a + value is constant. For a given object instance, the READ method of a constant property must return the same value every time it is called. This constant value may be different for different instances of the object. A constant property cannot have a WRITE method or a NOTIFY signal. @@ -272,7 +272,7 @@ Q_DECLARE_METATYPE() macro so that their values can be stored in QVariant objects. This makes them suitable for use with both static properties declared using the Q_PROPERTY() macro in class - definitions and dynamic properties created at run-time. + definitions and dynamic properties created at run-time. \sa Q_DECLARE_METATYPE(), QMetaType, QVariant diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index d897c4b9a7..4e285f2966 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -365,7 +365,7 @@ arguments can have default values. Consider QObject::destroyed(): \code - void destroyed(QObject* = 0); + void destroyed(QObject* = 0); \endcode When a QObject is deleted, it emits this QObject::destroyed() @@ -434,7 +434,7 @@ handle each signal differently. Suppose you have three push buttons that determine which file you - will open: "Tax File", "Accounts File", or "Report File". + will open: "Tax File", "Accounts File", or "Report File". In order to open the correct file, you use QSignalMapper::setMapping() to map all the clicked() signals to a QSignalMapper object. Then you connect |