Change QModelingObjectPropertyModel to show "to be implemented"

When implementing derived properties/operations the Q_TODO
tag should also be removed in the corresponding *object_p.h
file.

Change-Id: I4c81d5754b5289778957d0c2912fe2dd92479387
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

37 files changed, 378 insertions, 360 deletions

diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl
index 23463ce2..1db78b48 100644
--- a/scripts/templates/common.tmpl
+++ b/scripts/templates/common.tmpl
@@ -135,6 +135,8 @@ ${attributeName}
 [%- SET found = "false" -%]
 [%- SET className = class.findvalue("@name") -%]
 [%- FOREACH attribute IN attributes -%]
+    [%- SET derived = attribute.findvalue("@isDerived") -%]
+    [%- SET derivedUnion = attribute.findvalue("@isDerivedUnion") -%]
     [%- IF found == "false" %]
 
     // Owned attributes [${className}]
@@ -144,11 +146,11 @@ ${attributeName}
     [%- NEXT IF redefinedProperties.grep("^${className}-${qtAttribute}$").size > 0 -%]
     [%- SET qtType = QT_TYPE(namespace, attribute, "false") -%]
     [%- IF qtType.match("QList|QSet") %]
-    Q_INVOKABLE const ${qtType}${PLURALFORM(qtAttribute, attribute)}() const;
+    [% IF derived == "true" && (derivedUnion == "false" || derivedUnion == "") %]Q_TODO [% END %]Q_INVOKABLE const ${qtType}${PLURALFORM(qtAttribute, attribute)}() const;
     [%- ELSIF qtType.match('\*$') %]
-    Q_INVOKABLE ${qtType}${qtAttribute}() const;
+    [% IF derived == "true" && (derivedUnion == "false" || derivedUnion == "") %]Q_TODO [% END %]Q_INVOKABLE ${qtType}${qtAttribute}() const;
     [%- ELSE %]
-    Q_INVOKABLE ${qtType}${qtAttribute}() const;
+    [% IF derived == "true" && (derivedUnion == "false" || derivedUnion == "") %]Q_TODO [% END %]Q_INVOKABLE ${qtType}${qtAttribute}() const;
     [%- END %]
     [%- IF loop.last %]
     [%- END %]
@@ -174,7 +176,7 @@ ${attributeName}
 [%- NEXT IF redefinedOperations.grep("^${className}-${operationName}$").size > 0 -%]
 [%- SET qtType = QT_TYPE(namespace, operation.findnodes("ownedParameter[@direction='return']"), "false") -%]
 
