Improve metamodel documentation

Change-Id: Iebbb92c6a8aa42de0ab09f8db9f38cd323ebcf93 Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
author: Sandro S. Andrade <sandroandrade@kde.org> 2013-11-24 05:26:24 -0300
committer: Sandro S. Andrade <sandroandrade@kde.org> 2013-11-24 09:22:31 +0100
commit: 1b2df2c79004e93a5bab937d9cac32f7621a6c0e (patch)
tree: cf6efa06d89078c5bde44c3d2c93080e0447f859
parent: c0607c35be4b405eee7aa8a5311715e0ae1cd466 (diff)
114 files changed, 1510 insertions, 310 deletions
diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp
index 024778f8..5148170e 100644
--- a/scripts/templates/qclass.cpp
+++ b/scripts/templates/qclass.cpp
@@ -61,22 +61,27 @@
 [%- IF loop.last %]
 [% END -%]
 [%- END -%]
+[%- SET documentation = class.findvalue("ownedComment/body/text()") -%]
 
 QT_BEGIN_NAMESPACE
 
+[%- IF documentation != "" %]
 /*!
     \class Q${namespace}${className}
 
     \inmodule Qt${namespace}
-[%- IF class.findvalue("ownedComment/body/text()") != "" %]
 
     \brief ${class.findvalue("ownedComment/body/text()")}
+[%- IF class.findvalue("@isAbstract") == "true" %]
+
+    \b {Q${namespace}${className} is an abstract class.}
 [%- END %]
  */
 
 /*!
-    Creates a new Q${namespace}${className}. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+    Creates a new Q${namespace}${className}.[% IF class.findvalue("@isAbstract") != "true" %] Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.[% END %]
 */
+[%- END %]
 Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@isAbstract") != "true" %]bool createQModelingObject[% END %])
 [%- SET found = "false" -%]
 [%- FOREACH superclass IN generalization -%]
@@ -134,9 +139,11 @@ Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@is
 [%- END %]
 }
 
+[%- IF documentation != "" %]
 /*!
     Returns a deep-copied clone of the Q${namespace}${className}.
 */
