summaryrefslogtreecommitdiffstats
path: root/src/uml/qinteractionoperand.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/uml/qinteractionoperand.h')
-rw-r--r--src/uml/qinteractionoperand.h51
1 files changed, 28 insertions, 23 deletions
diff --git a/src/uml/qinteractionoperand.h b/src/uml/qinteractionoperand.h
index 628c4510..095aaac4 100644
--- a/src/uml/qinteractionoperand.h
+++ b/src/uml/qinteractionoperand.h
@@ -53,7 +53,10 @@
QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE_QTUML
+QT_BEGIN_NAMESPACE
+
+namespace QtUml
+{
QT_MODULE(QtUml)
@@ -66,31 +69,31 @@ class Q_UML_EXPORT QInteractionOperand : 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(QSet<QGeneralOrdering *> generalOrderings READ generalOrderings)
- Q_PROPERTY(QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
- Q_PROPERTY(QSet<QLifeline *> covered READ covered)
- Q_PROPERTY(QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
+ Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> generalOrderings READ generalOrderings)
+ Q_PROPERTY(QtUml::QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+ Q_PROPERTY(QSet<QtUml::QLifeline *> covered READ covered)
+ Q_PROPERTY(QtUml::QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
- Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports)
- Q_PROPERTY(QSet<QNamedElement *> members READ members)
- Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false)
- Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports)
- Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules)
- Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers)
+ Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports)
+ Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members)
+ Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false)
+ Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports)
+ Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules)
+ Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers)
- Q_PROPERTY(QList<QInteractionFragment *> fragments READ fragments)
- Q_PROPERTY(QInteractionConstraint * guard READ guard WRITE setGuard)
+ Q_PROPERTY(QList<QtUml::QInteractionFragment *> fragments READ fragments)
+ Q_PROPERTY(QtUml::QInteractionConstraint * guard READ guard WRITE setGuard)
Q_DISABLE_COPY(QInteractionOperand)
Q_DECLARE_PRIVATE(QInteractionOperand)
@@ -109,8 +112,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
@@ -164,7 +167,9 @@ private:
QNamespace *_wrappedNamespace;
};
-QT_END_NAMESPACE_QTUML
+}
+
+QT_END_NAMESPACE
QT_END_HEADER