-    Q_INVOKABLE [%- IF qtType != " " -%]${qtType}[%- ELSE -%]void [%- END -%]
+    Q_TODO Q_INVOKABLE [%- IF qtType != " " -%]${qtType}[%- ELSE -%]void [%- END -%]
 [%- IF uml2qt_attribute.item(operationName) != "" -%]${uml2qt_attribute.item(operationName)}[%- ELSE -%]${operationName}[%- END -%](
     [%- FOREACH parameter = operation.findnodes("ownedParameter[@direction!='return']") -%]
         [%- QT_TYPE(namespace, parameter, "false") -%]
diff --git a/src/modeling/qmodelingobject.h b/src/modeling/qmodelingobject.h
index 01244ece..d6e3cf56 100644
--- a/src/modeling/qmodelingobject.h
+++ b/src/modeling/qmodelingobject.h
@@ -47,6 +47,10 @@
 
 #include <QtCore/QMetaProperty>
 
+#ifndef Q_MOC_RUN
+    #define Q_TODO
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtModeling)
diff --git a/src/modelingwidgets/qmodelingobjectpropertymodel.cpp b/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
index 2ba655f5..b73d6ee7 100644
--- a/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
+++ b/src/modelingwidgets/qmodelingobjectpropertymodel.cpp
@@ -184,6 +184,12 @@ QVariant QModelingObjectPropertyModel::data(const QModelIndex &index, int role)
                     if (index.parent().row() != -1 && metaProperty->isValid()) {
                         QString typeName = QString::fromLatin1(metaProperty->typeName());
                         QVariant variant = metaProperty->read(d->modelingObject);
+                        int methodIndex = d->modelingMetaObject->indexOfMethod(QStringLiteral("%1()").arg(QString::fromLatin1(metaProperty->name())).toLatin1());
+                        if (methodIndex != -1) {
+                            if (QString::fromLatin1(d->modelingMetaObject->method(methodIndex).tag()) == QStringLiteral("Q_TODO")) {
+                                return QStringLiteral("<to be implemented>");
+                            }
+                        }
                         if (metaProperty->isEnumType())
                             return QString::fromLatin1(metaProperty->enumerator().valueToKey(variant.toInt())).remove(QString::fromLatin1(metaProperty->typeName()).split(':').last()).toLower();
                         else if (metaProperty->type() == QVariant::Bool || metaProperty->type() == QVariant::String || metaProperty->type() == QVariant::Int) {
@@ -267,6 +273,12 @@ QVariant QModelingObjectPropertyModel::data(const QModelIndex &index, int role)
                 font.setBold(true);
                 return font;
             }
+            int methodIndex = d->modelingMetaObject->indexOfMethod(QStringLiteral("%1()").arg(QString::fromLatin1(metaProperty->name())).toLatin1());
+            if (methodIndex != -1) {
+                if (QString::fromLatin1(d->modelingMetaObject->method(methodIndex).tag()) == QStringLiteral("Q_TODO")) {
+                    font.setItalic(true);
+                }
+            }
             if (metaProperty->isValid() && index.column() == 0 && metaProperty->isResettable())
                 font.setBold(d->modelingObject->isPropertyModified(*metaProperty));
             if (metaProperty->isValid() && index.column() == 0)
diff --git a/src/mof/qobjects/qmofassociationobject_p.h b/src/mof/qobjects/qmofassociationobject_p.h
index d2939adb..bab0f883 100644
--- a/src/mof/qobjects/qmofassociationobject_p.h
+++ b/src/mof/qobjects/qmofassociationobject_p.h
@@ -146,15 +146,15 @@ public:
     // Owned attributes [Classifier]
     Q_INVOKABLE const QSet<QObject *> attributes() const;
     Q_INVOKABLE const QSet<QObject *> features() const;
-    Q_INVOKABLE const QSet<QObject *> generals() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const;
     Q_INVOKABLE const QSet<QObject *> generalizations() const;
-    Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
     Q_INVOKABLE bool isAbstract() const;
     Q_INVOKABLE bool isFinalSpecialization() const;
     Q_INVOKABLE const QSet<QObject *> redefinedClassifiers() const;
 
     // Owned attributes [Association]
-    Q_INVOKABLE const QList<QObject *> endTypes() const;
+    Q_TODO Q_INVOKABLE const QList<QObject *> endTypes() const;
     Q_INVOKABLE bool isDerived() const;
     Q_INVOKABLE const QList<QObject *> memberEnds() const;
     Q_INVOKABLE const QSet<QObject *> navigableOwnedEnds() const;
@@ -163,38 +163,38 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Type]
-    Q_INVOKABLE bool isInstance(QObject *object) const;
+    Q_TODO Q_INVOKABLE bool isInstance(QObject *object) const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Classifier]
-    Q_INVOKABLE QSet<QObject *> allFeatures() const;
-    Q_INVOKABLE QSet<QObject *> allParents() const;
-    Q_INVOKABLE bool conformsTo(QObject *other) const;
-    Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
-    Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
-    Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
-    Q_INVOKABLE bool maySpecializeType(QObject *c) const;
-    Q_INVOKABLE QSet<QObject *> parents() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const;
+    Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const;
+    Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
+    Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> parents() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofclassobject_p.h b/src/mof/qobjects/qmofclassobject_p.h
index b3acbd66..5bcfd37e 100644
--- a/src/mof/qobjects/qmofclassobject_p.h
+++ b/src/mof/qobjects/qmofclassobject_p.h
@@ -139,7 +139,7 @@ public:
     Q_INVOKABLE const QSet<QObject *> attributes() const;
     Q_INVOKABLE const QSet<QObject *> features() const;
     Q_INVOKABLE const QSet<QObject *> generalizations() const;
-    Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
     Q_INVOKABLE bool isFinalSpecialization() const;
     Q_INVOKABLE const QSet<QObject *> redefinedClassifiers() const;
 
@@ -148,45 +148,45 @@ public:
     Q_INVOKABLE const QList<QObject *> nestedClassifiers() const;
     Q_INVOKABLE const QList<QObject *> ownedAttributes() const;
     Q_INVOKABLE const QList<QObject *> ownedOperations() const;
-    Q_INVOKABLE const QSet<QObject *> superClasses() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const;
 
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Type]
-    Q_INVOKABLE bool isInstance(QObject *object) const;
+    Q_TODO Q_INVOKABLE bool isInstance(QObject *object) const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Classifier]
-    Q_INVOKABLE QSet<QObject *> allFeatures() const;
-    Q_INVOKABLE QSet<QObject *> allParents() const;
-    Q_INVOKABLE bool conformsTo(QObject *other) const;
-    Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
-    Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
-    Q_INVOKABLE bool maySpecializeType(QObject *c) const;
-    Q_INVOKABLE QSet<QObject *> parents() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const;
+    Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const;
+    Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
+    Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> parents() const;
 
     // Operations [Class]