+[%- END %]
 QModelingElement *Q${namespace}${className}::clone() const
 {
     Q${namespace}${className} *c = new Q${namespace}${className};
@@ -165,11 +172,47 @@ QModelingElement *Q${namespace}${className}::clone() const
 [%- IF documentation != "" -%]
 /*!
     ${documentation}
-[% IF qtType.match("QList|QSet") %]
+[% IF attribute.findnodes("upperValue").findvalue("@value") == "*" && readOnly != "true" %]
     \sa add${attributeName}(), remove${attributeName}()
 [% END -%]
+[%- IF readOnly == "true" || derived == "true" || derivedUnion == "true" %]
+    \b {This is a[%- IF readOnly == "true" %] read-only[% END %][% IF derivedUnion == "true" %] derived union[% ELSE %][% IF derived == "true" %] derived[% END %][% END %] property.}
+[% END -%]
+[%- IF attribute.findvalue("@subsettedProperty") != "" %]
+    \b {Subsetted property(ies):} 
+    [%- FOREACH subsettedPropertyName = attribute.findvalue("@subsettedProperty").split(" ") -%]
+        [%- SET subsettedProperty = xmi.findnodes("//packagedElement[(@xmi:type=\"uml:Class\" or @xmi:type=\"uml:Stereotype\") and @name=\"${subsettedPropertyName.split('-').0}\"]/ownedAttribute[@name=\"${subsettedPropertyName.split('-').1}\"]") -%]
+        [%- IF subsettedProperty.findvalue("@name") != "" -%]
+Q${namespace}${subsettedPropertyName.split("-").0}::${PLURALFORM(QT_ATTRIBUTE(subsettedProperty), subsettedProperty)}()[% IF !loop.last %], [% END %]
+        [%- END -%]
+    [%- END -%].
+[% END -%]
+[%- IF attribute.findvalue("@redefinedProperty") != "" %]
+    \b {Redefined property(ies):} 
+    [%- FOREACH redefinedPropertyName = attribute.findvalue("@redefinedProperty").split(" ") -%]
+        [%- SET redefinedProperty = xmi.findnodes("//packagedElement[(@xmi:type=\"uml:Class\" or @xmi:type=\"uml:Stereotype\") and @name=\"${redefinedPropertyName.split('-').0}\"]/ownedAttribute[@name=\"${redefinedPropertyName.split('-').1}\"]") -%]
+        [%- IF redefinedProperty.findvalue("@name") != "" -%]
+Q${namespace}${redefinedPropertyName.split("-").0}::${PLURALFORM(QT_ATTRIBUTE(redefinedProperty), redefinedProperty)}()[% IF !loop.last %], [% END %]
+        [%- END -%]
+    [%- END -%].
+[% END -%]
+[%- IF association != "" -%]
+[%- found = "false" -%]
+[%- FOREACH memberEnd = xmi.findvalue("//packagedElement[(@xmi:type=\"uml:Association\" or @xmi:type=\"uml:Extension\") and @name=\"${association}\"]/@memberEnd").split(' ') -%]
+    [%- NEXT IF memberEnd.split('-').0 == className && memberEnd.split('-').1 == attributeName.lcfirst -%]
+    [%- SET oppositeProperty = xmi.findnodes("//packagedElement[(@xmi:type=\"uml:Class\" or @xmi:type=\"uml:Stereotype\") and @name=\"${memberEnd.split('-').0}\"]/ownedAttribute[@name=\"${memberEnd.split('-').1}\"]") -%]
+    [%- IF oppositeProperty.findvalue("@name") != "" -%]
+        [%- IF found == "false" %]
+    \b {Opposite property(ies):} Q${namespace}${memberEnd.split("-").0}::${PLURALFORM(QT_ATTRIBUTE(oppositeProperty), oppositeProperty)}()
+            [%- found = "true" -%]
+        [%- ELSE %], Q${namespace}${memberEnd.split("-").0}::${PLURALFORM(QT_ATTRIBUTE(oppositeProperty), oppositeProperty)}()
+        [%- END -%]
+    [%- END -%]
+[%- END -%][%- IF found == "true"- %].
+[% END -%]
+[%- END -%]
  */
-[%- END %]
+[% END -%]
 [% IF qtType.match("QList|QSet") %]const [% END %]${qtType}Q${namespace}${className}::${PLURALFORM(qtAttribute, attribute)}() const
 {
     // This is a [% IF readOnly == "" || readOnly == "false" %]read-write[% ELSE %]read-only[% END %][% IF derived == "true" %] derived[% END %][% IF derivedUnion == "true" %] union[% END %] [% IF association != "" %]association end[% ELSE %]property[% END %]
@@ -194,7 +237,7 @@ QModelingElement *Q${namespace}${className}::clone() const
 
     \sa ${PLURALFORM(qtAttribute, attribute)}(), remove${attributeName}()
  */
-[%- END %]
+[% END -%]
 void Q${namespace}${className}::add${attributeName}(${qtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}${qtAttribute})
 {
     // This is a [% IF readOnly == "" || readOnly == "false" %]read-write[% ELSE %]read-only[% END %][% IF derived == "true" %] derived[% END %][% IF derivedUnion == "true" %] union[% END %] [% IF association != "" %]association end[% ELSE %]property[% END %]
@@ -278,7 +321,7 @@ void Q${namespace}${className}::add${attributeName}(${qtType.remove("QSet<").rem
 
     \sa ${PLURALFORM(qtAttribute, attribute)}(), add${attributeName}()
  */
-[%- END %]
+[% END -%]
 void Q${namespace}${className}::remove${attributeName}(${qtType.remove("QSet<").remove("QList<").replace(">", "").replace('\* $', '*')}${qtAttribute})
 {
     // This is a [% IF readOnly == "" || readOnly == "false" %]read-write[% ELSE %]read-only[% END %][% IF derived == "true" %] derived[% END %][% IF derivedUnion == "true" %] union[% END %] [% IF association != "" %]association end[% ELSE %]property[% END %]
diff --git a/src/duse/qtduseglobal.h b/src/duse/qtduseglobal.h
index b39ad15e..28bd26e4 100644
--- a/src/duse/qtduseglobal.h
+++ b/src/duse/qtduseglobal.h
@@ -48,9 +48,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 
-Q_DECLARE_METATYPE(QList<QString> *)
-Q_DECLARE_METATYPE(QSet<QString> *)
-
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
diff --git a/src/mof/doc/qtmof.qdocconf b/src/mof/doc/qtmof.qdocconf
index 3dc90c49..fc5905d1 100644
--- a/src/mof/doc/qtmof.qdocconf
+++ b/src/mof/doc/qtmof.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtMof
-description             = Qt MOF Reference Documentation
+description             = Qt Mof Reference Documentation
 url                     = http://qt-project.org/doc/qt-$QT_VER
 version                 = $QT_VERSION
 
@@ -12,7 +12,7 @@ qhp.projects            = QtMof
 qhp.QtMof.file            = qtmof.qhp
 qhp.QtMof.namespace           = org.qt-project.qtmof.$QT_VERSION_TAG
 qhp.QtMof.virtualFolder       = qtmof
-qhp.QtMof.indexTitle          = Qt MOF
+qhp.QtMof.indexTitle          = Qt Mof
 qhp.QtMof.indexRoot           =
 
 qhp.QtMof.filterAttributes    = qtmof $QT_VERSION qtrefdoc
@@ -21,7 +21,7 @@ qhp.QtMof.customFilters.Qt.filterAttributes = qtmof $QT_VERSION
 
 qhp.QtMof.subprojects         = classes
 qhp.QtMof.subprojects.classes.title = C++ Classes
-qhp.QtMof.subprojects.classes.indexTitle = Qt MOF C++ Classes
+qhp.QtMof.subprojects.classes.indexTitle = Qt Mof C++ Classes
 qhp.QtMof.subprojects.classes.selectors = class fake:headerfile
 qhp.QtMof.subprojects.classes.sortPages = true
 tagfile                 = ../../../doc/qtmof/qtmof.tags
@@ -39,3 +39,6 @@ exampledirs += ../../../examples/mof \
 
 imagedirs   += images \
                ../../../examples/mof/doc/images
+
+navigation.landingpage = "Qt Mof"
+navigation.cppclassespage = "Qt Mof C++ Classes"
diff --git a/src/mof/doc/src/qtmof.qdoc b/src/mof/doc/src/qtmof.qdoc
index dc68b0cf..5318099b 100644
--- a/src/mof/doc/src/qtmof.qdoc
+++ b/src/mof/doc/src/qtmof.qdoc
@@ -26,17 +26,17 @@
 ****************************************************************************/
 /*!
     \page qtmof-index.html
-    \title Qt MOF
+    \title Qt Mof
     \brief Implements the OMG's Meta Object Facility (MOF) standard.
 
     Qt Mof is an add-on module which implements the OMG's Meta Object Facility (MOF) metamodel.
 
     \section1 Getting Started
-    To enable Qt MOF in a project, add this directive into the C++ files:
+    To enable Qt Mof in a project, add this directive into the C++ files:
     \code
     #include <QtMof>
     \endcode
-    To link against the Qt MOF module, add this line to the project file:
+    To link against the Qt Mof module, add this line to the project file:
     \code
     QT += mof
     \endcode
@@ -44,13 +44,13 @@
     \section1 Reference
     These are links to the API reference materials.
     \list
-    \li \l{Qt MOF Module C++ Classes}{C++ classes}
+    \li \l{Qt Mof C++ Classes}{C++ classes}
     \endlist
 */
 
 /*!
     \module QtMof
-    \title Qt MOF Module C++ Classes
+    \title Qt Mof C++ Classes
     \ingroup modules
     \brief Implements the OMG's Meta Object Facility (MOF) standard.
 
diff --git a/src/mof/qmofargument.cpp b/src/mof/qmofargument.cpp
index 93ab6e59..75a1ad29 100644
--- a/src/mof/qmofargument.cpp
+++ b/src/mof/qmofargument.cpp
@@ -46,11 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofArgument
-
-    \inmodule QtMof
- */
 QMofArgument::QMofArgument(bool createQModelingObject) :
     _value(0)
 {
@@ -69,7 +64,6 @@ QModelingElement *QMofArgument::clone() const
 
 // OWNED ATTRIBUTES
 
-
 QString QMofArgument::name() const
 {
     // This is a read-write property
@@ -86,7 +80,6 @@ void QMofArgument::setName(QString name)
     }
 }
 
-
 QMofObject *QMofArgument::value() const
 {
     // This is a read-write property
diff --git a/src/mof/qmofargument.h b/src/mof/qmofargument.h
index 2acf8b14..58dbd727 100644
--- a/src/mof/qmofargument.h
+++ b/src/mof/qmofargument.h
@@ -45,8 +45,6 @@
 
 #include <QtModeling/QModelingElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -75,7 +73,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofArgument) *)
 
-QT_END_HEADER
-
 #endif // QMOFARGUMENT_H
 
diff --git a/src/mof/qmofassociation.cpp b/src/mof/qmofassociation.cpp
index 4ba189c7..0312fe0d 100644
--- a/src/mof/qmofassociation.cpp
+++ b/src/mof/qmofassociation.cpp
@@ -68,6 +68,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An association describes a set of tuples whose values refer to typed instances. An instance of an association is called a link. A link is a tuple with one value for each end of the association, where each value is an instance of the type of the end.
  */
+
+/*!
+    Creates a new QMofAssociation. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofAssociation::QMofAssociation(bool createQModelingObject) :
     _isDerived(false)
 {
@@ -75,6 +79,9 @@ QMofAssociation::QMofAssociation(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofAssociationObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofAssociation.
+*/
 QModelingElement *QMofAssociation::clone() const
 {
     QMofAssociation *c = new QMofAssociation;
@@ -111,6 +118,10 @@ QModelingElement *QMofAssociation::clone() const
 
 /*!
     References the classifiers that are used as types of the ends of the association.
+
+    \b {This is a read-only derived property.}
+
+    \b {Subsetted property(ies):} QMofRelationship::relatedElements().
  */
 const QList<QMofType *> QMofAssociation::endTypes() const
 {
@@ -121,6 +132,11 @@ const QList<QMofType *> QMofAssociation::endTypes() const
     return QList<QMofType *>();
 }
 
+/*!
+    Adds \a endType to endTypes.
+
+    \sa endTypes(), removeEndType()
+ */
 void QMofAssociation::addEndType(QMofType *endType)
 {
     // This is a read-only derived association end
@@ -136,6 +152,11 @@ void QMofAssociation::addEndType(QMofType *endType)
     }
 }
 
+/*!
+    Removes \a endType from endTypes.
+
+    \sa endTypes(), addEndType()
+ */
 void QMofAssociation::removeEndType(QMofType *endType)
 {
     // This is a read-only derived association end
@@ -161,6 +182,9 @@ bool QMofAssociation::isDerived() const
     return _isDerived;
 }
 
+/*!
+    Adjusts isDerived to \a isDerived.
+ */
 void QMofAssociation::setDerived(bool isDerived)
 {
     // This is a read-write property
@@ -173,6 +197,12 @@ void QMofAssociation::setDerived(bool isDerived)
 
 /*!
     Each end represents participation of instances of the classifier connected to the end in links of the association.
+
+    \sa addMemberEnd(), removeMemberEnd()
+
+    \b {Subsetted property(ies):} QMofNamespace::members().
+
+    \b {Opposite property(ies):} QMofProperty::association().
  */
 const QList<QMofProperty *> QMofAssociation::memberEnds() const
 {
@@ -181,6 +211,11 @@ const QList<QMofProperty *> QMofAssociation::memberEnds() const
     return _memberEnds;
 }
 
+/*!
+    Adds \a memberEnd to memberEnds.
+
+    \sa memberEnds(), removeMemberEnd()
+ */
 void QMofAssociation::addMemberEnd(QMofProperty *memberEnd)
 {
     // This is a read-write association end
@@ -200,6 +235,11 @@ void QMofAssociation::addMemberEnd(QMofProperty *memberEnd)
     }
 }
 
+/*!
+    Removes \a memberEnd from memberEnds.
+
+    \sa memberEnds(), addMemberEnd()
+ */
 void QMofAssociation::removeMemberEnd(QMofProperty *memberEnd)
 {
     // This is a read-write association end
@@ -219,6 +259,10 @@ void QMofAssociation::removeMemberEnd(QMofProperty *memberEnd)
 
 /*!
     The navigable ends that are owned by the association itself.
+
+    \sa addNavigableOwnedEnd(), removeNavigableOwnedEnd()
+
+    \b {Subsetted property(ies):} QMofAssociation::ownedEnds().
  */
 const QSet<QMofProperty *> QMofAssociation::navigableOwnedEnds() const
 {
@@ -227,6 +271,11 @@ const QSet<QMofProperty *> QMofAssociation::navigableOwnedEnds() const
     return _navigableOwnedEnds;
 }
 
+/*!
+    Adds \a navigableOwnedEnd to navigableOwnedEnds.
+
+    \sa navigableOwnedEnds(), removeNavigableOwnedEnd()
+ */
 void QMofAssociation::addNavigableOwnedEnd(QMofProperty *navigableOwnedEnd)
 {
     // This is a read-write association end
@@ -241,6 +290,11 @@ void QMofAssociation::addNavigableOwnedEnd(QMofProperty *navigableOwnedEnd)
     }
 }
 
+/*!
+    Removes \a navigableOwnedEnd from navigableOwnedEnds.
+
+    \sa navigableOwnedEnds(), addNavigableOwnedEnd()
+ */
 void QMofAssociation::removeNavigableOwnedEnd(QMofProperty *navigableOwnedEnd)
 {
     // This is a read-write association end
@@ -255,6 +309,12 @@ void QMofAssociation::removeNavigableOwnedEnd(QMofProperty *navigableOwnedEnd)
 
 /*!
     The ends that are owned by the association itself.
+
+    \sa addOwnedEnd(), removeOwnedEnd()
+
+    \b {Subsetted property(ies):} QMofClassifier::features(), QMofNamespace::ownedMembers(), QMofAssociation::memberEnds().
+
+    \b {Opposite property(ies):} QMofProperty::owningAssociation().
  */
 const QList<QMofProperty *> QMofAssociation::ownedEnds() const
 {
@@ -263,6 +323,11 @@ const QList<QMofProperty *> QMofAssociation::ownedEnds() const
     return _ownedEnds;
 }
 
+/*!
+    Adds \a ownedEnd to ownedEnds.
+
+    \sa ownedEnds(), removeOwnedEnd()
+ */
 void QMofAssociation::addOwnedEnd(QMofProperty *ownedEnd)
 {
     // This is a read-write association end
@@ -285,6 +350,11 @@ void QMofAssociation::addOwnedEnd(QMofProperty *ownedEnd)
     }
 }
 
+/*!
+    Removes \a ownedEnd from ownedEnds.
+
+    \sa ownedEnds(), addOwnedEnd()
+ */
 void QMofAssociation::removeOwnedEnd(QMofProperty *ownedEnd)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofassociation.h b/src/mof/qmofassociation.h
index 343c9808..e7214399 100644
--- a/src/mof/qmofassociation.h
+++ b/src/mof/qmofassociation.h
@@ -46,8 +46,6 @@
 #include <QtMof/QMofRelationship>
 #include <QtMof/QMofClassifier>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -89,7 +87,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofAssociation) *)
 
-QT_END_HEADER
-
 #endif // QMOFASSOCIATION_H
 
diff --git a/src/mof/qmofbehavioralfeature.cpp b/src/mof/qmofbehavioralfeature.cpp
index 92e45e3b..65008d09 100644
--- a/src/mof/qmofbehavioralfeature.cpp
+++ b/src/mof/qmofbehavioralfeature.cpp
@@ -61,11 +61,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A behavioral feature is a feature of a classifier that specifies an aspect of the behavior of its instances.
+
+    \b {QMofBehavioralFeature is an abstract class.}
  */
+
+/*!
+    Creates a new QMofBehavioralFeature.
+*/
 QMofBehavioralFeature::QMofBehavioralFeature()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofBehavioralFeature.
+*/
 QModelingElement *QMofBehavioralFeature::clone() const
 {
     QMofBehavioralFeature *c = new QMofBehavioralFeature;
@@ -92,6 +101,10 @@ QModelingElement *QMofBehavioralFeature::clone() const
 
 /*!
     Specifies the ordered set of formal parameters of this BehavioralFeature.
+
+    \sa addOwnedParameter(), removeOwnedParameter()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedMembers().
  */
 const QList<QMofParameter *> QMofBehavioralFeature::ownedParameters() const
 {
@@ -100,6 +113,11 @@ const QList<QMofParameter *> QMofBehavioralFeature::ownedParameters() const
     return _ownedParameters;
 }
 
+/*!
+    Adds \a ownedParameter to ownedParameters.
+
+    \sa ownedParameters(), removeOwnedParameter()
+ */
 void QMofBehavioralFeature::addOwnedParameter(QMofParameter *ownedParameter)
 {
     // This is a read-write association end
@@ -115,6 +133,11 @@ void QMofBehavioralFeature::addOwnedParameter(QMofParameter *ownedParameter)
     }
 }
 
+/*!
+    Removes \a ownedParameter from ownedParameters.
+
+    \sa ownedParameters(), addOwnedParameter()
+ */
 void QMofBehavioralFeature::removeOwnedParameter(QMofParameter *ownedParameter)
 {
     // This is a read-write association end
@@ -131,6 +154,8 @@ void QMofBehavioralFeature::removeOwnedParameter(QMofParameter *ownedParameter)
 
 /*!
     References the Types representing exceptions that may be raised during an invocation of this feature.
+
+    \sa addRaisedException(), removeRaisedException()
  */
 const QSet<QMofType *> QMofBehavioralFeature::raisedExceptions() const
 {
@@ -139,6 +164,11 @@ const QSet<QMofType *> QMofBehavioralFeature::raisedExceptions() const
     return _raisedExceptions;
 }
 
+/*!
+    Adds \a raisedException to raisedExceptions.
+
+    \sa raisedExceptions(), removeRaisedException()
+ */
 void QMofBehavioralFeature::addRaisedException(QMofType *raisedException)
 {
     // This is a read-write association end
@@ -150,6 +180,11 @@ void QMofBehavioralFeature::addRaisedException(QMofType *raisedException)
     }
 }
 
+/*!
+    Removes \a raisedException from raisedExceptions.
+
+    \sa raisedExceptions(), addRaisedException()
+ */
 void QMofBehavioralFeature::removeRaisedException(QMofType *raisedException)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofbehavioralfeature.h b/src/mof/qmofbehavioralfeature.h
index ddd643c4..76942191 100644
--- a/src/mof/qmofbehavioralfeature.h
+++ b/src/mof/qmofbehavioralfeature.h
@@ -46,8 +46,6 @@
 #include <QtMof/QMofFeature>
 #include <QtMof/QMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -83,7 +81,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofBehavioralFeature) *)
 
-QT_END_HEADER
-
 #endif // QMOFBEHAVIORALFEATURE_H
 
diff --git a/src/mof/qmofclass.cpp b/src/mof/qmofclass.cpp
index 69595773..84b16cab 100644
--- a/src/mof/qmofclass.cpp
+++ b/src/mof/qmofclass.cpp
@@ -68,6 +68,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A class describes a set of objects that share the same specifications of features, constraints, and semantics.
  */
+
+/*!
+    Creates a new QMofClass. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofClass::QMofClass(bool createQModelingObject) :
     _isAbstract(false)
 {
@@ -75,6 +79,9 @@ QMofClass::QMofClass(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofClassObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofClass.
+*/
 QModelingElement *QMofClass::clone() const
 {
     QMofClass *c = new QMofClass;
@@ -110,6 +117,8 @@ QModelingElement *QMofClass::clone() const
 
 /*!
     If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.
+
+    \b {Redefined property(ies):} QMofClassifier::isAbstract().
  */
 bool QMofClass::isAbstract() const
 {
@@ -118,6 +127,9 @@ bool QMofClass::isAbstract() const
     return _isAbstract;
 }
 
+/*!
+    Adjusts isAbstract to \a isAbstract.
+ */
 void QMofClass::setAbstract(bool isAbstract)
 {
     // This is a read-write property
@@ -133,6 +145,10 @@ void QMofClass::setAbstract(bool isAbstract)
 
 /*!
     References all the Classifiers that are defined (nested) within the Class.
+
+    \sa addNestedClassifier(), removeNestedClassifier()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedMembers().
  */
 const QList<QMofClassifier *> QMofClass::nestedClassifiers() const
 {
@@ -141,6 +157,11 @@ const QList<QMofClassifier *> QMofClass::nestedClassifiers() const
     return _nestedClassifiers;
 }
 
+/*!
+    Adds \a nestedClassifier to nestedClassifiers.
+
+    \sa nestedClassifiers(), removeNestedClassifier()
+ */
 void QMofClass::addNestedClassifier(QMofClassifier *nestedClassifier)
 {
     // This is a read-write association end
@@ -156,6 +177,11 @@ void QMofClass::addNestedClassifier(QMofClassifier *nestedClassifier)
     }
 }
 
+/*!
+    Removes \a nestedClassifier from nestedClassifiers.
+
+    \sa nestedClassifiers(), addNestedClassifier()
+ */
 void QMofClass::removeNestedClassifier(QMofClassifier *nestedClassifier)
 {
     // This is a read-write association end
@@ -172,6 +198,12 @@ void QMofClass::removeNestedClassifier(QMofClassifier *nestedClassifier)
 
 /*!
     The attributes (i.e. the properties) owned by the class.
+
+    \sa addOwnedAttribute(), removeOwnedAttribute()
+
+    \b {Subsetted property(ies):} QMofClassifier::attributes(), QMofNamespace::ownedMembers().
+
+    \b {Opposite property(ies):} QMofProperty::class_().
  */
 const QList<QMofProperty *> QMofClass::ownedAttributes() const
 {
@@ -180,6 +212,11 @@ const QList<QMofProperty *> QMofClass::ownedAttributes() const
     return _ownedAttributes;
 }
 
+/*!
+    Adds \a ownedAttribute to ownedAttributes.
+
+    \sa ownedAttributes(), removeOwnedAttribute()
+ */
 void QMofClass::addOwnedAttribute(QMofProperty *ownedAttribute)
 {
     // This is a read-write association end
@@ -201,6 +238,11 @@ void QMofClass::addOwnedAttribute(QMofProperty *ownedAttribute)
     }
 }
 
+/*!
+    Removes \a ownedAttribute from ownedAttributes.
+
+    \sa ownedAttributes(), addOwnedAttribute()
+ */
 void QMofClass::removeOwnedAttribute(QMofProperty *ownedAttribute)
 {
     // This is a read-write association end
@@ -223,6 +265,12 @@ void QMofClass::removeOwnedAttribute(QMofProperty *ownedAttribute)
 
 /*!
     The operations owned by the class.
+
+    \sa addOwnedOperation(), removeOwnedOperation()
+
+    \b {Subsetted property(ies):} QMofClassifier::features(), QMofNamespace::ownedMembers(), .
+
+    \b {Opposite property(ies):} QMofOperation::class_().
  */
 const QList<QMofOperation *> QMofClass::ownedOperations() const
 {
@@ -231,6 +279,11 @@ const QList<QMofOperation *> QMofClass::ownedOperations() const
     return _ownedOperations;
 }
 
+/*!
+    Adds \a ownedOperation to ownedOperations.
+
+    \sa ownedOperations(), removeOwnedOperation()
+ */
 void QMofClass::addOwnedOperation(QMofOperation *ownedOperation)
 {
     // This is a read-write association end
@@ -252,6 +305,11 @@ void QMofClass::addOwnedOperation(QMofOperation *ownedOperation)
     }
 }
 
+/*!
+    Removes \a ownedOperation from ownedOperations.
+
+    \sa ownedOperations(), addOwnedOperation()
+ */
 void QMofClass::removeOwnedOperation(QMofOperation *ownedOperation)
 {
     // This is a read-write association end
@@ -274,6 +332,12 @@ void QMofClass::removeOwnedOperation(QMofOperation *ownedOperation)
 
 /*!
     This gives the superclasses of a class.
+
+    \sa addSuperClass(), removeSuperClass()
+
+    \b {This is a derived property.}
+
+    \b {Redefined property(ies):} QMofClassifier::generals().
  */
 const QSet<QMofClass *> QMofClass::superClasses() const
 {
@@ -284,6 +348,11 @@ const QSet<QMofClass *> QMofClass::superClasses() const
     return QSet<QMofClass *>();
 }
 
+/*!
+    Adds \a superClass to superClasses.
+
+    \sa superClasses(), removeSuperClass()
+ */
 void QMofClass::addSuperClass(QMofClass *superClass)
 {
     // This is a read-write derived association end
@@ -299,6 +368,11 @@ void QMofClass::addSuperClass(QMofClass *superClass)
     }
 }
 
+/*!
+    Removes \a superClass from superClasses.
+
+    \sa superClasses(), addSuperClass()
+ */
 void QMofClass::removeSuperClass(QMofClass *superClass)
 {
     // This is a read-write derived association end
diff --git a/src/mof/qmofclass.h b/src/mof/qmofclass.h
index 60939158..dcafdbbc 100644
--- a/src/mof/qmofclass.h
+++ b/src/mof/qmofclass.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofClassifier>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -92,7 +90,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofClass) *)
 
-QT_END_HEADER
-
 #endif // QMOFCLASS_H
 
diff --git a/src/mof/qmofclassifier.cpp b/src/mof/qmofclassifier.cpp
index a5a8f2ef..7390ec94 100644
--- a/src/mof/qmofclassifier.cpp
+++ b/src/mof/qmofclassifier.cpp
@@ -62,13 +62,22 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A classifier is a classification of instances - it describes a set of instances that have features in common. A classifier can specify a generalization hierarchy by referencing its general classifiers.
+
+    \b {QMofClassifier is an abstract class.}
  */
+
+/*!
+    Creates a new QMofClassifier.
+*/
 QMofClassifier::QMofClassifier() :
     _isAbstract(false),
     _isFinalSpecialization(false)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofClassifier.
+*/
 QModelingElement *QMofClassifier::clone() const
 {
     QMofClassifier *c = new QMofClassifier;
@@ -98,6 +107,10 @@ QModelingElement *QMofClassifier::clone() const
 
 /*!
     Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofClassifier::features(), .
  */
 const QSet<QMofProperty *> QMofClassifier::attributes() const
 {
@@ -106,6 +119,11 @@ const QSet<QMofProperty *> QMofClassifier::attributes() const
     return _attributes;
 }
 
+/*!
+    Adds \a attribute to attributes.
+
+    \sa attributes(), removeAttribute()
+ */
 void QMofClassifier::addAttribute(QMofProperty *attribute)
 {
     // This is a read-only derived union association end
@@ -120,6 +138,11 @@ void QMofClassifier::addAttribute(QMofProperty *attribute)
     }
 }
 
+/*!
+    Removes \a attribute from attributes.
+
+    \sa attributes(), addAttribute()
+ */
 void QMofClassifier::removeAttribute(QMofProperty *attribute)
 {
     // This is a read-only derived union association end
@@ -134,6 +157,12 @@ void QMofClassifier::removeAttribute(QMofProperty *attribute)
 
 /*!
     Specifies each feature defined in the classifier.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofNamespace::members().
+
+    \b {Opposite property(ies):} QMofFeature::featuringClassifiers().
  */
 const QSet<QMofFeature *> QMofClassifier::features() const
 {
@@ -142,6 +171,11 @@ const QSet<QMofFeature *> QMofClassifier::features() const
     return _features;
 }
 
+/*!
+    Adds \a feature to features.
+
+    \sa features(), removeFeature()
+ */
 void QMofClassifier::addFeature(QMofFeature *feature)
 {
     // This is a read-only derived union association end
@@ -161,6 +195,11 @@ void QMofClassifier::addFeature(QMofFeature *feature)
     }
 }
 
+/*!
+    Removes \a feature from features.
+
+    \sa features(), addFeature()
+ */
 void QMofClassifier::removeFeature(QMofFeature *feature)
 {
     // This is a read-only derived union association end
@@ -180,6 +219,10 @@ void QMofClassifier::removeFeature(QMofFeature *feature)
 
 /*!
     Specifies the general Classifiers for this Classifier.
+
+    \sa addGeneral(), removeGeneral()
+
+    \b {This is a derived property.}
  */
 const QSet<QMofClassifier *> QMofClassifier::generals() const
 {
@@ -190,6 +233,11 @@ const QSet<QMofClassifier *> QMofClassifier::generals() const
     return QSet<QMofClassifier *>();
 }
 
+/*!
+    Adds \a general to generals.
+
+    \sa generals(), removeGeneral()
+ */
 void QMofClassifier::addGeneral(QMofClassifier *general)
 {
     // This is a read-write derived association end
@@ -202,6 +250,11 @@ void QMofClassifier::addGeneral(QMofClassifier *general)
     }
 }
 
+/*!
+    Removes \a general from generals.
+
+    \sa generals(), addGeneral()
+ */
 void QMofClassifier::removeGeneral(QMofClassifier *general)
 {
     // This is a read-write derived association end
@@ -216,6 +269,12 @@ void QMofClassifier::removeGeneral(QMofClassifier *general)
 
 /*!
     Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy.
+
+    \sa addGeneralization(), removeGeneralization()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
+
+    \b {Opposite property(ies):} QMofGeneralization::specific().
  */
 const QSet<QMofGeneralization *> QMofClassifier::generalizations() const
 {
@@ -224,6 +283,11 @@ const QSet<QMofGeneralization *> QMofClassifier::generalizations() const
     return _generalizations;
 }
 
+/*!
+    Adds \a generalization to generalizations.
+
+    \sa generalizations(), removeGeneralization()
+ */
 void QMofClassifier::addGeneralization(QMofGeneralization *generalization)
 {
     // This is a read-write association end
@@ -244,6 +308,11 @@ void QMofClassifier::addGeneralization(QMofGeneralization *generalization)
     }
 }
 
+/*!
+    Removes \a generalization from generalizations.
+
+    \sa generalizations(), addGeneralization()
+ */
 void QMofClassifier::removeGeneralization(QMofGeneralization *generalization)
 {
     // This is a read-write association end
@@ -265,6 +334,10 @@ void QMofClassifier::removeGeneralization(QMofGeneralization *generalization)
 
 /*!
     Specifies all elements inherited by this classifier from the general classifiers.
+
+    \b {This is a read-only derived property.}
+
+    \b {Subsetted property(ies):} QMofNamespace::members().
  */
 const QSet<QMofNamedElement *> QMofClassifier::inheritedMembers() const
 {
@@ -275,6 +348,11 @@ const QSet<QMofNamedElement *> QMofClassifier::inheritedMembers() const
     return QSet<QMofNamedElement *>();
 }
 
+/*!
+    Adds \a inheritedMember to inheritedMembers.
+
+    \sa inheritedMembers(), removeInheritedMember()
+ */
 void QMofClassifier::addInheritedMember(QMofNamedElement *inheritedMember)
 {
     // This is a read-only derived association end
@@ -290,6 +368,11 @@ void QMofClassifier::addInheritedMember(QMofNamedElement *inheritedMember)
     }
 }
 
+/*!
+    Removes \a inheritedMember from inheritedMembers.
+
+    \sa inheritedMembers(), addInheritedMember()
+ */
 void QMofClassifier::removeInheritedMember(QMofNamedElement *inheritedMember)
 {
     // This is a read-only derived association end
@@ -315,6 +398,9 @@ bool QMofClassifier::isAbstract() const
     return _isAbstract;
 }
 
+/*!
+    Adjusts isAbstract to \a isAbstract.
+ */
 void QMofClassifier::setAbstract(bool isAbstract)
 {
     // This is a read-write property
@@ -335,6 +421,9 @@ bool QMofClassifier::isFinalSpecialization() const
     return _isFinalSpecialization;
 }
 
+/*!
+    Adjusts isFinalSpecialization to \a isFinalSpecialization.
+ */
 void QMofClassifier::setFinalSpecialization(bool isFinalSpecialization)
 {
     // This is a read-write property
@@ -347,6 +436,10 @@ void QMofClassifier::setFinalSpecialization(bool isFinalSpecialization)
 
 /*!
     References the Classifiers that are redefined by this Classifier.
+
+    \sa addRedefinedClassifier(), removeRedefinedClassifier()
+
+    \b {Subsetted property(ies):} QMofRedefinableElement::redefinedElements().
  */
 const QSet<QMofClassifier *> QMofClassifier::redefinedClassifiers() const
 {
@@ -355,6 +448,11 @@ const QSet<QMofClassifier *> QMofClassifier::redefinedClassifiers() const
     return _redefinedClassifiers;
 }
 
+/*!
+    Adds \a redefinedClassifier to redefinedClassifiers.
+
+    \sa redefinedClassifiers(), removeRedefinedClassifier()
+ */
 void QMofClassifier::addRedefinedClassifier(QMofClassifier *redefinedClassifier)
 {
     // This is a read-write association end
@@ -369,6 +467,11 @@ void QMofClassifier::addRedefinedClassifier(QMofClassifier *redefinedClassifier)
     }
 }
 
+/*!
+    Removes \a redefinedClassifier from redefinedClassifiers.
+
+    \sa redefinedClassifiers(), addRedefinedClassifier()
+ */
 void QMofClassifier::removeRedefinedClassifier(QMofClassifier *redefinedClassifier)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofclassifier.h b/src/mof/qmofclassifier.h
index 06f8cfc3..a35f47e2 100644
--- a/src/mof/qmofclassifier.h
+++ b/src/mof/qmofclassifier.h
@@ -47,8 +47,6 @@
 #include <QtMof/QMofRedefinableElement>
 #include <QtMof/QMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -112,7 +110,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofClassifier) *)
 
-QT_END_HEADER
-
 #endif // QMOFCLASSIFIER_H
 
diff --git a/src/mof/qmofcomment.cpp b/src/mof/qmofcomment.cpp
index 61afa31e..513c8cfc 100644
--- a/src/mof/qmofcomment.cpp
+++ b/src/mof/qmofcomment.cpp
@@ -53,12 +53,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A comment is a textual annotation that can be attached to a set of elements.
  */
+
+/*!
+    Creates a new QMofComment. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofComment::QMofComment(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofCommentObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofComment.
+*/
 QModelingElement *QMofComment::clone() const
 {
     QMofComment *c = new QMofComment;
@@ -74,6 +81,8 @@ QModelingElement *QMofComment::clone() const
 
 /*!
     References the Element(s) being commented.
+
+    \sa addAnnotatedElement(), removeAnnotatedElement()
  */
 const QSet<QMofElement *> QMofComment::annotatedElements() const
 {
@@ -82,6 +91,11 @@ const QSet<QMofElement *> QMofComment::annotatedElements() const
     return _annotatedElements;
 }
 
+/*!
+    Adds \a annotatedElement to annotatedElements.
+
+    \sa annotatedElements(), removeAnnotatedElement()
+ */
 void QMofComment::addAnnotatedElement(QMofElement *annotatedElement)
 {
     // This is a read-write association end
@@ -93,6 +107,11 @@ void QMofComment::addAnnotatedElement(QMofElement *annotatedElement)
     }
 }
 
+/*!
+    Removes \a annotatedElement from annotatedElements.
+
+    \sa annotatedElements(), addAnnotatedElement()
+ */
 void QMofComment::removeAnnotatedElement(QMofElement *annotatedElement)
 {
     // This is a read-write association end
@@ -112,6 +131,9 @@ QString QMofComment::body() const
     return _body;
 }
 
+/*!
+    Adjusts body to \a body.
+ */
 void QMofComment::setBody(QString body)
 {
     // This is a read-write property
diff --git a/src/mof/qmofcomment.h b/src/mof/qmofcomment.h
index 90ee7a91..a9281413 100644
--- a/src/mof/qmofcomment.h
+++ b/src/mof/qmofcomment.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofComment) *)
 
-QT_END_HEADER
-
 #endif // QMOFCOMMENT_H
 
diff --git a/src/mof/qmofconstraint.cpp b/src/mof/qmofconstraint.cpp
index 691f70cf..ec10e079 100644
--- a/src/mof/qmofconstraint.cpp
+++ b/src/mof/qmofconstraint.cpp
@@ -58,6 +58,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A constraint is a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of an element.
  */
+
+/*!
+    Creates a new QMofConstraint. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofConstraint::QMofConstraint(bool createQModelingObject) :
     _context(0),
     _specification(0)
@@ -66,6 +70,9 @@ QMofConstraint::QMofConstraint(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofConstraintObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofConstraint.
+*/
 QModelingElement *QMofConstraint::clone() const
 {
     QMofConstraint *c = new QMofConstraint;
@@ -86,6 +93,8 @@ QModelingElement *QMofConstraint::clone() const
 
 /*!
     The ordered set of Elements referenced by this Constraint.
+
+    \sa addConstrainedElement(), removeConstrainedElement()
  */
 const QList<QMofElement *> QMofConstraint::constrainedElements() const
 {
@@ -94,6 +103,11 @@ const QList<QMofElement *> QMofConstraint::constrainedElements() const
     return _constrainedElements;
 }
 
+/*!
+    Adds \a constrainedElement to constrainedElements.
+
+    \sa constrainedElements(), removeConstrainedElement()
+ */
 void QMofConstraint::addConstrainedElement(QMofElement *constrainedElement)
 {
     // This is a read-write association end
@@ -105,6 +119,11 @@ void QMofConstraint::addConstrainedElement(QMofElement *constrainedElement)
     }
 }
 
+/*!
+    Removes \a constrainedElement from constrainedElements.
+
+    \sa constrainedElements(), addConstrainedElement()
+ */
 void QMofConstraint::removeConstrainedElement(QMofElement *constrainedElement)
 {
     // This is a read-write association end
@@ -116,6 +135,10 @@ void QMofConstraint::removeConstrainedElement(QMofElement *constrainedElement)
 
 /*!
     Specifies the namespace that owns the NamedElement.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_().
+
+    \b {Opposite property(ies):} QMofNamespace::ownedRules().
  */
 QMofNamespace *QMofConstraint::context() const
 {
@@ -124,6 +147,9 @@ QMofNamespace *QMofConstraint::context() const
     return _context;
 }
 
+/*!
+    Adjusts context to \a context.
+ */
 void QMofConstraint::setContext(QMofNamespace *context)
 {
     // This is a read-write association end
@@ -142,6 +168,8 @@ void QMofConstraint::setContext(QMofNamespace *context)
 
 /*!
     A condition that must be true when evaluated in order for the constraint to be satisfied.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofConstraint::specification() const
 {
@@ -150,6 +178,9 @@ QMofValueSpecification *QMofConstraint::specification() const
     return _specification;
 }
 
+/*!
+    Adjusts specification to \a specification.
+ */
 void QMofConstraint::setSpecification(QMofValueSpecification *specification)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofconstraint.h b/src/mof/qmofconstraint.h
index 4a6944b0..21e90605 100644
--- a/src/mof/qmofconstraint.h
+++ b/src/mof/qmofconstraint.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofPackageableElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -81,7 +79,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofConstraint) *)
 
-QT_END_HEADER
-
 #endif // QMOFCONSTRAINT_H
 
diff --git a/src/mof/qmofdatatype.cpp b/src/mof/qmofdatatype.cpp
index dc4f3659..58345801 100644
--- a/src/mof/qmofdatatype.cpp
+++ b/src/mof/qmofdatatype.cpp
@@ -69,12 +69,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A data type is a type whose instances are identified only by their value. A data type may contain attributes to support the modeling of structured data types.
  */
+
+/*!
+    Creates a new QMofDataType. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofDataType::QMofDataType(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofDataTypeObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofDataType.
+*/
 QModelingElement *QMofDataType::clone() const
 {
     QMofDataType *c = new QMofDataType;
@@ -108,6 +115,12 @@ QModelingElement *QMofDataType::clone() const
 
 /*!
     The Attributes owned by the DataType.
+
+    \sa addOwnedAttribute(), removeOwnedAttribute()
+
+    \b {Subsetted property(ies):} QMofClassifier::attributes(), QMofNamespace::ownedMembers().
+
+    \b {Opposite property(ies):} QMofProperty::datatype().
  */
 const QList<QMofProperty *> QMofDataType::ownedAttributes() const
 {
@@ -116,6 +129,11 @@ const QList<QMofProperty *> QMofDataType::ownedAttributes() const
     return _ownedAttributes;
 }
 
+/*!
+    Adds \a ownedAttribute to ownedAttributes.
+
+    \sa ownedAttributes(), removeOwnedAttribute()
+ */
 void QMofDataType::addOwnedAttribute(QMofProperty *ownedAttribute)
 {
     // This is a read-write association end
@@ -137,6 +155,11 @@ void QMofDataType::addOwnedAttribute(QMofProperty *ownedAttribute)
     }
 }
 
+/*!
+    Removes \a ownedAttribute from ownedAttributes.
+
+    \sa ownedAttributes(), addOwnedAttribute()
+ */
 void QMofDataType::removeOwnedAttribute(QMofProperty *ownedAttribute)
 {
     // This is a read-write association end
@@ -159,6 +182,12 @@ void QMofDataType::removeOwnedAttribute(QMofProperty *ownedAttribute)
 
 /*!
     The Operations owned by the DataType.
+
+    \sa addOwnedOperation(), removeOwnedOperation()
+
+    \b {Subsetted property(ies):} QMofClassifier::features(), QMofNamespace::ownedMembers(), .
+
+    \b {Opposite property(ies):} QMofOperation::datatype().
  */
 const QList<QMofOperation *> QMofDataType::ownedOperations() const
 {
@@ -167,6 +196,11 @@ const QList<QMofOperation *> QMofDataType::ownedOperations() const
     return _ownedOperations;
 }
 
+/*!
+    Adds \a ownedOperation to ownedOperations.
+
+    \sa ownedOperations(), removeOwnedOperation()
+ */
 void QMofDataType::addOwnedOperation(QMofOperation *ownedOperation)
 {
     // This is a read-write association end
@@ -188,6 +222,11 @@ void QMofDataType::addOwnedOperation(QMofOperation *ownedOperation)
     }
 }
 
+/*!
+    Removes \a ownedOperation from ownedOperations.
+
+    \sa ownedOperations(), addOwnedOperation()
+ */
 void QMofDataType::removeOwnedOperation(QMofOperation *ownedOperation)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofdatatype.h b/src/mof/qmofdatatype.h
index 6578adf3..47c84d93 100644
--- a/src/mof/qmofdatatype.h
+++ b/src/mof/qmofdatatype.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofClassifier>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -82,7 +80,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofDataType) *)
 
-QT_END_HEADER
-
 #endif // QMOFDATATYPE_H
 
diff --git a/src/mof/qmofdirectedrelationship.cpp b/src/mof/qmofdirectedrelationship.cpp
index f3ea1d7c..42935a4b 100644
--- a/src/mof/qmofdirectedrelationship.cpp
+++ b/src/mof/qmofdirectedrelationship.cpp
@@ -52,11 +52,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A directed relationship represents a relationship between a collection of source model elements and a collection of target model elements.
+
+    \b {QMofDirectedRelationship is an abstract class.}
  */
+
+/*!
+    Creates a new QMofDirectedRelationship.
+*/
 QMofDirectedRelationship::QMofDirectedRelationship()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofDirectedRelationship.
+*/
 QModelingElement *QMofDirectedRelationship::clone() const
 {
     QMofDirectedRelationship *c = new QMofDirectedRelationship;
@@ -69,6 +78,10 @@ QModelingElement *QMofDirectedRelationship::clone() const
 
 /*!
     Specifies the sources of the DirectedRelationship.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofRelationship::relatedElements().
  */
 const QSet<QMofElement *> QMofDirectedRelationship::sources() const
 {
@@ -77,6 +90,11 @@ const QSet<QMofElement *> QMofDirectedRelationship::sources() const
     return _sources;
 }
 
+/*!
+    Adds \a source to sources.
+
+    \sa sources(), removeSource()
+ */
 void QMofDirectedRelationship::addSource(QMofElement *source)
 {
     // This is a read-only derived union association end
@@ -91,6 +109,11 @@ void QMofDirectedRelationship::addSource(QMofElement *source)
     }
 }
 
+/*!
+    Removes \a source from sources.
+
+    \sa sources(), addSource()
+ */
 void QMofDirectedRelationship::removeSource(QMofElement *source)
 {
     // This is a read-only derived union association end
@@ -105,6 +128,10 @@ void QMofDirectedRelationship::removeSource(QMofElement *source)
 
 /*!
     Specifies the targets of the DirectedRelationship.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofRelationship::relatedElements().
  */
 const QSet<QMofElement *> QMofDirectedRelationship::targets() const
 {
@@ -113,6 +140,11 @@ const QSet<QMofElement *> QMofDirectedRelationship::targets() const
     return _targets;
 }
 
+/*!
+    Adds \a target to targets.
+
+    \sa targets(), removeTarget()
+ */
 void QMofDirectedRelationship::addTarget(QMofElement *target)
 {
     // This is a read-only derived union association end
@@ -127,6 +159,11 @@ void QMofDirectedRelationship::addTarget(QMofElement *target)
     }
 }
 
+/*!
+    Removes \a target from targets.
+
+    \sa targets(), addTarget()
+ */
 void QMofDirectedRelationship::removeTarget(QMofElement *target)
 {
     // This is a read-only derived union association end
diff --git a/src/mof/qmofdirectedrelationship.h b/src/mof/qmofdirectedrelationship.h
index cdfc142f..d442e89f 100644
--- a/src/mof/qmofdirectedrelationship.h
+++ b/src/mof/qmofdirectedrelationship.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofRelationship>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -77,7 +75,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofDirectedRelationship) *)
 
-QT_END_HEADER
-
 #endif // QMOFDIRECTEDRELATIONSHIP_H
 
diff --git a/src/mof/qmofelement.cpp b/src/mof/qmofelement.cpp
index b5d3bcd4..3ff9bf68 100644
--- a/src/mof/qmofelement.cpp
+++ b/src/mof/qmofelement.cpp
@@ -51,13 +51,22 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief An element is a constituent of a model. As such, it has the capability of owning other elements.
+
+    \b {QMofElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofElement.
+*/
 QMofElement::QMofElement() :
     QMofObject(false),
     _owner(0)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofElement.
+*/
 QModelingElement *QMofElement::clone() const
 {
     QMofElement *c = new QMofElement;
@@ -70,6 +79,10 @@ QModelingElement *QMofElement::clone() const
 
 /*!
     The Comments owned by this element.
+
+    \sa addOwnedComment(), removeOwnedComment()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 const QSet<QMofComment *> QMofElement::ownedComments() const
 {
@@ -78,6 +91,11 @@ const QSet<QMofComment *> QMofElement::ownedComments() const
     return _ownedComments;
 }
 
+/*!
+    Adds \a ownedComment to ownedComments.
+
+    \sa ownedComments(), removeOwnedComment()
+ */
 void QMofElement::addOwnedComment(QMofComment *ownedComment)
 {
     // This is a read-write association end
@@ -93,6 +111,11 @@ void QMofElement::addOwnedComment(QMofComment *ownedComment)
     }
 }
 
+/*!
+    Removes \a ownedComment from ownedComments.
+
+    \sa ownedComments(), addOwnedComment()
+ */
 void QMofElement::removeOwnedComment(QMofComment *ownedComment)
 {
     // This is a read-write association end
@@ -109,6 +132,10 @@ void QMofElement::removeOwnedComment(QMofComment *ownedComment)
 
 /*!
     The Elements owned by this element.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Opposite property(ies):} QMofElement::owner().
  */
 const QSet<QMofElement *> QMofElement::ownedElements() const
 {
@@ -117,6 +144,11 @@ const QSet<QMofElement *> QMofElement::ownedElements() const
     return _ownedElements;
 }
 
+/*!
+    Adds \a ownedElement to ownedElements.
+
+    \sa ownedElements(), removeOwnedElement()
+ */
 void QMofElement::addOwnedElement(QMofElement *ownedElement)
 {
     // This is a read-only derived union association end
@@ -134,6 +166,11 @@ void QMofElement::addOwnedElement(QMofElement *ownedElement)
     }
 }
 
+/*!
+    Removes \a ownedElement from ownedElements.
+
+    \sa ownedElements(), addOwnedElement()
+ */
 void QMofElement::removeOwnedElement(QMofElement *ownedElement)
 {
     // This is a read-only derived union association end
@@ -152,6 +189,10 @@ void QMofElement::removeOwnedElement(QMofElement *ownedElement)
 
 /*!
     The Element that owns this element.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Opposite property(ies):} QMofElement::ownedElements().
  */
 QMofElement *QMofElement::owner() const
 {
@@ -160,6 +201,9 @@ QMofElement *QMofElement::owner() const
     return _owner;
 }
 
+/*!
+    Adjusts owner to \a owner.
+ */
 void QMofElement::setOwner(QMofElement *owner)
 {
     // This is a read-only derived union association end
diff --git a/src/mof/qmofelement.h b/src/mof/qmofelement.h
index 8fde4be6..20e1289d 100644
--- a/src/mof/qmofelement.h
+++ b/src/mof/qmofelement.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -92,7 +90,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFELEMENT_H
 
diff --git a/src/mof/qmofelementimport.cpp b/src/mof/qmofelementimport.cpp
index 9b4b001a..2bd81b1c 100644
--- a/src/mof/qmofelementimport.cpp
+++ b/src/mof/qmofelementimport.cpp
@@ -57,6 +57,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An element import identifies an element in another package, and allows the element to be referenced using its name without a qualifier.
  */
+
+/*!
+    Creates a new QMofElementImport. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofElementImport::QMofElementImport(bool createQModelingObject) :
     _importedElement(0),
     _importingNamespace(0),
@@ -66,6 +70,9 @@ QMofElementImport::QMofElementImport(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofElementImportObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofElementImport.
+*/
 QModelingElement *QMofElementImport::clone() const
 {
     QMofElementImport *c = new QMofElementImport;
@@ -92,6 +99,9 @@ QString QMofElementImport::alias() const
     return _alias;
 }
 
+/*!
+    Adjusts alias to \a alias.
+ */
 void QMofElementImport::setAlias(QString alias)
 {
     // This is a read-write property
@@ -103,6 +113,8 @@ void QMofElementImport::setAlias(QString alias)
 
 /*!
     Specifies the PackageableElement whose name is to be added to a Namespace.
+
+    \b {Subsetted property(ies):} QMofDirectedRelationship::targets().
  */
 QMofPackageableElement *QMofElementImport::importedElement() const
 {
@@ -111,6 +123,9 @@ QMofPackageableElement *QMofElementImport::importedElement() const
     return _importedElement;
 }
 
+/*!
+    Adjusts importedElement to \a importedElement.
+ */
 void QMofElementImport::setImportedElement(QMofPackageableElement *importedElement)
 {
     // This is a read-write association end
@@ -132,6 +147,10 @@ void QMofElementImport::setImportedElement(QMofPackageableElement *importedEleme
 
 /*!
     Specifies the Namespace that imports a PackageableElement from another Package.
+
+    \b {Subsetted property(ies):} QMofElement::owner(), QMofDirectedRelationship::sources().
+
+    \b {Opposite property(ies):} QMofNamespace::elementImports().
  */
 QMofNamespace *QMofElementImport::importingNamespace() const
 {
@@ -140,6 +159,9 @@ QMofNamespace *QMofElementImport::importingNamespace() const
     return _importingNamespace;
 }
 
+/*!
+    Adjusts importingNamespace to \a importingNamespace.
+ */
 void QMofElementImport::setImportingNamespace(QMofNamespace *importingNamespace)
 {
     // This is a read-write association end
@@ -170,6 +192,9 @@ QtMof::VisibilityKind QMofElementImport::visibility() const
     return _visibility;
 }
 
+/*!
+    Adjusts visibility to \a visibility.
+ */
 void QMofElementImport::setVisibility(QtMof::VisibilityKind visibility)
 {
     // This is a read-write property
diff --git a/src/mof/qmofelementimport.h b/src/mof/qmofelementimport.h
index f0d93afa..3f8d67f5 100644
--- a/src/mof/qmofelementimport.h
+++ b/src/mof/qmofelementimport.h
@@ -47,8 +47,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -87,7 +85,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofElementImport) *)
 
-QT_END_HEADER
-
 #endif // QMOFELEMENTIMPORT_H
 
diff --git a/src/mof/qmofenumeration.cpp b/src/mof/qmofenumeration.cpp
index e496f662..ea5bbbc6 100644
--- a/src/mof/qmofenumeration.cpp
+++ b/src/mof/qmofenumeration.cpp
@@ -71,6 +71,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An enumeration is a data type whose values are enumerated in the model as enumeration literals.
  */
+
+/*!
+    Creates a new QMofEnumeration. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofEnumeration::QMofEnumeration(bool createQModelingObject) :
     QMofDataType(false)
 {
@@ -78,6 +82,9 @@ QMofEnumeration::QMofEnumeration(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofEnumerationObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofEnumeration.
+*/
 QModelingElement *QMofEnumeration::clone() const
 {
     QMofEnumeration *c = new QMofEnumeration;
@@ -113,6 +120,12 @@ QModelingElement *QMofEnumeration::clone() const
 
 /*!
     The ordered set of literals for this Enumeration.
+
+    \sa addOwnedLiteral(), removeOwnedLiteral()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedMembers().
+
+    \b {Opposite property(ies):} QMofEnumerationLiteral::enumeration().
  */
 const QList<QMofEnumerationLiteral *> QMofEnumeration::ownedLiterals() const
 {
@@ -121,6 +134,11 @@ const QList<QMofEnumerationLiteral *> QMofEnumeration::ownedLiterals() const
     return _ownedLiterals;
 }
 
+/*!
+    Adds \a ownedLiteral to ownedLiterals.
+
+    \sa ownedLiterals(), removeOwnedLiteral()
+ */
 void QMofEnumeration::addOwnedLiteral(QMofEnumerationLiteral *ownedLiteral)
 {
     // This is a read-write association end
@@ -141,6 +159,11 @@ void QMofEnumeration::addOwnedLiteral(QMofEnumerationLiteral *ownedLiteral)
     }
 }
 
+/*!
+    Removes \a ownedLiteral from ownedLiterals.
+
+    \sa ownedLiterals(), addOwnedLiteral()
+ */
 void QMofEnumeration::removeOwnedLiteral(QMofEnumerationLiteral *ownedLiteral)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofenumeration.h b/src/mof/qmofenumeration.h
index 10eead48..d7a498bf 100644
--- a/src/mof/qmofenumeration.h
+++ b/src/mof/qmofenumeration.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofDataType>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -73,7 +71,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofEnumeration) *)
 
-QT_END_HEADER
-
 #endif // QMOFENUMERATION_H
 
diff --git a/src/mof/qmofenumerationliteral.cpp b/src/mof/qmofenumerationliteral.cpp
index b20d591c..f7071bfa 100644
--- a/src/mof/qmofenumerationliteral.cpp
+++ b/src/mof/qmofenumerationliteral.cpp
@@ -61,6 +61,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An enumeration literal is a user-defined data value for an enumeration.
  */
+
+/*!
+    Creates a new QMofEnumerationLiteral. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofEnumerationLiteral::QMofEnumerationLiteral(bool createQModelingObject) :
     QMofInstanceSpecification(false),
     _enumeration(0)
@@ -69,6 +73,9 @@ QMofEnumerationLiteral::QMofEnumerationLiteral(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofEnumerationLiteralObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofEnumerationLiteral.
+*/
 QModelingElement *QMofEnumerationLiteral::clone() const
 {
     QMofEnumerationLiteral *c = new QMofEnumerationLiteral;
@@ -89,6 +96,10 @@ QModelingElement *QMofEnumerationLiteral::clone() const
 
 /*!
     The classifier of this EnumerationLiteral derived to be equal to its enumeration.
+
+    \b {This is a read-only derived property.}
+
+    \b {Redefined property(ies):} QMofInstanceSpecification::classifiers().
  */
 QMofEnumeration *QMofEnumerationLiteral::classifier() const
 {
@@ -99,6 +110,9 @@ QMofEnumeration *QMofEnumerationLiteral::classifier() const
     return 0;
 }
 
+/*!
+    Adjusts classifier to \a classifier.
+ */
 void QMofEnumerationLiteral::setClassifier(QMofEnumeration *classifier)
 {
     // This is a read-only derived association end
@@ -120,6 +134,10 @@ void QMofEnumerationLiteral::setClassifier(QMofEnumeration *classifier)
 
 /*!
     The Enumeration that this EnumerationLiteral is a member of.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_().
+
+    \b {Opposite property(ies):} QMofEnumeration::ownedLiterals().
  */
 QMofEnumeration *QMofEnumerationLiteral::enumeration() const
 {
@@ -128,6 +146,9 @@ QMofEnumeration *QMofEnumerationLiteral::enumeration() const
     return _enumeration;
 }
 
+/*!
+    Adjusts enumeration to \a enumeration.
+ */
 void QMofEnumerationLiteral::setEnumeration(QMofEnumeration *enumeration)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofenumerationliteral.h b/src/mof/qmofenumerationliteral.h
index b126f383..a49a7143 100644
--- a/src/mof/qmofenumerationliteral.h
+++ b/src/mof/qmofenumerationliteral.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofInstanceSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofEnumerationLiteral) *)
 
-QT_END_HEADER
-
 #endif // QMOFENUMERATIONLITERAL_H
 
diff --git a/src/mof/qmofexception.cpp b/src/mof/qmofexception.cpp
index fd75147c..fa4b990a 100644
--- a/src/mof/qmofexception.cpp
+++ b/src/mof/qmofexception.cpp
@@ -46,11 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofException
-
-    \inmodule QtMof
- */
 QMofException::QMofException(bool createQModelingObject) :
     _objectInError(0),
     _elementInError(0)
@@ -72,7 +67,6 @@ QModelingElement *QMofException::clone() const
 
 // OWNED ATTRIBUTES
 
-
 QMofElement *QMofException::objectInError() const
 {
     // This is a read-write property
@@ -91,7 +85,6 @@ void QMofException::setObjectInError(QMofElement *objectInError)
     }
 }
 
-
 QMofElement *QMofException::elementInError() const
 {
     // This is a read-write property
@@ -110,7 +103,6 @@ void QMofException::setElementInError(QMofElement *elementInError)
     }
 }
 
-
 QString QMofException::description() const
 {
     // This is a read-write property
diff --git a/src/mof/qmofexception.h b/src/mof/qmofexception.h
index 08aee64e..aa4e03a4 100644
--- a/src/mof/qmofexception.h
+++ b/src/mof/qmofexception.h
@@ -45,8 +45,6 @@
 
 #include <QtModeling/QModelingElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -78,7 +76,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofException) *)
 
-QT_END_HEADER
-
 #endif // QMOFEXCEPTION_H
 
diff --git a/src/mof/qmofexpression.cpp b/src/mof/qmofexpression.cpp
index 29f5ae31..b1c90f98 100644
--- a/src/mof/qmofexpression.cpp
+++ b/src/mof/qmofexpression.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications.
  */
+
+/*!
+    Creates a new QMofExpression. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofExpression::QMofExpression(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofExpressionObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofExpression.
+*/
 QModelingElement *QMofExpression::clone() const
 {
     QMofExpression *c = new QMofExpression;
@@ -83,6 +90,10 @@ QModelingElement *QMofExpression::clone() const
 
 /*!
     Specifies a sequence of operands.
+
+    \sa addOperand(), removeOperand()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 const QList<QMofValueSpecification *> QMofExpression::operands() const
 {
@@ -91,6 +102,11 @@ const QList<QMofValueSpecification *> QMofExpression::operands() const
     return _operands;
 }
 
+/*!
+    Adds \a operand to operands.
+
+    \sa operands(), removeOperand()
+ */
 void QMofExpression::addOperand(QMofValueSpecification *operand)
 {
     // This is a read-write association end
@@ -106,6 +122,11 @@ void QMofExpression::addOperand(QMofValueSpecification *operand)
     }
 }
 
+/*!
+    Removes \a operand from operands.
+
+    \sa operands(), addOperand()
+ */
 void QMofExpression::removeOperand(QMofValueSpecification *operand)
 {
     // This is a read-write association end
@@ -130,6 +151,9 @@ QString QMofExpression::symbol() const
     return _symbol;
 }
 
+/*!
+    Adjusts symbol to \a symbol.
+ */
 void QMofExpression::setSymbol(QString symbol)
 {
     // This is a read-write property
diff --git a/src/mof/qmofexpression.h b/src/mof/qmofexpression.h
index dc038ce3..f9f1a1f1 100644
--- a/src/mof/qmofexpression.h
+++ b/src/mof/qmofexpression.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofValueSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofExpression) *)
 
-QT_END_HEADER
-
 #endif // QMOFEXPRESSION_H
 
diff --git a/src/mof/qmofextent.cpp b/src/mof/qmofextent.cpp
index d2539737..275d0df3 100644
--- a/src/mof/qmofextent.cpp
+++ b/src/mof/qmofextent.cpp
@@ -50,11 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofExtent
-
-    \inmodule QtMof
- */
 QMofExtent::QMofExtent(bool createQModelingObject) :
     QMofObject(false)
 {
diff --git a/src/mof/qmofextent.h b/src/mof/qmofextent.h
index c164f4c1..37250bea 100644
--- a/src/mof/qmofextent.h
+++ b/src/mof/qmofextent.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -80,7 +78,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofExtent) *)
 
-QT_END_HEADER
-
 #endif // QMOFEXTENT_H
 
diff --git a/src/mof/qmoffactory.cpp b/src/mof/qmoffactory.cpp
index 080e5e0e..c7dea8d9 100644
--- a/src/mof/qmoffactory.cpp
+++ b/src/mof/qmoffactory.cpp
@@ -52,11 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofFactory
-
-    \inmodule QtMof
- */
 QMofFactory::QMofFactory(bool createQModelingObject) :
     _package(0)
 {
@@ -74,7 +69,6 @@ QModelingElement *QMofFactory::clone() const
 
 // OWNED ATTRIBUTES
 
-
 QMofPackage *QMofFactory::package() const
 {
     // This is a read-write property
diff --git a/src/mof/qmoffactory.h b/src/mof/qmoffactory.h
index b9e3952b..cc118001 100644
--- a/src/mof/qmoffactory.h
+++ b/src/mof/qmoffactory.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -85,7 +83,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofFactory) *)
 
-QT_END_HEADER
-
 #endif // QMOFFACTORY_H
 
diff --git a/src/mof/qmoffeature.cpp b/src/mof/qmoffeature.cpp
index 5ef903d8..5ac824a4 100644
--- a/src/mof/qmoffeature.cpp
+++ b/src/mof/qmoffeature.cpp
@@ -55,12 +55,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A feature declares a behavioral or structural characteristic of instances of classifiers.
+
+    \b {QMofFeature is an abstract class.}
  */
+
+/*!
+    Creates a new QMofFeature.
+*/
 QMofFeature::QMofFeature() :
     _isStatic(false)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofFeature.
+*/
 QModelingElement *QMofFeature::clone() const
 {
     QMofFeature *c = new QMofFeature;
@@ -77,6 +86,12 @@ QModelingElement *QMofFeature::clone() const
 
 /*!
     The Classifiers that have this Feature as a feature.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} .
+
+    \b {Opposite property(ies):} QMofClassifier::features().
  */
 const QSet<QMofClassifier *> QMofFeature::featuringClassifiers() const
 {
@@ -85,6 +100,11 @@ const QSet<QMofClassifier *> QMofFeature::featuringClassifiers() const
     return _featuringClassifiers;
 }
 
+/*!
+    Adds \a featuringClassifier to featuringClassifiers.
+
+    \sa featuringClassifiers(), removeFeaturingClassifier()
+ */
 void QMofFeature::addFeaturingClassifier(QMofClassifier *featuringClassifier)
 {
     // This is a read-only derived union association end
@@ -101,6 +121,11 @@ void QMofFeature::addFeaturingClassifier(QMofClassifier *featuringClassifier)
     }
 }
 
+/*!
+    Removes \a featuringClassifier from featuringClassifiers.
+
+    \sa featuringClassifiers(), addFeaturingClassifier()
+ */
 void QMofFeature::removeFeaturingClassifier(QMofClassifier *featuringClassifier)
 {
     // This is a read-only derived union association end
@@ -125,6 +150,9 @@ bool QMofFeature::isStatic() const
     return _isStatic;
 }
 
+/*!
+    Adjusts isStatic to \a isStatic.
+ */
 void QMofFeature::setStatic(bool isStatic)
 {
     // This is a read-write property
diff --git a/src/mof/qmoffeature.h b/src/mof/qmoffeature.h
index f88b7f24..7c683ddc 100644
--- a/src/mof/qmoffeature.h
+++ b/src/mof/qmoffeature.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofRedefinableElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -76,7 +74,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofFeature) *)
 
-QT_END_HEADER
-
 #endif // QMOFFEATURE_H
 
diff --git a/src/mof/qmofgeneralization.cpp b/src/mof/qmofgeneralization.cpp
index 21174646..dedfdb7a 100644
--- a/src/mof/qmofgeneralization.cpp
+++ b/src/mof/qmofgeneralization.cpp
@@ -56,6 +56,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A generalization is a taxonomic relationship between a more general classifier and a more specific classifier. Each instance of the specific classifier is also an indirect instance of the general classifier. Thus, the specific classifier inherits the features of the more general classifier.
  */
+
+/*!
+    Creates a new QMofGeneralization. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofGeneralization::QMofGeneralization(bool createQModelingObject) :
     _general(0),
     _isSubstitutable(true),
@@ -65,6 +69,9 @@ QMofGeneralization::QMofGeneralization(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofGeneralizationObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofGeneralization.
+*/
 QModelingElement *QMofGeneralization::clone() const
 {
     QMofGeneralization *c = new QMofGeneralization;
@@ -82,6 +89,8 @@ QModelingElement *QMofGeneralization::clone() const
 
 /*!
     References the general classifier in the Generalization relationship.
+
+    \b {Subsetted property(ies):} QMofDirectedRelationship::targets().
  */
 QMofClassifier *QMofGeneralization::general() const
 {
@@ -90,6 +99,9 @@ QMofClassifier *QMofGeneralization::general() const
     return _general;
 }
 
+/*!
+    Adjusts general to \a general.
+ */
 void QMofGeneralization::setGeneral(QMofClassifier *general)
 {
     // This is a read-write association end
@@ -119,6 +131,9 @@ bool QMofGeneralization::isSubstitutable() const
     return _isSubstitutable;
 }
 
+/*!
+    Adjusts isSubstitutable to \a isSubstitutable.
+ */
 void QMofGeneralization::setSubstitutable(bool isSubstitutable)
 {
     // This is a read-write property
@@ -131,6 +146,10 @@ void QMofGeneralization::setSubstitutable(bool isSubstitutable)
 
 /*!
     References the specializing classifier in the Generalization relationship.
+
+    \b {Subsetted property(ies):} QMofElement::owner(), QMofDirectedRelationship::sources().
+
+    \b {Opposite property(ies):} QMofClassifier::generalizations().
  */
 QMofClassifier *QMofGeneralization::specific() const
 {
@@ -139,6 +158,9 @@ QMofClassifier *QMofGeneralization::specific() const
     return _specific;
 }
 
+/*!
+    Adjusts specific to \a specific.
+ */
 void QMofGeneralization::setSpecific(QMofClassifier *specific)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofgeneralization.h b/src/mof/qmofgeneralization.h
index 032a457c..9198e750 100644
--- a/src/mof/qmofgeneralization.h
+++ b/src/mof/qmofgeneralization.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofDirectedRelationship>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -78,7 +76,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofGeneralization) *)
 
-QT_END_HEADER
-
 #endif // QMOFGENERALIZATION_H
 
diff --git a/src/mof/qmofinstancespecification.cpp b/src/mof/qmofinstancespecification.cpp
index 83d2d775..847d72bc 100644
--- a/src/mof/qmofinstancespecification.cpp
+++ b/src/mof/qmofinstancespecification.cpp
@@ -60,6 +60,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An instance specification is a model element that represents an instance in a modeled system.
  */
+
+/*!
+    Creates a new QMofInstanceSpecification. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofInstanceSpecification::QMofInstanceSpecification(bool createQModelingObject) :
     _specification(0)
 {
@@ -67,6 +71,9 @@ QMofInstanceSpecification::QMofInstanceSpecification(bool createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofInstanceSpecificationObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofInstanceSpecification.
+*/
 QModelingElement *QMofInstanceSpecification::clone() const
 {
     QMofInstanceSpecification *c = new QMofInstanceSpecification;
@@ -87,6 +94,8 @@ QModelingElement *QMofInstanceSpecification::clone() const
 
 /*!
     The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them.
+
+    \sa addClassifier(), removeClassifier()
  */
 const QSet<QMofClassifier *> QMofInstanceSpecification::classifiers() const
 {
@@ -95,6 +104,11 @@ const QSet<QMofClassifier *> QMofInstanceSpecification::classifiers() const
     return _classifiers;
 }
 
+/*!
+    Adds \a classifier to classifiers.
+
+    \sa classifiers(), removeClassifier()
+ */
 void QMofInstanceSpecification::addClassifier(QMofClassifier *classifier)
 {
     // This is a read-write association end
@@ -106,6 +120,11 @@ void QMofInstanceSpecification::addClassifier(QMofClassifier *classifier)
     }
 }
 
+/*!
+    Removes \a classifier from classifiers.
+
+    \sa classifiers(), addClassifier()
+ */
 void QMofInstanceSpecification::removeClassifier(QMofClassifier *classifier)
 {
     // This is a read-write association end
@@ -117,6 +136,12 @@ void QMofInstanceSpecification::removeClassifier(QMofClassifier *classifier)
 
 /*!
     A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description.
+
+    \sa addSlot(), removeSlot()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
+
+    \b {Opposite property(ies):} QMofSlot::owningInstance().
  */
 const QSet<QMofSlot *> QMofInstanceSpecification::slots_() const
 {
@@ -125,6 +150,11 @@ const QSet<QMofSlot *> QMofInstanceSpecification::slots_() const
     return _slots_;
 }
 
+/*!
+    Adds \a slot_ to slots_.
+
+    \sa slots_(), removeSlot()
+ */
 void QMofInstanceSpecification::addSlot(QMofSlot *slot_)
 {
     // This is a read-write association end
@@ -145,6 +175,11 @@ void QMofInstanceSpecification::addSlot(QMofSlot *slot_)
     }
 }
 
+/*!
+    Removes \a slot_ from slots_.
+
+    \sa slots_(), addSlot()
+ */
 void QMofInstanceSpecification::removeSlot(QMofSlot *slot_)
 {
     // This is a read-write association end
@@ -166,6 +201,8 @@ void QMofInstanceSpecification::removeSlot(QMofSlot *slot_)
 
 /*!
     A specification of how to compute, derive, or construct the instance.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofInstanceSpecification::specification() const
 {
@@ -174,6 +211,9 @@ QMofValueSpecification *QMofInstanceSpecification::specification() const
     return _specification;
 }
 
+/*!
+    Adjusts specification to \a specification.
+ */
 void QMofInstanceSpecification::setSpecification(QMofValueSpecification *specification)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofinstancespecification.h b/src/mof/qmofinstancespecification.h
index b9546dc8..f8256bc6 100644
--- a/src/mof/qmofinstancespecification.h
+++ b/src/mof/qmofinstancespecification.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofPackageableElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -82,7 +80,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofInstanceSpecification) *)
 
-QT_END_HEADER
-
 #endif // QMOFINSTANCESPECIFICATION_H
 
diff --git a/src/mof/qmofinstancevalue.cpp b/src/mof/qmofinstancevalue.cpp
index a78650e6..c63f5291 100644
--- a/src/mof/qmofinstancevalue.cpp
+++ b/src/mof/qmofinstancevalue.cpp
@@ -59,6 +59,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An instance value is a value specification that identifies an instance.
  */
+
+/*!
+    Creates a new QMofInstanceValue. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofInstanceValue::QMofInstanceValue(bool createQModelingObject) :
     _instance(0)
 {
@@ -66,6 +70,9 @@ QMofInstanceValue::QMofInstanceValue(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofInstanceValueObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofInstanceValue.
+*/
 QModelingElement *QMofInstanceValue::clone() const
 {
     QMofInstanceValue *c = new QMofInstanceValue;
@@ -92,6 +99,9 @@ QMofInstanceSpecification *QMofInstanceValue::instance() const
     return _instance;
 }
 
+/*!
+    Adjusts instance to \a instance.
+ */
 void QMofInstanceValue::setInstance(QMofInstanceSpecification *instance)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofinstancevalue.h b/src/mof/qmofinstancevalue.h
index 2f588418..99f55a71 100644
--- a/src/mof/qmofinstancevalue.h
+++ b/src/mof/qmofinstancevalue.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofValueSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -72,7 +70,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofInstanceValue) *)
 
