summaryrefslogtreecommitdiffstats
path: root/src/uml/qstructuralfeature.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/uml/qstructuralfeature.h')
-rw-r--r--src/uml/qstructuralfeature.h39
1 files changed, 22 insertions, 17 deletions
diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h
index 023c9741..2719dca0 100644
--- a/src/uml/qstructuralfeature.h
+++ b/src/uml/qstructuralfeature.h
@@ -51,7 +51,10 @@
QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE_QTUML
+QT_BEGIN_NAMESPACE
+
+namespace QtUml
+{
QT_MODULE(QtUml)
@@ -61,32 +64,32 @@ class Q_UML_EXPORT QStructuralFeature : public QWrappedObject
{
Q_OBJECT
- Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements)
- Q_PROPERTY(QElement * owner READ owner)
- Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments)
+ Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements)
+ Q_PROPERTY(QtUml::QElement * owner READ owner)
+ Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments)
Q_PROPERTY(QString name READ name WRITE setName)
- Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
+ Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility)
Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false)
- Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression)
- Q_PROPERTY(QNamespace * namespace_ READ namespace_)
- Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies)
+ Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression)
+ Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_)
+ Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies)
- Q_PROPERTY(QType * type READ type WRITE setType)
+ Q_PROPERTY(QtUml::QType * type READ type WRITE setType)
Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false)
Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false)
- Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue)
- Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue)
+ Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue)
+ Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue)
Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
- Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements)
- Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts)
+ Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements)
+ Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts)
Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
- Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers)
+ Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers)
Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly)
@@ -107,8 +110,8 @@ public:
// Attributes from aggregated QNamedElement
Q_INVOKABLE QString name() const;
Q_INVOKABLE void setName(QString name);
- Q_INVOKABLE QtUml::VisibilityKind visibility() const;
- Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility);
+ Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const;
+ Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility);
Q_INVOKABLE QString qualifiedName() const;
// Association ends from aggregated QNamedElement
@@ -175,7 +178,9 @@ private:
QFeature *_wrappedFeature;
};
-QT_END_NAMESPACE_QTUML
+}
+
+QT_END_NAMESPACE
QT_END_HEADER