-    Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofcommentobject_p.h b/src/mof/qobjects/qmofcommentobject_p.h
index 28633329..3473dcbf 100644
--- a/src/mof/qobjects/qmofcommentobject_p.h
+++ b/src/mof/qobjects/qmofcommentobject_p.h
@@ -81,10 +81,10 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofconstraintobject_p.h b/src/mof/qobjects/qmofconstraintobject_p.h
index 3828d588..c4769daf 100644
--- a/src/mof/qobjects/qmofconstraintobject_p.h
+++ b/src/mof/qobjects/qmofconstraintobject_p.h
@@ -101,14 +101,14 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
 public Q_SLOTS:
diff --git a/src/mof/qobjects/qmofdatatypeobject_p.h b/src/mof/qobjects/qmofdatatypeobject_p.h
index 2082ccc0..50f2e585 100644
--- a/src/mof/qobjects/qmofdatatypeobject_p.h
+++ b/src/mof/qobjects/qmofdatatypeobject_p.h
@@ -137,9 +137,9 @@ public:
     // Owned attributes [Classifier]
     Q_INVOKABLE const QSet<QObject *> attributes() const;
     Q_INVOKABLE const QSet<QObject *> features() const;
-    Q_INVOKABLE const QSet<QObject *> generals() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const;
     Q_INVOKABLE const QSet<QObject *> generalizations() const;
-    Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
     Q_INVOKABLE bool isAbstract() const;
     Q_INVOKABLE bool isFinalSpecialization() const;
     Q_INVOKABLE const QSet<QObject *> redefinedClassifiers() const;
@@ -151,40 +151,40 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Type]
-    Q_INVOKABLE bool isInstance(QObject *object) const;
+    Q_TODO Q_INVOKABLE bool isInstance(QObject *object) const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Classifier]
-    Q_INVOKABLE QSet<QObject *> allFeatures() const;
-    Q_INVOKABLE QSet<QObject *> allParents() const;
-    Q_INVOKABLE bool conformsTo(QObject *other) const;
-    Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
-    Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
-    Q_INVOKABLE bool maySpecializeType(QObject *c) const;
-    Q_INVOKABLE QSet<QObject *> parents() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const;
+    Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const;
+    Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
+    Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> parents() const;
 
     // Operations [DataType]
-    Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofelementimportobject_p.h b/src/mof/qobjects/qmofelementimportobject_p.h
index b5267c1a..9eb7faa5 100644
--- a/src/mof/qobjects/qmofelementimportobject_p.h
+++ b/src/mof/qobjects/qmofelementimportobject_p.h
@@ -101,13 +101,13 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [ElementImport]
-    Q_INVOKABLE QString getName() const;
+    Q_TODO Q_INVOKABLE QString getName() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofenumerationliteralobject_p.h b/src/mof/qobjects/qmofenumerationliteralobject_p.h
index f5e0fd2a..8688a50a 100644
--- a/src/mof/qobjects/qmofenumerationliteralobject_p.h
+++ b/src/mof/qobjects/qmofenumerationliteralobject_p.h
@@ -101,20 +101,20 @@ public:
     Q_INVOKABLE QObject *specification() const;
 
     // Owned attributes [EnumerationLiteral]
-    Q_INVOKABLE QObject *classifier() const;
+    Q_TODO Q_INVOKABLE QObject *classifier() const;
     Q_INVOKABLE QObject *enumeration() const;
 
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
 public Q_SLOTS:
diff --git a/src/mof/qobjects/qmofenumerationobject_p.h b/src/mof/qobjects/qmofenumerationobject_p.h
index f55f8144..2211a67c 100644
--- a/src/mof/qobjects/qmofenumerationobject_p.h
+++ b/src/mof/qobjects/qmofenumerationobject_p.h
@@ -140,9 +140,9 @@ public:
     // Owned attributes [Classifier]
     Q_INVOKABLE const QSet<QObject *> attributes() const;
     Q_INVOKABLE const QSet<QObject *> features() const;
-    Q_INVOKABLE const QSet<QObject *> generals() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const;
     Q_INVOKABLE const QSet<QObject *> generalizations() const;
-    Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
     Q_INVOKABLE bool isAbstract() const;
     Q_INVOKABLE bool isFinalSpecialization() const;
     Q_INVOKABLE const QSet<QObject *> redefinedClassifiers() const;
@@ -157,40 +157,40 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Type]
-    Q_INVOKABLE bool isInstance(QObject *object) const;
+    Q_TODO Q_INVOKABLE bool isInstance(QObject *object) const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Classifier]
-    Q_INVOKABLE QSet<QObject *> allFeatures() const;
-    Q_INVOKABLE QSet<QObject *> allParents() const;
-    Q_INVOKABLE bool conformsTo(QObject *other) const;
-    Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
-    Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
-    Q_INVOKABLE bool maySpecializeType(QObject *c) const;
-    Q_INVOKABLE QSet<QObject *> parents() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const;
+    Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const;
+    Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
+    Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> parents() const;
 
     // Operations [DataType]