-QT_END_HEADER
-
 #endif // QMOFINSTANCEVALUE_H
 
diff --git a/src/mof/qmoflink.cpp b/src/mof/qmoflink.cpp
index cf3a45b2..bd75558b 100644
--- a/src/mof/qmoflink.cpp
+++ b/src/mof/qmoflink.cpp
@@ -47,11 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofLink
-
-    \inmodule QtMof
- */
 QMofLink::QMofLink(bool createQModelingObject) :
     QMofObject(false),
     _firstElement(0),
@@ -76,7 +71,6 @@ QModelingElement *QMofLink::clone() const
 
 // OWNED ATTRIBUTES
 
-
 QMofElement *QMofLink::firstElement() const
 {
     // This is a read-write property
@@ -95,7 +89,6 @@ void QMofLink::setFirstElement(QMofElement *firstElement)
     }
 }
 
-
 QMofElement *QMofLink::secondElement() const
 {
     // This is a read-write property
@@ -114,7 +107,6 @@ void QMofLink::setSecondElement(QMofElement *secondElement)
     }
 }
 
-
 QMofAssociation *QMofLink::association() const
 {
     // This is a read-write property
diff --git a/src/mof/qmoflink.h b/src/mof/qmoflink.h
index 0650928b..6c06b1a6 100644
--- a/src/mof/qmoflink.h
+++ b/src/mof/qmoflink.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -83,7 +81,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLink) *)
 
