summaryrefslogtreecommitdiffstats
path: root/src/uml/qpackage.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/uml/qpackage.h')
-rw-r--r--src/uml/qpackage.h61
1 files changed, 33 insertions, 28 deletions
diff --git a/src/uml/qpackage.h b/src/uml/qpackage.h
index 84eb7137..01525c04 100644
--- a/src/uml/qpackage.h
+++ b/src/uml/qpackage.h
@@ -57,7 +57,10 @@
QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE_QTUML
+QT_BEGIN_NAMESPACE
+
+namespace QtUml
+{
QT_MODULE(QtUml)
@@ -75,39 +78,39 @@ class Q_UML_EXPORT QPackage : 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(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<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(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
- Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter)
+ Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+ Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter)
- Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
+ Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
- Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
- Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings)
+ Q_PROPERTY(QtUml::QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
+ Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings)
Q_PROPERTY(QString URI READ URI WRITE setURI)
- Q_PROPERTY(QSet<QType *> ownedTypes READ ownedTypes STORED false)
- Q_PROPERTY(QSet<QPackageableElement *> packagedElements READ packagedElements)
- Q_PROPERTY(QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage)
- Q_PROPERTY(QSet<QProfileApplication *> profileApplications READ profileApplications)
- Q_PROPERTY(QSet<QStereotype *> ownedStereotypes READ ownedStereotypes STORED false)
- Q_PROPERTY(QSet<QPackageMerge *> packageMerges READ packageMerges)
- Q_PROPERTY(QSet<QPackage *> nestedPackages READ nestedPackages STORED false)
+ Q_PROPERTY(QSet<QtUml::QType *> ownedTypes READ ownedTypes STORED false)
+ Q_PROPERTY(QSet<QtUml::QPackageableElement *> packagedElements READ packagedElements)
+ Q_PROPERTY(QtUml::QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage)
+ Q_PROPERTY(QSet<QtUml::QProfileApplication *> profileApplications READ profileApplications)
+ Q_PROPERTY(QSet<QtUml::QStereotype *> ownedStereotypes READ ownedStereotypes STORED false)
+ Q_PROPERTY(QSet<QtUml::QPackageMerge *> packageMerges READ packageMerges)
+ Q_PROPERTY(QSet<QtUml::QPackage *> nestedPackages READ nestedPackages STORED false)
Q_DISABLE_COPY(QPackage)
Q_DECLARE_PRIVATE(QPackage)
@@ -157,8 +160,8 @@ public:
Q_INVOKABLE void setTemplateParameter(QTemplateParameter *templateParameter);
// Attributes from aggregated QPackageableElement
- 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 void unsetVisibility();
// Association ends from aggregated QTemplateableElement
@@ -216,7 +219,9 @@ private:
QTemplateableElement *_wrappedTemplateableElement;
};
-QT_END_NAMESPACE_QTUML
+}
+
+QT_END_NAMESPACE
QT_END_HEADER