-    Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofexpressionobject_p.h b/src/mof/qobjects/qmofexpressionobject_p.h
index 96851d2a..c857c19f 100644
--- a/src/mof/qobjects/qmofexpressionobject_p.h
+++ b/src/mof/qobjects/qmofexpressionobject_p.h
@@ -105,24 +105,24 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofextentobject_p.h b/src/mof/qobjects/qmofextentobject_p.h
index 5bc47a3a..059c9f53 100644
--- a/src/mof/qobjects/qmofextentobject_p.h
+++ b/src/mof/qobjects/qmofextentobject_p.h
@@ -61,12 +61,12 @@ public:
     Q_INVOKABLE explicit QMofExtentObject(QMofExtent *modelingElement);
 
     // Operations [Extent]
-    Q_INVOKABLE bool useContainment() const;
-    Q_INVOKABLE QObject *elements() const;
-    Q_INVOKABLE QSet<QObject *> elementsOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE QSet<QObject *> linksOfType(QObject *type) const;
-    Q_INVOKABLE QSet<QObject *> linkedElements(QObject *association, QObject *endElement, bool end1ToEnd2Direction) const;
-    Q_INVOKABLE bool linkExists(QObject *association, QObject *firstElement, QObject *secondElement) const;
+    Q_TODO Q_INVOKABLE bool useContainment() const;
+    Q_TODO Q_INVOKABLE QObject *elements() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> elementsOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> linksOfType(QObject *type) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> linkedElements(QObject *association, QObject *endElement, bool end1ToEnd2Direction) const;
+    Q_TODO Q_INVOKABLE bool linkExists(QObject *association, QObject *firstElement, QObject *secondElement) const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmoffactoryobject_p.h b/src/mof/qobjects/qmoffactoryobject_p.h
index 9b103f0a..ec80e421 100644
--- a/src/mof/qobjects/qmoffactoryobject_p.h
+++ b/src/mof/qobjects/qmoffactoryobject_p.h
@@ -67,11 +67,11 @@ public:
     Q_INVOKABLE QObject *package() const;
 
     // Operations [Factory]
-    Q_INVOKABLE QObject *createFromString(QObject *dataType, QString string);
-    Q_INVOKABLE QString convertToString(QObject *dataType, QObject *object);
-    Q_INVOKABLE QObject *create(QObject *metaClass);
-    Q_INVOKABLE QObject *createElement(QObject *class_, QSet<QObject *> arguments);
-    Q_INVOKABLE QObject *createLink(QObject *association, QObject *firstElement, QObject *secondElement);
+    Q_TODO Q_INVOKABLE QObject *createFromString(QObject *dataType, QString string);
+    Q_TODO Q_INVOKABLE QString convertToString(QObject *dataType, QObject *object);
+    Q_TODO Q_INVOKABLE QObject *create(QObject *metaClass);
+    Q_TODO Q_INVOKABLE QObject *createElement(QObject *class_, QSet<QObject *> arguments);
+    Q_TODO Q_INVOKABLE QObject *createLink(QObject *association, QObject *firstElement, QObject *secondElement);
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofgeneralizationobject_p.h b/src/mof/qobjects/qmofgeneralizationobject_p.h
index bc1ab753..1917a571 100644
--- a/src/mof/qobjects/qmofgeneralizationobject_p.h
+++ b/src/mof/qobjects/qmofgeneralizationobject_p.h
@@ -97,10 +97,10 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofinstancespecificationobject_p.h b/src/mof/qobjects/qmofinstancespecificationobject_p.h
index 30a38c92..d2dea73d 100644
--- a/src/mof/qobjects/qmofinstancespecificationobject_p.h
+++ b/src/mof/qobjects/qmofinstancespecificationobject_p.h
@@ -101,14 +101,14 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
 public Q_SLOTS:
diff --git a/src/mof/qobjects/qmofinstancevalueobject_p.h b/src/mof/qobjects/qmofinstancevalueobject_p.h
index 036736b7..a483d768 100644
--- a/src/mof/qobjects/qmofinstancevalueobject_p.h
+++ b/src/mof/qobjects/qmofinstancevalueobject_p.h
@@ -103,24 +103,24 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmoflinkobject_p.h b/src/mof/qobjects/qmoflinkobject_p.h
index 7a00989b..cf11dbaa 100644
--- a/src/mof/qobjects/qmoflinkobject_p.h
+++ b/src/mof/qobjects/qmoflinkobject_p.h
@@ -71,8 +71,8 @@ public:
     Q_INVOKABLE QObject *association() const;
 
     // Operations [Link]