-QT_END_HEADER
-
 #endif // QMOFLINK_H
 
diff --git a/src/mof/qmofliteralboolean.cpp b/src/mof/qmofliteralboolean.cpp
index cf1e40c9..91709c6a 100644
--- a/src/mof/qmofliteralboolean.cpp
+++ b/src/mof/qmofliteralboolean.cpp
@@ -58,6 +58,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal Boolean is a specification of a Boolean value.
  */
+
+/*!
+    Creates a new QMofLiteralBoolean. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralBoolean::QMofLiteralBoolean(bool createQModelingObject) :
     _value(false)
 {
@@ -65,6 +69,9 @@ QMofLiteralBoolean::QMofLiteralBoolean(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralBooleanObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralBoolean.
+*/
 QModelingElement *QMofLiteralBoolean::clone() const
 {
     QMofLiteralBoolean *c = new QMofLiteralBoolean;
@@ -90,6 +97,9 @@ bool QMofLiteralBoolean::value() const
     return _value;
 }
 
+/*!
+    Adjusts value to \a value.
+ */
 void QMofLiteralBoolean::setValue(bool value)
 {
     // This is a read-write property
diff --git a/src/mof/qmofliteralboolean.h b/src/mof/qmofliteralboolean.h
index 3fbdaa6d..28e91337 100644
--- a/src/mof/qmofliteralboolean.h
+++ b/src/mof/qmofliteralboolean.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralBoolean) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALBOOLEAN_H
 
diff --git a/src/mof/qmofliteralinteger.cpp b/src/mof/qmofliteralinteger.cpp
index a9cda286..3702c0ea 100644
--- a/src/mof/qmofliteralinteger.cpp
+++ b/src/mof/qmofliteralinteger.cpp
@@ -58,6 +58,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal integer is a specification of an integer value.
  */
+
+/*!
+    Creates a new QMofLiteralInteger. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralInteger::QMofLiteralInteger(bool createQModelingObject) :
     _value(0)
 {
@@ -65,6 +69,9 @@ QMofLiteralInteger::QMofLiteralInteger(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralIntegerObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralInteger.
+*/
 QModelingElement *QMofLiteralInteger::clone() const
 {
     QMofLiteralInteger *c = new QMofLiteralInteger;
@@ -90,6 +97,9 @@ int QMofLiteralInteger::value() const
     return _value;
 }
 
+/*!
+    Adjusts value to \a value.
+ */
 void QMofLiteralInteger::setValue(int value)
 {
     // This is a read-write property
diff --git a/src/mof/qmofliteralinteger.h b/src/mof/qmofliteralinteger.h
index 4e5c1055..dd38443b 100644
--- a/src/mof/qmofliteralinteger.h
+++ b/src/mof/qmofliteralinteger.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralInteger) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALINTEGER_H
 
diff --git a/src/mof/qmofliteralnull.cpp b/src/mof/qmofliteralnull.cpp
index 1e18a179..0bf2f69f 100644
--- a/src/mof/qmofliteralnull.cpp
+++ b/src/mof/qmofliteralnull.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal null specifies the lack of a value.
  */
+
+/*!
+    Creates a new QMofLiteralNull. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralNull::QMofLiteralNull(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralNullObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralNull.
+*/
 QModelingElement *QMofLiteralNull::clone() const
 {
     QMofLiteralNull *c = new QMofLiteralNull;
diff --git a/src/mof/qmofliteralnull.h b/src/mof/qmofliteralnull.h
index bacba94b..f8916377 100644
--- a/src/mof/qmofliteralnull.h
+++ b/src/mof/qmofliteralnull.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -70,7 +68,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralNull) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALNULL_H
 
diff --git a/src/mof/qmofliteralreal.cpp b/src/mof/qmofliteralreal.cpp
index 1e169a10..ef90a29b 100644
--- a/src/mof/qmofliteralreal.cpp
+++ b/src/mof/qmofliteralreal.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal real is a specification of a real value.
  */
+
+/*!
+    Creates a new QMofLiteralReal. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralReal::QMofLiteralReal(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralRealObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralReal.
+*/
 QModelingElement *QMofLiteralReal::clone() const
 {
     QMofLiteralReal *c = new QMofLiteralReal;
@@ -79,7 +86,6 @@ QModelingElement *QMofLiteralReal::clone() const
 
 // OWNED ATTRIBUTES
 
-
 double QMofLiteralReal::value() const
 {
     // This is a read-write property
diff --git a/src/mof/qmofliteralreal.h b/src/mof/qmofliteralreal.h
index a1b9195e..3fb88179 100644
--- a/src/mof/qmofliteralreal.h
+++ b/src/mof/qmofliteralreal.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralReal) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALREAL_H
 
diff --git a/src/mof/qmofliteralspecification.cpp b/src/mof/qmofliteralspecification.cpp
index 44c57b94..17b51f38 100644
--- a/src/mof/qmofliteralspecification.cpp
+++ b/src/mof/qmofliteralspecification.cpp
@@ -55,11 +55,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A literal specification identifies a literal constant being modeled.
+
+    \b {QMofLiteralSpecification is an abstract class.}
  */
+
+/*!
+    Creates a new QMofLiteralSpecification.
+*/
 QMofLiteralSpecification::QMofLiteralSpecification()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralSpecification.
+*/
 QModelingElement *QMofLiteralSpecification::clone() const
 {
     QMofLiteralSpecification *c = new QMofLiteralSpecification;
diff --git a/src/mof/qmofliteralspecification.h b/src/mof/qmofliteralspecification.h
index 1c9200a3..4cdd3137 100644
--- a/src/mof/qmofliteralspecification.h
+++ b/src/mof/qmofliteralspecification.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofValueSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -66,7 +64,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralSpecification) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALSPECIFICATION_H
 
diff --git a/src/mof/qmofliteralstring.cpp b/src/mof/qmofliteralstring.cpp
index 9d863268..05b257be 100644
--- a/src/mof/qmofliteralstring.cpp
+++ b/src/mof/qmofliteralstring.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal string is a specification of a string value.
  */
+
+/*!
+    Creates a new QMofLiteralString. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralString::QMofLiteralString(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralStringObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralString.
+*/
 QModelingElement *QMofLiteralString::clone() const
 {
     QMofLiteralString *c = new QMofLiteralString;
@@ -89,6 +96,9 @@ QString QMofLiteralString::value() const
     return _value;
 }
 
+/*!
+    Adjusts value to \a value.
+ */
 void QMofLiteralString::setValue(QString value)
 {
     // This is a read-write property
diff --git a/src/mof/qmofliteralstring.h b/src/mof/qmofliteralstring.h
index b9ecb912..527f0972 100644
--- a/src/mof/qmofliteralstring.h
+++ b/src/mof/qmofliteralstring.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralString) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALSTRING_H
 
diff --git a/src/mof/qmofliteralunlimitednatural.cpp b/src/mof/qmofliteralunlimitednatural.cpp
index 32a39aa8..4408bae7 100644
--- a/src/mof/qmofliteralunlimitednatural.cpp
+++ b/src/mof/qmofliteralunlimitednatural.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief A literal unlimited natural is a specification of an unlimited natural number.
  */
+
+/*!
+    Creates a new QMofLiteralUnlimitedNatural. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofLiteralUnlimitedNatural::QMofLiteralUnlimitedNatural(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofLiteralUnlimitedNaturalObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofLiteralUnlimitedNatural.
+*/
 QModelingElement *QMofLiteralUnlimitedNatural::clone() const
 {
     QMofLiteralUnlimitedNatural *c = new QMofLiteralUnlimitedNatural;
@@ -89,6 +96,9 @@ QString QMofLiteralUnlimitedNatural::value() const
     return _value;
 }
 
+/*!
+    Adjusts value to \a value.
+ */
 void QMofLiteralUnlimitedNatural::setValue(QString value)
 {
     // This is a read-write property
diff --git a/src/mof/qmofliteralunlimitednatural.h b/src/mof/qmofliteralunlimitednatural.h
index 429fa660..9fe66e69 100644
--- a/src/mof/qmofliteralunlimitednatural.h
+++ b/src/mof/qmofliteralunlimitednatural.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofLiteralSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofLiteralUnlimitedNatural) *)
 