-    Q_INVOKABLE bool equals(QObject *otherLink) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE bool equals(QObject *otherLink) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralbooleanobject_p.h b/src/mof/qobjects/qmofliteralbooleanobject_p.h
index 0b289383..c03fe0f2 100644
--- a/src/mof/qobjects/qmofliteralbooleanobject_p.h
+++ b/src/mof/qobjects/qmofliteralbooleanobject_p.h
@@ -103,26 +103,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [LiteralBoolean]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralintegerobject_p.h b/src/mof/qobjects/qmofliteralintegerobject_p.h
index 996567b6..1d05c2d4 100644
--- a/src/mof/qobjects/qmofliteralintegerobject_p.h
+++ b/src/mof/qobjects/qmofliteralintegerobject_p.h
@@ -103,26 +103,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [LiteralInteger]
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralnullobject_p.h b/src/mof/qobjects/qmofliteralnullobject_p.h
index 90fa60d9..9eff7797 100644
--- a/src/mof/qobjects/qmofliteralnullobject_p.h
+++ b/src/mof/qobjects/qmofliteralnullobject_p.h
@@ -97,26 +97,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [LiteralNull]
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralrealobject_p.h b/src/mof/qobjects/qmofliteralrealobject_p.h
index ab216b58..b7374ceb 100644
--- a/src/mof/qobjects/qmofliteralrealobject_p.h
+++ b/src/mof/qobjects/qmofliteralrealobject_p.h
@@ -103,26 +103,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [LiteralReal]
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE double realValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE double realValue() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralstringobject_p.h b/src/mof/qobjects/qmofliteralstringobject_p.h
index 258d6b86..560f782d 100644
--- a/src/mof/qobjects/qmofliteralstringobject_p.h
+++ b/src/mof/qobjects/qmofliteralstringobject_p.h
@@ -103,26 +103,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [LiteralString]
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE QString stringValue() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofliteralunlimitednaturalobject_p.h b/src/mof/qobjects/qmofliteralunlimitednaturalobject_p.h
index 675c21cd..b199cafd 100644
--- a/src/mof/qobjects/qmofliteralunlimitednaturalobject_p.h
+++ b/src/mof/qobjects/qmofliteralunlimitednaturalobject_p.h
@@ -103,26 +103,26 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
 
     // Operations [LiteralUnlimitedNatural]
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofobjectobject_p.h b/src/mof/qobjects/qmofobjectobject_p.h
index c2902d64..e46b0ea7 100644
--- a/src/mof/qobjects/qmofobjectobject_p.h
+++ b/src/mof/qobjects/qmofobjectobject_p.h
@@ -61,12 +61,12 @@ public:
     Q_INVOKABLE explicit QMofObjectObject(QMofObject *modelingElement);
 
     // Operations [Object]
-    Q_INVOKABLE QObject *get(QObject *property) const;
-    Q_INVOKABLE bool equals(QObject *element) const;
-    Q_INVOKABLE void set(QObject *property, QObject *value);
-    Q_INVOKABLE bool isSet(QObject *property) const;
-    Q_INVOKABLE void unset(QObject *property);
-    Q_INVOKABLE QObject *invoke(QObject *op, QSet<QObject *> arguments);
+    Q_TODO Q_INVOKABLE QObject *get(QObject *property) const;
+    Q_TODO Q_INVOKABLE bool equals(QObject *element) const;
+    Q_TODO Q_INVOKABLE void set(QObject *property, QObject *value);
+    Q_TODO Q_INVOKABLE bool isSet(QObject *property) const;
+    Q_TODO Q_INVOKABLE void unset(QObject *property);
+    Q_TODO Q_INVOKABLE QObject *invoke(QObject *op, QSet<QObject *> arguments);
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofopaqueexpressionobject_p.h b/src/mof/qobjects/qmofopaqueexpressionobject_p.h
index 60de23f7..bf8f6967 100644
--- a/src/mof/qobjects/qmofopaqueexpressionobject_p.h
+++ b/src/mof/qobjects/qmofopaqueexpressionobject_p.h
@@ -105,30 +105,30 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [ValueSpecification]
-    Q_INVOKABLE bool booleanValue() const;
-    Q_INVOKABLE int integerValue() const;
-    Q_INVOKABLE bool isComputable() const;
-    Q_INVOKABLE bool isNull() const;
-    Q_INVOKABLE double realValue();
-    Q_INVOKABLE QString stringValue() const;
-    Q_INVOKABLE QString unlimitedValue() const;
+    Q_TODO Q_INVOKABLE bool booleanValue() const;
+    Q_TODO Q_INVOKABLE int integerValue() const;
+    Q_TODO Q_INVOKABLE bool isComputable() const;
+    Q_TODO Q_INVOKABLE bool isNull() const;
+    Q_TODO Q_INVOKABLE double realValue();
+    Q_TODO Q_INVOKABLE QString stringValue() const;
+    Q_TODO Q_INVOKABLE QString unlimitedValue() const;
 
     // Operations [OpaqueExpression]
-    Q_INVOKABLE bool isIntegral() const;
-    Q_INVOKABLE bool isNonNegative() const;
-    Q_INVOKABLE bool isPositive() const;
-    Q_INVOKABLE int value() const;
+    Q_TODO Q_INVOKABLE bool isIntegral() const;
+    Q_TODO Q_INVOKABLE bool isNonNegative() const;
+    Q_TODO Q_INVOKABLE bool isPositive() const;
+    Q_TODO Q_INVOKABLE int value() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofoperationobject_p.h b/src/mof/qobjects/qmofoperationobject_p.h
index 2619e5df..801e3dec 100644
--- a/src/mof/qobjects/qmofoperationobject_p.h
+++ b/src/mof/qobjects/qmofoperationobject_p.h
@@ -142,45 +142,45 @@ public:
     Q_INVOKABLE QObject *bodyCondition() const;
     Q_INVOKABLE QObject *class_() const;
     Q_INVOKABLE QObject *datatype() const;
-    Q_INVOKABLE bool isOrdered() const;
+    Q_TODO Q_INVOKABLE bool isOrdered() const;
     Q_INVOKABLE bool isQuery() const;
-    Q_INVOKABLE bool isUnique() const;
-    Q_INVOKABLE int lower() const;
+    Q_TODO Q_INVOKABLE bool isUnique() const;
+    Q_TODO Q_INVOKABLE int lower() const;
     Q_INVOKABLE const QList<QObject *> ownedParameters() const;
     Q_INVOKABLE const QSet<QObject *> postconditions() const;
     Q_INVOKABLE const QSet<QObject *> preconditions() const;
     Q_INVOKABLE const QSet<QObject *> raisedExceptions() const;
     Q_INVOKABLE const QSet<QObject *> redefinedOperations() const;
-    Q_INVOKABLE QObject *type() const;
-    Q_INVOKABLE QString upper() const;
+    Q_TODO Q_INVOKABLE QObject *type() const;
+    Q_TODO Q_INVOKABLE QString upper() const;
 
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [BehavioralFeature]
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
 
     // Operations [Operation]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE QSet<QObject *> returnResult() const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> returnResult() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofpackageimportobject_p.h b/src/mof/qobjects/qmofpackageimportobject_p.h
index aceebfee..1ebcf6e9 100644
--- a/src/mof/qobjects/qmofpackageimportobject_p.h
+++ b/src/mof/qobjects/qmofpackageimportobject_p.h
@@ -99,10 +99,10 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofpackagemergeobject_p.h b/src/mof/qobjects/qmofpackagemergeobject_p.h
index f43950ad..f19da9b1 100644
--- a/src/mof/qobjects/qmofpackagemergeobject_p.h
+++ b/src/mof/qobjects/qmofpackagemergeobject_p.h
@@ -95,10 +95,10 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofpackageobject_p.h b/src/mof/qobjects/qmofpackageobject_p.h
index de93bb16..93af3107 100644
--- a/src/mof/qobjects/qmofpackageobject_p.h
+++ b/src/mof/qobjects/qmofpackageobject_p.h
@@ -122,26 +122,26 @@ public:
 
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Package]
-    Q_INVOKABLE bool makesVisible(QObject *el) const;
+    Q_TODO Q_INVOKABLE bool makesVisible(QObject *el) const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QSet<QObject *> visibleMembers() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> visibleMembers() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofparameterobject_p.h b/src/mof/qobjects/qmofparameterobject_p.h
index 174e0fcb..8280b311 100644
--- a/src/mof/qobjects/qmofparameterobject_p.h
+++ b/src/mof/qobjects/qmofparameterobject_p.h
@@ -107,13 +107,13 @@ public:
     // Owned attributes [MultiplicityElement]
     Q_INVOKABLE bool isOrdered() const;
     Q_INVOKABLE bool isUnique() const;
-    Q_INVOKABLE int lower() const;
+    Q_TODO Q_INVOKABLE int lower() const;
     Q_INVOKABLE QObject *lowerValue() const;
-    Q_INVOKABLE QString upper() const;
+    Q_TODO Q_INVOKABLE QString upper() const;
     Q_INVOKABLE QObject *upperValue() const;
 
     // Owned attributes [Parameter]
-    Q_INVOKABLE QString default_() const;
+    Q_TODO Q_INVOKABLE QString default_() const;
     Q_INVOKABLE QObject *defaultValue() const;
     Q_INVOKABLE QtMof::ParameterDirectionKind direction() const;
     Q_INVOKABLE QObject *operation() const;