-QT_END_HEADER
-
 #endif // QMOFLITERALUNLIMITEDNATURAL_H
 
diff --git a/src/mof/qmofmultiplicityelement.cpp b/src/mof/qmofmultiplicityelement.cpp
index 24e3084c..f93bddae 100644
--- a/src/mof/qmofmultiplicityelement.cpp
+++ b/src/mof/qmofmultiplicityelement.cpp
@@ -52,7 +52,13 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A multiplicity is a definition of an inclusive interval of non-negative integers beginning with a lower bound and ending with a (possibly infinite) upper bound. A multiplicity element embeds this information to specify the allowable cardinalities for an instantiation of this element.
+
+    \b {QMofMultiplicityElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofMultiplicityElement.
+*/
 QMofMultiplicityElement::QMofMultiplicityElement() :
     _isOrdered(false),
     _isUnique(true),
@@ -61,6 +67,9 @@ QMofMultiplicityElement::QMofMultiplicityElement() :
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofMultiplicityElement.
+*/
 QModelingElement *QMofMultiplicityElement::clone() const
 {
     QMofMultiplicityElement *c = new QMofMultiplicityElement;
@@ -87,6 +96,9 @@ bool QMofMultiplicityElement::isOrdered() const
     return _isOrdered;
 }
 
+/*!
+    Adjusts isOrdered to \a isOrdered.
+ */
 void QMofMultiplicityElement::setOrdered(bool isOrdered)
 {
     // This is a read-write property
@@ -107,6 +119,9 @@ bool QMofMultiplicityElement::isUnique() const
     return _isUnique;
 }
 
+/*!
+    Adjusts isUnique to \a isUnique.
+ */
 void QMofMultiplicityElement::setUnique(bool isUnique)
 {
     // This is a read-write property
@@ -119,6 +134,8 @@ void QMofMultiplicityElement::setUnique(bool isUnique)
 
 /*!
     Specifies the lower bound of the multiplicity interval.
+
+    \b {This is a derived property.}
  */
 int QMofMultiplicityElement::lower() const
 {
@@ -129,6 +146,9 @@ int QMofMultiplicityElement::lower() const
     return int();
 }
 
+/*!
+    Adjusts lower to \a lower.
+ */
 void QMofMultiplicityElement::setLower(int lower)
 {
     // This is a read-write derived property
@@ -143,6 +163,8 @@ void QMofMultiplicityElement::setLower(int lower)
 
 /*!
     The specification of the lower bound for this multiplicity.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofMultiplicityElement::lowerValue() const
 {
@@ -151,6 +173,9 @@ QMofValueSpecification *QMofMultiplicityElement::lowerValue() const
     return _lowerValue;
 }
 
+/*!
+    Adjusts lowerValue to \a lowerValue.
+ */
 void QMofMultiplicityElement::setLowerValue(QMofValueSpecification *lowerValue)
 {
     // This is a read-write association end
@@ -173,6 +198,8 @@ void QMofMultiplicityElement::setLowerValue(QMofValueSpecification *lowerValue)
 
 /*!
     Specifies the upper bound of the multiplicity interval.
+
+    \b {This is a derived property.}
  */
 QString QMofMultiplicityElement::upper() const
 {
@@ -183,6 +210,9 @@ QString QMofMultiplicityElement::upper() const
     return QString();
 }
 
+/*!
+    Adjusts upper to \a upper.
+ */
 void QMofMultiplicityElement::setUpper(QString upper)
 {
     // This is a read-write derived property
@@ -197,6 +227,8 @@ void QMofMultiplicityElement::setUpper(QString upper)
 
 /*!
     The specification of the upper bound for this multiplicity.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofMultiplicityElement::upperValue() const
 {
@@ -205,6 +237,9 @@ QMofValueSpecification *QMofMultiplicityElement::upperValue() const
     return _upperValue;
 }
 
+/*!
+    Adjusts upperValue to \a upperValue.
+ */
 void QMofMultiplicityElement::setUpperValue(QMofValueSpecification *upperValue)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofmultiplicityelement.h b/src/mof/qmofmultiplicityelement.h
index 0d113ee0..8ed4f598 100644
--- a/src/mof/qmofmultiplicityelement.h
+++ b/src/mof/qmofmultiplicityelement.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -92,7 +90,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofMultiplicityElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFMULTIPLICITYELEMENT_H
 
diff --git a/src/mof/qmofnamedelement.cpp b/src/mof/qmofnamedelement.cpp
index 3c516f52..07a66529 100644
--- a/src/mof/qmofnamedelement.cpp
+++ b/src/mof/qmofnamedelement.cpp
@@ -52,13 +52,22 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A named element is an element in a model that may have a name.
+
+    \b {QMofNamedElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofNamedElement.
+*/
 QMofNamedElement::QMofNamedElement() :
     _namespace_(0),
     _visibility(QtMof::VisibilityKindNone)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofNamedElement.
+*/
 QModelingElement *QMofNamedElement::clone() const
 {
     QMofNamedElement *c = new QMofNamedElement;
@@ -81,6 +90,9 @@ QString QMofNamedElement::name() const
     return _name;
 }
 
+/*!
+    Adjusts name to \a name.
+ */
 void QMofNamedElement::setName(QString name)
 {
     // This is a read-write property
@@ -93,6 +105,12 @@ void QMofNamedElement::setName(QString name)
 
 /*!
     Specifies the namespace that owns the NamedElement.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofElement::owner(), .
+
+    \b {Opposite property(ies):} QMofNamespace::ownedMembers().
  */
 QMofNamespace *QMofNamedElement::namespace_() const
 {
@@ -101,6 +119,9 @@ QMofNamespace *QMofNamedElement::namespace_() const
     return _namespace_;
 }
 
+/*!
+    Adjusts namespace_ to \a namespace_.
+ */
 void QMofNamedElement::setNamespace(QMofNamespace *namespace_)
 {
     // This is a read-only derived union association end
@@ -119,6 +140,8 @@ void QMofNamedElement::setNamespace(QMofNamespace *namespace_)
 
 /*!
     A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself.
+
+    \b {This is a read-only derived property.}
  */
 QString QMofNamedElement::qualifiedName() const
 {
@@ -136,6 +159,9 @@ QString QMofNamedElement::qualifiedName() const
     return qualifiedName_;
 }
 
+/*!
+    Adjusts qualifiedName to \a qualifiedName.
+ */
 void QMofNamedElement::setQualifiedName(QString qualifiedName)
 {
     // This is a read-only derived property
@@ -158,6 +184,9 @@ QtMof::VisibilityKind QMofNamedElement::visibility() const
     return _visibility;
 }
 
+/*!
+    Adjusts visibility to \a visibility.
+ */
 void QMofNamedElement::setVisibility(QtMof::VisibilityKind visibility)
 {
     // This is a read-write property
diff --git a/src/mof/qmofnamedelement.h b/src/mof/qmofnamedelement.h
index 427454d7..aab155b7 100644
--- a/src/mof/qmofnamedelement.h
+++ b/src/mof/qmofnamedelement.h
@@ -47,8 +47,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -87,7 +85,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofNamedElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFNAMEDELEMENT_H
 
diff --git a/src/mof/qmofnamespace.cpp b/src/mof/qmofnamespace.cpp
index 4133e328..c2dfe0bc 100644
--- a/src/mof/qmofnamespace.cpp
+++ b/src/mof/qmofnamespace.cpp
@@ -58,11 +58,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A namespace is an element in a model that contains a set of named elements that can be identified by name.
+
+    \b {QMofNamespace is an abstract class.}
  */
+
+/*!
+    Creates a new QMofNamespace.
+*/
 QMofNamespace::QMofNamespace()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofNamespace.
+*/
 QModelingElement *QMofNamespace::clone() const
 {
     QMofNamespace *c = new QMofNamespace;
@@ -83,6 +92,12 @@ QModelingElement *QMofNamespace::clone() const
 
 /*!
     References the ElementImports owned by the Namespace.
+
+    \sa addElementImport(), removeElementImport()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
+
+    \b {Opposite property(ies):} QMofElementImport::importingNamespace().
  */
 const QSet<QMofElementImport *> QMofNamespace::elementImports() const
 {
@@ -91,6 +106,11 @@ const QSet<QMofElementImport *> QMofNamespace::elementImports() const
     return _elementImports;
 }
 
+/*!
+    Adds \a elementImport to elementImports.
+
+    \sa elementImports(), removeElementImport()
+ */
 void QMofNamespace::addElementImport(QMofElementImport *elementImport)
 {
     // This is a read-write association end
@@ -111,6 +131,11 @@ void QMofNamespace::addElementImport(QMofElementImport *elementImport)
     }
 }
 
+/*!
+    Removes \a elementImport from elementImports.
+
+    \sa elementImports(), addElementImport()
+ */
 void QMofNamespace::removeElementImport(QMofElementImport *elementImport)
 {
     // This is a read-write association end
@@ -132,6 +157,10 @@ void QMofNamespace::removeElementImport(QMofElementImport *elementImport)
 
 /*!
     References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports.
+
+    \b {This is a read-only derived property.}
+
+    \b {Subsetted property(ies):} QMofNamespace::members().
  */
 const QSet<QMofPackageableElement *> QMofNamespace::importedMembers() const
 {
@@ -146,6 +175,11 @@ const QSet<QMofPackageableElement *> QMofNamespace::importedMembers() const
     return importedMembers_;
 }
 
+/*!
+    Adds \a importedMember to importedMembers.
+
+    \sa importedMembers(), removeImportedMember()
+ */
 void QMofNamespace::addImportedMember(QMofPackageableElement *importedMember)
 {
     // This is a read-only derived association end
@@ -161,6 +195,11 @@ void QMofNamespace::addImportedMember(QMofPackageableElement *importedMember)
     }
 }
 
+/*!
+    Removes \a importedMember from importedMembers.
+
+    \sa importedMembers(), addImportedMember()
+ */
 void QMofNamespace::removeImportedMember(QMofPackageableElement *importedMember)
 {
     // This is a read-only derived association end
@@ -178,6 +217,8 @@ void QMofNamespace::removeImportedMember(QMofPackageableElement *importedMember)
 
 /*!
     A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance.
+
+    \b {This is a read-only derived union property.}
  */
 const QSet<QMofNamedElement *> QMofNamespace::members() const
 {
@@ -186,6 +227,11 @@ const QSet<QMofNamedElement *> QMofNamespace::members() const
     return _members;
 }
 
+/*!
+    Adds \a member to members.
+
+    \sa members(), removeMember()
+ */
 void QMofNamespace::addMember(QMofNamedElement *member)
 {
     // This is a read-only derived union association end
@@ -197,6 +243,11 @@ void QMofNamespace::addMember(QMofNamedElement *member)
     }
 }
 
+/*!
+    Removes \a member from members.
+
+    \sa members(), addMember()
+ */
 void QMofNamespace::removeMember(QMofNamedElement *member)
 {
     // This is a read-only derived union association end
@@ -208,6 +259,12 @@ void QMofNamespace::removeMember(QMofNamedElement *member)
 
 /*!
     A collection of NamedElements owned by the Namespace.
+
+    \b {This is a read-only derived union property.}
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements(), QMofNamespace::members().
+
+    \b {Opposite property(ies):} QMofNamedElement::namespace_().
  */
 const QSet<QMofNamedElement *> QMofNamespace::ownedMembers() const
 {
@@ -216,6 +273,11 @@ const QSet<QMofNamedElement *> QMofNamespace::ownedMembers() const
     return _ownedMembers;
 }
 
+/*!
+    Adds \a ownedMember to ownedMembers.
+
+    \sa ownedMembers(), removeOwnedMember()
+ */
 void QMofNamespace::addOwnedMember(QMofNamedElement *ownedMember)
 {
     // This is a read-only derived union association end
@@ -237,6 +299,11 @@ void QMofNamespace::addOwnedMember(QMofNamedElement *ownedMember)
     }
 }
 
+/*!
+    Removes \a ownedMember from ownedMembers.
+
+    \sa ownedMembers(), addOwnedMember()
+ */
 void QMofNamespace::removeOwnedMember(QMofNamedElement *ownedMember)
 {
     // This is a read-only derived union association end
@@ -259,6 +326,12 @@ void QMofNamespace::removeOwnedMember(QMofNamedElement *ownedMember)
 
 /*!
     Specifies a set of Constraints owned by this Namespace.
+
+    \sa addOwnedRule(), removeOwnedRule()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedMembers().
+
+    \b {Opposite property(ies):} QMofConstraint::context().
  */
 const QSet<QMofConstraint *> QMofNamespace::ownedRules() const
 {
@@ -267,6 +340,11 @@ const QSet<QMofConstraint *> QMofNamespace::ownedRules() const
     return _ownedRules;
 }
 
+/*!
+    Adds \a ownedRule to ownedRules.
+
+    \sa ownedRules(), removeOwnedRule()
+ */
 void QMofNamespace::addOwnedRule(QMofConstraint *ownedRule)
 {
     // This is a read-write association end
@@ -287,6 +365,11 @@ void QMofNamespace::addOwnedRule(QMofConstraint *ownedRule)
     }
 }
 
+/*!
+    Removes \a ownedRule from ownedRules.
+
+    \sa ownedRules(), addOwnedRule()
+ */
 void QMofNamespace::removeOwnedRule(QMofConstraint *ownedRule)
 {
     // This is a read-write association end
@@ -308,6 +391,12 @@ void QMofNamespace::removeOwnedRule(QMofConstraint *ownedRule)
 
 /*!
     References the PackageImports owned by the Namespace.
+
+    \sa addPackageImport(), removePackageImport()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
+
+    \b {Opposite property(ies):} QMofPackageImport::importingNamespace().
  */
 const QSet<QMofPackageImport *> QMofNamespace::packageImports() const
 {
@@ -316,6 +405,11 @@ const QSet<QMofPackageImport *> QMofNamespace::packageImports() const
     return _packageImports;
 }
 
+/*!
+    Adds \a packageImport to packageImports.
+
+    \sa packageImports(), removePackageImport()
+ */
 void QMofNamespace::addPackageImport(QMofPackageImport *packageImport)
 {
     // This is a read-write association end
@@ -336,6 +430,11 @@ void QMofNamespace::addPackageImport(QMofPackageImport *packageImport)
     }
 }
 
+/*!
+    Removes \a packageImport from packageImports.
+
+    \sa packageImports(), addPackageImport()
+ */
 void QMofNamespace::removePackageImport(QMofPackageImport *packageImport)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofnamespace.h b/src/mof/qmofnamespace.h
index f94115fa..ce83270e 100644
--- a/src/mof/qmofnamespace.h
+++ b/src/mof/qmofnamespace.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofNamedElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -101,7 +99,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofNamespace) *)
 
-QT_END_HEADER
-
 #endif // QMOFNAMESPACE_H
 
diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp
index 4f04925a..c4086b47 100644
--- a/src/mof/qmofobject.cpp
+++ b/src/mof/qmofobject.cpp
@@ -48,11 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofObject
-
-    \inmodule QtMof
- */
 QMofObject::QMofObject(bool createQModelingObject)
 {
     if (createQModelingObject)
diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h
index bae1681d..f3c57fbd 100644
--- a/src/mof/qmofobject.h
+++ b/src/mof/qmofobject.h
@@ -45,8 +45,6 @@
 
 #include <QtModeling/QModelingElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -78,7 +76,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofObject) *)
 
-QT_END_HEADER
-
 #endif // QMOFOBJECT_H
 
diff --git a/src/mof/qmofopaqueexpression.cpp b/src/mof/qmofopaqueexpression.cpp
index a03cc0b1..3a9097f9 100644
--- a/src/mof/qmofopaqueexpression.cpp
+++ b/src/mof/qmofopaqueexpression.cpp
@@ -58,12 +58,19 @@ QT_BEGIN_NAMESPACE
 
     \brief An opaque expression is an uninterpreted textual statement that denotes a (possibly empty) set of values when evaluated in a context.
  */
+
+/*!
+    Creates a new QMofOpaqueExpression. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofOpaqueExpression::QMofOpaqueExpression(bool createQModelingObject)
 {
     if (createQModelingObject)
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofOpaqueExpressionObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofOpaqueExpression.
+*/
 QModelingElement *QMofOpaqueExpression::clone() const
 {
     QMofOpaqueExpression *c = new QMofOpaqueExpression;
@@ -84,6 +91,8 @@ QModelingElement *QMofOpaqueExpression::clone() const
 
 /*!
     The text of the expression, possibly in multiple languages.
+
+    \sa addBody(), removeBody()
  */
 const QList<QString> QMofOpaqueExpression::bodies() const
 {
@@ -92,6 +101,11 @@ const QList<QString> QMofOpaqueExpression::bodies() const
     return _bodies;
 }
 
+/*!
+    Adds \a body to bodies.
+
+    \sa bodies(), removeBody()
+ */
 void QMofOpaqueExpression::addBody(QString body)
 {
     // This is a read-write property
@@ -101,6 +115,11 @@ void QMofOpaqueExpression::addBody(QString body)
     }
 }
 
+/*!
+    Removes \a body from bodies.
+
+    \sa bodies(), addBody()
+ */
 void QMofOpaqueExpression::removeBody(QString body)
 {
     // This is a read-write property
@@ -112,6 +131,8 @@ void QMofOpaqueExpression::removeBody(QString body)
 
 /*!
     Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order.
+
+    \sa addLanguage(), removeLanguage()
  */
 const QList<QString> QMofOpaqueExpression::languages() const
 {
@@ -120,6 +141,11 @@ const QList<QString> QMofOpaqueExpression::languages() const
     return _languages;
 }
 
+/*!
+    Adds \a language to languages.
+
+    \sa languages(), removeLanguage()
+ */
 void QMofOpaqueExpression::addLanguage(QString language)
 {
     // This is a read-write property
@@ -129,6 +155,11 @@ void QMofOpaqueExpression::addLanguage(QString language)
     }
 }
 
+/*!
+    Removes \a language from languages.
+
+    \sa languages(), addLanguage()
+ */
 void QMofOpaqueExpression::removeLanguage(QString language)
 {
     // This is a read-write property
diff --git a/src/mof/qmofopaqueexpression.h b/src/mof/qmofopaqueexpression.h
index e8910288..5f4bb7b9 100644
--- a/src/mof/qmofopaqueexpression.h
+++ b/src/mof/qmofopaqueexpression.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofValueSpecification>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -81,7 +79,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofOpaqueExpression) *)
 
-QT_END_HEADER
-
 #endif // QMOFOPAQUEEXPRESSION_H
 
diff --git a/src/mof/qmofoperation.cpp b/src/mof/qmofoperation.cpp
index 0c00d1dd..e714b994 100644
--- a/src/mof/qmofoperation.cpp
+++ b/src/mof/qmofoperation.cpp
@@ -66,6 +66,10 @@ QT_BEGIN_NAMESPACE
 
     \brief An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior.
  */
+
+/*!
+    Creates a new QMofOperation. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofOperation::QMofOperation(bool createQModelingObject) :
     _bodyCondition(0),
     _class_(0),
@@ -76,6 +80,9 @@ QMofOperation::QMofOperation(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofOperationObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofOperation.
+*/
 QModelingElement *QMofOperation::clone() const
 {
     QMofOperation *c = new QMofOperation;
@@ -115,6 +122,8 @@ QModelingElement *QMofOperation::clone() const
 
 /*!
     An optional Constraint on the result values of an invocation of this Operation.
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedRules().
  */
 QMofConstraint *QMofOperation::bodyCondition() const
 {
@@ -123,6 +132,9 @@ QMofConstraint *QMofOperation::bodyCondition() const
     return _bodyCondition;
 }
 
+/*!
+    Adjusts bodyCondition to \a bodyCondition.
+ */
 void QMofOperation::setBodyCondition(QMofConstraint *bodyCondition)
 {
     // This is a read-write association end
@@ -145,6 +157,10 @@ void QMofOperation::setBodyCondition(QMofConstraint *bodyCondition)
 
 /*!
     The class that owns the operation.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_(), QMofFeature::featuringClassifiers(), QMofRedefinableElement::redefinitionContexts().
+
+    \b {Opposite property(ies):} QMofClass::ownedOperations().
  */
 QMofClass *QMofOperation::class_() const
 {
@@ -153,6 +169,9 @@ QMofClass *QMofOperation::class_() const
     return _class_;
 }
 
+/*!
+    Adjusts class_ to \a class_.
+ */
 void QMofOperation::setClass(QMofClass *class_)
 {
     // This is a read-write association end
@@ -179,6 +198,10 @@ void QMofOperation::setClass(QMofClass *class_)
 
 /*!
     The DataType that owns this Operation.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_(), QMofFeature::featuringClassifiers(), QMofRedefinableElement::redefinitionContexts().
+
+    \b {Opposite property(ies):} QMofDataType::ownedOperations().
  */
 QMofDataType *QMofOperation::datatype() const
 {
@@ -187,6 +210,9 @@ QMofDataType *QMofOperation::datatype() const
     return _datatype;
 }
 
+/*!
+    Adjusts datatype to \a datatype.
+ */
 void QMofOperation::setDatatype(QMofDataType *datatype)
 {
     // This is a read-write association end
@@ -213,6 +239,8 @@ void QMofOperation::setDatatype(QMofDataType *datatype)
 
 /*!
     Specifies whether the return parameter is ordered or not, if present.
+
+    \b {This is a read-only derived property.}
  */
 bool QMofOperation::isOrdered() const
 {
@@ -223,6 +251,9 @@ bool QMofOperation::isOrdered() const
     return bool();
 }
 
+/*!
+    Adjusts isOrdered to \a isOrdered.
+ */
 void QMofOperation::setOrdered(bool isOrdered)
 {
     // This is a read-only derived property
@@ -245,6 +276,9 @@ bool QMofOperation::isQuery() const
     return _isQuery;
 }
 
+/*!
+    Adjusts isQuery to \a isQuery.
+ */
 void QMofOperation::setQuery(bool isQuery)
 {
     // This is a read-write property
@@ -257,6 +291,8 @@ void QMofOperation::setQuery(bool isQuery)
 
 /*!
     Specifies whether the return parameter is unique or not, if present.
+
+    \b {This is a read-only derived property.}
  */
 bool QMofOperation::isUnique() const
 {
@@ -267,6 +303,9 @@ bool QMofOperation::isUnique() const
     return bool();
 }
 
+/*!
+    Adjusts isUnique to \a isUnique.
+ */
 void QMofOperation::setUnique(bool isUnique)
 {
     // This is a read-only derived property
@@ -281,6 +320,8 @@ void QMofOperation::setUnique(bool isUnique)
 
 /*!
     Specifies the lower multiplicity of the return parameter, if present.
+
+    \b {This is a read-only derived property.}
  */
 int QMofOperation::lower() const
 {
@@ -291,6 +332,9 @@ int QMofOperation::lower() const
     return int();
 }
 
+/*!
+    Adjusts lower to \a lower.
+ */
 void QMofOperation::setLower(int lower)
 {
     // This is a read-only derived property
@@ -305,6 +349,12 @@ void QMofOperation::setLower(int lower)
 
 /*!
     Specifies the parameters owned by this Operation.
+
+    \sa addOwnedParameter(), removeOwnedParameter()
+
+    \b {Redefined property(ies):} QMofBehavioralFeature::ownedParameters().
+
+    \b {Opposite property(ies):} QMofParameter::operation().
  */
 const QList<QMofParameter *> QMofOperation::ownedParameters() const
 {
@@ -313,6 +363,11 @@ const QList<QMofParameter *> QMofOperation::ownedParameters() const
     return _ownedParameters;
 }
 
+/*!
+    Adds \a ownedParameter to ownedParameters.
+
+    \sa ownedParameters(), removeOwnedParameter()
+ */
 void QMofOperation::addOwnedParameter(QMofParameter *ownedParameter)
 {
     // This is a read-write association end
@@ -333,6 +388,11 @@ void QMofOperation::addOwnedParameter(QMofParameter *ownedParameter)
     }
 }
 
+/*!
+    Removes \a ownedParameter from ownedParameters.
+
+    \sa ownedParameters(), addOwnedParameter()
+ */
 void QMofOperation::removeOwnedParameter(QMofParameter *ownedParameter)
 {
     // This is a read-write association end
@@ -354,6 +414,10 @@ void QMofOperation::removeOwnedParameter(QMofParameter *ownedParameter)
 
 /*!
     An optional set of Constraints specifying the state of the system when the Operation is completed.
+
+    \sa addPostcondition(), removePostcondition()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedRules().
  */
 const QSet<QMofConstraint *> QMofOperation::postconditions() const
 {
@@ -362,6 +426,11 @@ const QSet<QMofConstraint *> QMofOperation::postconditions() const
     return _postconditions;
 }
 
+/*!
+    Adds \a postcondition to postconditions.
+
+    \sa postconditions(), removePostcondition()
+ */
 void QMofOperation::addPostcondition(QMofConstraint *postcondition)
 {
     // This is a read-write association end
@@ -377,6 +446,11 @@ void QMofOperation::addPostcondition(QMofConstraint *postcondition)
     }
 }
 
+/*!
+    Removes \a postcondition from postconditions.
+
+    \sa postconditions(), addPostcondition()
+ */
 void QMofOperation::removePostcondition(QMofConstraint *postcondition)
 {
     // This is a read-write association end
@@ -393,6 +467,10 @@ void QMofOperation::removePostcondition(QMofConstraint *postcondition)
 
 /*!
     An optional set of Constraints on the state of the system when the Operation is invoked.
+
+    \sa addPrecondition(), removePrecondition()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedRules().
  */
 const QSet<QMofConstraint *> QMofOperation::preconditions() const
 {
@@ -401,6 +479,11 @@ const QSet<QMofConstraint *> QMofOperation::preconditions() const
     return _preconditions;
 }
 
+/*!
+    Adds \a precondition to preconditions.
+
+    \sa preconditions(), removePrecondition()
+ */
 void QMofOperation::addPrecondition(QMofConstraint *precondition)
 {
     // This is a read-write association end
@@ -416,6 +499,11 @@ void QMofOperation::addPrecondition(QMofConstraint *precondition)
     }
 }
 
+/*!
+    Removes \a precondition from preconditions.
+
+    \sa preconditions(), addPrecondition()
+ */
 void QMofOperation::removePrecondition(QMofConstraint *precondition)
 {
     // This is a read-write association end
@@ -432,6 +520,10 @@ void QMofOperation::removePrecondition(QMofConstraint *precondition)
 
 /*!
     References the Types representing exceptions that may be raised during an invocation of this operation.
+
+    \sa addRaisedException(), removeRaisedException()
+
+    \b {Redefined property(ies):} QMofBehavioralFeature::raisedExceptions().
  */
 const QSet<QMofType *> QMofOperation::raisedExceptions() const
 {
@@ -440,6 +532,11 @@ const QSet<QMofType *> QMofOperation::raisedExceptions() const
     return _raisedExceptions;
 }
 
+/*!
+    Adds \a raisedException to raisedExceptions.
+
+    \sa raisedExceptions(), removeRaisedException()
+ */
 void QMofOperation::addRaisedException(QMofType *raisedException)
 {
     // This is a read-write association end
@@ -454,6 +551,11 @@ void QMofOperation::addRaisedException(QMofType *raisedException)
     }
 }
 
+/*!
+    Removes \a raisedException from raisedExceptions.
+
+    \sa raisedExceptions(), addRaisedException()
+ */
 void QMofOperation::removeRaisedException(QMofType *raisedException)
 {
     // This is a read-write association end
@@ -468,6 +570,10 @@ void QMofOperation::removeRaisedException(QMofType *raisedException)
 
 /*!
     References the Operations that are redefined by this Operation.
+
+    \sa addRedefinedOperation(), removeRedefinedOperation()
+
+    \b {Subsetted property(ies):} QMofRedefinableElement::redefinedElements().
  */
 const QSet<QMofOperation *> QMofOperation::redefinedOperations() const
 {
@@ -476,6 +582,11 @@ const QSet<QMofOperation *> QMofOperation::redefinedOperations() const
     return _redefinedOperations;
 }
 
+/*!
+    Adds \a redefinedOperation to redefinedOperations.
+
+    \sa redefinedOperations(), removeRedefinedOperation()
+ */
 void QMofOperation::addRedefinedOperation(QMofOperation *redefinedOperation)
 {
     // This is a read-write association end
@@ -490,6 +601,11 @@ void QMofOperation::addRedefinedOperation(QMofOperation *redefinedOperation)
     }
 }
 
+/*!
+    Removes \a redefinedOperation from redefinedOperations.
+
+    \sa redefinedOperations(), addRedefinedOperation()
+ */
 void QMofOperation::removeRedefinedOperation(QMofOperation *redefinedOperation)
 {
     // This is a read-write association end
@@ -504,6 +620,8 @@ void QMofOperation::removeRedefinedOperation(QMofOperation *redefinedOperation)
 
 /*!
     Specifies the return result of the operation, if present.
+
+    \b {This is a read-only derived property.}
  */
 QMofType *QMofOperation::type() const
 {
@@ -514,6 +632,9 @@ QMofType *QMofOperation::type() const
     return 0;
 }
 
+/*!
+    Adjusts type to \a type.
+ */
 void QMofOperation::setType(QMofType *type)
 {
     // This is a read-only derived association end
@@ -528,6 +649,8 @@ void QMofOperation::setType(QMofType *type)
 
 /*!
     Specifies the upper multiplicity of the return parameter, if present.
+
+    \b {This is a read-only derived property.}
  */
 QString QMofOperation::upper() const
 {
@@ -538,6 +661,9 @@ QString QMofOperation::upper() const
     return QString();
 }
 
+/*!
+    Adjusts upper to \a upper.
+ */
 void QMofOperation::setUpper(QString upper)
 {
     // This is a read-only derived property
diff --git a/src/mof/qmofoperation.h b/src/mof/qmofoperation.h
index 05c390d1..71548022 100644
--- a/src/mof/qmofoperation.h
+++ b/src/mof/qmofoperation.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofBehavioralFeature>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -120,7 +118,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofOperation) *)
 
-QT_END_HEADER
-
 #endif // QMOFOPERATION_H
 
diff --git a/src/mof/qmofpackage.cpp b/src/mof/qmofpackage.cpp
index bc0b36bf..9704e347 100644
--- a/src/mof/qmofpackage.cpp
+++ b/src/mof/qmofpackage.cpp
@@ -61,6 +61,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A package is used to group elements, and provides a namespace for the grouped elements.
  */
+
+/*!
+    Creates a new QMofPackage. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofPackage::QMofPackage(bool createQModelingObject) :
     _nestingPackage(0)
 {
@@ -68,6 +72,9 @@ QMofPackage::QMofPackage(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofPackageObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofPackage.
+*/
 QModelingElement *QMofPackage::clone() const
 {
     QMofPackage *c = new QMofPackage;
@@ -103,6 +110,9 @@ QString QMofPackage::URI() const
     return _URI;
 }
 
+/*!
+    Adjusts URI to \a URI.
+ */
 void QMofPackage::setURI(QString URI)
 {
     // This is a read-write property
@@ -114,6 +124,14 @@ void QMofPackage::setURI(QString URI)
 
 /*!
     References the packaged elements that are Packages.
+
+    \sa addNestedPackage(), removeNestedPackage()
+
+    \b {This is a derived property.}
+
+    \b {Subsetted property(ies):} QMofPackage::packagedElements().
+
+    \b {Opposite property(ies):} QMofPackage::nestingPackage().
  */
 const QSet<QMofPackage *> QMofPackage::nestedPackages() const
 {
@@ -126,6 +144,11 @@ const QSet<QMofPackage *> QMofPackage::nestedPackages() const
     return nestedPackages_;
 }
 
+/*!
+    Adds \a nestedPackage to nestedPackages.
+
+    \sa nestedPackages(), removeNestedPackage()
+ */
 void QMofPackage::addNestedPackage(QMofPackage *nestedPackage)
 {
     // This is a read-write derived association end
@@ -141,6 +164,11 @@ void QMofPackage::addNestedPackage(QMofPackage *nestedPackage)
     }
 }
 
+/*!
+    Removes \a nestedPackage from nestedPackages.
+
+    \sa nestedPackages(), addNestedPackage()
+ */
 void QMofPackage::removeNestedPackage(QMofPackage *nestedPackage)
 {
     // This is a read-write derived association end
@@ -158,6 +186,10 @@ void QMofPackage::removeNestedPackage(QMofPackage *nestedPackage)
 
 /*!
     References the Package that owns this Package.
+
+    \b {Subsetted property(ies):} .
+
+    \b {Opposite property(ies):} QMofPackage::nestedPackages().
  */
 QMofPackage *QMofPackage::nestingPackage() const
 {
@@ -166,6 +198,9 @@ QMofPackage *QMofPackage::nestingPackage() const
     return _nestingPackage;
 }
 
+/*!
+    Adjusts nestingPackage to \a nestingPackage.
+ */
 void QMofPackage::setNestingPackage(QMofPackage *nestingPackage)
 {
     // This is a read-write association end
@@ -179,6 +214,14 @@ void QMofPackage::setNestingPackage(QMofPackage *nestingPackage)
 
 /*!
     References the packaged elements that are Types.
+
+    \sa addOwnedType(), removeOwnedType()
+
+    \b {This is a derived property.}
+
+    \b {Subsetted property(ies):} QMofPackage::packagedElements().
+
+    \b {Opposite property(ies):} QMofType::package().
  */
 const QSet<QMofType *> QMofPackage::ownedTypes() const
 {
@@ -191,6 +234,11 @@ const QSet<QMofType *> QMofPackage::ownedTypes() const
     return ownedTypes_;
 }
 
+/*!
+    Adds \a ownedType to ownedTypes.
+
+    \sa ownedTypes(), removeOwnedType()
+ */
 void QMofPackage::addOwnedType(QMofType *ownedType)
 {
     // This is a read-write derived association end
@@ -206,6 +254,11 @@ void QMofPackage::addOwnedType(QMofType *ownedType)
     }
 }
 
+/*!
+    Removes \a ownedType from ownedTypes.
+
+    \sa ownedTypes(), addOwnedType()
+ */
 void QMofPackage::removeOwnedType(QMofType *ownedType)
 {
     // This is a read-write derived association end
@@ -223,6 +276,12 @@ void QMofPackage::removeOwnedType(QMofType *ownedType)
 
 /*!
     References the PackageMerges that are owned by this Package.
+
+    \sa addPackageMerge(), removePackageMerge()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
+
+    \b {Opposite property(ies):} QMofPackageMerge::receivingPackage().
  */
 const QSet<QMofPackageMerge *> QMofPackage::packageMerges() const
 {
@@ -231,6 +290,11 @@ const QSet<QMofPackageMerge *> QMofPackage::packageMerges() const
     return _packageMerges;
 }
 
+/*!
+    Adds \a packageMerge to packageMerges.
+
+    \sa packageMerges(), removePackageMerge()
+ */
 void QMofPackage::addPackageMerge(QMofPackageMerge *packageMerge)
 {
     // This is a read-write association end
@@ -251,6 +315,11 @@ void QMofPackage::addPackageMerge(QMofPackageMerge *packageMerge)
     }
 }
 
+/*!
+    Removes \a packageMerge from packageMerges.
+
+    \sa packageMerges(), addPackageMerge()
+ */
 void QMofPackage::removePackageMerge(QMofPackageMerge *packageMerge)
 {
     // This is a read-write association end
@@ -272,6 +341,10 @@ void QMofPackage::removePackageMerge(QMofPackageMerge *packageMerge)
 
 /*!
     Specifies the packageable elements that are owned by this Package.
+
+    \sa addPackagedElement(), removePackagedElement()
+
+    \b {Subsetted property(ies):} QMofNamespace::ownedMembers().
  */
 const QSet<QMofPackageableElement *> QMofPackage::packagedElements() const
 {
@@ -280,6 +353,11 @@ const QSet<QMofPackageableElement *> QMofPackage::packagedElements() const
     return _packagedElements;
 }
 
+/*!
+    Adds \a packagedElement to packagedElements.
+
+    \sa packagedElements(), removePackagedElement()
+ */
 void QMofPackage::addPackagedElement(QMofPackageableElement *packagedElement)
 {
     // This is a read-write association end
@@ -295,6 +373,11 @@ void QMofPackage::addPackagedElement(QMofPackageableElement *packagedElement)
     }
 }
 
+/*!
+    Removes \a packagedElement from packagedElements.
+
+    \sa packagedElements(), addPackagedElement()
+ */
 void QMofPackage::removePackagedElement(QMofPackageableElement *packagedElement)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofpackage.h b/src/mof/qmofpackage.h
index 068acdfd..d39fa266 100644
--- a/src/mof/qmofpackage.h
+++ b/src/mof/qmofpackage.h
@@ -46,8 +46,6 @@
 #include <QtMof/QMofNamespace>
 #include <QtMof/QMofPackageableElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -97,7 +95,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofPackage) *)
 
-QT_END_HEADER
-
 #endif // QMOFPACKAGE_H
 
diff --git a/src/mof/qmofpackageableelement.cpp b/src/mof/qmofpackageableelement.cpp
index b58aec4f..9b576556 100644
--- a/src/mof/qmofpackageableelement.cpp
+++ b/src/mof/qmofpackageableelement.cpp
@@ -53,12 +53,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A packageable element indicates a named element that may be owned directly by a package.
+
+    \b {QMofPackageableElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofPackageableElement.
+*/
 QMofPackageableElement::QMofPackageableElement() :
     _visibility(QtMof::VisibilityKindPublic)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofPackageableElement.
+*/
 QModelingElement *QMofPackageableElement::clone() const
 {
     QMofPackageableElement *c = new QMofPackageableElement;
@@ -73,6 +82,8 @@ QModelingElement *QMofPackageableElement::clone() const
 
 /*!
     Indicates that packageable elements must always have a visibility, i.e., visibility is not optional.
+
+    \b {Redefined property(ies):} QMofNamedElement::visibility().
  */
 QtMof::VisibilityKind QMofPackageableElement::visibility() const
 {
@@ -81,6 +92,9 @@ QtMof::VisibilityKind QMofPackageableElement::visibility() const
     return _visibility;
 }
 
+/*!
+    Adjusts visibility to \a visibility.
+ */
 void QMofPackageableElement::setVisibility(QtMof::VisibilityKind visibility)
 {
     // This is a read-write property
diff --git a/src/mof/qmofpackageableelement.h b/src/mof/qmofpackageableelement.h
index 1ce767e8..5f98bdf0 100644
--- a/src/mof/qmofpackageableelement.h
+++ b/src/mof/qmofpackageableelement.h
@@ -47,8 +47,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -72,7 +70,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofPackageableElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFPACKAGEABLEELEMENT_H
 
diff --git a/src/mof/qmofpackageimport.cpp b/src/mof/qmofpackageimport.cpp
index 4a14f93a..d0fee64e 100644
--- a/src/mof/qmofpackageimport.cpp
+++ b/src/mof/qmofpackageimport.cpp
@@ -57,6 +57,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A package import is a relationship that allows the use of unqualified names to refer to package members from other namespaces.
  */
+
+/*!
+    Creates a new QMofPackageImport. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofPackageImport::QMofPackageImport(bool createQModelingObject) :
     _importedPackage(0),
     _importingNamespace(0),
@@ -66,6 +70,9 @@ QMofPackageImport::QMofPackageImport(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofPackageImportObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofPackageImport.
+*/
 QModelingElement *QMofPackageImport::clone() const
 {
     QMofPackageImport *c = new QMofPackageImport;
@@ -83,6 +90,8 @@ QModelingElement *QMofPackageImport::clone() const
 
 /*!
     Specifies the Package whose members are imported into a Namespace.
+
+    \b {Subsetted property(ies):} QMofDirectedRelationship::targets().
  */
 QMofPackage *QMofPackageImport::importedPackage() const
 {
@@ -91,6 +100,9 @@ QMofPackage *QMofPackageImport::importedPackage() const
     return _importedPackage;
 }
 
+/*!
+    Adjusts importedPackage to \a importedPackage.
+ */
 void QMofPackageImport::setImportedPackage(QMofPackage *importedPackage)
 {
     // This is a read-write association end
@@ -112,6 +124,10 @@ void QMofPackageImport::setImportedPackage(QMofPackage *importedPackage)
 
 /*!
     Specifies the Namespace that imports the members from a Package.
+
+    \b {Subsetted property(ies):} QMofElement::owner(), QMofDirectedRelationship::sources().
+
+    \b {Opposite property(ies):} QMofNamespace::packageImports().
  */
 QMofNamespace *QMofPackageImport::importingNamespace() const
 {
@@ -120,6 +136,9 @@ QMofNamespace *QMofPackageImport::importingNamespace() const
     return _importingNamespace;
 }
 
+/*!
+    Adjusts importingNamespace to \a importingNamespace.
+ */
 void QMofPackageImport::setImportingNamespace(QMofNamespace *importingNamespace)
 {
     // This is a read-write association end
@@ -150,6 +169,9 @@ QtMof::VisibilityKind QMofPackageImport::visibility() const
     return _visibility;
 }
 
+/*!
+    Adjusts visibility to \a visibility.
+ */
 void QMofPackageImport::setVisibility(QtMof::VisibilityKind visibility)
 {
     // This is a read-write property
diff --git a/src/mof/qmofpackageimport.h b/src/mof/qmofpackageimport.h
index fddf2122..67b05d27 100644
--- a/src/mof/qmofpackageimport.h
+++ b/src/mof/qmofpackageimport.h
@@ -47,8 +47,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -81,7 +79,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofPackageImport) *)
 
-QT_END_HEADER
-
 #endif // QMOFPACKAGEIMPORT_H
 
diff --git a/src/mof/qmofpackagemerge.cpp b/src/mof/qmofpackagemerge.cpp
index 9f894649..f2acd3c7 100644
--- a/src/mof/qmofpackagemerge.cpp
+++ b/src/mof/qmofpackagemerge.cpp
@@ -56,6 +56,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A package merge defines how the contents of one package are extended by the contents of another package.
  */
+
+/*!
+    Creates a new QMofPackageMerge. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofPackageMerge::QMofPackageMerge(bool createQModelingObject) :
     _mergedPackage(0),
     _receivingPackage(0)
@@ -64,6 +68,9 @@ QMofPackageMerge::QMofPackageMerge(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofPackageMergeObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofPackageMerge.
+*/
 QModelingElement *QMofPackageMerge::clone() const
 {
     QMofPackageMerge *c = new QMofPackageMerge;
@@ -80,6 +87,8 @@ QModelingElement *QMofPackageMerge::clone() const
 
 /*!
     References the Package that is to be merged with the receiving package of the PackageMerge.
+
+    \b {Subsetted property(ies):} QMofDirectedRelationship::targets().
  */
 QMofPackage *QMofPackageMerge::mergedPackage() const
 {
@@ -88,6 +97,9 @@ QMofPackage *QMofPackageMerge::mergedPackage() const
     return _mergedPackage;
 }
 
+/*!
+    Adjusts mergedPackage to \a mergedPackage.
+ */
 void QMofPackageMerge::setMergedPackage(QMofPackage *mergedPackage)
 {
     // This is a read-write association end
@@ -109,6 +121,10 @@ void QMofPackageMerge::setMergedPackage(QMofPackage *mergedPackage)
 
 /*!
     References the Package that is being extended with the contents of the merged package of the PackageMerge.
+
+    \b {Subsetted property(ies):} QMofElement::owner(), QMofDirectedRelationship::sources().
+
+    \b {Opposite property(ies):} QMofPackage::packageMerges().
  */
 QMofPackage *QMofPackageMerge::receivingPackage() const
 {
@@ -117,6 +133,9 @@ QMofPackage *QMofPackageMerge::receivingPackage() const
     return _receivingPackage;
 }
 
+/*!
+    Adjusts receivingPackage to \a receivingPackage.
+ */
 void QMofPackageMerge::setReceivingPackage(QMofPackage *receivingPackage)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofpackagemerge.h b/src/mof/qmofpackagemerge.h
index 5cb478fd..bd3f597b 100644
--- a/src/mof/qmofpackagemerge.h
+++ b/src/mof/qmofpackagemerge.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofDirectedRelationship>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -75,7 +73,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofPackageMerge) *)
 
-QT_END_HEADER
-
 #endif // QMOFPACKAGEMERGE_H
 
diff --git a/src/mof/qmofparameter.cpp b/src/mof/qmofparameter.cpp
index 545a1099..79947873 100644
--- a/src/mof/qmofparameter.cpp
+++ b/src/mof/qmofparameter.cpp
@@ -60,6 +60,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature.
  */
+
+/*!
+    Creates a new QMofParameter. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofParameter::QMofParameter(bool createQModelingObject) :
     _defaultValue(0),
     _direction(QtMof::ParameterDirectionKindIn),
@@ -69,6 +73,9 @@ QMofParameter::QMofParameter(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofParameterObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofParameter.
+*/
 QModelingElement *QMofParameter::clone() const
 {
     QMofParameter *c = new QMofParameter;
@@ -96,6 +103,8 @@ QModelingElement *QMofParameter::clone() const
 
 /*!
     Specifies a String that represents a value to be used when no argument is supplied for the Parameter.
+
+    \b {This is a read-only derived property.}
  */
 QString QMofParameter::default_() const
 {
@@ -106,6 +115,9 @@ QString QMofParameter::default_() const
     return QString();
 }
 
+/*!
+    Adjusts default_ to \a default_.
+ */
 void QMofParameter::setDefault(QString default_)
 {
     // This is a read-only derived property
@@ -120,6 +132,8 @@ void QMofParameter::setDefault(QString default_)
 
 /*!
     Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofParameter::defaultValue() const
 {
@@ -128,6 +142,9 @@ QMofValueSpecification *QMofParameter::defaultValue() const
     return _defaultValue;
 }
 
+/*!
+    Adjusts defaultValue to \a defaultValue.
+ */
 void QMofParameter::setDefaultValue(QMofValueSpecification *defaultValue)
 {
     // This is a read-write association end
@@ -158,6 +175,9 @@ QtMof::ParameterDirectionKind QMofParameter::direction() const
     return _direction;
 }
 
+/*!
+    Adjusts direction to \a direction.
+ */
 void QMofParameter::setDirection(QtMof::ParameterDirectionKind direction)
 {
     // This is a read-write property
@@ -170,6 +190,10 @@ void QMofParameter::setDirection(QtMof::ParameterDirectionKind direction)
 
 /*!
     References the Operation owning this parameter.
+
+    \b {Subsetted property(ies):} .
+
+    \b {Opposite property(ies):} QMofOperation::ownedParameters().
  */
 QMofOperation *QMofParameter::operation() const
 {
@@ -178,6 +202,9 @@ QMofOperation *QMofParameter::operation() const
     return _operation;
 }
 
+/*!
+    Adjusts operation to \a operation.
+ */
 void QMofParameter::setOperation(QMofOperation *operation)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofparameter.h b/src/mof/qmofparameter.h
index cc9169fe..b41df3b6 100644
--- a/src/mof/qmofparameter.h
+++ b/src/mof/qmofparameter.h
@@ -48,8 +48,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -84,7 +82,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofParameter) *)
 
-QT_END_HEADER
-
 #endif // QMOFPARAMETER_H
 
diff --git a/src/mof/qmofprimitivetype.cpp b/src/mof/qmofprimitivetype.cpp
index 119e8759..fa825b2b 100644
--- a/src/mof/qmofprimitivetype.cpp
+++ b/src/mof/qmofprimitivetype.cpp
@@ -70,6 +70,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A primitive type defines a predefined data type, without any relevant substructure (i.e., it has no parts in the context of UML). A primitive datatype may have an algebra and operations defined outside of UML, for example, mathematically.
  */
+
+/*!
+    Creates a new QMofPrimitiveType. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofPrimitiveType::QMofPrimitiveType(bool createQModelingObject) :
     QMofDataType(false)
 {
@@ -77,6 +81,9 @@ QMofPrimitiveType::QMofPrimitiveType(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofPrimitiveTypeObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofPrimitiveType.
+*/
 QModelingElement *QMofPrimitiveType::clone() const
 {
     QMofPrimitiveType *c = new QMofPrimitiveType;
diff --git a/src/mof/qmofprimitivetype.h b/src/mof/qmofprimitivetype.h
index 5c11ad86..bdb7da73 100644
--- a/src/mof/qmofprimitivetype.h
+++ b/src/mof/qmofprimitivetype.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofDataType>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -66,7 +64,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofPrimitiveType) *)
 
-QT_END_HEADER
-
 #endif // QMOFPRIMITIVETYPE_H
 
diff --git a/src/mof/qmofproperty.cpp b/src/mof/qmofproperty.cpp
index e505a139..d7690fe4 100644
--- a/src/mof/qmofproperty.cpp
+++ b/src/mof/qmofproperty.cpp
@@ -64,6 +64,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A property is a structural feature of a classifier that characterizes instances of the classifier. A property related by ownedAttribute to a classifier (other than an association) represents an attribute and might also represent an association end. It relates an instance of the class to a value or set of values of the type of the attribute. A property related by memberEnd or its specializations to an association represents an end of the association. The type of the property is the type of the end of the association.
  */
+
+/*!
+    Creates a new QMofProperty. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofProperty::QMofProperty(bool createQModelingObject) :
     _aggregation(QtMof::AggregationKindNone),
     _association(0),
@@ -80,6 +84,9 @@ QMofProperty::QMofProperty(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofPropertyObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofProperty.
+*/
 QModelingElement *QMofProperty::clone() const
 {
     QMofProperty *c = new QMofProperty;
@@ -131,6 +138,9 @@ QtMof::AggregationKind QMofProperty::aggregation() const
     return _aggregation;
 }
 
+/*!
+    Adjusts aggregation to \a aggregation.
+ */
 void QMofProperty::setAggregation(QtMof::AggregationKind aggregation)
 {
     // This is a read-write property
@@ -143,6 +153,10 @@ void QMofProperty::setAggregation(QtMof::AggregationKind aggregation)
 
 /*!
     References the association of which this property is a member, if any.
+
+    \b {Subsetted property(ies):} .
+
+    \b {Opposite property(ies):} QMofAssociation::memberEnds().
  */
 QMofAssociation *QMofProperty::association() const
 {
@@ -151,6 +165,9 @@ QMofAssociation *QMofProperty::association() const
     return _association;
 }
 
+/*!
+    Adjusts association to \a association.
+ */
 void QMofProperty::setAssociation(QMofAssociation *association)
 {
     // This is a read-write association end
@@ -164,6 +181,10 @@ void QMofProperty::setAssociation(QMofAssociation *association)
 
 /*!
     References the Class that owns the Property.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_(), .
+
+    \b {Opposite property(ies):} QMofClass::ownedAttributes().
  */
 QMofClass *QMofProperty::class_() const
 {
@@ -172,6 +193,9 @@ QMofClass *QMofProperty::class_() const
     return _class_;
 }
 
+/*!
+    Adjusts class_ to \a class_.
+ */
 void QMofProperty::setClass(QMofClass *class_)
 {
     // This is a read-write association end
@@ -190,6 +214,10 @@ void QMofProperty::setClass(QMofClass *class_)
 
 /*!
     The DataType that owns this Property.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_(), .
+
+    \b {Opposite property(ies):} QMofDataType::ownedAttributes().
  */
 QMofDataType *QMofProperty::datatype() const
 {
@@ -198,6 +226,9 @@ QMofDataType *QMofProperty::datatype() const
     return _datatype;
 }
 
+/*!
+    Adjusts datatype to \a datatype.
+ */
 void QMofProperty::setDatatype(QMofDataType *datatype)
 {
     // This is a read-write association end
@@ -216,6 +247,8 @@ void QMofProperty::setDatatype(QMofDataType *datatype)
 
 /*!
     A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated.
+
+    \b {This is a derived property.}
  */
 QString QMofProperty::default_() const
 {
@@ -226,6 +259,9 @@ QString QMofProperty::default_() const
     return QString();
 }
 
+/*!
+    Adjusts default_ to \a default_.
+ */
 void QMofProperty::setDefault(QString default_)
 {
     // This is a read-write derived property
@@ -240,6 +276,8 @@ void QMofProperty::setDefault(QString default_)
 
 /*!
     A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated.
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 QMofValueSpecification *QMofProperty::defaultValue() const
 {
@@ -248,6 +286,9 @@ QMofValueSpecification *QMofProperty::defaultValue() const
     return _defaultValue;
 }
 
+/*!
+    Adjusts defaultValue to \a defaultValue.
+ */
 void QMofProperty::setDefaultValue(QMofValueSpecification *defaultValue)
 {
     // This is a read-write association end
@@ -270,6 +311,8 @@ void QMofProperty::setDefaultValue(QMofValueSpecification *defaultValue)
 
 /*!
     This is a derived value, indicating whether the aggregation of the Property is composite or not.
+
+    \b {This is a derived property.}
  */
 bool QMofProperty::isComposite() const
 {
@@ -280,6 +323,9 @@ bool QMofProperty::isComposite() const
     return bool();
 }
 
+/*!
+    Adjusts isComposite to \a isComposite.
+ */
 void QMofProperty::setComposite(bool isComposite)
 {
     // This is a read-write derived property
@@ -302,6 +348,9 @@ bool QMofProperty::isDerived() const
     return _isDerived;
 }
 
+/*!
+    Adjusts isDerived to \a isDerived.
+ */
 void QMofProperty::setDerived(bool isDerived)
 {
     // This is a read-write property
@@ -322,6 +371,9 @@ bool QMofProperty::isDerivedUnion() const
     return _isDerivedUnion;
 }
 
+/*!
+    Adjusts isDerivedUnion to \a isDerivedUnion.
+ */
 void QMofProperty::setDerivedUnion(bool isDerivedUnion)
 {
     // This is a read-write property
@@ -342,6 +394,9 @@ bool QMofProperty::isID() const
     return _isID;
 }
 
+/*!
+    Adjusts isID to \a isID.
+ */
 void QMofProperty::setID(bool isID)
 {
     // This is a read-write property
@@ -354,6 +409,8 @@ void QMofProperty::setID(bool isID)
 
 /*!
     If true, the attribute may only be read, and not written.
+
+    \b {Redefined property(ies):} QMofStructuralFeature::isReadOnly().
  */
 bool QMofProperty::isReadOnly() const
 {
@@ -362,6 +419,9 @@ bool QMofProperty::isReadOnly() const
     return _isReadOnly;
 }
 
+/*!
+    Adjusts isReadOnly to \a isReadOnly.
+ */
 void QMofProperty::setReadOnly(bool isReadOnly)
 {
     // This is a read-write property
@@ -377,6 +437,8 @@ void QMofProperty::setReadOnly(bool isReadOnly)
 
 /*!
     In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end.
+
+    \b {This is a derived property.}
  */
 QMofProperty *QMofProperty::opposite() const
 {
@@ -387,6 +449,9 @@ QMofProperty *QMofProperty::opposite() const
     return 0;
 }
 
+/*!
+    Adjusts opposite to \a opposite.
+ */
 void QMofProperty::setOpposite(QMofProperty *opposite)
 {
     // This is a read-write derived association end
@@ -401,6 +466,10 @@ void QMofProperty::setOpposite(QMofProperty *opposite)
 
 /*!
     References the owning association of this property, if any.
+
+    \b {Subsetted property(ies):} QMofNamedElement::namespace_(), QMofProperty::association(), QMofFeature::featuringClassifiers(), QMofRedefinableElement::redefinitionContexts().
+
+    \b {Opposite property(ies):} QMofAssociation::ownedEnds().
  */
 QMofAssociation *QMofProperty::owningAssociation() const
 {
@@ -409,6 +478,9 @@ QMofAssociation *QMofProperty::owningAssociation() const
     return _owningAssociation;
 }
 
+/*!
+    Adjusts owningAssociation to \a owningAssociation.
+ */
 void QMofProperty::setOwningAssociation(QMofAssociation *owningAssociation)
 {
     // This is a read-write association end
@@ -436,6 +508,10 @@ void QMofProperty::setOwningAssociation(QMofAssociation *owningAssociation)
 
 /*!
     References the properties that are redefined by this property.
+
+    \sa addRedefinedProperty(), removeRedefinedProperty()
+
+    \b {Subsetted property(ies):} QMofRedefinableElement::redefinedElements().
  */
 const QSet<QMofProperty *> QMofProperty::redefinedProperties() const
 {
@@ -444,6 +520,11 @@ const QSet<QMofProperty *> QMofProperty::redefinedProperties() const
     return _redefinedProperties;
 }
 
+/*!
+    Adds \a redefinedProperty to redefinedProperties.
+
+    \sa redefinedProperties(), removeRedefinedProperty()
+ */
 void QMofProperty::addRedefinedProperty(QMofProperty *redefinedProperty)
 {
     // This is a read-write association end
@@ -458,6 +539,11 @@ void QMofProperty::addRedefinedProperty(QMofProperty *redefinedProperty)
     }
 }
 
+/*!
+    Removes \a redefinedProperty from redefinedProperties.
+
+    \sa redefinedProperties(), addRedefinedProperty()
+ */
 void QMofProperty::removeRedefinedProperty(QMofProperty *redefinedProperty)
 {
     // This is a read-write association end
@@ -472,6 +558,8 @@ void QMofProperty::removeRedefinedProperty(QMofProperty *redefinedProperty)
 
 /*!
     References the properties of which this property is constrained to be a subset.
+
+    \sa addSubsettedProperty(), removeSubsettedProperty()
  */
 const QSet<QMofProperty *> QMofProperty::subsettedProperties() const
 {
@@ -480,6 +568,11 @@ const QSet<QMofProperty *> QMofProperty::subsettedProperties() const
     return _subsettedProperties;
 }
 
+/*!
+    Adds \a subsettedProperty to subsettedProperties.
+
+    \sa subsettedProperties(), removeSubsettedProperty()
+ */
 void QMofProperty::addSubsettedProperty(QMofProperty *subsettedProperty)
 {
     // This is a read-write association end
@@ -491,6 +584,11 @@ void QMofProperty::addSubsettedProperty(QMofProperty *subsettedProperty)
     }
 }
 
+/*!
+    Removes \a subsettedProperty from subsettedProperties.
+
+    \sa subsettedProperties(), addSubsettedProperty()
+ */
 void QMofProperty::removeSubsettedProperty(QMofProperty *subsettedProperty)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofproperty.h b/src/mof/qmofproperty.h
index 26c80d7d..9ef42302 100644
--- a/src/mof/qmofproperty.h
+++ b/src/mof/qmofproperty.h
@@ -47,8 +47,6 @@
 
 #include <QtMof/QtMofNamespace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -126,7 +124,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofProperty) *)
 
-QT_END_HEADER
-
 #endif // QMOFPROPERTY_H
 
diff --git a/src/mof/qmofredefinableelement.cpp b/src/mof/qmofredefinableelement.cpp
index 47ea825d..a6d18de9 100644
--- a/src/mof/qmofredefinableelement.cpp
+++ b/src/mof/qmofredefinableelement.cpp
@@ -54,12 +54,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A redefinable element is an element that, when defined in the context of a classifier, can be redefined more specifically or differently in the context of another classifier that specializes (directly or indirectly) the context classifier.
+
+    \b {QMofRedefinableElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofRedefinableElement.
+*/
 QMofRedefinableElement::QMofRedefinableElement() :
     _isLeaf(false)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofRedefinableElement.
+*/
 QModelingElement *QMofRedefinableElement::clone() const
 {
     QMofRedefinableElement *c = new QMofRedefinableElement;
@@ -83,6 +92,9 @@ bool QMofRedefinableElement::isLeaf() const
     return _isLeaf;
 }
 
+/*!
+    Adjusts isLeaf to \a isLeaf.
+ */
 void QMofRedefinableElement::setLeaf(bool isLeaf)
 {
     // This is a read-write property
@@ -95,6 +107,8 @@ void QMofRedefinableElement::setLeaf(bool isLeaf)
 
 /*!
     The redefinable element that is being redefined by this element.
+
+    \b {This is a read-only derived union property.}
  */
 const QSet<QMofRedefinableElement *> QMofRedefinableElement::redefinedElements() const
 {
@@ -103,6 +117,11 @@ const QSet<QMofRedefinableElement *> QMofRedefinableElement::redefinedElements()
     return _redefinedElements;
 }
 
+/*!
+    Adds \a redefinedElement to redefinedElements.
+
+    \sa redefinedElements(), removeRedefinedElement()
+ */
 void QMofRedefinableElement::addRedefinedElement(QMofRedefinableElement *redefinedElement)
 {
     // This is a read-only derived union association end
@@ -114,6 +133,11 @@ void QMofRedefinableElement::addRedefinedElement(QMofRedefinableElement *redefin
     }
 }
 
+/*!
+    Removes \a redefinedElement from redefinedElements.
+
+    \sa redefinedElements(), addRedefinedElement()
+ */
 void QMofRedefinableElement::removeRedefinedElement(QMofRedefinableElement *redefinedElement)
 {
     // This is a read-only derived union association end
@@ -125,6 +149,8 @@ void QMofRedefinableElement::removeRedefinedElement(QMofRedefinableElement *rede
 
 /*!
     References the contexts that this element may be redefined from.
+
+    \b {This is a read-only derived union property.}
  */
 const QSet<QMofClassifier *> QMofRedefinableElement::redefinitionContexts() const
 {
@@ -133,6 +159,11 @@ const QSet<QMofClassifier *> QMofRedefinableElement::redefinitionContexts() cons
     return _redefinitionContexts;
 }
 
+/*!
+    Adds \a redefinitionContext to redefinitionContexts.
+
+    \sa redefinitionContexts(), removeRedefinitionContext()
+ */
 void QMofRedefinableElement::addRedefinitionContext(QMofClassifier *redefinitionContext)
 {
     // This is a read-only derived union association end
@@ -144,6 +175,11 @@ void QMofRedefinableElement::addRedefinitionContext(QMofClassifier *redefinition
     }
 }
 
+/*!
+    Removes \a redefinitionContext from redefinitionContexts.
+
+    \sa redefinitionContexts(), addRedefinitionContext()
+ */
 void QMofRedefinableElement::removeRedefinitionContext(QMofClassifier *redefinitionContext)
 {
     // This is a read-only derived union association end
diff --git a/src/mof/qmofredefinableelement.h b/src/mof/qmofredefinableelement.h
index d1a07ddb..2c49ea01 100644
--- a/src/mof/qmofredefinableelement.h
+++ b/src/mof/qmofredefinableelement.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofNamedElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -84,7 +82,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofRedefinableElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFREDEFINABLEELEMENT_H
 
diff --git a/src/mof/qmofreflectivecollection.cpp b/src/mof/qmofreflectivecollection.cpp
index 9b0020b6..3bf23d3c 100644
--- a/src/mof/qmofreflectivecollection.cpp
+++ b/src/mof/qmofreflectivecollection.cpp
@@ -44,11 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofReflectiveCollection
-
-    \inmodule QtMof
- */
 QMofReflectiveCollection::QMofReflectiveCollection(bool createQModelingObject) :
     QMofObject(false)
 {
diff --git a/src/mof/qmofreflectivecollection.h b/src/mof/qmofreflectivecollection.h
index dc3278e8..a923709a 100644
--- a/src/mof/qmofreflectivecollection.h
+++ b/src/mof/qmofreflectivecollection.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -73,7 +71,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofReflectiveCollection) *)
 
-QT_END_HEADER
-
 #endif // QMOFREFLECTIVECOLLECTION_H
 
diff --git a/src/mof/qmofreflectivesequence.cpp b/src/mof/qmofreflectivesequence.cpp
index 0f602194..af8d79ba 100644
--- a/src/mof/qmofreflectivesequence.cpp
+++ b/src/mof/qmofreflectivesequence.cpp
@@ -46,11 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofReflectiveSequence
-
-    \inmodule QtMof
- */
 QMofReflectiveSequence::QMofReflectiveSequence(bool createQModelingObject) :
     QMofReflectiveCollection(false)
 {
diff --git a/src/mof/qmofreflectivesequence.h b/src/mof/qmofreflectivesequence.h
index b3b2b1be..cfdbcfd5 100644
--- a/src/mof/qmofreflectivesequence.h
+++ b/src/mof/qmofreflectivesequence.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofReflectiveCollection>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -74,7 +72,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofReflectiveSequence) *)
 
-QT_END_HEADER
-
 #endif // QMOFREFLECTIVESEQUENCE_H
 
diff --git a/src/mof/qmofrelationship.cpp b/src/mof/qmofrelationship.cpp
index 77e37252..ea95b44c 100644
--- a/src/mof/qmofrelationship.cpp
+++ b/src/mof/qmofrelationship.cpp
@@ -51,11 +51,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief Relationship is an abstract concept that specifies some kind of relationship between elements.
+
+    \b {QMofRelationship is an abstract class.}
  */
+
+/*!
+    Creates a new QMofRelationship.
+*/
 QMofRelationship::QMofRelationship()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofRelationship.
+*/
 QModelingElement *QMofRelationship::clone() const
 {
     QMofRelationship *c = new QMofRelationship;
@@ -68,6 +77,8 @@ QModelingElement *QMofRelationship::clone() const
 
 /*!
     Specifies the elements related by the Relationship.
+
+    \b {This is a read-only derived union property.}
  */
 const QSet<QMofElement *> QMofRelationship::relatedElements() const
 {
@@ -76,6 +87,11 @@ const QSet<QMofElement *> QMofRelationship::relatedElements() const
     return _relatedElements;
 }
 
+/*!
+    Adds \a relatedElement to relatedElements.
+
+    \sa relatedElements(), removeRelatedElement()
+ */
 void QMofRelationship::addRelatedElement(QMofElement *relatedElement)
 {
     // This is a read-only derived union association end
@@ -87,6 +103,11 @@ void QMofRelationship::addRelatedElement(QMofElement *relatedElement)
     }
 }
 
+/*!
+    Removes \a relatedElement from relatedElements.
+
+    \sa relatedElements(), addRelatedElement()
+ */
 void QMofRelationship::removeRelatedElement(QMofElement *relatedElement)
 {
     // This is a read-only derived union association end
diff --git a/src/mof/qmofrelationship.h b/src/mof/qmofrelationship.h
index 54402565..dfa57276 100644
--- a/src/mof/qmofrelationship.h
+++ b/src/mof/qmofrelationship.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -71,7 +69,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofRelationship) *)
 
-QT_END_HEADER
-
 #endif // QMOFRELATIONSHIP_H
 
diff --git a/src/mof/qmofslot.cpp b/src/mof/qmofslot.cpp
index 4f6e0c55..90f81525 100644
--- a/src/mof/qmofslot.cpp
+++ b/src/mof/qmofslot.cpp
@@ -57,6 +57,10 @@ QT_BEGIN_NAMESPACE
 
     \brief A slot specifies that an entity modeled by an instance specification has a value or values for a specific structural feature.
  */
+
+/*!
+    Creates a new QMofSlot. Also creates the corresponding QObject-based representation returned by asQModelingObject() if \a createQModelingObject is true.
+*/
 QMofSlot::QMofSlot(bool createQModelingObject) :
     _definingFeature(0),
     _owningInstance(0)
@@ -65,6 +69,9 @@ QMofSlot::QMofSlot(bool createQModelingObject) :
         _qModelingObject = qobject_cast<QModelingObject *>(new QMofSlotObject(this));
 }
 
+/*!
+    Returns a deep-copied clone of the QMofSlot.
+*/
 QModelingElement *QMofSlot::clone() const
 {
     QMofSlot *c = new QMofSlot;
@@ -91,6 +98,9 @@ QMofStructuralFeature *QMofSlot::definingFeature() const
     return _definingFeature;
 }
 
+/*!
+    Adjusts definingFeature to \a definingFeature.
+ */
 void QMofSlot::setDefiningFeature(QMofStructuralFeature *definingFeature)
 {
     // This is a read-write association end
@@ -104,6 +114,10 @@ void QMofSlot::setDefiningFeature(QMofStructuralFeature *definingFeature)
 
 /*!
     The instance specification that owns this slot.
+
+    \b {Subsetted property(ies):} QMofElement::owner().
+
+    \b {Opposite property(ies):} QMofInstanceSpecification::slots_().
  */
 QMofInstanceSpecification *QMofSlot::owningInstance() const
 {
@@ -112,6 +126,9 @@ QMofInstanceSpecification *QMofSlot::owningInstance() const
     return _owningInstance;
 }
 
+/*!
+    Adjusts owningInstance to \a owningInstance.
+ */
 void QMofSlot::setOwningInstance(QMofInstanceSpecification *owningInstance)
 {
     // This is a read-write association end
@@ -130,6 +147,10 @@ void QMofSlot::setOwningInstance(QMofInstanceSpecification *owningInstance)
 
 /*!
     The value or values corresponding to the defining feature for the owning instance specification.
+
+    \sa addValue(), removeValue()
+
+    \b {Subsetted property(ies):} QMofElement::ownedElements().
  */
 const QList<QMofValueSpecification *> QMofSlot::values() const
 {
@@ -138,6 +159,11 @@ const QList<QMofValueSpecification *> QMofSlot::values() const
     return _values;
 }
 
+/*!
+    Adds \a value to values.
+
+    \sa values(), removeValue()
+ */
 void QMofSlot::addValue(QMofValueSpecification *value)
 {
     // This is a read-write association end
@@ -153,6 +179,11 @@ void QMofSlot::addValue(QMofValueSpecification *value)
     }
 }
 
+/*!
+    Removes \a value from values.
+
+    \sa values(), addValue()
+ */
 void QMofSlot::removeValue(QMofValueSpecification *value)
 {
     // This is a read-write association end
diff --git a/src/mof/qmofslot.h b/src/mof/qmofslot.h
index e0520bca..82c08aa2 100644
--- a/src/mof/qmofslot.h
+++ b/src/mof/qmofslot.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -81,7 +79,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofSlot) *)
 
-QT_END_HEADER
-
 #endif // QMOFSLOT_H
 
diff --git a/src/mof/qmofstructuralfeature.cpp b/src/mof/qmofstructuralfeature.cpp
index 6878771c..1a3ef007 100644
--- a/src/mof/qmofstructuralfeature.cpp
+++ b/src/mof/qmofstructuralfeature.cpp
@@ -58,12 +58,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the collection of values associated with an instantiation of the structural feature.
+
+    \b {QMofStructuralFeature is an abstract class.}
  */
+
+/*!
+    Creates a new QMofStructuralFeature.
+*/
 QMofStructuralFeature::QMofStructuralFeature() :
     _isReadOnly(false)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofStructuralFeature.
+*/
 QModelingElement *QMofStructuralFeature::clone() const
 {
     QMofStructuralFeature *c = new QMofStructuralFeature;
@@ -97,6 +106,9 @@ bool QMofStructuralFeature::isReadOnly() const
     return _isReadOnly;
 }
 
+/*!
+    Adjusts isReadOnly to \a isReadOnly.
+ */
 void QMofStructuralFeature::setReadOnly(bool isReadOnly)
 {
     // This is a read-write property
diff --git a/src/mof/qmofstructuralfeature.h b/src/mof/qmofstructuralfeature.h
index 4f65010c..dfb0adee 100644
--- a/src/mof/qmofstructuralfeature.h
+++ b/src/mof/qmofstructuralfeature.h
@@ -47,8 +47,6 @@
 #include <QtMof/QMofTypedElement>
 #include <QtMof/QMofMultiplicityElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -72,7 +70,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofStructuralFeature) *)
 
-QT_END_HEADER
-
 #endif // QMOFSTRUCTURALFEATURE_H
 
diff --git a/src/mof/qmoftag.cpp b/src/mof/qmoftag.cpp
index 49bdabd2..03ddaa0a 100644
--- a/src/mof/qmoftag.cpp
+++ b/src/mof/qmoftag.cpp
@@ -44,11 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofTag
-
-    \inmodule QtMof
- */
 QMofTag::QMofTag(bool createQModelingObject) :
     _tagOwner(0)
 {
@@ -70,7 +65,6 @@ QModelingElement *QMofTag::clone() const
 
 // OWNED ATTRIBUTES
 
-
 QString QMofTag::name() const
 {
     // This is a read-write property
@@ -87,7 +81,6 @@ void QMofTag::setName(QString name)
     }
 }
 
-
 QString QMofTag::value() const
 {
     // This is a read-write property
@@ -104,14 +97,12 @@ void QMofTag::setValue(QString value)
     }
 }
 
-
 const QSet<QMofElement *> QMofTag::elements() const
 {
     // This is a read-write property
 
     return _elements;
 }
-
 void QMofTag::addElement(QMofElement *element)
 {
     // This is a read-write property
@@ -122,7 +113,6 @@ void QMofTag::addElement(QMofElement *element)
             QObject::connect(element->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeElement(QObject *)));
     }
 }
-
 void QMofTag::removeElement(QMofElement *element)
 {
     // This is a read-write property
@@ -132,7 +122,6 @@ void QMofTag::removeElement(QMofElement *element)
     }
 }
 
-
 QMofElement *QMofTag::tagOwner() const
 {
     // This is a read-write property
diff --git a/src/mof/qmoftag.h b/src/mof/qmoftag.h
index 6e2d045b..76017056 100644
--- a/src/mof/qmoftag.h
+++ b/src/mof/qmoftag.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -80,7 +78,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofTag) *)
 
-QT_END_HEADER
-
 #endif // QMOFTAG_H
 
diff --git a/src/mof/qmoftype.cpp b/src/mof/qmoftype.cpp
index e6ed500e..99ea1eb1 100644
--- a/src/mof/qmoftype.cpp
+++ b/src/mof/qmoftype.cpp
@@ -56,12 +56,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A type constrains the values represented by a typed element.
+
+    \b {QMofType is an abstract class.}
  */
+
+/*!
+    Creates a new QMofType.
+*/
 QMofType::QMofType() :
     _package(0)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofType.
+*/
 QModelingElement *QMofType::clone() const
 {
     QMofType *c = new QMofType;
@@ -78,6 +87,10 @@ QModelingElement *QMofType::clone() const
 
 /*!
     Specifies the owning package of this classifier, if any.
+
+    \b {Subsetted property(ies):} .
+
+    \b {Opposite property(ies):} QMofPackage::ownedTypes().
  */
 QMofPackage *QMofType::package() const
 {
@@ -86,6 +99,9 @@ QMofPackage *QMofType::package() const
     return _package;
 }
 
+/*!
+    Adjusts package to \a package.
+ */
 void QMofType::setPackage(QMofPackage *package)
 {
     // This is a read-write association end
diff --git a/src/mof/qmoftype.h b/src/mof/qmoftype.h
index 5c9c578f..34a85445 100644
--- a/src/mof/qmoftype.h
+++ b/src/mof/qmoftype.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofPackageableElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -77,7 +75,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofType) *)
 
-QT_END_HEADER
-
 #endif // QMOFTYPE_H
 
diff --git a/src/mof/qmoftypedelement.cpp b/src/mof/qmoftypedelement.cpp
index 8cd2a80f..6298452e 100644
--- a/src/mof/qmoftypedelement.cpp
+++ b/src/mof/qmoftypedelement.cpp
@@ -54,12 +54,21 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A typed element has a type.
+
+    \b {QMofTypedElement is an abstract class.}
  */
+
+/*!
+    Creates a new QMofTypedElement.
+*/
 QMofTypedElement::QMofTypedElement() :
     _type(0)
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofTypedElement.
+*/
 QModelingElement *QMofTypedElement::clone() const
 {
     QMofTypedElement *c = new QMofTypedElement;
@@ -84,6 +93,9 @@ QMofType *QMofTypedElement::type() const
     return _type;
 }
 
+/*!
+    Adjusts type to \a type.
+ */
 void QMofTypedElement::setType(QMofType *type)
 {
     // This is a read-write association end
diff --git a/src/mof/qmoftypedelement.h b/src/mof/qmoftypedelement.h
index 4075e33a..3614c82e 100644
--- a/src/mof/qmoftypedelement.h
+++ b/src/mof/qmoftypedelement.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofNamedElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -72,7 +70,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofTypedElement) *)
 
-QT_END_HEADER
-
 #endif // QMOFTYPEDELEMENT_H
 
diff --git a/src/mof/qmofuriextent.cpp b/src/mof/qmofuriextent.cpp
index 40c1eb83..ae8787a1 100644
--- a/src/mof/qmofuriextent.cpp
+++ b/src/mof/qmofuriextent.cpp
@@ -46,11 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*!
-    \class QMofURIExtent
-
-    \inmodule QtMof
- */
 QMofURIExtent::QMofURIExtent(bool createQModelingObject) :
     QMofExtent(false)
 {
diff --git a/src/mof/qmofuriextent.h b/src/mof/qmofuriextent.h
index 7bc681c4..f7ae8f69 100644
--- a/src/mof/qmofuriextent.h
+++ b/src/mof/qmofuriextent.h
@@ -45,8 +45,6 @@
 
 #include <QtMof/QMofExtent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -73,7 +71,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofURIExtent) *)
 
-QT_END_HEADER
-
 #endif // QMOFURIEXTENT_H
 
diff --git a/src/mof/qmofvaluespecification.cpp b/src/mof/qmofvaluespecification.cpp
index 7c6a7f0e..a9f85815 100644
--- a/src/mof/qmofvaluespecification.cpp
+++ b/src/mof/qmofvaluespecification.cpp
@@ -55,11 +55,20 @@ QT_BEGIN_NAMESPACE
     \inmodule QtMof
 
     \brief A value specification is the specification of a (possibly empty) set of instances, including both objects and data values.
+
+    \b {QMofValueSpecification is an abstract class.}
  */
+
+/*!
+    Creates a new QMofValueSpecification.
+*/
 QMofValueSpecification::QMofValueSpecification()
 {
 }
 
+/*!
+    Returns a deep-copied clone of the QMofValueSpecification.
+*/
 QModelingElement *QMofValueSpecification::clone() const
 {
     QMofValueSpecification *c = new QMofValueSpecification;
diff --git a/src/mof/qmofvaluespecification.h b/src/mof/qmofvaluespecification.h
index d86d58f2..a44166b9 100644
--- a/src/mof/qmofvaluespecification.h
+++ b/src/mof/qmofvaluespecification.h
@@ -46,8 +46,6 @@
 #include <QtMof/QMofPackageableElement>
 #include <QtMof/QMofTypedElement>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -76,7 +74,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QMofValueSpecification) *)
 
-QT_END_HEADER
-
 #endif // QMOFVALUESPECIFICATION_H
 
diff --git a/src/mof/qtmofnamespace.h b/src/mof/qtmofnamespace.h
index 1c0684fb..8ac1fd68 100644
--- a/src/mof/qtmofnamespace.h
+++ b/src/mof/qtmofnamespace.h
@@ -45,8 +45,6 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtMof)
@@ -85,7 +83,5 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QTMOFNAMESPACE_H
 
diff --git a/src/saduseprofile/qtsaduseprofileglobal.h b/src/saduseprofile/qtsaduseprofileglobal.h
index f8b3e2cd..bd73f909 100644
--- a/src/saduseprofile/qtsaduseprofileglobal.h
+++ b/src/saduseprofile/qtsaduseprofileglobal.h
@@ -48,9 +48,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 
-Q_DECLARE_METATYPE(QList<QString> *)
-Q_DECLARE_METATYPE(QSet<QString> *)
-
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
diff --git a/src/uml/doc/qtuml.qdocconf b/src/uml/doc/qtuml.qdocconf
index 36e76686..03c0553d 100644
--- a/src/uml/doc/qtuml.qdocconf
+++ b/src/uml/doc/qtuml.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtUml
-description             = Qt UML Reference Documentation
+description             = Qt Uml Reference Documentation
 url                     = http://qt-project.org/doc/qt-$QT_VER
 version                 = $QT_VERSION
 
@@ -12,7 +12,7 @@ qhp.projects            = QtUml
 qhp.QtUml.file            = qtuml.qhp
 qhp.QtUml.namespace           = org.qt-project.qtuml.$QT_VERSION_TAG
 qhp.QtUml.virtualFolder       = qtuml
-qhp.QtUml.indexTitle          = Qt UML
+qhp.QtUml.indexTitle          = Qt Uml
 qhp.QtUml.indexRoot           =
 
 qhp.QtUml.filterAttributes    = qtuml $QT_VERSION qtrefdoc
@@ -21,7 +21,7 @@ qhp.QtUml.customFilters.Qt.filterAttributes = qtuml $QT_VERSION
 
 qhp.QtUml.subprojects         = classes
 qhp.QtUml.subprojects.classes.title = C++ Classes
-qhp.QtUml.subprojects.classes.indexTitle = Qt UML C++ Classes
+qhp.QtUml.subprojects.classes.indexTitle = Qt Uml C++ Classes
 qhp.QtUml.subprojects.classes.selectors = class fake:headerfile
 qhp.QtUml.subprojects.classes.sortPages = true
 tagfile                 = ../../../doc/qtuml/qtuml.tags
@@ -39,3 +39,7 @@ exampledirs += ../../../examples/uml \
 
 imagedirs   += images \
                ../../../examples/uml/doc/images
+
+
+navigation.landingpage = "Qt Uml"
+navigation.cppclassespage = "Qt Uml C++ Classes"
diff --git a/src/uml/doc/src/qtuml.qdoc b/src/uml/doc/src/qtuml.qdoc
index 01d6d5c8..e20c8ce5 100644
--- a/src/uml/doc/src/qtuml.qdoc
+++ b/src/uml/doc/src/qtuml.qdoc
@@ -26,17 +26,17 @@
 ****************************************************************************/
 /*!
     \page qtuml-index.html
-    \title Qt UML
+    \title Qt Uml
     \brief Implements the OMG's Unified Modeling Language (UML) standard.
 
     Qt Uml is an add-on module which implements the OMG's Unified Modeling Language (UML) metamodel.
 
     \section1 Getting Started
-    To enable Qt UML in a project, add this directive into the C++ files:
+    To enable Qt Uml in a project, add this directive into the C++ files:
     \code
     #include <QtUml>
     \endcode
-    To link against the Qt UML module, add this line to the project file:
+    To link against the Qt Uml module, add this line to the project file:
     \code
     QT += uml
     \endcode
@@ -44,13 +44,13 @@
     \section1 Reference
     These are links to the API reference materials.
     \list
-    \li \l{Qt UML Module C++ Classes}{C++ classes}
+    \li \l{Qt Uml C++ Classes}{C++ classes}
     \endlist
 */
 
 /*!
     \module QtUml
-    \title Qt UML Module C++ Classes
+    \title Qt Uml C++ Classes
     \ingroup modules
     \brief Implements the OMG's Unified Modeling Language (UML) standard.
author	Sandro S. Andrade <sandroandrade@kde.org>	2013-11-24 05:26:24 -0300
committer	Sandro S. Andrade <sandroandrade@kde.org>	2013-11-24 09:22:31 +0100
commit	1b2df2c79004e93a5bab937d9cac32f7621a6c0e (patch)
tree	cf6efa06d89078c5bde44c3d2c93080e0447f859
parent	c0607c35be4b405eee7aa8a5311715e0ae1cd466 (diff)