@@ -121,22 +121,22 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [MultiplicityElement]
-    Q_INVOKABLE bool includesCardinality(int C) const;
-    Q_INVOKABLE bool includesMultiplicity(QObject *M) const;
-    Q_INVOKABLE bool isMultivalued() const;
-    Q_INVOKABLE int lowerBound() const;
-    Q_INVOKABLE QString upperBound() const;
+    Q_TODO Q_INVOKABLE bool includesCardinality(int C) const;
+    Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const;
+    Q_TODO Q_INVOKABLE bool isMultivalued() const;
+    Q_TODO Q_INVOKABLE int lowerBound() const;
+    Q_TODO Q_INVOKABLE QString upperBound() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofprimitivetypeobject_p.h b/src/mof/qobjects/qmofprimitivetypeobject_p.h
index c8fa7028..ea9eb892 100644
--- a/src/mof/qobjects/qmofprimitivetypeobject_p.h
+++ b/src/mof/qobjects/qmofprimitivetypeobject_p.h
@@ -137,9 +137,9 @@ public:
     // Owned attributes [Classifier]
     Q_INVOKABLE const QSet<QObject *> attributes() const;
     Q_INVOKABLE const QSet<QObject *> features() const;
-    Q_INVOKABLE const QSet<QObject *> generals() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const;
     Q_INVOKABLE const QSet<QObject *> generalizations() const;
-    Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
+    Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const;
     Q_INVOKABLE bool isAbstract() const;
     Q_INVOKABLE bool isFinalSpecialization() const;
     Q_INVOKABLE const QSet<QObject *> redefinedClassifiers() const;
@@ -151,40 +151,40 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [Type]
-    Q_INVOKABLE bool isInstance(QObject *object) const;
+    Q_TODO Q_INVOKABLE bool isInstance(QObject *object) const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [Namespace]
-    Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
-    Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
-    Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
-    Q_INVOKABLE bool membersAreDistinguishable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QObject *imps) const;
+    Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QObject *imps) const;
+    Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const;
 
     // Operations [Classifier]
-    Q_INVOKABLE QSet<QObject *> allFeatures() const;
-    Q_INVOKABLE QSet<QObject *> allParents() const;
-    Q_INVOKABLE bool conformsTo(QObject *other) const;
-    Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
-    Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
-    Q_INVOKABLE bool maySpecializeType(QObject *c) const;
-    Q_INVOKABLE QSet<QObject *> parents() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const;
+    Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const;
+    Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const;
+    Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> parents() const;
 
     // Operations [DataType]
-    Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofpropertyobject_p.h b/src/mof/qobjects/qmofpropertyobject_p.h
index 066b31a4..2ecddc96 100644
--- a/src/mof/qobjects/qmofpropertyobject_p.h
+++ b/src/mof/qobjects/qmofpropertyobject_p.h
@@ -138,9 +138,9 @@ public:
     // Owned attributes [MultiplicityElement]
     Q_INVOKABLE bool isOrdered() const;
     Q_INVOKABLE bool isUnique() const;
-    Q_INVOKABLE int lower() const;
+    Q_TODO Q_INVOKABLE int lower() const;
     Q_INVOKABLE QObject *lowerValue() const;
-    Q_INVOKABLE QString upper() const;
+    Q_TODO Q_INVOKABLE QString upper() const;
     Q_INVOKABLE QObject *upperValue() const;
 
     // Owned attributes [StructuralFeature]
@@ -150,14 +150,14 @@ public:
     Q_INVOKABLE QObject *association() const;
     Q_INVOKABLE QObject *class_() const;
     Q_INVOKABLE QObject *datatype() const;
-    Q_INVOKABLE QString default_() const;
+    Q_TODO Q_INVOKABLE QString default_() const;
     Q_INVOKABLE QObject *defaultValue() const;
-    Q_INVOKABLE bool isComposite() const;
+    Q_TODO Q_INVOKABLE bool isComposite() const;
     Q_INVOKABLE bool isDerived() const;
     Q_INVOKABLE bool isDerivedUnion() const;
     Q_INVOKABLE bool isID() const;
     Q_INVOKABLE bool isReadOnly() const;
-    Q_INVOKABLE QObject *opposite() const;
+    Q_TODO Q_INVOKABLE QObject *opposite() const;
     Q_INVOKABLE QObject *owningAssociation() const;
     Q_INVOKABLE const QSet<QObject *> redefinedProperties() const;
     Q_INVOKABLE const QSet<QObject *> subsettedProperties() const;
@@ -165,31 +165,31 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
     // Operations [NamedElement]
     Q_INVOKABLE QList<QObject *> allNamespaces() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
+    Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const;
     Q_INVOKABLE QString separator() const;
 
     // Operations [RedefinableElement]
-    Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
+    Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const;
 
     // Operations [MultiplicityElement]
-    Q_INVOKABLE bool includesCardinality(int C) const;
-    Q_INVOKABLE bool includesMultiplicity(QObject *M) const;
-    Q_INVOKABLE bool isMultivalued() const;
-    Q_INVOKABLE int lowerBound() const;
-    Q_INVOKABLE QString upperBound() const;
+    Q_TODO Q_INVOKABLE bool includesCardinality(int C) const;
+    Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const;
+    Q_TODO Q_INVOKABLE bool isMultivalued() const;
+    Q_TODO Q_INVOKABLE int lowerBound() const;
+    Q_TODO Q_INVOKABLE QString upperBound() const;
 
     // Operations [Property]
-    Q_INVOKABLE bool isAttribute(QObject *p) const;
-    Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
-    Q_INVOKABLE bool isNavigable() const;
-    Q_INVOKABLE QSet<QObject *> subsettingContext() const;
+    Q_TODO Q_INVOKABLE bool isAttribute(QObject *p) const;
+    Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const;
+    Q_TODO Q_INVOKABLE bool isNavigable() const;
+    Q_TODO Q_INVOKABLE QSet<QObject *> subsettingContext() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofreflectivecollectionobject_p.h b/src/mof/qobjects/qmofreflectivecollectionobject_p.h
index 0d10a99c..a3744b93 100644
--- a/src/mof/qobjects/qmofreflectivecollectionobject_p.h
+++ b/src/mof/qobjects/qmofreflectivecollectionobject_p.h
@@ -61,11 +61,11 @@ public:
     Q_INVOKABLE explicit QMofReflectiveCollectionObject(QMofReflectiveCollection *modelingElement);
 
     // Operations [ReflectiveCollection]
-    Q_INVOKABLE bool add(QObject *object);
-    Q_INVOKABLE bool addAll(QObject *objects);
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE bool remove(QObject *object);
-    Q_INVOKABLE int size() const;
+    Q_TODO Q_INVOKABLE bool add(QObject *object);
+    Q_TODO Q_INVOKABLE bool addAll(QObject *objects);
+    Q_TODO Q_INVOKABLE void clear();
+    Q_TODO Q_INVOKABLE bool remove(QObject *object);
+    Q_TODO Q_INVOKABLE int size() const;
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofreflectivesequenceobject_p.h b/src/mof/qobjects/qmofreflectivesequenceobject_p.h
index 2a0586b5..b1235578 100644
--- a/src/mof/qobjects/qmofreflectivesequenceobject_p.h
+++ b/src/mof/qobjects/qmofreflectivesequenceobject_p.h
@@ -61,10 +61,10 @@ public:
     Q_INVOKABLE explicit QMofReflectiveSequenceObject(QMofReflectiveSequence *modelingElement);
 
     // Operations [ReflectiveSequence]
-    Q_INVOKABLE void add(int index, QObject *object);
-    Q_INVOKABLE QObject *get(int index) const;
-    Q_INVOKABLE QObject *remove(int index);
-    Q_INVOKABLE QObject *set(int index, QObject *object);
+    Q_TODO Q_INVOKABLE void add(int index, QObject *object);
+    Q_TODO Q_INVOKABLE QObject *get(int index) const;
+    Q_TODO Q_INVOKABLE QObject *remove(int index);
+    Q_TODO Q_INVOKABLE QObject *set(int index, QObject *object);
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofslotobject_p.h b/src/mof/qobjects/qmofslotobject_p.h
index 8cbbf47b..e4a40d33 100644
--- a/src/mof/qobjects/qmofslotobject_p.h
+++ b/src/mof/qobjects/qmofslotobject_p.h
@@ -83,10 +83,10 @@ public:
     // Operations [Element]
     Q_INVOKABLE QSet<QObject *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    Q_INVOKABLE QObject *getMetaClass() const;
-    Q_INVOKABLE QObject *container() const;
-    Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
-    Q_INVOKABLE void delete_();
+    Q_TODO Q_INVOKABLE QObject *getMetaClass() const;
+    Q_TODO Q_INVOKABLE QObject *container() const;
+    Q_TODO Q_INVOKABLE bool isInstanceOfType(QObject *type, bool includesSubtypes) const;
+    Q_TODO Q_INVOKABLE void delete_();
 
 public Q_SLOTS:
 
diff --git a/src/mof/qobjects/qmofuriextentobject_p.h b/src/mof/qobjects/qmofuriextentobject_p.h
index ac1a0056..cb913946 100644
--- a/src/mof/qobjects/qmofuriextentobject_p.h
+++ b/src/mof/qobjects/qmofuriextentobject_p.h
@@ -61,9 +61,9 @@ public:
     Q_INVOKABLE explicit QMofURIExtentObject(QMofURIExtent *modelingElement);
 
     // Operations [URIExtent]
-    Q_INVOKABLE QString contextURI() const;
-    Q_INVOKABLE QString uri(QObject *object) const;
-    Q_INVOKABLE QObject *element(QString uri) const;
+    Q_TODO Q_INVOKABLE QString contextURI() const;
+    Q_TODO Q_INVOKABLE QString uri(QObject *object) const;
+    Q_TODO Q_INVOKABLE QObject *element(QString uri) const;
 
 public Q_SLOTS: