diff options
659 files changed, 4589 insertions, 4060 deletions
diff --git a/examples/uml/editor/mainwindow.cpp b/examples/uml/editor/mainwindow.cpp index 4ff0f732..b1caa7e1 100644 --- a/examples/uml/editor/mainwindow.cpp +++ b/examples/uml/editor/mainwindow.cpp @@ -1,7 +1,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> #include <QtUml/QModel> #include <QtUml/QPrimitiveType> @@ -20,7 +20,7 @@ #include <QContextMenuEvent> using namespace QtUml; -using QtMof::QMofPointer; +using QtWrappedObjects::QWrappedObjectPointer; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -40,22 +40,22 @@ MainWindow::MainWindow(QWidget *parent) : ui->propertyEditor->setSelectionMode(QAbstractItemView::SingleSelection); ui->propertyEditor->setSelectionBehavior(QAbstractItemView::SelectRows); - QMofPointer<QModel> model = new QModel; + QWrappedObjectPointer<QModel> model = new QModel; model->setName("MyModel"); - QMofPointer<QPackage> package = new QPackage; + QWrappedObjectPointer<QPackage> package = new QPackage; package->setName("Package1"); - QMofPointer<QPrimitiveType> primitiveType = new QPrimitiveType; + QWrappedObjectPointer<QPrimitiveType> primitiveType = new QPrimitiveType; primitiveType->setName("String"); - QMofPointer<QEnumeration> enumeration = new QEnumeration; + QWrappedObjectPointer<QEnumeration> enumeration = new QEnumeration; enumeration->setName("DirectionKind"); - QMofPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral; + QWrappedObjectPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral; directionIn->setName("DirectionIn"); enumeration->addOwnedLiteral(directionIn); - QMofPointer<QClass> class_ = new QClass; + QWrappedObjectPointer<QClass> class_ = new QClass; class_->setName("Student"); class_->setAbstract(true); class_->setVisibility(QtUml::QtUml::VisibilityPackage); @@ -111,7 +111,7 @@ void MainWindow::populateContextMenu(QMenu &menu, QObject *element) } } -void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QMetaObject *metaObject, int level) +void MainWindow::handleMetaObjectProperties(QtWrappedObjects::QWrappedObject *element, const QMetaObject *metaObject, int level) { if (metaObject->superClass() && !_visitedParents.contains(metaObject->superClass()->className())) handleMetaObjectProperties(element, metaObject->superClass(), level+1); @@ -184,7 +184,7 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM if (property.type() == QVariant::String) { QObject *rootElement = element; if (QString(property.name()) == "objectName") - rootElement = qmofobject_cast<QObject *>(element); + rootElement = qwrappedobject_cast<QObject *>(element); item->setText(1, property.read(rootElement).toString()); } @@ -197,11 +197,11 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM } if (typeName.endsWith('*') && typeName.contains("QSet") && property.read(element).isValid()) { - if (QSet<QtMof::QMofObject *> *elements = reinterpret_cast<QSet<QtMof::QMofObject *> *>(*((QSet<QObject *> **) property.read(element).data()))) { + if (QSet<QtWrappedObjects::QWrappedObject *> *elements = reinterpret_cast<QSet<QtWrappedObjects::QWrappedObject *> *>(*((QSet<QObject *> **) property.read(element).data()))) { if (elements->size() > 0) { QString str = "["; - foreach (QtMof::QMofObject *object, *elements) - str.append((qmofobject_cast<QtMof::QMofObject *>(object))->objectName().append(", ")); + foreach (QtWrappedObjects::QWrappedObject *object, *elements) + str.append((qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(object))->objectName().append(", ")); str.chop(2); str.append("]"); item->setText(1, str); @@ -212,11 +212,11 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM } if (typeName.endsWith('*') && typeName.contains("QList") && property.read(element).isValid()) { - if (QList<QtMof::QMofObject *> *elements = reinterpret_cast<QList<QtMof::QMofObject *> *>(*((QList<QObject *> **) property.read(element).data()))) { + if (QList<QtWrappedObjects::QWrappedObject *> *elements = reinterpret_cast<QList<QtWrappedObjects::QWrappedObject *> *>(*((QList<QObject *> **) property.read(element).data()))) { if (elements->size() > 0) { QString str = "["; - foreach (QtMof::QMofObject *object, *elements) - str.append((qmofobject_cast<QtMof::QMofObject *>(object))->objectName().append(", ")); + foreach (QtWrappedObjects::QWrappedObject *object, *elements) + str.append((qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(object))->objectName().append(", ")); str.chop(2); str.append("]"); item->setText(1, str); @@ -231,10 +231,10 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM } } -void MainWindow::handleObjectProperties(QtMof::QMofObject *element, int level) +void MainWindow::handleObjectProperties(QtWrappedObjects::QWrappedObject *element, int level) { foreach (QObject *child, element->children()) - handleObjectProperties(dynamic_cast<QtMof::QMofObject *>(child), level+1); + handleObjectProperties(dynamic_cast<QtWrappedObjects::QWrappedObject *>(child), level+1); handleMetaObjectProperties(element, element->metaObject(), level); } @@ -247,7 +247,7 @@ void MainWindow::on_modelExplorer_currentItemChanged(QTreeWidgetItem *current, Q return; ui->propertyEditor->blockSignals(true); - QtMof::QMofObject *element = qmofobject_cast<QtMof::QMofObject *>(current->data(0, Qt::UserRole).value<QtMof::QMofObject *>()); + QtWrappedObjects::QWrappedObject *element = qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(current->data(0, Qt::UserRole).value<QtWrappedObjects::QWrappedObject *>()); ui->propertyEditor->clear(); _visitedParents.clear(); @@ -284,7 +284,7 @@ void MainWindow::currentIndexChanged(int index) } } -void MainWindow::populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetItem *parent) +void MainWindow::populateModelExplorer(QtWrappedObjects::QWrappedObject *element, QTreeWidgetItem *parent) { if (!element) return; @@ -299,7 +299,7 @@ void MainWindow::populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetIt if (!parent) ui->modelExplorer->addTopLevelItem(item); - if (QElement *umlElement = qmofobject_cast<QElement *>(element)) + if (QElement *umlElement = qwrappedobject_cast<QElement *>(element)) foreach (QElement *ownedElement, *umlElement->ownedElements()) populateModelExplorer(ownedElement, item); ui->modelExplorer->blockSignals(false); @@ -340,7 +340,7 @@ void MainWindow::handleAddMethod() void MainWindow::refreshModel() { - QtMof::QMofObject *rootElement = qmofobject_cast<QtMof::QMofObject *>(ui->modelExplorer->topLevelItem(0)->data(0, Qt::UserRole).value<QtMof::QMofObject *>()); + QtWrappedObjects::QWrappedObject *rootElement = qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(ui->modelExplorer->topLevelItem(0)->data(0, Qt::UserRole).value<QtWrappedObjects::QWrappedObject *>()); ui->modelExplorer->clear(); populateModelExplorer(rootElement); } diff --git a/examples/uml/editor/mainwindow.h b/examples/uml/editor/mainwindow.h index 16c7d292..97daa481 100644 --- a/examples/uml/editor/mainwindow.h +++ b/examples/uml/editor/mainwindow.h @@ -8,8 +8,8 @@ namespace Ui { class MainWindow; } -namespace QtMof { - class QMofObject; +namespace QtWrappedObjects { + class QWrappedObject; } namespace QtUml { @@ -33,7 +33,7 @@ private Q_SLOTS: void on_modelExplorer_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_propertyEditor_itemChanged(QTreeWidgetItem *item, int column); void currentIndexChanged(int index); - void populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetItem *parent = 0); + void populateModelExplorer(QtWrappedObjects::QWrappedObject *element, QTreeWidgetItem *parent = 0); QTreeWidgetItem *parentItemForProperty(QString propertyGroup); void handleAddMethod(); void refreshModel(); @@ -44,8 +44,8 @@ private: QMap< QString, QPair<int, QTreeWidgetItem *> > _visitedProperties; QMap< QString, QPair<QObject *, QMetaMethod> > _visitedAddMethods; - void handleObjectProperties(QtMof::QMofObject *element, int level = 0); - void handleMetaObjectProperties(QtMof::QMofObject *element, const QMetaObject *metaObject, int level = 0); + void handleObjectProperties(QtWrappedObjects::QWrappedObject *element, int level = 0); + void handleMetaObjectProperties(QtWrappedObjects::QWrappedObject *element, const QMetaObject *metaObject, int level = 0); void populateContextMenu(QMenu &menu, QObject *element); }; diff --git a/examples/uml/nested-packages/main.cpp b/examples/uml/nested-packages/main.cpp index 157306a1..df53f456 100644 --- a/examples/uml/nested-packages/main.cpp +++ b/examples/uml/nested-packages/main.cpp @@ -1,4 +1,4 @@ -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> #include <QtUml/QModel> #include <QtUml/QPackage> @@ -14,7 +14,7 @@ #include <QtCore/QMetaProperty> using namespace QtUml; -using QtMof::QMofPointer; +using QtWrappedObjects::QWrappedObjectPointer; typedef const QSet<QPackage *> QPackageList; typedef const QSet<QStereotype *> QStereotypeList; @@ -31,22 +31,22 @@ void checkProperties(QObject *object) int main () { - QMofPointer<QModel> model = new QModel; + QWrappedObjectPointer<QModel> model = new QModel; model->setName("MyModel"); - QMofPointer<QPackage> package = new QPackage; + QWrappedObjectPointer<QPackage> package = new QPackage; package->setName("Package1"); - QMofPointer<QPrimitiveType> primitiveType = new QPrimitiveType; + QWrappedObjectPointer<QPrimitiveType> primitiveType = new QPrimitiveType; primitiveType->setName("String"); - QMofPointer<QEnumeration> enumeration = new QEnumeration; + QWrappedObjectPointer<QEnumeration> enumeration = new QEnumeration; enumeration->setName("DirectionKind"); - QMofPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral; + QWrappedObjectPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral; directionIn->setName("DirectionIn"); enumeration->addOwnedLiteral(directionIn); - QMofPointer<QClass> class_ = new QClass; + QWrappedObjectPointer<QClass> class_ = new QClass; class_->setName("Student"); class_->setAbstract(false); @@ -100,9 +100,9 @@ int main () checkProperties(model); - QMofPointer<QComponent> c1 = new QComponent; - QMofPointer<QComponent> c2 = new QComponent; - QMofPointer<QComponentRealization> cr = new QComponentRealization; + QWrappedObjectPointer<QComponent> c1 = new QComponent; + QWrappedObjectPointer<QComponent> c2 = new QComponent; + QWrappedObjectPointer<QComponentRealization> cr = new QComponentRealization; cr->setAbstraction(c1); qDebug(); qDebug() << "cr->suppliers()->size():" << cr->suppliers()->size(); diff --git a/examples/uml/nested-packages/nested-packages.pro b/examples/uml/nested-packages/nested-packages.pro index 558d1579..74afd727 100644 --- a/examples/uml/nested-packages/nested-packages.pro +++ b/examples/uml/nested-packages/nested-packages.pro @@ -4,6 +4,7 @@ DEPENDPATH += . INCLUDEPATH += . QT += uml +QT -= gui # Input SOURCES += main.cpp diff --git a/examples/uml/profiles/main.cpp b/examples/uml/profiles/main.cpp index 62c7c03f..b8e1b8ca 100644 --- a/examples/uml/profiles/main.cpp +++ b/examples/uml/profiles/main.cpp @@ -1,4 +1,4 @@ -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> #include <QtUml/QPrimitiveType> #include <QtUml/QProfile> @@ -13,7 +13,7 @@ #include <QtCore/QDebug> using namespace QtUml; -using QtMof::QMofPointer; +using QtWrappedObjects::QWrappedObjectPointer; typedef const QSet<QStereotype *> QStereotypeList; typedef const QSet<QPackageableElement *> QPackageableElementList; @@ -21,18 +21,18 @@ typedef const QSet<QPackageableElement *> QPackageableElementList; int main () { // Create a "dymmy" UML meta-model - QMofPointer<QModel> umlModel = new QModel; + QWrappedObjectPointer<QModel> umlModel = new QModel; umlModel->setName("UML Meta-Model"); - QMofPointer<QClass> class_ = new QClass; + QWrappedObjectPointer<QClass> class_ = new QClass; class_->setName("Class"); umlModel->addOwnedType(class_); // Create a profile - QMofPointer<QProfile> profile = new QProfile; + QWrappedObjectPointer<QProfile> profile = new QProfile; profile->setName("MyProfile"); // Add a stereotype to profile - QMofPointer<QStereotype> stereotype = new QStereotype; + QWrappedObjectPointer<QStereotype> stereotype = new QStereotype; stereotype->setName("MyStereotype"); profile->addPackagedElement(stereotype); @@ -43,15 +43,15 @@ int main () qDebug() << " " << ownedStereotype->name(); // Adding attribute to stereotype - QMofPointer<QPrimitiveType> booleanPrimitiveType = new QPrimitiveType; + QWrappedObjectPointer<QPrimitiveType> booleanPrimitiveType = new QPrimitiveType; booleanPrimitiveType->setName("boolean"); - QMofPointer<QProperty> property = new QProperty; + QWrappedObjectPointer<QProperty> property = new QProperty; property->setName("isTransient"); property->setType(booleanPrimitiveType); stereotype->addOwnedAttribute(property); // Create UML meta-model element import - QMofPointer<QElementImport> elementImport = new QElementImport; + QWrappedObjectPointer<QElementImport> elementImport = new QElementImport; elementImport->setImportedElement(umlModel->packagedElements()->toList().first()); // Add meta-class reference to profile @@ -71,14 +71,14 @@ int main () qDebug() << " " << importedMember->name(); // Create extension - QMofPointer<QExtension> extension = new QExtension; + QWrappedObjectPointer<QExtension> extension = new QExtension; extension->setName("class_stereotype"); - QMofPointer<QProperty> stereotypeProperty = new QProperty; + QWrappedObjectPointer<QProperty> stereotypeProperty = new QProperty; stereotypeProperty->setName("base_class"); stereotypeProperty->setType(class_); - QMofPointer<QExtensionEnd> extensionEnd = new QExtensionEnd; + QWrappedObjectPointer<QExtensionEnd> extensionEnd = new QExtensionEnd; extensionEnd->setName("extension_stereotype"); extensionEnd->setType(stereotype); diff --git a/examples/uml/profiles/profiles.pro b/examples/uml/profiles/profiles.pro index 7db81ae6..c5db0546 100644 --- a/examples/uml/profiles/profiles.pro +++ b/examples/uml/profiles/profiles.pro @@ -4,6 +4,7 @@ DEPENDPATH += . INCLUDEPATH += . QT += uml +QT -= gui # Input SOURCES += main.cpp diff --git a/modules/qtwrappedobjects.pri b/modules/qtwrappedobjects.pri new file mode 100644 index 00000000..46c967e6 --- /dev/null +++ b/modules/qtwrappedobjects.pri @@ -0,0 +1,17 @@ +QT.wrappedobjects.VERSION = 5.0.0 +QT.wrappedobjects.MAJOR_VERSION = 5 +QT.wrappedobjects.MINOR_VERSION = 0 +QT.wrappedobjects.PATCH_VERSION = 0 + +QT.wrappedobjects.name = QtWrappedObjects +QT.wrappedobjects.bins = $$QT_MODULE_BIN_BASE +QT.wrappedobjects.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/$$QT.wrappedobjects.name +QT.wrappedobjects.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.wrappedobjects.name/$$QT.wrappedobjects.VERSION +QT.wrappedobjects.sources = $$QT_MODULE_BASE/src/wrappedobjects +QT.wrappedobjects.libs = $$QT_MODULE_LIB_BASE +QT.wrappedobjects.plugins = $$QT_MODULE_PLUGIN_BASE +QT.wrappedobjects.imports = $$QT_MODULE_IMPORT_BASE +QT.wrappedobjects.depends = core + +QT.wrappedobjects.DEFINES = QT_WRAPPEDOBJECTS_LIB +QT_CONFIG += wrappedobjects diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp index d535db58..833ffdde 100644 --- a/scripts/templates/class.cpp +++ b/scripts/templates/class.cpp @@ -34,12 +34,12 @@ if (${accessor.parameter.0.name}) { [%- END %] [%- IF property.isReadOnly == subsettedPropertyItem.isReadOnly %] - [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qmofobject_cast<${subsettedClass}[% IF subsettedPropertyItem.isReadOnly == 'true' %]Private[% END %] *>(this))->${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); + [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qwrappedobject_cast<${subsettedClass}[% IF subsettedPropertyItem.isReadOnly == 'true' %]Private[% END %] *>(this))->${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); [%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'true' %] - [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qmofobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); + [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qwrappedobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); [%- ELSE %] [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]Q_Q(${class.name}); - [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]q->${subsettedClass}::${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); + [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]q->${subsettedClass}::${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name})); [%- END %] [%- IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] } @@ -53,14 +53,14 @@ [%- found = 'true' -%] [%- END %] [%- IF property.isReadOnly == 'true' and subsettedPropertyItem.isReadOnly == 'true' %] - (qmofobject_cast<${subsettedClass}Private *>(this))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name})); + (qwrappedobject_cast<${subsettedClass}Private *>(this))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name})); [%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'false' %] - (qmofobject_cast<${subsettedClass} *>(this))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name})); + (qwrappedobject_cast<${subsettedClass} *>(this))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name})); [%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'true' %] - (qmofobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name})); + (qwrappedobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name})); [%- ELSE %] Q_Q(${class.name}); - q->${subsettedClass}::${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name})); + q->${subsettedClass}::${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name})); [%- END %] [%- END -%] [%- END -%] @@ -87,7 +87,7 @@ [%- IF opposite.isReadOnly == 'false' %] [% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %]${accessor.parameter.0.name}->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); [%- ELSE %] - [% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %](qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); + [% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %](qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); [%- END -%] [%- ELSE -%][%- IF operation == 2 and opposite.accessor.size > 2 %] [%- IF opposite.isReadOnly == 'false' %] @@ -95,13 +95,13 @@ [% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); [%- ELSE %] if ([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}) - (qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->d_func()))->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); + (qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->d_func()))->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]); [%- END %] [%- ELSIF singlevalued == 'false' %] [%- IF opposite.isReadOnly == 'false' %] ${accessor.parameter.0.name}->${opposite.accessor.1.name}(0); [%- ELSE %] - (qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}(0); + (qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}(0); [%- END %] [%- END -%][%- END -%] [%- IF operation == 2 and singlevalued == 'true' %] @@ -182,14 +182,14 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- IF accessor.name.search('^add') %] d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this)); [%- END %] [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] [%- HANDLESUBSETTEDPROPERTY(attribute, 2, 'false') -%] [%- END -%] @@ -235,7 +235,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- END -%] [%- END %] [%- ELSE %] - [% IF accessor.return != 'void ' %]return [% END %](qmofobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]); + [% IF accessor.return != 'void ' %]return [% END %](qwrappedobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]); [%- END %] } @@ -287,7 +287,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- IF accessor.name.search('^add') %] d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this)); [%- END %] [%- HANDLESUBSETTEDPROPERTY(associationend, 1, 'false') -%] [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%] @@ -295,7 +295,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- IF accessor.name.search('^remove') %] d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] [%- HANDLESUBSETTEDPROPERTY(associationend, 2, 'false') -%] [%- HANDLEOPPOSITEEND(associationend, accessor, 2, 'false') -%] @@ -347,7 +347,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces } [%- END %] [%- ELSE %] - [% IF accessor.return != 'void ' %]return [% END %](qmofobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]); + [% IF accessor.return != 'void ' %]return [% END %](qwrappedobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]); [%- END %] } @@ -536,14 +536,14 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] Q_Q(${class.name}); - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(q)); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q)); [%- END %] [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] [%- HANDLESUBSETTEDPROPERTY(attribute, 2, 'false') -%] [%- END -%] @@ -607,7 +607,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] Q_Q(${class.name}); - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(q)); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q)); [%- END %] [%- HANDLESUBSETTEDPROPERTY(associationend, 1, 'false') -%] [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%] @@ -615,7 +615,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- IF accessor.name.search('^remove') %] this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] - qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0); + qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] [%- HANDLESUBSETTEDPROPERTY(associationend, 2, 'false') -%] [%- HANDLEOPPOSITEEND(associationend, accessor, 2, 'false') -%] @@ -669,8 +669,8 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I */ [%- END %] -${class.name}::${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper) : -[% IF class.superclass.size == 1-%] ${class.superclass.0.name}[%- ELSE -%] [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject[% END %](*new ${class.name}Private, parent, wrapper) +${class.name}::${class.name}(QWrappedObject *parent, QWrappedObject *wrapper) : +[% IF class.superclass.size == 1-%] ${class.superclass.0.name}[%- ELSE -%] QWrappedObject[% END %](*new ${class.name}Private, parent, wrapper) [%- IF class.superclass and class.superclass.size > 1 -%] [%- FOREACH parentClass IN class.superclass -%] , @@ -680,8 +680,8 @@ ${class.name}::${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofOb { } -${class.name}::${class.name}(${class.name}Private &dd, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper) : -[% IF class.superclass.size == 1-%] ${class.superclass.0.name}(dd, parent, wrapper)[%- ELSE -%] [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject(dd, parent, wrapper)[%- END -%] +${class.name}::${class.name}(${class.name}Private &dd, QWrappedObject *parent, QWrappedObject *wrapper) : +[% IF class.superclass.size == 1-%] ${class.superclass.0.name}(dd, parent, wrapper)[%- ELSE -%] QWrappedObject(dd, parent, wrapper)[%- END -%] [%- IF class.superclass and class.superclass.size > 1 -%] [%- FOREACH parentClass IN class.superclass -%] , @@ -738,7 +738,7 @@ ${operation.return}${class.name}::${operation.name}([%- FOREACH parameter IN ope [%- END -%] [%- FOREACH accessor IN property.accessor -%] [%- NEXT IF loop.first %] -${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness} +${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness} { [%- IF loop.count == 2 %] ${parameter.accessor.1.name}(${attribute.accessor.1.parameter.0.name}); @@ -777,7 +777,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attri [%- END -%] [%- FOREACH accessor IN property.accessor -%] [%- NEXT IF loop.first %] -${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness} +${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness} { [%- IF loop.count == 2 %] ${associationend.accessor.1.name}(${associationend.accessor.1.parameter.0.name}); diff --git a/scripts/templates/class.h b/scripts/templates/class.h index 1080eb61..7158277f 100644 --- a/scripts/templates/class.h +++ b/scripts/templates/class.h @@ -173,7 +173,8 @@ // Base class includes [%- IF !class.superclass || class.superclass.size > 1 %] -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; [%- END -%] [%- FOREACH superClass IN class.superclass %] #include <${superClass.include}> @@ -233,7 +234,8 @@ [%- END %] [%- IF found == 'true' %] -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; [%- END %] QT_BEGIN_HEADER @@ -276,7 +278,7 @@ class ${forwarddecl.content}; class ${class.name}Private; -class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}[% ELSE %]public [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject[% END %] +class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}[% ELSE %]public QWrappedObject[% END %] { Q_OBJECT [%- GENERATEPROPERTIES(class, 'false') %] @@ -285,7 +287,7 @@ class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% I Q_DECLARE_PRIVATE(${class.name}) public: - Q_INVOKABLE explicit ${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent = 0, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper = 0); + Q_INVOKABLE explicit ${class.name}(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~${class.name}(); [%- IF class.superclass and class.superclass.size > 1 -%] [%- GENERATEFUNCTIONS(class, 'true') -%] @@ -316,7 +318,7 @@ public: [%- END -%] [%- FOREACH accessor IN property.accessor -%] [%- NEXT IF loop.first %] - Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}; + Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%]<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}; [%- END -%] [%- END -%] [%- END -%] @@ -340,7 +342,7 @@ public: [%- END -%] [%- FOREACH accessor IN property.accessor -%] [%- NEXT IF loop.first %] - Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}; + Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}; [%- END -%] [%- END -%] [%- END -%] @@ -371,7 +373,7 @@ public: [%- END %] protected: - explicit ${class.name}(${class.name}Private &dd, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent = 0, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper = 0); + explicit ${class.name}(${class.name}Private &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); [%- IF class.superclass and class.superclass.size > 1 %] private: diff --git a/scripts/templates/class_p.h b/scripts/templates/class_p.h index 5a436148..a64cd762 100644 --- a/scripts/templates/class_p.h +++ b/scripts/templates/class_p.h @@ -44,7 +44,8 @@ // Base class includes [%- IF !class.superclass || class.superclass.size > 1 -%] -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; [%- END -%] [%- FOREACH superclass IN class.superclass -%] @@ -114,7 +115,7 @@ class ${forwarddecl.content}; class ${class.name}; [%- END %] -class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name}Private : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}Private[% ELSE %]public [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObjectPrivate[% END %] +class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name}Private : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}Private[% ELSE %]public QWrappedObjectPrivate[% END %] { Q_DECLARE_PUBLIC(${class.name}) diff --git a/scripts/templates/namespace.pri b/scripts/templates/namespace.pri index 3284c767..7ae6e731 100644 --- a/scripts/templates/namespace.pri +++ b/scripts/templates/namespace.pri @@ -1,7 +1,5 @@ -PUBLIC_HEADERS += - ${namespace.path}/qtumlglobal.h - ${namespace.path}/qumlobject.h - ${namespace.path}/qumlpointer.h +PUBLIC_HEADERS += \ + ${namespace.path}/${namespace.path.split('/').0.lower}global.h [%- IF namespace.item('enumeration') -%][% ' \\' %] ${namespace.path}/${namespace.path.split('/').0.lower}enumerations.h [%- END %] @@ -10,13 +8,11 @@ PUBLIC_HEADERS += [%- END %] PRIVATE_HEADERS += - ${namespace.path}/qumlobject_p.h [%- FOREACH class IN namespace.class.values -%][% ' \\' %] ${namespace.path}/${class.name.lower}_p.h [%- END %] SOURCES += - ${namespace.path}/qumlobject.cpp [%- IF namespace.item('enumeration') -%][% ' \\' %] ${namespace.path}/${namespace.path.split('/').0.lower}enumerations.cpp [%- END -%] diff --git a/scripts/templates/project.pri b/scripts/templates/project.pri new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/scripts/templates/project.pri diff --git a/scripts/templates/project.pro b/scripts/templates/project.pro index 0e176e33..1f414102 100644 --- a/scripts/templates/project.pro +++ b/scripts/templates/project.pro @@ -1,12 +1,12 @@ load(qt_build_config) TARGET = [% namespace.split('/').0 %] -QT = core-private +QT = wrappedobjects-private load(qt_module) [%- FOREACH namespace IN namespaces %] -include(${namespace.path}/${namespace.path.replace('/','-').lower}.pri) +include(${namespace.path.replace('/','-').lower}.pri) [%- END %] -HEADERS += [%- GET '$$PUBLIC_HEADERS' -%] +HEADERS += [%- GET '$$PUBLIC_HEADERS' -%] [% GET '$$PRIVATE_HEADERS' -%] diff --git a/scripts/xmi2qt.pl b/scripts/xmi2qt.pl index c450b6d3..2d7ef3af 100755 --- a/scripts/xmi2qt.pl +++ b/scripts/xmi2qt.pl @@ -69,7 +69,7 @@ if ($tt->process('namespace.pri', { } -open STDOUT, '>', $options{o}."/uml.pro"; +open STDOUT, '>', $options{o}."/project.pro"; if ($tt->process('project.pro', { namespaces => $namespaces, }) ne 1) { print $tt->error(); } diff --git a/src/mof/mof.pri b/src/mof/mof.pri index ab56bc5c..98fec8af 100644 --- a/src/mof/mof.pri +++ b/src/mof/mof.pri @@ -1,7 +1,5 @@ PUBLIC_HEADERS += \ qtmofglobal.h \ - qmofobject.h \ - qmofpointer.h \ qtmofenumerations.h \ qrelationship.h \ qcomment.h \ @@ -31,6 +29,7 @@ PUBLIC_HEADERS += \ qdatatype.h \ qreflectivesequence.h \ quriextent.h \ + qmofobject.h \ qprimitivetype.h \ qextent.h \ qpackagemerge.h \ @@ -57,7 +56,6 @@ PUBLIC_HEADERS += \ qbehavioralfeature.h PRIVATE_HEADERS += \ - qmofobject_p.h \ qrelationship_p.h \ qcomment_p.h \ qtag_p.h \ @@ -86,6 +84,7 @@ PRIVATE_HEADERS += \ qdatatype_p.h \ qreflectivesequence_p.h \ quriextent_p.h \ + qmofobject_p.h \ qprimitivetype_p.h \ qextent_p.h \ qpackagemerge_p.h \ @@ -112,7 +111,6 @@ PRIVATE_HEADERS += \ qbehavioralfeature_p.h SOURCES += \ - qmofobject.cpp \ qtmofenumerations.cpp \ qrelationship.cpp \ qcomment.cpp \ @@ -142,6 +140,7 @@ SOURCES += \ qdatatype.cpp \ qreflectivesequence.cpp \ quriextent.cpp \ + qmofobject.cpp \ qprimitivetype.cpp \ qextent.cpp \ qpackagemerge.cpp \ diff --git a/src/mof/mof.pro b/src/mof/mof.pro index 8323db8c..87d3a555 100644 --- a/src/mof/mof.pro +++ b/src/mof/mof.pro @@ -1,7 +1,7 @@ load(qt_build_config) TARGET = QtMof -QT = core-private +QT = wrappedobjects-private core-private load(qt_module) diff --git a/src/mof/qargument.cpp b/src/mof/qargument.cpp index 815206b2..054cd348 100644 --- a/src/mof/qargument.cpp +++ b/src/mof/qargument.cpp @@ -56,13 +56,13 @@ QArgumentPrivate::~QArgumentPrivate() } -QArgument::QArgument(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QArgumentPrivate, parent, wrapper) +QArgument::QArgument(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QArgumentPrivate, parent, wrapper) { } -QArgument::QArgument(QArgumentPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper) +QArgument::QArgument(QArgumentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper) { } diff --git a/src/mof/qargument.h b/src/mof/qargument.h index ac4cc179..7f6b8830 100644 --- a/src/mof/qargument.h +++ b/src/mof/qargument.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; // Qt includes #include <QtCore/QString> @@ -60,7 +61,7 @@ class QMofObject; class QArgumentPrivate; -class Q_MOF_EXPORT QArgument : public QMofObject +class Q_MOF_EXPORT QArgument : public QWrappedObject { Q_OBJECT @@ -71,7 +72,7 @@ class Q_MOF_EXPORT QArgument : public QMofObject Q_DECLARE_PRIVATE(QArgument) public: - Q_INVOKABLE explicit QArgument(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QArgument(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QArgument(); // Attributes from QArgument @@ -81,7 +82,7 @@ public: Q_INVOKABLE void setValue(QMofObject *value); protected: - explicit QArgument(QArgumentPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QArgument(QArgumentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qargument_p.h b/src/mof/qargument_p.h index f75c531e..dceefcb1 100644 --- a/src/mof/qargument_p.h +++ b/src/mof/qargument_p.h @@ -42,7 +42,8 @@ #define QTMOF_QARGUMENT_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "QtMof/QArgument" @@ -59,7 +60,7 @@ QT_MODULE(QtMof) class QMofObject; class QArgument; -class Q_MOF_EXPORT QArgumentPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QArgumentPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QArgument) diff --git a/src/mof/qassociation.cpp b/src/mof/qassociation.cpp index 02679dbb..45c1186f 100644 --- a/src/mof/qassociation.cpp +++ b/src/mof/qassociation.cpp @@ -70,15 +70,15 @@ QAssociationPrivate::~QAssociationPrivate() \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. */ -QAssociation::QAssociation(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QAssociationPrivate, parent, wrapper), +QAssociation::QAssociation(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QAssociationPrivate, parent, wrapper), _wrappedRelationship(new QRelationship(this, this)), _wrappedClassifier(new QClassifier(this, this)) { } -QAssociation::QAssociation(QAssociationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QAssociation::QAssociation(QAssociationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedRelationship(new QRelationship(this, this)), _wrappedClassifier(new QClassifier(this, this)) { @@ -97,7 +97,7 @@ QAssociation::~QAssociation() */ const QSet<QElement *> *QAssociation::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -105,7 +105,7 @@ const QSet<QElement *> *QAssociation::ownedElements() const */ QElement *QAssociation::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -113,17 +113,17 @@ QElement *QAssociation::owner() const */ const QSet<QComment *> *QAssociation::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QAssociation::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QAssociation::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -135,7 +135,7 @@ void QAssociation::removeOwnedComment(QComment *ownedComment) */ const QSet<QElement *> *QAssociation::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -147,12 +147,12 @@ const QSet<QElement *> *QAssociation::relatedElements() const */ QString QAssociation::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QAssociation::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -160,7 +160,7 @@ void QAssociation::setName(QString name) */ QString QAssociation::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -172,7 +172,7 @@ QString QAssociation::qualifiedName() const */ QNamespace *QAssociation::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -184,12 +184,12 @@ QNamespace *QAssociation::namespace_() const */ QtMof::VisibilityKind QAssociation::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QAssociation::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -201,12 +201,12 @@ void QAssociation::setVisibility(QtMof::VisibilityKind visibility) */ QPackage *QAssociation::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QAssociation::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -218,12 +218,12 @@ void QAssociation::setPackage(QPackage *package) */ bool QAssociation::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QAssociation::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -235,7 +235,7 @@ void QAssociation::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -243,7 +243,7 @@ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const */ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -255,17 +255,17 @@ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const */ const QSet<QPackageImport *> *QAssociation::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QAssociation::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QAssociation::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -273,7 +273,7 @@ void QAssociation::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QAssociation::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -281,7 +281,7 @@ const QSet<QNamedElement *> *QAssociation::members() const */ const QSet<QPackageableElement *> *QAssociation::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -289,17 +289,17 @@ const QSet<QPackageableElement *> *QAssociation::importedMembers() const */ const QSet<QElementImport *> *QAssociation::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QAssociation::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QAssociation::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -307,17 +307,17 @@ void QAssociation::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QAssociation::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QAssociation::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QAssociation::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -325,7 +325,7 @@ void QAssociation::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QAssociation::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -337,12 +337,12 @@ const QSet<QNamedElement *> *QAssociation::ownedMembers() const */ bool QAssociation::isAbstract() const { - return (qmofobject_cast<const QClassifier *>(this))->isAbstract(); + return (qwrappedobject_cast<const QClassifier *>(this))->isAbstract(); } void QAssociation::setAbstract(bool isAbstract) { - (qmofobject_cast<QClassifier *>(this))->setAbstract(isAbstract); + (qwrappedobject_cast<QClassifier *>(this))->setAbstract(isAbstract); } /*! @@ -350,12 +350,12 @@ void QAssociation::setAbstract(bool isAbstract) */ bool QAssociation::isFinalSpecialization() const { - return (qmofobject_cast<const QClassifier *>(this))->isFinalSpecialization(); + return (qwrappedobject_cast<const QClassifier *>(this))->isFinalSpecialization(); } void QAssociation::setFinalSpecialization(bool isFinalSpecialization) { - (qmofobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); + (qwrappedobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); } // --------------------------------------------------------------- @@ -367,7 +367,7 @@ void QAssociation::setFinalSpecialization(bool isFinalSpecialization) */ const QSet<QProperty *> *QAssociation::attributes() const { - return (qmofobject_cast<const QClassifier *>(this))->attributes(); + return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } /*! @@ -375,7 +375,7 @@ const QSet<QProperty *> *QAssociation::attributes() const */ const QSet<QFeature *> *QAssociation::features() const { - return (qmofobject_cast<const QClassifier *>(this))->features(); + return (qwrappedobject_cast<const QClassifier *>(this))->features(); } /*! @@ -383,17 +383,17 @@ const QSet<QFeature *> *QAssociation::features() const */ const QSet<QClassifier *> *QAssociation::generals() const { - return (qmofobject_cast<const QClassifier *>(this))->generals(); + return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } void QAssociation::addGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->addGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->addGeneral(general); } void QAssociation::removeGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->removeGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneral(general); } /*! @@ -401,17 +401,17 @@ void QAssociation::removeGeneral(QClassifier *general) */ const QSet<QClassifier *> *QAssociation::redefinedClassifiers() const { - return (qmofobject_cast<const QClassifier *>(this))->redefinedClassifiers(); + return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } void QAssociation::addRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); } void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); } /*! @@ -419,7 +419,7 @@ void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) */ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const { - return (qmofobject_cast<const QClassifier *>(this))->inheritedMembers(); + return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } /*! @@ -427,17 +427,17 @@ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const */ const QSet<QGeneralization *> *QAssociation::generalizations() const { - return (qmofobject_cast<const QClassifier *>(this))->generalizations(); + return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } void QAssociation::addGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->addGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->addGeneralization(generalization); } void QAssociation::removeGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->removeGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneralization(generalization); } // --------------------------------------------------------------- @@ -501,7 +501,7 @@ void QAssociation::addNavigableOwnedEnd(QProperty *navigableOwnedEnd) d->navigableOwnedEnds->insert(navigableOwnedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->addOwnedEnd(qmofobject_cast<QProperty *>(navigableOwnedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->addOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); } } @@ -514,7 +514,7 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) d->navigableOwnedEnds->remove(navigableOwnedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->removeOwnedEnd(qmofobject_cast<QProperty *>(navigableOwnedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->removeOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); } } @@ -538,9 +538,9 @@ void QAssociation::addOwnedEnd(QProperty *ownedEnd) d->ownedEnds->append(ownedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedEnd)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedEnd)); - (qmofobject_cast<QAssociation *>(this))->addMemberEnd(qmofobject_cast<QProperty *>(ownedEnd)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->addMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); // Adjust opposite property ownedEnd->setOwningAssociation(this); @@ -556,9 +556,9 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) d->ownedEnds->removeAll(ownedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedEnd)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedEnd)); - (qmofobject_cast<QAssociation *>(this))->removeMemberEnd(qmofobject_cast<QProperty *>(ownedEnd)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->removeMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); // Adjust opposite property ownedEnd->setOwningAssociation(0); @@ -585,7 +585,7 @@ void QAssociation::addMemberEnd(QProperty *memberEnd) d->memberEnds->append(memberEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addMember(qmofobject_cast<QNamedElement *>(memberEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); // Adjust opposite property memberEnd->setAssociation(this); @@ -601,7 +601,7 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) d->memberEnds->removeAll(memberEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeMember(qmofobject_cast<QNamedElement *>(memberEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); // Adjust opposite property memberEnd->setAssociation(0); diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h index 7fb1fa5e..61f633e9 100644 --- a/src/mof/qassociation.h +++ b/src/mof/qassociation.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QRelationship> #include <QtMof/QClassifier> @@ -64,7 +65,7 @@ class QProperty; class QAssociationPrivate; -class Q_MOF_EXPORT QAssociation : public QMofObject +class Q_MOF_EXPORT QAssociation : public QWrappedObject { Q_OBJECT @@ -78,7 +79,7 @@ class Q_MOF_EXPORT QAssociation : public QMofObject Q_DECLARE_PRIVATE(QAssociation) public: - Q_INVOKABLE explicit QAssociation(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAssociation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAssociation(); // Association ends from aggregated QElement @@ -166,7 +167,7 @@ public: Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd); protected: - explicit QAssociation(QAssociationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QAssociation(QAssociationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QRelationship *_wrappedRelationship; diff --git a/src/mof/qassociation_p.h b/src/mof/qassociation_p.h index 4eb95cb8..599ac8ff 100644 --- a/src/mof/qassociation_p.h +++ b/src/mof/qassociation_p.h @@ -42,7 +42,8 @@ #define QTMOF_QASSOCIATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qrelationship_p.h" #include "private/qclassifier_p.h" @@ -63,7 +64,7 @@ class QType; class QProperty; class QAssociation; -class Q_MOF_EXPORT QAssociationPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QAssociationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QAssociation) diff --git a/src/mof/qbehavioralfeature.cpp b/src/mof/qbehavioralfeature.cpp index c87345d1..0092e153 100644 --- a/src/mof/qbehavioralfeature.cpp +++ b/src/mof/qbehavioralfeature.cpp @@ -68,15 +68,15 @@ QBehavioralFeaturePrivate::~QBehavioralFeaturePrivate() \brief A behavioral feature is a feature of a classifier that specifies an aspect of the behavior of its instances. */ -QBehavioralFeature::QBehavioralFeature(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QBehavioralFeaturePrivate, parent, wrapper), +QBehavioralFeature::QBehavioralFeature(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QBehavioralFeaturePrivate, parent, wrapper), _wrappedFeature(new QFeature(this, this)), _wrappedNamespace(new QNamespace(this, this)) { } -QBehavioralFeature::QBehavioralFeature(QBehavioralFeaturePrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QBehavioralFeature::QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedFeature(new QFeature(this, this)), _wrappedNamespace(new QNamespace(this, this)) { @@ -95,7 +95,7 @@ QBehavioralFeature::~QBehavioralFeature() */ const QSet<QElement *> *QBehavioralFeature::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -103,7 +103,7 @@ const QSet<QElement *> *QBehavioralFeature::ownedElements() const */ QElement *QBehavioralFeature::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -111,17 +111,17 @@ QElement *QBehavioralFeature::owner() const */ const QSet<QComment *> *QBehavioralFeature::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QBehavioralFeature::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QBehavioralFeature::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -133,12 +133,12 @@ void QBehavioralFeature::removeOwnedComment(QComment *ownedComment) */ QString QBehavioralFeature::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QBehavioralFeature::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -146,12 +146,12 @@ void QBehavioralFeature::setName(QString name) */ QtMof::VisibilityKind QBehavioralFeature::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QBehavioralFeature::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -159,7 +159,7 @@ void QBehavioralFeature::setVisibility(QtMof::VisibilityKind visibility) */ QString QBehavioralFeature::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -171,7 +171,7 @@ QString QBehavioralFeature::qualifiedName() const */ QNamespace *QBehavioralFeature::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -183,12 +183,12 @@ QNamespace *QBehavioralFeature::namespace_() const */ bool QBehavioralFeature::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QBehavioralFeature::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -200,7 +200,7 @@ void QBehavioralFeature::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -208,7 +208,7 @@ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const */ const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -220,12 +220,12 @@ const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const */ bool QBehavioralFeature::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QBehavioralFeature::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -237,7 +237,7 @@ void QBehavioralFeature::setStatic(bool isStatic) */ const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- @@ -249,17 +249,17 @@ const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const */ const QSet<QPackageImport *> *QBehavioralFeature::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QBehavioralFeature::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -267,7 +267,7 @@ void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QBehavioralFeature::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -275,7 +275,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::members() const */ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -283,17 +283,17 @@ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const */ const QSet<QElementImport *> *QBehavioralFeature::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QBehavioralFeature::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QBehavioralFeature::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -301,17 +301,17 @@ void QBehavioralFeature::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QBehavioralFeature::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QBehavioralFeature::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -319,7 +319,7 @@ void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -377,7 +377,7 @@ void QBehavioralFeature::addOwnedParameter(QParameter *ownedParameter) d->ownedParameters->append(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } @@ -390,7 +390,7 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) d->ownedParameters->removeAll(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } diff --git a/src/mof/qbehavioralfeature.h b/src/mof/qbehavioralfeature.h index 37ee996e..b1251414 100644 --- a/src/mof/qbehavioralfeature.h +++ b/src/mof/qbehavioralfeature.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QFeature> #include <QtMof/QNamespace> @@ -65,7 +66,7 @@ class QNamedElement; class QBehavioralFeaturePrivate; -class Q_MOF_EXPORT QBehavioralFeature : public QMofObject +class Q_MOF_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT @@ -76,7 +77,7 @@ class Q_MOF_EXPORT QBehavioralFeature : public QMofObject Q_DECLARE_PRIVATE(QBehavioralFeature) public: - Q_INVOKABLE explicit QBehavioralFeature(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBehavioralFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBehavioralFeature(); // Association ends from aggregated QElement @@ -137,7 +138,7 @@ public: Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; protected: - explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QFeature *_wrappedFeature; diff --git a/src/mof/qbehavioralfeature_p.h b/src/mof/qbehavioralfeature_p.h index 6b12ea49..b8181aaa 100644 --- a/src/mof/qbehavioralfeature_p.h +++ b/src/mof/qbehavioralfeature_p.h @@ -42,7 +42,8 @@ #define QTMOF_QBEHAVIORALFEATURE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qfeature_p.h" #include "private/qnamespace_p.h" @@ -63,7 +64,7 @@ class QParameter; class QType; class QNamedElement; -class Q_MOF_EXPORT QBehavioralFeaturePrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QBehavioralFeaturePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QBehavioralFeature) diff --git a/src/mof/qclass.cpp b/src/mof/qclass.cpp index ff8a1213..2e797108 100644 --- a/src/mof/qclass.cpp +++ b/src/mof/qclass.cpp @@ -71,12 +71,12 @@ QClassPrivate::~QClassPrivate() \brief A class describes a set of objects that share the same specifications of features, constraints, and semantics. */ -QClass::QClass(QMofObject *parent, QMofObject *wrapper) : +QClass::QClass(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QClassPrivate, parent, wrapper) { } -QClass::QClass(QClassPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QClass::QClass(QClassPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -134,7 +134,7 @@ void QClass::addNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->append(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -147,7 +147,7 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->removeAll(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -171,8 +171,8 @@ void QClass::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setClass_(this); @@ -188,8 +188,8 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setClass_(0); @@ -216,8 +216,8 @@ void QClass::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setClass_(this); @@ -233,8 +233,8 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setClass_(0); diff --git a/src/mof/qclass.h b/src/mof/qclass.h index c6329b79..7d7bd904 100644 --- a/src/mof/qclass.h +++ b/src/mof/qclass.h @@ -77,7 +77,7 @@ class Q_MOF_EXPORT QClass : public QClassifier Q_DECLARE_PRIVATE(QClass) public: - Q_INVOKABLE explicit QClass(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClass(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClass(); // Attributes from QClass @@ -102,7 +102,7 @@ public: Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; protected: - explicit QClass(QClassPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QClass(QClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qclassifier.cpp b/src/mof/qclassifier.cpp index 0c1aa538..d5f7f8d7 100644 --- a/src/mof/qclassifier.cpp +++ b/src/mof/qclassifier.cpp @@ -77,7 +77,7 @@ void QClassifierPrivate::addAttribute(QProperty *attribute) this->attributes->insert(attribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(this))->addFeature(qmofobject_cast<QFeature *>(attribute)); + (qwrappedobject_cast<QClassifierPrivate *>(this))->addFeature(qwrappedobject_cast<QFeature *>(attribute)); } } @@ -89,7 +89,7 @@ void QClassifierPrivate::removeAttribute(QProperty *attribute) this->attributes->remove(attribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(this))->removeFeature(qmofobject_cast<QFeature *>(attribute)); + (qwrappedobject_cast<QClassifierPrivate *>(this))->removeFeature(qwrappedobject_cast<QFeature *>(attribute)); } } @@ -101,11 +101,11 @@ void QClassifierPrivate::addFeature(QFeature *feature) this->features->insert(feature); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->addMember(qmofobject_cast<QNamedElement *>(feature)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(feature)); // Adjust opposite property Q_Q(QClassifier); - (qmofobject_cast<QFeaturePrivate *>(feature->d_func()))->addFeaturingClassifier(q); + (qwrappedobject_cast<QFeaturePrivate *>(feature->d_func()))->addFeaturingClassifier(q); } } @@ -117,12 +117,12 @@ void QClassifierPrivate::removeFeature(QFeature *feature) this->features->remove(feature); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->removeMember(qmofobject_cast<QNamedElement *>(feature)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(feature)); // Adjust opposite property Q_Q(QClassifier); if (feature) - (qmofobject_cast<QFeaturePrivate *>(feature->d_func()))->removeFeaturingClassifier(q); + (qwrappedobject_cast<QFeaturePrivate *>(feature->d_func()))->removeFeaturingClassifier(q); } } @@ -134,16 +134,16 @@ void QClassifierPrivate::removeFeature(QFeature *feature) \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. */ -QClassifier::QClassifier(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QClassifierPrivate, parent, wrapper), +QClassifier::QClassifier(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QClassifierPrivate, parent, wrapper), _wrappedType(new QType(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) { } -QClassifier::QClassifier(QClassifierPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QClassifier::QClassifier(QClassifierPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedType(new QType(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) @@ -163,7 +163,7 @@ QClassifier::~QClassifier() */ const QSet<QElement *> *QClassifier::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -171,7 +171,7 @@ const QSet<QElement *> *QClassifier::ownedElements() const */ QElement *QClassifier::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -179,17 +179,17 @@ QElement *QClassifier::owner() const */ const QSet<QComment *> *QClassifier::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QClassifier::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QClassifier::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -201,12 +201,12 @@ void QClassifier::removeOwnedComment(QComment *ownedComment) */ QString QClassifier::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QClassifier::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -214,7 +214,7 @@ void QClassifier::setName(QString name) */ QString QClassifier::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -226,7 +226,7 @@ QString QClassifier::qualifiedName() const */ QNamespace *QClassifier::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -238,12 +238,12 @@ QNamespace *QClassifier::namespace_() const */ QtMof::VisibilityKind QClassifier::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QClassifier::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -255,12 +255,12 @@ void QClassifier::setVisibility(QtMof::VisibilityKind visibility) */ QPackage *QClassifier::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QClassifier::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -272,12 +272,12 @@ void QClassifier::setPackage(QPackage *package) */ bool QClassifier::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QClassifier::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -289,7 +289,7 @@ void QClassifier::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -297,7 +297,7 @@ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const */ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -309,17 +309,17 @@ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const */ const QSet<QPackageImport *> *QClassifier::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QClassifier::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QClassifier::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -327,7 +327,7 @@ void QClassifier::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QClassifier::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -335,7 +335,7 @@ const QSet<QNamedElement *> *QClassifier::members() const */ const QSet<QPackageableElement *> *QClassifier::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -343,17 +343,17 @@ const QSet<QPackageableElement *> *QClassifier::importedMembers() const */ const QSet<QElementImport *> *QClassifier::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QClassifier::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QClassifier::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -361,17 +361,17 @@ void QClassifier::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QClassifier::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QClassifier::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QClassifier::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -379,7 +379,7 @@ void QClassifier::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QClassifier::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -510,7 +510,7 @@ void QClassifier::addRedefinedClassifier(QClassifier *redefinedClassifier) d->redefinedClassifiers->insert(redefinedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedClassifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); } } @@ -523,7 +523,7 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) d->redefinedClassifiers->remove(redefinedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedClassifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); } } @@ -559,7 +559,7 @@ void QClassifier::addGeneralization(QGeneralization *generalization) d->generalizations->insert(generalization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(generalization)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalization)); // Adjust opposite property generalization->setSpecific(this); @@ -575,7 +575,7 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) d->generalizations->remove(generalization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(generalization)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalization)); // Adjust opposite property generalization->setSpecific(0); diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h index a54fde7e..ccac528c 100644 --- a/src/mof/qclassifier.h +++ b/src/mof/qclassifier.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QType> #include <QtMof/QRedefinableElement> #include <QtMof/QNamespace> @@ -66,7 +67,7 @@ class QFeature; class QClassifierPrivate; -class Q_MOF_EXPORT QClassifier : public QMofObject +class Q_MOF_EXPORT QClassifier : public QWrappedObject { Q_OBJECT @@ -83,7 +84,7 @@ class Q_MOF_EXPORT QClassifier : public QMofObject Q_DECLARE_PRIVATE(QClassifier) public: - Q_INVOKABLE explicit QClassifier(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClassifier(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClassifier(); // Association ends from aggregated QElement @@ -165,7 +166,7 @@ public: friend class QFeaturePrivate; protected: - explicit QClassifier(QClassifierPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QClassifier(QClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QType *_wrappedType; diff --git a/src/mof/qclassifier_p.h b/src/mof/qclassifier_p.h index bd3f1e6f..f9860274 100644 --- a/src/mof/qclassifier_p.h +++ b/src/mof/qclassifier_p.h @@ -42,7 +42,8 @@ #define QTMOF_QCLASSIFIER_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtype_p.h" #include "private/qredefinableelement_p.h" #include "private/qnamespace_p.h" @@ -65,7 +66,7 @@ class QClassifier; class QProperty; class QFeature; -class Q_MOF_EXPORT QClassifierPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QClassifierPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QClassifier) diff --git a/src/mof/qcomment.cpp b/src/mof/qcomment.cpp index c124a3dc..3da642e3 100644 --- a/src/mof/qcomment.cpp +++ b/src/mof/qcomment.cpp @@ -62,12 +62,12 @@ QCommentPrivate::~QCommentPrivate() \brief A comment is a textual annotation that can be attached to a set of elements. */ -QComment::QComment(QMofObject *parent, QMofObject *wrapper) : +QComment::QComment(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QCommentPrivate, parent, wrapper) { } -QComment::QComment(QCommentPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QComment::QComment(QCommentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/mof/qcomment.h b/src/mof/qcomment.h index 764853c1..7cd8ea0d 100644 --- a/src/mof/qcomment.h +++ b/src/mof/qcomment.h @@ -69,7 +69,7 @@ class Q_MOF_EXPORT QComment : public QElement Q_DECLARE_PRIVATE(QComment) public: - Q_INVOKABLE explicit QComment(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QComment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QComment(); // Attributes from QComment @@ -82,7 +82,7 @@ public: Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement); protected: - explicit QComment(QCommentPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QComment(QCommentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qconstraint.cpp b/src/mof/qconstraint.cpp index 515483d0..91b5271d 100644 --- a/src/mof/qconstraint.cpp +++ b/src/mof/qconstraint.cpp @@ -68,12 +68,12 @@ QConstraintPrivate::~QConstraintPrivate() \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. */ -QConstraint::QConstraint(QMofObject *parent, QMofObject *wrapper) : +QConstraint::QConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QConstraintPrivate, parent, wrapper) { } -QConstraint::QConstraint(QConstraintPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QConstraint::QConstraint(QConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } @@ -110,7 +110,7 @@ void QConstraint::setContext(QNamespace *context) d->context = context; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(context)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(context)); // Adjust opposite property if (context) @@ -136,13 +136,13 @@ void QConstraint::setSpecification(QValueSpecification *specification) Q_D(QConstraint); if (d->specification != specification) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->specification)); d->specification = specification; // Adjust subsetted property(ies) if (specification) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(specification)); } } } diff --git a/src/mof/qconstraint.h b/src/mof/qconstraint.h index b35704d0..dded0b67 100644 --- a/src/mof/qconstraint.h +++ b/src/mof/qconstraint.h @@ -74,7 +74,7 @@ class Q_MOF_EXPORT QConstraint : public QPackageableElement Q_DECLARE_PRIVATE(QConstraint) public: - Q_INVOKABLE explicit QConstraint(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConstraint(); // Association ends from QConstraint @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement); protected: - explicit QConstraint(QConstraintPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdatatype.cpp b/src/mof/qdatatype.cpp index 0cd1e07f..6dd6b143 100644 --- a/src/mof/qdatatype.cpp +++ b/src/mof/qdatatype.cpp @@ -68,12 +68,12 @@ QDataTypePrivate::~QDataTypePrivate() \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. */ -QDataType::QDataType(QMofObject *parent, QMofObject *wrapper) : +QDataType::QDataType(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QDataTypePrivate, parent, wrapper) { } -QDataType::QDataType(QDataTypePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QDataType::QDataType(QDataTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -106,8 +106,8 @@ void QDataType::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setDatatype(this); @@ -123,8 +123,8 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setDatatype(0); @@ -151,8 +151,8 @@ void QDataType::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setDatatype(this); @@ -168,8 +168,8 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setDatatype(0); diff --git a/src/mof/qdatatype.h b/src/mof/qdatatype.h index 9dbe5cf9..5552b924 100644 --- a/src/mof/qdatatype.h +++ b/src/mof/qdatatype.h @@ -74,7 +74,7 @@ class Q_MOF_EXPORT QDataType : public QClassifier Q_DECLARE_PRIVATE(QDataType) public: - Q_INVOKABLE explicit QDataType(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDataType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDataType(); // Association ends from QDataType @@ -89,7 +89,7 @@ public: Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; protected: - explicit QDataType(QDataTypePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QDataType(QDataTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdirectedrelationship.cpp b/src/mof/qdirectedrelationship.cpp index e4fc9de7..8ddf5385 100644 --- a/src/mof/qdirectedrelationship.cpp +++ b/src/mof/qdirectedrelationship.cpp @@ -66,7 +66,7 @@ void QDirectedRelationshipPrivate::addSource(QElement *source) this->sources->insert(source); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qmofobject_cast<QElement *>(source)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(source)); } } @@ -78,7 +78,7 @@ void QDirectedRelationshipPrivate::removeSource(QElement *source) this->sources->remove(source); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qmofobject_cast<QElement *>(source)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(source)); } } @@ -90,7 +90,7 @@ void QDirectedRelationshipPrivate::addTarget(QElement *target) this->targets->insert(target); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qmofobject_cast<QElement *>(target)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(target)); } } @@ -102,7 +102,7 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) this->targets->remove(target); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qmofobject_cast<QElement *>(target)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(target)); } } @@ -114,12 +114,12 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) \brief A directed relationship represents a relationship between a collection of source model elements and a collection of target model elements. */ -QDirectedRelationship::QDirectedRelationship(QMofObject *parent, QMofObject *wrapper) : +QDirectedRelationship::QDirectedRelationship(QWrappedObject *parent, QWrappedObject *wrapper) : QRelationship(*new QDirectedRelationshipPrivate, parent, wrapper) { } -QDirectedRelationship::QDirectedRelationship(QDirectedRelationshipPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QDirectedRelationship::QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRelationship(dd, parent, wrapper) { } diff --git a/src/mof/qdirectedrelationship.h b/src/mof/qdirectedrelationship.h index 4596f5de..53749253 100644 --- a/src/mof/qdirectedrelationship.h +++ b/src/mof/qdirectedrelationship.h @@ -71,7 +71,7 @@ class Q_MOF_EXPORT QDirectedRelationship : public QRelationship Q_DECLARE_PRIVATE(QDirectedRelationship) public: - Q_INVOKABLE explicit QDirectedRelationship(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDirectedRelationship(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDirectedRelationship(); // Association ends from QDirectedRelationship @@ -79,7 +79,7 @@ public: Q_INVOKABLE const QSet<QElement *> *targets() const; protected: - explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelement.cpp b/src/mof/qelement.cpp index 089f63ea..99ff26c2 100644 --- a/src/mof/qelement.cpp +++ b/src/mof/qelement.cpp @@ -67,10 +67,10 @@ void QElementPrivate::addOwnedElement(QElement *ownedElement) if (!this->ownedElements->contains(ownedElement)) { this->ownedElements->insert(ownedElement); Q_Q(QElement); - qmof_topLevelWrapper(ownedElement)->setParent(qmof_topLevelWrapper(q)); + qTopLevelWrapper(ownedElement)->setParent(qTopLevelWrapper(q)); // Adjust opposite property - (qmofobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(q); + (qwrappedobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(q); } } @@ -80,10 +80,10 @@ void QElementPrivate::removeOwnedElement(QElement *ownedElement) if (this->ownedElements->contains(ownedElement)) { this->ownedElements->remove(ownedElement); - qmof_topLevelWrapper(ownedElement)->setParent(0); + qTopLevelWrapper(ownedElement)->setParent(0); // Adjust opposite property - (qmofobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(0); + (qwrappedobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(0); } } @@ -95,13 +95,13 @@ void QElementPrivate::setOwner(QElement *owner) Q_Q(QElement); // Adjust opposite property if (this->owner) - (qmofobject_cast<QElementPrivate *>(this->owner->d_func()))->removeOwnedElement(q); + (qwrappedobject_cast<QElementPrivate *>(this->owner->d_func()))->removeOwnedElement(q); this->owner = owner; // Adjust opposite property if (owner) - (qmofobject_cast<QElementPrivate *>(owner->d_func()))->addOwnedElement(q); + (qwrappedobject_cast<QElementPrivate *>(owner->d_func()))->addOwnedElement(q); } } @@ -113,12 +113,12 @@ void QElementPrivate::setOwner(QElement *owner) \brief An element is a constituent of a model. As such, it has the capability of owning other elements. */ -QElement::QElement(QMofObject *parent, QMofObject *wrapper) : +QElement::QElement(QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(*new QElementPrivate, parent, wrapper) { } -QElement::QElement(QElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QElement::QElement(QElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(dd, parent, wrapper) { } @@ -173,7 +173,7 @@ void QElement::addOwnedComment(QComment *ownedComment) d->ownedComments->insert(ownedComment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedComment)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); } } @@ -186,7 +186,7 @@ void QElement::removeOwnedComment(QComment *ownedComment) d->ownedComments->remove(ownedComment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(ownedComment)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); } } diff --git a/src/mof/qelement.h b/src/mof/qelement.h index bc0a8447..c14791d3 100644 --- a/src/mof/qelement.h +++ b/src/mof/qelement.h @@ -73,7 +73,7 @@ class Q_MOF_EXPORT QElement : public QMofObject Q_DECLARE_PRIVATE(QElement) public: - Q_INVOKABLE explicit QElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QElement(); // Association ends from QElement @@ -92,7 +92,7 @@ public: Q_INVOKABLE void delete_(); protected: - explicit QElement(QElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QElement(QElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelementimport.cpp b/src/mof/qelementimport.cpp index 69c08fe3..9bf78473 100644 --- a/src/mof/qelementimport.cpp +++ b/src/mof/qelementimport.cpp @@ -66,12 +66,12 @@ QElementImportPrivate::~QElementImportPrivate() \brief An element import identifies an element in another package, and allows the element to be referenced using its name without a qualifier. */ -QElementImport::QElementImport(QMofObject *parent, QMofObject *wrapper) : +QElementImport::QElementImport(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QElementImportPrivate, parent, wrapper) { } -QElementImport::QElementImport(QElementImportPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QElementImport::QElementImport(QElementImportPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -148,13 +148,13 @@ void QElementImport::setImportedElement(QPackageableElement *importedElement) Q_D(QElementImport); if (d->importedElement != importedElement) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->importedElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->importedElement)); d->importedElement = importedElement; // Adjust subsetted property(ies) if (importedElement) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(importedElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(importedElement)); } } } @@ -181,14 +181,14 @@ void QElementImport::setImportingNamespace(QNamespace *importingNamespace) d->importingNamespace->removeElementImport(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->importingNamespace)); d->importingNamespace = importingNamespace; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(importingNamespace)); if (importingNamespace) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(importingNamespace)); } // Adjust opposite property diff --git a/src/mof/qelementimport.h b/src/mof/qelementimport.h index 43c8887a..ea2c39b1 100644 --- a/src/mof/qelementimport.h +++ b/src/mof/qelementimport.h @@ -77,7 +77,7 @@ class Q_MOF_EXPORT QElementImport : public QDirectedRelationship Q_DECLARE_PRIVATE(QElementImport) public: - Q_INVOKABLE explicit QElementImport(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QElementImport(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QElementImport(); // Attributes from QElementImport @@ -96,7 +96,7 @@ public: Q_INVOKABLE QString getName() const; protected: - explicit QElementImport(QElementImportPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumeration.cpp b/src/mof/qenumeration.cpp index 1f3b7455..550aa7f6 100644 --- a/src/mof/qenumeration.cpp +++ b/src/mof/qenumeration.cpp @@ -64,12 +64,12 @@ QEnumerationPrivate::~QEnumerationPrivate() \brief An enumeration is a data type whose values are enumerated in the model as enumeration literals. */ -QEnumeration::QEnumeration(QMofObject *parent, QMofObject *wrapper) : +QEnumeration::QEnumeration(QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(*new QEnumerationPrivate, parent, wrapper) { } -QEnumeration::QEnumeration(QEnumerationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QEnumeration::QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(dd, parent, wrapper) { } @@ -102,7 +102,7 @@ void QEnumeration::addOwnedLiteral(QEnumerationLiteral *ownedLiteral) d->ownedLiterals->append(ownedLiteral); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedLiteral)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); // Adjust opposite property ownedLiteral->setEnumeration(this); @@ -118,7 +118,7 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) d->ownedLiterals->removeAll(ownedLiteral); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedLiteral)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); // Adjust opposite property ownedLiteral->setEnumeration(0); diff --git a/src/mof/qenumeration.h b/src/mof/qenumeration.h index f0166ece..a2b170ba 100644 --- a/src/mof/qenumeration.h +++ b/src/mof/qenumeration.h @@ -70,7 +70,7 @@ class Q_MOF_EXPORT QEnumeration : public QDataType Q_DECLARE_PRIVATE(QEnumeration) public: - Q_INVOKABLE explicit QEnumeration(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEnumeration(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEnumeration(); // Association ends from QEnumeration @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral); protected: - explicit QEnumeration(QEnumerationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumerationliteral.cpp b/src/mof/qenumerationliteral.cpp index 2349fe13..13a10720 100644 --- a/src/mof/qenumerationliteral.cpp +++ b/src/mof/qenumerationliteral.cpp @@ -63,12 +63,12 @@ QEnumerationLiteralPrivate::~QEnumerationLiteralPrivate() \brief An enumeration literal is a user-defined data value for an enumeration. */ -QEnumerationLiteral::QEnumerationLiteral(QMofObject *parent, QMofObject *wrapper) : +QEnumerationLiteral::QEnumerationLiteral(QWrappedObject *parent, QWrappedObject *wrapper) : QInstanceSpecification(*new QEnumerationLiteralPrivate, parent, wrapper) { } -QEnumerationLiteral::QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QEnumerationLiteral::QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInstanceSpecification(dd, parent, wrapper) { } @@ -117,7 +117,7 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) d->enumeration = enumeration; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(enumeration)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(enumeration)); // Adjust opposite property if (enumeration) diff --git a/src/mof/qenumerationliteral.h b/src/mof/qenumerationliteral.h index df9a3a60..f322947b 100644 --- a/src/mof/qenumerationliteral.h +++ b/src/mof/qenumerationliteral.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QEnumerationLiteral : public QInstanceSpecification Q_DECLARE_PRIVATE(QEnumerationLiteral) public: - Q_INVOKABLE explicit QEnumerationLiteral(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEnumerationLiteral(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEnumerationLiteral(); // Association ends from QEnumerationLiteral @@ -77,7 +77,7 @@ public: Q_INVOKABLE void setEnumeration(QEnumeration *enumeration); protected: - explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexception.cpp b/src/mof/qexception.cpp index 25a3093a..67810cd0 100644 --- a/src/mof/qexception.cpp +++ b/src/mof/qexception.cpp @@ -57,13 +57,13 @@ QExceptionPrivate::~QExceptionPrivate() } -QException::QException(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QExceptionPrivate, parent, wrapper) +QException::QException(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QExceptionPrivate, parent, wrapper) { } -QException::QException(QExceptionPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper) +QException::QException(QExceptionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper) { } diff --git a/src/mof/qexception.h b/src/mof/qexception.h index 0e22f0ff..b906c8e6 100644 --- a/src/mof/qexception.h +++ b/src/mof/qexception.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; // Qt includes #include <QtCore/QString> @@ -60,7 +61,7 @@ class QElement; class QExceptionPrivate; -class Q_MOF_EXPORT QException : public QMofObject +class Q_MOF_EXPORT QException : public QWrappedObject { Q_OBJECT @@ -72,7 +73,7 @@ class Q_MOF_EXPORT QException : public QMofObject Q_DECLARE_PRIVATE(QException) public: - Q_INVOKABLE explicit QException(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QException(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QException(); // Attributes from QException @@ -84,7 +85,7 @@ public: Q_INVOKABLE void setObjectInError(QElement *objectInError); protected: - explicit QException(QExceptionPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QException(QExceptionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexception_p.h b/src/mof/qexception_p.h index 7dcba16c..fc615254 100644 --- a/src/mof/qexception_p.h +++ b/src/mof/qexception_p.h @@ -42,7 +42,8 @@ #define QTMOF_QEXCEPTION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "QtMof/QException" @@ -59,7 +60,7 @@ QT_MODULE(QtMof) class QElement; class QException; -class Q_MOF_EXPORT QExceptionPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QExceptionPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QException) diff --git a/src/mof/qexpression.cpp b/src/mof/qexpression.cpp index 43b4e927..0a8ae07e 100644 --- a/src/mof/qexpression.cpp +++ b/src/mof/qexpression.cpp @@ -62,12 +62,12 @@ QExpressionPrivate::~QExpressionPrivate() \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. */ -QExpression::QExpression(QMofObject *parent, QMofObject *wrapper) : +QExpression::QExpression(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QExpressionPrivate, parent, wrapper) { } -QExpression::QExpression(QExpressionPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QExpression::QExpression(QExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } @@ -125,7 +125,7 @@ void QExpression::addOperand(QValueSpecification *operand) d->operands->append(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } @@ -138,7 +138,7 @@ void QExpression::removeOperand(QValueSpecification *operand) d->operands->removeAll(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } diff --git a/src/mof/qexpression.h b/src/mof/qexpression.h index f6fca36c..1b716770 100644 --- a/src/mof/qexpression.h +++ b/src/mof/qexpression.h @@ -69,7 +69,7 @@ class Q_MOF_EXPORT QExpression : public QValueSpecification Q_DECLARE_PRIVATE(QExpression) public: - Q_INVOKABLE explicit QExpression(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExpression(); // Attributes from QExpression @@ -82,7 +82,7 @@ public: Q_INVOKABLE void removeOperand(QValueSpecification *operand); protected: - explicit QExpression(QExpressionPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QExpression(QExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qextent.cpp b/src/mof/qextent.cpp index 962a938f..32f42fa7 100644 --- a/src/mof/qextent.cpp +++ b/src/mof/qextent.cpp @@ -59,12 +59,12 @@ QExtentPrivate::~QExtentPrivate() } -QExtent::QExtent(QMofObject *parent, QMofObject *wrapper) : +QExtent::QExtent(QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(*new QExtentPrivate, parent, wrapper) { } -QExtent::QExtent(QExtentPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QExtent::QExtent(QExtentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(dd, parent, wrapper) { } diff --git a/src/mof/qextent.h b/src/mof/qextent.h index 737a6664..6fbe996c 100644 --- a/src/mof/qextent.h +++ b/src/mof/qextent.h @@ -72,7 +72,7 @@ class Q_MOF_EXPORT QExtent : public QMofObject Q_DECLARE_PRIVATE(QExtent) public: - Q_INVOKABLE explicit QExtent(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExtent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExtent(); // Operations @@ -84,7 +84,7 @@ public: Q_INVOKABLE bool linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const; protected: - explicit QExtent(QExtentPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QExtent(QExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfactory.cpp b/src/mof/qfactory.cpp index 84c64c4a..2fe0cf3f 100644 --- a/src/mof/qfactory.cpp +++ b/src/mof/qfactory.cpp @@ -62,12 +62,12 @@ QFactoryPrivate::~QFactoryPrivate() } -QFactory::QFactory(QMofObject *parent, QMofObject *wrapper) : +QFactory::QFactory(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QFactoryPrivate, parent, wrapper) { } -QFactory::QFactory(QFactoryPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QFactory::QFactory(QFactoryPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/mof/qfactory.h b/src/mof/qfactory.h index 7fe251da..753d7a94 100644 --- a/src/mof/qfactory.h +++ b/src/mof/qfactory.h @@ -77,7 +77,7 @@ class Q_MOF_EXPORT QFactory : public QElement Q_DECLARE_PRIVATE(QFactory) public: - Q_INVOKABLE explicit QFactory(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFactory(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFactory(); // Attributes from QFactory @@ -92,7 +92,7 @@ public: Q_INVOKABLE QLink *createLink(const QAssociation *association, const QElement *firstElement, const QElement *secondElement); protected: - explicit QFactory(QFactoryPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QFactory(QFactoryPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfeature.cpp b/src/mof/qfeature.cpp index fcedeb24..8a1928d4 100644 --- a/src/mof/qfeature.cpp +++ b/src/mof/qfeature.cpp @@ -68,7 +68,7 @@ void QFeaturePrivate::addFeaturingClassifier(QClassifier *featuringClassifier) // Adjust opposite property Q_Q(QFeature); - (qmofobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->addFeature(q); + (qwrappedobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->addFeature(q); } } @@ -82,7 +82,7 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier // Adjust opposite property Q_Q(QFeature); if (featuringClassifier) - (qmofobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->removeFeature(q); + (qwrappedobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->removeFeature(q); } } @@ -94,12 +94,12 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier \brief A feature declares a behavioral or structural characteristic of instances of classifiers. */ -QFeature::QFeature(QMofObject *parent, QMofObject *wrapper) : +QFeature::QFeature(QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(*new QFeaturePrivate, parent, wrapper) { } -QFeature::QFeature(QFeaturePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QFeature::QFeature(QFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(dd, parent, wrapper) { } diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h index 35fa0906..3cae606f 100644 --- a/src/mof/qfeature.h +++ b/src/mof/qfeature.h @@ -71,7 +71,7 @@ class Q_MOF_EXPORT QFeature : public QRedefinableElement Q_DECLARE_PRIVATE(QFeature) public: - Q_INVOKABLE explicit QFeature(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFeature(); // Attributes from QFeature @@ -85,7 +85,7 @@ public: friend class QClassifierPrivate; protected: - explicit QFeature(QFeaturePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QFeature(QFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qgeneralization.cpp b/src/mof/qgeneralization.cpp index 1c514c06..42c2cc0c 100644 --- a/src/mof/qgeneralization.cpp +++ b/src/mof/qgeneralization.cpp @@ -65,12 +65,12 @@ QGeneralizationPrivate::~QGeneralizationPrivate() \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. */ -QGeneralization::QGeneralization(QMofObject *parent, QMofObject *wrapper) : +QGeneralization::QGeneralization(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QGeneralizationPrivate, parent, wrapper) { } -QGeneralization::QGeneralization(QGeneralizationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QGeneralization::QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -130,14 +130,14 @@ void QGeneralization::setSpecific(QClassifier *specific) d->specific->removeGeneralization(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->specific)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->specific)); d->specific = specific; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(specific)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(specific)); if (specific) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(specific)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(specific)); } // Adjust opposite property @@ -164,13 +164,13 @@ void QGeneralization::setGeneral(QClassifier *general) Q_D(QGeneralization); if (d->general != general) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->general)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->general)); d->general = general; // Adjust subsetted property(ies) if (general) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(general)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(general)); } } } diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h index 7fd4d5ca..7bafddd1 100644 --- a/src/mof/qgeneralization.h +++ b/src/mof/qgeneralization.h @@ -69,7 +69,7 @@ class Q_MOF_EXPORT QGeneralization : public QDirectedRelationship Q_DECLARE_PRIVATE(QGeneralization) public: - Q_INVOKABLE explicit QGeneralization(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QGeneralization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGeneralization(); // Attributes from QGeneralization @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setGeneral(QClassifier *general); protected: - explicit QGeneralization(QGeneralizationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancespecification.cpp b/src/mof/qinstancespecification.cpp index b3b33088..f85ad971 100644 --- a/src/mof/qinstancespecification.cpp +++ b/src/mof/qinstancespecification.cpp @@ -69,12 +69,12 @@ QInstanceSpecificationPrivate::~QInstanceSpecificationPrivate() \brief An instance specification is a model element that represents an instance in a modeled system. */ -QInstanceSpecification::QInstanceSpecification(QMofObject *parent, QMofObject *wrapper) : +QInstanceSpecification::QInstanceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QInstanceSpecificationPrivate, parent, wrapper) { } -QInstanceSpecification::QInstanceSpecification(QInstanceSpecificationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QInstanceSpecification::QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } @@ -136,13 +136,13 @@ void QInstanceSpecification::setSpecification(QValueSpecification *specification Q_D(QInstanceSpecification); if (d->specification != specification) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->specification)); d->specification = specification; // Adjust subsetted property(ies) if (specification) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(specification)); } } } @@ -167,7 +167,7 @@ void QInstanceSpecification::addSlot_(QSlot *slot_) d->slots_->insert(slot_); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(slot_)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(slot_)); // Adjust opposite property slot_->setOwningInstance(this); @@ -183,7 +183,7 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) d->slots_->remove(slot_); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(slot_)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(slot_)); // Adjust opposite property slot_->setOwningInstance(0); diff --git a/src/mof/qinstancespecification.h b/src/mof/qinstancespecification.h index 8277dcd6..fdfc97f9 100644 --- a/src/mof/qinstancespecification.h +++ b/src/mof/qinstancespecification.h @@ -74,7 +74,7 @@ class Q_MOF_EXPORT QInstanceSpecification : public QPackageableElement Q_DECLARE_PRIVATE(QInstanceSpecification) public: - Q_INVOKABLE explicit QInstanceSpecification(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInstanceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInstanceSpecification(); // Association ends from QInstanceSpecification @@ -88,7 +88,7 @@ public: Q_INVOKABLE void removeSlot_(QSlot *slot_); protected: - explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancevalue.cpp b/src/mof/qinstancevalue.cpp index 6a6a83f9..e94267f3 100644 --- a/src/mof/qinstancevalue.cpp +++ b/src/mof/qinstancevalue.cpp @@ -63,12 +63,12 @@ QInstanceValuePrivate::~QInstanceValuePrivate() \brief An instance value is a value specification that identifies an instance. */ -QInstanceValue::QInstanceValue(QMofObject *parent, QMofObject *wrapper) : +QInstanceValue::QInstanceValue(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QInstanceValuePrivate, parent, wrapper) { } -QInstanceValue::QInstanceValue(QInstanceValuePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QInstanceValue::QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qinstancevalue.h b/src/mof/qinstancevalue.h index 9035d658..07ee62ad 100644 --- a/src/mof/qinstancevalue.h +++ b/src/mof/qinstancevalue.h @@ -67,7 +67,7 @@ class Q_MOF_EXPORT QInstanceValue : public QValueSpecification Q_DECLARE_PRIVATE(QInstanceValue) public: - Q_INVOKABLE explicit QInstanceValue(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInstanceValue(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInstanceValue(); // Association ends from QInstanceValue @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setInstance(QInstanceSpecification *instance); protected: - explicit QInstanceValue(QInstanceValuePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qlink.cpp b/src/mof/qlink.cpp index 257e3ffc..4b848285 100644 --- a/src/mof/qlink.cpp +++ b/src/mof/qlink.cpp @@ -59,12 +59,12 @@ QLinkPrivate::~QLinkPrivate() } -QLink::QLink(QMofObject *parent, QMofObject *wrapper) : +QLink::QLink(QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(*new QLinkPrivate, parent, wrapper) { } -QLink::QLink(QLinkPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLink::QLink(QLinkPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(dd, parent, wrapper) { } diff --git a/src/mof/qlink.h b/src/mof/qlink.h index c4c2296f..0b1af9da 100644 --- a/src/mof/qlink.h +++ b/src/mof/qlink.h @@ -70,7 +70,7 @@ class Q_MOF_EXPORT QLink : public QMofObject Q_DECLARE_PRIVATE(QLink) public: - Q_INVOKABLE explicit QLink(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLink(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLink(); // Attributes from QLink @@ -86,7 +86,7 @@ public: Q_INVOKABLE void delete_(); protected: - explicit QLink(QLinkPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLink(QLinkPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralboolean.cpp b/src/mof/qliteralboolean.cpp index 7db1c1e5..85e29744 100644 --- a/src/mof/qliteralboolean.cpp +++ b/src/mof/qliteralboolean.cpp @@ -61,12 +61,12 @@ QLiteralBooleanPrivate::~QLiteralBooleanPrivate() \brief A literal Boolean is a specification of a Boolean value. */ -QLiteralBoolean::QLiteralBoolean(QMofObject *parent, QMofObject *wrapper) : +QLiteralBoolean::QLiteralBoolean(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralBooleanPrivate, parent, wrapper) { } -QLiteralBoolean::QLiteralBoolean(QLiteralBooleanPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralBoolean::QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralboolean.h b/src/mof/qliteralboolean.h index 9de863f1..41c26afb 100644 --- a/src/mof/qliteralboolean.h +++ b/src/mof/qliteralboolean.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QLiteralBoolean : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralBoolean) public: - Q_INVOKABLE explicit QLiteralBoolean(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralBoolean(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralBoolean(); // Attributes from QLiteralBoolean @@ -76,7 +76,7 @@ public: Q_INVOKABLE bool isComputable() const; protected: - explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralinteger.cpp b/src/mof/qliteralinteger.cpp index 9de442ff..f2ffb352 100644 --- a/src/mof/qliteralinteger.cpp +++ b/src/mof/qliteralinteger.cpp @@ -60,12 +60,12 @@ QLiteralIntegerPrivate::~QLiteralIntegerPrivate() \brief A literal integer is a specification of an integer value. */ -QLiteralInteger::QLiteralInteger(QMofObject *parent, QMofObject *wrapper) : +QLiteralInteger::QLiteralInteger(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralIntegerPrivate, parent, wrapper) { } -QLiteralInteger::QLiteralInteger(QLiteralIntegerPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralInteger::QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralinteger.h b/src/mof/qliteralinteger.h index a6875034..4121f712 100644 --- a/src/mof/qliteralinteger.h +++ b/src/mof/qliteralinteger.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QLiteralInteger : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralInteger) public: - Q_INVOKABLE explicit QLiteralInteger(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralInteger(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralInteger(); // Attributes from QLiteralInteger @@ -76,7 +76,7 @@ public: Q_INVOKABLE bool isComputable() const; protected: - explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralnull.cpp b/src/mof/qliteralnull.cpp index a85252c3..9a87fb94 100644 --- a/src/mof/qliteralnull.cpp +++ b/src/mof/qliteralnull.cpp @@ -60,12 +60,12 @@ QLiteralNullPrivate::~QLiteralNullPrivate() \brief A literal null specifies the lack of a value. */ -QLiteralNull::QLiteralNull(QMofObject *parent, QMofObject *wrapper) : +QLiteralNull::QLiteralNull(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralNullPrivate, parent, wrapper) { } -QLiteralNull::QLiteralNull(QLiteralNullPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralNull::QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralnull.h b/src/mof/qliteralnull.h index e713f456..54f3a368 100644 --- a/src/mof/qliteralnull.h +++ b/src/mof/qliteralnull.h @@ -62,7 +62,7 @@ class Q_MOF_EXPORT QLiteralNull : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralNull) public: - Q_INVOKABLE explicit QLiteralNull(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralNull(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralNull(); // Operations @@ -70,7 +70,7 @@ public: Q_INVOKABLE bool isNull() const; protected: - explicit QLiteralNull(QLiteralNullPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralreal.cpp b/src/mof/qliteralreal.cpp index 1b7779c1..3214abf8 100644 --- a/src/mof/qliteralreal.cpp +++ b/src/mof/qliteralreal.cpp @@ -60,12 +60,12 @@ QLiteralRealPrivate::~QLiteralRealPrivate() \brief A literal real is a specification of a real value. */ -QLiteralReal::QLiteralReal(QMofObject *parent, QMofObject *wrapper) : +QLiteralReal::QLiteralReal(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralRealPrivate, parent, wrapper) { } -QLiteralReal::QLiteralReal(QLiteralRealPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralReal::QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralreal.h b/src/mof/qliteralreal.h index 42528ff5..e912b341 100644 --- a/src/mof/qliteralreal.h +++ b/src/mof/qliteralreal.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QLiteralReal : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralReal) public: - Q_INVOKABLE explicit QLiteralReal(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralReal(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralReal(); // Attributes from QLiteralReal @@ -76,7 +76,7 @@ public: Q_INVOKABLE qreal realValue() const; protected: - explicit QLiteralReal(QLiteralRealPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralspecification.cpp b/src/mof/qliteralspecification.cpp index fb64c135..98d5227f 100644 --- a/src/mof/qliteralspecification.cpp +++ b/src/mof/qliteralspecification.cpp @@ -60,12 +60,12 @@ QLiteralSpecificationPrivate::~QLiteralSpecificationPrivate() \brief A literal specification identifies a literal constant being modeled. */ -QLiteralSpecification::QLiteralSpecification(QMofObject *parent, QMofObject *wrapper) : +QLiteralSpecification::QLiteralSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QLiteralSpecificationPrivate, parent, wrapper) { } -QLiteralSpecification::QLiteralSpecification(QLiteralSpecificationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralSpecification::QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralspecification.h b/src/mof/qliteralspecification.h index 389ef989..25d971de 100644 --- a/src/mof/qliteralspecification.h +++ b/src/mof/qliteralspecification.h @@ -62,11 +62,11 @@ class Q_MOF_EXPORT QLiteralSpecification : public QValueSpecification Q_DECLARE_PRIVATE(QLiteralSpecification) public: - Q_INVOKABLE explicit QLiteralSpecification(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralSpecification(); protected: - explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralstring.cpp b/src/mof/qliteralstring.cpp index 3df9e72c..2813c0aa 100644 --- a/src/mof/qliteralstring.cpp +++ b/src/mof/qliteralstring.cpp @@ -60,12 +60,12 @@ QLiteralStringPrivate::~QLiteralStringPrivate() \brief A literal string is a specification of a string value. */ -QLiteralString::QLiteralString(QMofObject *parent, QMofObject *wrapper) : +QLiteralString::QLiteralString(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralStringPrivate, parent, wrapper) { } -QLiteralString::QLiteralString(QLiteralStringPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralString::QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralstring.h b/src/mof/qliteralstring.h index d2db1109..61e848c7 100644 --- a/src/mof/qliteralstring.h +++ b/src/mof/qliteralstring.h @@ -67,7 +67,7 @@ class Q_MOF_EXPORT QLiteralString : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralString) public: - Q_INVOKABLE explicit QLiteralString(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralString(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralString(); // Attributes from QLiteralString @@ -79,7 +79,7 @@ public: Q_INVOKABLE QString stringValue() const; protected: - explicit QLiteralString(QLiteralStringPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralunlimitednatural.cpp b/src/mof/qliteralunlimitednatural.cpp index cb8baaff..976cb1cd 100644 --- a/src/mof/qliteralunlimitednatural.cpp +++ b/src/mof/qliteralunlimitednatural.cpp @@ -61,12 +61,12 @@ QLiteralUnlimitedNaturalPrivate::~QLiteralUnlimitedNaturalPrivate() \brief A literal unlimited natural is a specification of an unlimited natural number. */ -QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QMofObject *parent, QMofObject *wrapper) : +QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralUnlimitedNaturalPrivate, parent, wrapper) { } -QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qliteralunlimitednatural.h b/src/mof/qliteralunlimitednatural.h index 15ad6aba..02f6e6a7 100644 --- a/src/mof/qliteralunlimitednatural.h +++ b/src/mof/qliteralunlimitednatural.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QLiteralUnlimitedNatural : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralUnlimitedNatural) public: - Q_INVOKABLE explicit QLiteralUnlimitedNatural(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralUnlimitedNatural(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralUnlimitedNatural(); // Attributes from QLiteralUnlimitedNatural @@ -76,7 +76,7 @@ public: Q_INVOKABLE qint32 unlimitedValue() const; protected: - explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp index c9eddc9a..856649af 100644 --- a/src/mof/qmofobject.cpp +++ b/src/mof/qmofobject.cpp @@ -48,8 +48,7 @@ QT_BEGIN_NAMESPACE_QTMOF -QMofObjectPrivate::QMofObjectPrivate(int version) - : QObjectPrivate(version), wrapper(0) +QMofObjectPrivate::QMofObjectPrivate() { } @@ -58,16 +57,14 @@ QMofObjectPrivate::~QMofObjectPrivate() } -QMofObject::QMofObject(QMofObject *parent, QMofObject *wrapper) : - QObject(*new QMofObjectPrivate, parent) +QMofObject::QMofObject(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QMofObjectPrivate, parent, wrapper) { - setWrapper(wrapper); } -QMofObject::QMofObject(QMofObjectPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QObject(dd, parent) +QMofObject::QMofObject(QMofObjectPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper) { - setWrapper(wrapper); } QMofObject::~QMofObject() @@ -120,33 +117,6 @@ QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> *ar return 0; // change here to your derived return } -const QList<QMofObject *> &QMofObject::wrappedObjects() const -{ - Q_D(const QMofObject); - return d->wrappedObjects; -} - -void QMofObject::setWrapper(QMofObject *wrapper) -{ - Q_D(QMofObject); - if (wrapper == d->wrapper) - return; - - if (d->wrapper) - d->wrapper->d_func()->wrappedObjects.removeAll(this); - - d->wrapper = wrapper; - - if (wrapper) - wrapper->d_func()->wrappedObjects.append(this); -} - -QMofObject *QMofObject::wrapper() const -{ - Q_D(const QMofObject); - return d->wrapper; -} - #include "moc_qmofobject.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h index 315a99b5..405a0b86 100644 --- a/src/mof/qmofobject.h +++ b/src/mof/qmofobject.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtCore/QObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; // Qt includes #include <QtCore/QSet> @@ -62,7 +63,7 @@ class QProperty; class QMofObjectPrivate; -class Q_MOF_EXPORT QMofObject : public QObject +class Q_MOF_EXPORT QMofObject : public QWrappedObject { Q_OBJECT @@ -70,14 +71,9 @@ class Q_MOF_EXPORT QMofObject : public QObject Q_DECLARE_PRIVATE(QMofObject) public: - Q_INVOKABLE explicit QMofObject(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMofObject(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMofObject(); - const QList<QMofObject *> &wrappedObjects() const; - - void setWrapper(QMofObject *wrapper); - QMofObject *wrapper() const; - // Operations Q_INVOKABLE QMofObject *get(const QProperty *property) const; Q_INVOKABLE bool equals(const QMofObject *element) const; @@ -87,7 +83,7 @@ public: Q_INVOKABLE QMofObject *invoke(const QOperation *op, const QSet<QArgument *> *arguments); protected: - explicit QMofObject(QMofObjectPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QMofObject(QMofObjectPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF @@ -96,36 +92,6 @@ Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *) Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) -template <class T> -inline T qmofobject_cast(QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *base, bool restoreToWrapper = true) -{ - if (!base) - return T(); - while (restoreToWrapper && base->wrapper()) - base = base->wrapper(); - if (dynamic_cast<T>(base)) - return dynamic_cast<T>(base); - foreach (QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *wrappedObject, base->wrappedObjects()) { - T returnValue = qmofobject_cast<T>(wrappedObject, false); - if (returnValue != T()) - return returnValue; - } - return T(); // not found -} - -template <class T> -inline T qmofobject_cast(const QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *base, bool restoreToWrapper = true) -{ - return qmofobject_cast<T>(const_cast<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>(base), restoreToWrapper); -} - -inline QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *qmof_topLevelWrapper(QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *wrapped) -{ - while (wrapped->wrapper()) - wrapped = wrapped->wrapper(); - return wrapped; -} - QT_END_HEADER #endif // QTMOF_QMOFOBJECT_H diff --git a/src/mof/qmofobject_p.h b/src/mof/qmofobject_p.h index 42e2282c..b8b18026 100644 --- a/src/mof/qmofobject_p.h +++ b/src/mof/qmofobject_p.h @@ -42,7 +42,8 @@ #define QTMOF_QMOFOBJECT_P_H // Base class includes -#include "private/qobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "QtMof/QMofObject" @@ -61,40 +62,18 @@ class QOperation; class QMofObject; class QProperty; -class Q_MOF_EXPORT QMofObjectPrivate : public QObjectPrivate +class Q_MOF_EXPORT QMofObjectPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QMofObject) public: - explicit QMofObjectPrivate(int version = QObjectPrivateVersion); + explicit QMofObjectPrivate(); virtual ~QMofObjectPrivate(); - static QMofObjectPrivate *get(QMofObject *o) - { - return dynamic_cast<QMofObjectPrivate *>(o->d_func()); - } - - QList<QMofObject *> wrappedObjects; - QMofObject *wrapper; }; QT_END_NAMESPACE_QTMOF -template <class T> -inline T qmofobject_cast(QT_PREPEND_NAMESPACE_QTMOF(QMofObjectPrivate) *base, bool restoreToWrapper = true) -{ - while (restoreToWrapper && base->wrapper) - base = base->get(base->wrapper); - if (dynamic_cast<T>(base)) - return dynamic_cast<T>(base); - foreach (QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *wrappedObject, base->wrappedObjects) { - T returnValue = qmofobject_cast<T>(base->get(wrappedObject), false); - if (returnValue != T()) - return returnValue; - } - return T(); // not found -} - QT_END_HEADER #endif // QTMOF_QMOFOBJECT_P_H diff --git a/src/mof/qmultiplicityelement.cpp b/src/mof/qmultiplicityelement.cpp index b9c1fc52..7fbd8e5c 100644 --- a/src/mof/qmultiplicityelement.cpp +++ b/src/mof/qmultiplicityelement.cpp @@ -66,12 +66,12 @@ QMultiplicityElementPrivate::~QMultiplicityElementPrivate() \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. */ -QMultiplicityElement::QMultiplicityElement(QMofObject *parent, QMofObject *wrapper) : +QMultiplicityElement::QMultiplicityElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QMultiplicityElementPrivate, parent, wrapper) { } -QMultiplicityElement::QMultiplicityElement(QMultiplicityElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QMultiplicityElement::QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -196,13 +196,13 @@ void QMultiplicityElement::setUpperValue(QValueSpecification *upperValue) Q_D(QMultiplicityElement); if (d->upperValue != upperValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->upperValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->upperValue)); d->upperValue = upperValue; // Adjust subsetted property(ies) if (upperValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(upperValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(upperValue)); } } } @@ -225,13 +225,13 @@ void QMultiplicityElement::setLowerValue(QValueSpecification *lowerValue) Q_D(QMultiplicityElement); if (d->lowerValue != lowerValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->lowerValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->lowerValue)); d->lowerValue = lowerValue; // Adjust subsetted property(ies) if (lowerValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(lowerValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(lowerValue)); } } } diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h index 1dcba67a..e69e7183 100644 --- a/src/mof/qmultiplicityelement.h +++ b/src/mof/qmultiplicityelement.h @@ -72,7 +72,7 @@ class Q_MOF_EXPORT QMultiplicityElement : public QElement Q_DECLARE_PRIVATE(QMultiplicityElement) public: - Q_INVOKABLE explicit QMultiplicityElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMultiplicityElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMultiplicityElement(); // Attributes from QMultiplicityElement @@ -99,7 +99,7 @@ public: Q_INVOKABLE qint32 upperBound() const; protected: - explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamedelement.cpp b/src/mof/qnamedelement.cpp index 91ea4bc8..8f6119b4 100644 --- a/src/mof/qnamedelement.cpp +++ b/src/mof/qnamedelement.cpp @@ -65,16 +65,16 @@ void QNamedElementPrivate::setNamespace_(QNamespace *namespace_) Q_Q(QNamedElement); // Adjust opposite property if (this->namespace_) - (qmofobject_cast<QNamespacePrivate *>(this->namespace_->d_func()))->removeOwnedMember(q); + (qwrappedobject_cast<QNamespacePrivate *>(this->namespace_->d_func()))->removeOwnedMember(q); this->namespace_ = namespace_; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->setOwner(qmofobject_cast<QElement *>(namespace_)); + (qwrappedobject_cast<QElementPrivate *>(this))->setOwner(qwrappedobject_cast<QElement *>(namespace_)); // Adjust opposite property if (namespace_) - (qmofobject_cast<QNamespacePrivate *>(namespace_->d_func()))->addOwnedMember(q); + (qwrappedobject_cast<QNamespacePrivate *>(namespace_->d_func()))->addOwnedMember(q); } } @@ -86,12 +86,12 @@ void QNamedElementPrivate::setNamespace_(QNamespace *namespace_) \brief A named element is an element in a model that may have a name. */ -QNamedElement::QNamedElement(QMofObject *parent, QMofObject *wrapper) : +QNamedElement::QNamedElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QNamedElementPrivate, parent, wrapper) { } -QNamedElement::QNamedElement(QNamedElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QNamedElement::QNamedElement(QNamedElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/mof/qnamedelement.h b/src/mof/qnamedelement.h index 999c4388..34d6b405 100644 --- a/src/mof/qnamedelement.h +++ b/src/mof/qnamedelement.h @@ -77,7 +77,7 @@ class Q_MOF_EXPORT QNamedElement : public QElement Q_DECLARE_PRIVATE(QNamedElement) public: - Q_INVOKABLE explicit QNamedElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QNamedElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QNamedElement(); // Attributes from QNamedElement @@ -99,7 +99,7 @@ public: friend class QNamespacePrivate; protected: - explicit QNamedElement(QNamedElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QNamedElement(QNamedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamespace.cpp b/src/mof/qnamespace.cpp index c4314384..4691da5e 100644 --- a/src/mof/qnamespace.cpp +++ b/src/mof/qnamespace.cpp @@ -95,12 +95,12 @@ void QNamespacePrivate::addOwnedMember(QNamedElement *ownedMember) this->ownedMembers->insert(ownedMember); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->addOwnedElement(qmofobject_cast<QElement *>(ownedMember)); - (qmofobject_cast<QNamespacePrivate *>(this))->addMember(qmofobject_cast<QNamedElement *>(ownedMember)); + (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); // Adjust opposite property Q_Q(QNamespace); - (qmofobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(q); + (qwrappedobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(q); } } @@ -112,11 +112,11 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) this->ownedMembers->remove(ownedMember); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->removeOwnedElement(qmofobject_cast<QElement *>(ownedMember)); - (qmofobject_cast<QNamespacePrivate *>(this))->removeMember(qmofobject_cast<QNamedElement *>(ownedMember)); + (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); // Adjust opposite property - (qmofobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(0); + (qwrappedobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(0); } } @@ -128,12 +128,12 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) \brief A namespace is an element in a model that contains a set of named elements that can be identified by name. */ -QNamespace::QNamespace(QMofObject *parent, QMofObject *wrapper) : +QNamespace::QNamespace(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QNamespacePrivate, parent, wrapper) { } -QNamespace::QNamespace(QNamespacePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QNamespace::QNamespace(QNamespacePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -166,7 +166,7 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) d->packageImports->insert(packageImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(packageImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); // Adjust opposite property packageImport->setImportingNamespace(this); @@ -182,7 +182,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) d->packageImports->remove(packageImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(packageImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); // Adjust opposite property packageImport->setImportingNamespace(0); @@ -232,7 +232,7 @@ void QNamespace::addElementImport(QElementImport *elementImport) d->elementImports->insert(elementImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(elementImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); // Adjust opposite property elementImport->setImportingNamespace(this); @@ -248,7 +248,7 @@ void QNamespace::removeElementImport(QElementImport *elementImport) d->elementImports->remove(elementImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(elementImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); // Adjust opposite property elementImport->setImportingNamespace(0); @@ -275,7 +275,7 @@ void QNamespace::addOwnedRule(QConstraint *ownedRule) d->ownedRules->insert(ownedRule); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedRule)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); // Adjust opposite property ownedRule->setContext(this); @@ -291,7 +291,7 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) d->ownedRules->remove(ownedRule); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedRule)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); // Adjust opposite property ownedRule->setContext(0); diff --git a/src/mof/qnamespace.h b/src/mof/qnamespace.h index d4445694..0e6aec10 100644 --- a/src/mof/qnamespace.h +++ b/src/mof/qnamespace.h @@ -79,7 +79,7 @@ class Q_MOF_EXPORT QNamespace : public QNamedElement Q_DECLARE_PRIVATE(QNamespace) public: - Q_INVOKABLE explicit QNamespace(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QNamespace(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QNamespace(); // Association ends from QNamespace @@ -106,7 +106,7 @@ public: friend class QNamedElementPrivate; protected: - explicit QNamespace(QNamespacePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QNamespace(QNamespacePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qopaqueexpression.cpp b/src/mof/qopaqueexpression.cpp index 156030b6..4570b8c0 100644 --- a/src/mof/qopaqueexpression.cpp +++ b/src/mof/qopaqueexpression.cpp @@ -64,12 +64,12 @@ QOpaqueExpressionPrivate::~QOpaqueExpressionPrivate() \brief An opaque expression is an uninterpreted textual statement that denotes a (possibly empty) set of values when evaluated in a context. */ -QOpaqueExpression::QOpaqueExpression(QMofObject *parent, QMofObject *wrapper) : +QOpaqueExpression::QOpaqueExpression(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QOpaqueExpressionPrivate, parent, wrapper) { } -QOpaqueExpression::QOpaqueExpression(QOpaqueExpressionPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QOpaqueExpression::QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/mof/qopaqueexpression.h b/src/mof/qopaqueexpression.h index 2d66225c..a8ba03b5 100644 --- a/src/mof/qopaqueexpression.h +++ b/src/mof/qopaqueexpression.h @@ -69,7 +69,7 @@ class Q_MOF_EXPORT QOpaqueExpression : public QValueSpecification Q_DECLARE_PRIVATE(QOpaqueExpression) public: - Q_INVOKABLE explicit QOpaqueExpression(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOpaqueExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOpaqueExpression(); // Attributes from QOpaqueExpression @@ -87,7 +87,7 @@ public: Q_INVOKABLE qint32 value() const; protected: - explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qoperation.cpp b/src/mof/qoperation.cpp index 2e29d34c..2d781066 100644 --- a/src/mof/qoperation.cpp +++ b/src/mof/qoperation.cpp @@ -81,12 +81,12 @@ QOperationPrivate::~QOperationPrivate() \brief An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior. */ -QOperation::QOperation(QMofObject *parent, QMofObject *wrapper) : +QOperation::QOperation(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioralFeature(*new QOperationPrivate, parent, wrapper) { } -QOperation::QOperation(QOperationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QOperation::QOperation(QOperationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioralFeature(dd, parent, wrapper) { } @@ -190,7 +190,7 @@ void QOperation::addOwnedParameter(QParameter *ownedParameter) Q_D(QOperation); if (!d->ownedParameters->contains(ownedParameter)) { d->ownedParameters->append(ownedParameter); - qmof_topLevelWrapper(ownedParameter)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(ownedParameter)->setParent(qTopLevelWrapper(this)); // Adjust opposite property ownedParameter->setOperation(this); @@ -204,7 +204,7 @@ void QOperation::removeOwnedParameter(QParameter *ownedParameter) Q_D(QOperation); if (d->ownedParameters->contains(ownedParameter)) { d->ownedParameters->removeAll(ownedParameter); - qmof_topLevelWrapper(ownedParameter)->setParent(0); + qTopLevelWrapper(ownedParameter)->setParent(0); // Adjust opposite property ownedParameter->setOperation(0); @@ -229,13 +229,13 @@ void QOperation::setBodyCondition(QConstraint *bodyCondition) Q_D(QOperation); if (d->bodyCondition != bodyCondition) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(d->bodyCondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(d->bodyCondition)); d->bodyCondition = bodyCondition; // Adjust subsetted property(ies) if (bodyCondition) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(bodyCondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(bodyCondition)); } } } @@ -260,7 +260,7 @@ void QOperation::addRedefinedOperation(QOperation *redefinedOperation) d->redefinedOperations->insert(redefinedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedOperation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); } } @@ -273,7 +273,7 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) d->redefinedOperations->remove(redefinedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedOperation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); } } @@ -297,7 +297,7 @@ void QOperation::addPostcondition(QConstraint *postcondition) d->postconditions->insert(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -310,7 +310,7 @@ void QOperation::removePostcondition(QConstraint *postcondition) d->postconditions->remove(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -336,18 +336,18 @@ void QOperation::setDatatype(QDataType *datatype) d->datatype->removeOwnedOperation(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->datatype)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->datatype)); d->datatype = datatype; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(datatype)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(datatype)); if (datatype) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(datatype)); } if (datatype) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(datatype)); } // Adjust opposite property @@ -388,7 +388,7 @@ void QOperation::addPrecondition(QConstraint *precondition) d->preconditions->insert(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -401,7 +401,7 @@ void QOperation::removePrecondition(QConstraint *precondition) d->preconditions->remove(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -427,18 +427,18 @@ void QOperation::setClass_(QClass *class_) d->class_->removeOwnedOperation(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->class_)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->class_)); d->class_ = class_; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(class_)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(class_)); if (class_) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(class_)); } if (class_) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(class_)); } // Adjust opposite property diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h index cecbe8a9..460c9b5b 100644 --- a/src/mof/qoperation.h +++ b/src/mof/qoperation.h @@ -89,7 +89,7 @@ class Q_MOF_EXPORT QOperation : public QBehavioralFeature Q_DECLARE_PRIVATE(QOperation) public: - Q_INVOKABLE explicit QOperation(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOperation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOperation(); // Attributes from QOperation @@ -129,7 +129,7 @@ public: Q_INVOKABLE const QSet<QParameter *> *returnResult() const; protected: - explicit QOperation(QOperationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QOperation(QOperationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackage.cpp b/src/mof/qpackage.cpp index fde450cc..7be20b59 100644 --- a/src/mof/qpackage.cpp +++ b/src/mof/qpackage.cpp @@ -69,15 +69,15 @@ QPackagePrivate::~QPackagePrivate() \brief A package is used to group elements, and provides a namespace for the grouped elements. */ -QPackage::QPackage(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QPackagePrivate, parent, wrapper), +QPackage::QPackage(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QPackagePrivate, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { } -QPackage::QPackage(QPackagePrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QPackage::QPackage(QPackagePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { @@ -96,7 +96,7 @@ QPackage::~QPackage() */ const QSet<QElement *> *QPackage::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -104,7 +104,7 @@ const QSet<QElement *> *QPackage::ownedElements() const */ QElement *QPackage::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -112,17 +112,17 @@ QElement *QPackage::owner() const */ const QSet<QComment *> *QPackage::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QPackage::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QPackage::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -134,12 +134,12 @@ void QPackage::removeOwnedComment(QComment *ownedComment) */ QString QPackage::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QPackage::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -147,7 +147,7 @@ void QPackage::setName(QString name) */ QString QPackage::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -159,7 +159,7 @@ QString QPackage::qualifiedName() const */ QNamespace *QPackage::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -171,17 +171,17 @@ QNamespace *QPackage::namespace_() const */ const QSet<QPackageImport *> *QPackage::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QPackage::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QPackage::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -189,7 +189,7 @@ void QPackage::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QPackage::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -197,7 +197,7 @@ const QSet<QNamedElement *> *QPackage::members() const */ const QSet<QPackageableElement *> *QPackage::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -205,17 +205,17 @@ const QSet<QPackageableElement *> *QPackage::importedMembers() const */ const QSet<QElementImport *> *QPackage::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QPackage::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QPackage::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -223,17 +223,17 @@ void QPackage::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QPackage::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QPackage::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QPackage::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -241,7 +241,7 @@ void QPackage::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QPackage::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -253,12 +253,12 @@ const QSet<QNamedElement *> *QPackage::ownedMembers() const */ QtMof::VisibilityKind QPackage::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QPackage::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -313,7 +313,7 @@ void QPackage::addOwnedType(QType *ownedType) // change to your derived code // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->addPackagedElement(qmofobject_cast<QPackageableElement *>(ownedType)); + (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); // Adjust opposite property ownedType->setPackage(this); @@ -331,7 +331,7 @@ void QPackage::removeOwnedType(QType *ownedType) // change to your derived code // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->removePackagedElement(qmofobject_cast<QPackageableElement *>(ownedType)); + (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); // Adjust opposite property ownedType->setPackage(0); @@ -358,7 +358,7 @@ void QPackage::addPackagedElement(QPackageableElement *packagedElement) d->packagedElements->insert(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } @@ -371,7 +371,7 @@ void QPackage::removePackagedElement(QPackageableElement *packagedElement) d->packagedElements->remove(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } @@ -399,7 +399,7 @@ void QPackage::setNestingPackage(QPackage *nestingPackage) d->nestingPackage = nestingPackage; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(nestingPackage)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(nestingPackage)); // Adjust opposite property if (nestingPackage) @@ -427,7 +427,7 @@ void QPackage::addPackageMerge(QPackageMerge *packageMerge) d->packageMerges->insert(packageMerge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(packageMerge)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); // Adjust opposite property packageMerge->setReceivingPackage(this); @@ -443,7 +443,7 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) d->packageMerges->remove(packageMerge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(packageMerge)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); // Adjust opposite property packageMerge->setReceivingPackage(0); @@ -473,7 +473,7 @@ void QPackage::addNestedPackage(QPackage *nestedPackage) // change to your derived code // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->addPackagedElement(qmofobject_cast<QPackageableElement *>(nestedPackage)); + (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); // Adjust opposite property nestedPackage->setNestingPackage(this); @@ -491,7 +491,7 @@ void QPackage::removeNestedPackage(QPackage *nestedPackage) // change to your derived code // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->removePackagedElement(qmofobject_cast<QPackageableElement *>(nestedPackage)); + (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); // Adjust opposite property nestedPackage->setNestingPackage(0); @@ -531,22 +531,22 @@ const QSet<QPackageableElement *> *QPackage::visibleMembers() const // Overriden methods for subsetted properties -void QPackage::addPackagedElement(QMofPointer<QType> ownedType) +void QPackage::addPackagedElement(QWrappedObjectPointer<QType> ownedType) { addOwnedType(ownedType); } -void QPackage::removePackagedElement(QMofPointer<QType> ownedType) +void QPackage::removePackagedElement(QWrappedObjectPointer<QType> ownedType) { removeOwnedType(ownedType); } -void QPackage::addPackagedElement(QMofPointer<QPackage> nestedPackage) +void QPackage::addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage) { addNestedPackage(nestedPackage); } -void QPackage::removePackagedElement(QMofPointer<QPackage> nestedPackage) +void QPackage::removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage) { removeNestedPackage(nestedPackage); } diff --git a/src/mof/qpackage.h b/src/mof/qpackage.h index 75dd5aa6..812d17a6 100644 --- a/src/mof/qpackage.h +++ b/src/mof/qpackage.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QNamespace> #include <QtMof/QPackageableElement> @@ -52,7 +53,8 @@ #include <QtCore/QString> #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -67,7 +69,7 @@ class QType; class QPackagePrivate; -class Q_MOF_EXPORT QPackage : public QMofObject +class Q_MOF_EXPORT QPackage : public QWrappedObject { Q_OBJECT @@ -82,7 +84,7 @@ class Q_MOF_EXPORT QPackage : public QMofObject Q_DECLARE_PRIVATE(QPackage) public: - Q_INVOKABLE explicit QPackage(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackage(); // Association ends from aggregated QElement @@ -144,13 +146,13 @@ public: Q_INVOKABLE const QSet<QPackageableElement *> *visibleMembers() const; // Overriden methods for subsetted properties - Q_INVOKABLE void addPackagedElement(QMofPointer<QType> ownedType); - Q_INVOKABLE void removePackagedElement(QMofPointer<QType> ownedType); - Q_INVOKABLE void addPackagedElement(QMofPointer<QPackage> nestedPackage); - Q_INVOKABLE void removePackagedElement(QMofPointer<QPackage> nestedPackage); + Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QType> ownedType); + Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType); + Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); + Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); protected: - explicit QPackage(QPackagePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QPackage(QPackagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QNamespace *_wrappedNamespace; diff --git a/src/mof/qpackage_p.h b/src/mof/qpackage_p.h index ef1a4652..ee0f5ef6 100644 --- a/src/mof/qpackage_p.h +++ b/src/mof/qpackage_p.h @@ -42,7 +42,8 @@ #define QTMOF_QPACKAGE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qnamespace_p.h" #include "private/qpackageableelement_p.h" @@ -64,7 +65,7 @@ class QPackageMerge; class QPackage; class QType; -class Q_MOF_EXPORT QPackagePrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QPackagePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QPackage) diff --git a/src/mof/qpackageableelement.cpp b/src/mof/qpackageableelement.cpp index 27b612df..1c9689bd 100644 --- a/src/mof/qpackageableelement.cpp +++ b/src/mof/qpackageableelement.cpp @@ -61,12 +61,12 @@ QPackageableElementPrivate::~QPackageableElementPrivate() \brief A packageable element indicates a named element that may be owned directly by a package. */ -QPackageableElement::QPackageableElement(QMofObject *parent, QMofObject *wrapper) : +QPackageableElement::QPackageableElement(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QPackageableElementPrivate, parent, wrapper) { } -QPackageableElement::QPackageableElement(QPackageableElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QPackageableElement::QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/mof/qpackageableelement.h b/src/mof/qpackageableelement.h index 982f45da..ae3fd428 100644 --- a/src/mof/qpackageableelement.h +++ b/src/mof/qpackageableelement.h @@ -67,7 +67,7 @@ class Q_MOF_EXPORT QPackageableElement : public QNamedElement Q_DECLARE_PRIVATE(QPackageableElement) public: - Q_INVOKABLE explicit QPackageableElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageableElement(); // Attributes from QPackageableElement @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); protected: - explicit QPackageableElement(QPackageableElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageimport.cpp b/src/mof/qpackageimport.cpp index 2e1b5964..37286038 100644 --- a/src/mof/qpackageimport.cpp +++ b/src/mof/qpackageimport.cpp @@ -66,12 +66,12 @@ QPackageImportPrivate::~QPackageImportPrivate() \brief A package import is a relationship that allows the use of unqualified names to refer to package members from other namespaces. */ -QPackageImport::QPackageImport(QMofObject *parent, QMofObject *wrapper) : +QPackageImport::QPackageImport(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QPackageImportPrivate, parent, wrapper) { } -QPackageImport::QPackageImport(QPackageImportPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QPackageImport::QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -131,14 +131,14 @@ void QPackageImport::setImportingNamespace(QNamespace *importingNamespace) d->importingNamespace->removePackageImport(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->importingNamespace)); d->importingNamespace = importingNamespace; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(importingNamespace)); if (importingNamespace) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(importingNamespace)); } // Adjust opposite property @@ -165,13 +165,13 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) Q_D(QPackageImport); if (d->importedPackage != importedPackage) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->importedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->importedPackage)); d->importedPackage = importedPackage; // Adjust subsetted property(ies) if (importedPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(importedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(importedPackage)); } } } diff --git a/src/mof/qpackageimport.h b/src/mof/qpackageimport.h index f8af3e32..e9288e14 100644 --- a/src/mof/qpackageimport.h +++ b/src/mof/qpackageimport.h @@ -73,7 +73,7 @@ class Q_MOF_EXPORT QPackageImport : public QDirectedRelationship Q_DECLARE_PRIVATE(QPackageImport) public: - Q_INVOKABLE explicit QPackageImport(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageImport(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageImport(); // Attributes from QPackageImport @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setImportedPackage(QPackage *importedPackage); protected: - explicit QPackageImport(QPackageImportPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackagemerge.cpp b/src/mof/qpackagemerge.cpp index 6c2436ba..05a76a43 100644 --- a/src/mof/qpackagemerge.cpp +++ b/src/mof/qpackagemerge.cpp @@ -64,12 +64,12 @@ QPackageMergePrivate::~QPackageMergePrivate() \brief A package merge defines how the contents of one package are extended by the contents of another package. */ -QPackageMerge::QPackageMerge(QMofObject *parent, QMofObject *wrapper) : +QPackageMerge::QPackageMerge(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QPackageMergePrivate, parent, wrapper) { } -QPackageMerge::QPackageMerge(QPackageMergePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QPackageMerge::QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -100,13 +100,13 @@ void QPackageMerge::setMergedPackage(QPackage *mergedPackage) Q_D(QPackageMerge); if (d->mergedPackage != mergedPackage) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->mergedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->mergedPackage)); d->mergedPackage = mergedPackage; // Adjust subsetted property(ies) if (mergedPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(mergedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(mergedPackage)); } } } @@ -133,14 +133,14 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) d->receivingPackage->removePackageMerge(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->receivingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->receivingPackage)); d->receivingPackage = receivingPackage; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(receivingPackage)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(receivingPackage)); if (receivingPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(receivingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(receivingPackage)); } // Adjust opposite property diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h index f8915645..95a0423f 100644 --- a/src/mof/qpackagemerge.h +++ b/src/mof/qpackagemerge.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QPackageMerge : public QDirectedRelationship Q_DECLARE_PRIVATE(QPackageMerge) public: - Q_INVOKABLE explicit QPackageMerge(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageMerge(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageMerge(); // Association ends from QPackageMerge @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage); protected: - explicit QPackageMerge(QPackageMergePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qparameter.cpp b/src/mof/qparameter.cpp index ab1f5849..5f58a7a2 100644 --- a/src/mof/qparameter.cpp +++ b/src/mof/qparameter.cpp @@ -66,15 +66,15 @@ QParameterPrivate::~QParameterPrivate() \brief A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature. */ -QParameter::QParameter(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QParameterPrivate, parent, wrapper), +QParameter::QParameter(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QParameterPrivate, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)) { } -QParameter::QParameter(QParameterPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QParameter::QParameter(QParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)) { @@ -93,7 +93,7 @@ QParameter::~QParameter() */ const QSet<QElement *> *QParameter::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -101,7 +101,7 @@ const QSet<QElement *> *QParameter::ownedElements() const */ QElement *QParameter::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -109,17 +109,17 @@ QElement *QParameter::owner() const */ const QSet<QComment *> *QParameter::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QParameter::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QParameter::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -131,12 +131,12 @@ void QParameter::removeOwnedComment(QComment *ownedComment) */ QString QParameter::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QParameter::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -144,12 +144,12 @@ void QParameter::setName(QString name) */ QtMof::VisibilityKind QParameter::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QParameter::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -157,7 +157,7 @@ void QParameter::setVisibility(QtMof::VisibilityKind visibility) */ QString QParameter::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -169,7 +169,7 @@ QString QParameter::qualifiedName() const */ QNamespace *QParameter::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -181,12 +181,12 @@ QNamespace *QParameter::namespace_() const */ QType *QParameter::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QParameter::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -198,12 +198,12 @@ void QParameter::setType(QType *type) */ qint32 QParameter::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QParameter::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -211,12 +211,12 @@ void QParameter::setUpper(qint32 upper) */ bool QParameter::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QParameter::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -224,12 +224,12 @@ void QParameter::setUnique(bool isUnique) */ bool QParameter::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QParameter::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -237,12 +237,12 @@ void QParameter::setOrdered(bool isOrdered) */ qint32 QParameter::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QParameter::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -254,12 +254,12 @@ void QParameter::setLower(qint32 lower) */ QValueSpecification *QParameter::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QParameter::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -267,12 +267,12 @@ void QParameter::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QParameter::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QParameter::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -340,7 +340,7 @@ void QParameter::setOperation(QOperation *operation) d->operation = operation; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(operation)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(operation)); // Adjust opposite property if (operation) @@ -366,13 +366,13 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) Q_D(QParameter); if (d->defaultValue != defaultValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->defaultValue)); d->defaultValue = defaultValue; // Adjust subsetted property(ies) if (defaultValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(defaultValue)); } } } diff --git a/src/mof/qparameter.h b/src/mof/qparameter.h index ef13914d..a228bb6c 100644 --- a/src/mof/qparameter.h +++ b/src/mof/qparameter.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QTypedElement> #include <QtMof/QMultiplicityElement> @@ -66,7 +67,7 @@ class QOperation; class QParameterPrivate; -class Q_MOF_EXPORT QParameter : public QMofObject +class Q_MOF_EXPORT QParameter : public QWrappedObject { Q_OBJECT @@ -79,7 +80,7 @@ class Q_MOF_EXPORT QParameter : public QMofObject Q_DECLARE_PRIVATE(QParameter) public: - Q_INVOKABLE explicit QParameter(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QParameter(); // Association ends from aggregated QElement @@ -131,7 +132,7 @@ public: Q_INVOKABLE void setDefaultValue(QValueSpecification *defaultValue); protected: - explicit QParameter(QParameterPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QParameter(QParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTypedElement *_wrappedTypedElement; diff --git a/src/mof/qparameter_p.h b/src/mof/qparameter_p.h index 4c3e0fca..274dacf4 100644 --- a/src/mof/qparameter_p.h +++ b/src/mof/qparameter_p.h @@ -42,7 +42,8 @@ #define QTMOF_QPARAMETER_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtypedelement_p.h" #include "private/qmultiplicityelement_p.h" @@ -65,7 +66,7 @@ class QValueSpecification; class QOperation; class QParameter; -class Q_MOF_EXPORT QParameterPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QParameterPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QParameter) diff --git a/src/mof/qprimitivetype.cpp b/src/mof/qprimitivetype.cpp index 905cb2bb..e6e3c3d4 100644 --- a/src/mof/qprimitivetype.cpp +++ b/src/mof/qprimitivetype.cpp @@ -60,12 +60,12 @@ QPrimitiveTypePrivate::~QPrimitiveTypePrivate() \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. */ -QPrimitiveType::QPrimitiveType(QMofObject *parent, QMofObject *wrapper) : +QPrimitiveType::QPrimitiveType(QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(*new QPrimitiveTypePrivate, parent, wrapper) { } -QPrimitiveType::QPrimitiveType(QPrimitiveTypePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QPrimitiveType::QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(dd, parent, wrapper) { } diff --git a/src/mof/qprimitivetype.h b/src/mof/qprimitivetype.h index 28bfe1e0..596833a8 100644 --- a/src/mof/qprimitivetype.h +++ b/src/mof/qprimitivetype.h @@ -62,11 +62,11 @@ class Q_MOF_EXPORT QPrimitiveType : public QDataType Q_DECLARE_PRIVATE(QPrimitiveType) public: - Q_INVOKABLE explicit QPrimitiveType(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPrimitiveType(); protected: - explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qproperty.cpp b/src/mof/qproperty.cpp index 92ace370..f06ed8a8 100644 --- a/src/mof/qproperty.cpp +++ b/src/mof/qproperty.cpp @@ -81,12 +81,12 @@ QPropertyPrivate::~QPropertyPrivate() \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. */ -QProperty::QProperty(QMofObject *parent, QMofObject *wrapper) : +QProperty::QProperty(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeature(*new QPropertyPrivate, parent, wrapper) { } -QProperty::QProperty(QPropertyPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QProperty::QProperty(QPropertyPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeature(dd, parent, wrapper) { } @@ -309,19 +309,19 @@ void QProperty::setOwningAssociation(QAssociation *owningAssociation) d->owningAssociation->removeOwnedEnd(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->owningAssociation)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->owningAssociation)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->owningAssociation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->owningAssociation)); d->owningAssociation = owningAssociation; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(owningAssociation)); - (qmofobject_cast<QProperty *>(this))->setAssociation(qmofobject_cast<QAssociation *>(owningAssociation)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(owningAssociation)); + (qwrappedobject_cast<QProperty *>(this))->setAssociation(qwrappedobject_cast<QAssociation *>(owningAssociation)); if (owningAssociation) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(owningAssociation)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(owningAssociation)); } if (owningAssociation) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(owningAssociation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(owningAssociation)); } // Adjust opposite property @@ -348,13 +348,13 @@ void QProperty::setDefaultValue(QValueSpecification *defaultValue) Q_D(QProperty); if (d->defaultValue != defaultValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->defaultValue)); d->defaultValue = defaultValue; // Adjust subsetted property(ies) if (defaultValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(defaultValue)); } } } @@ -381,18 +381,18 @@ void QProperty::setClass_(QClass *class_) d->class_->removeOwnedAttribute(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->class_)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->class_)); d->class_ = class_; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(class_)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(class_)); if (class_) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(class_)); } if (class_) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(class_)); } // Adjust opposite property @@ -447,18 +447,18 @@ void QProperty::setDatatype(QDataType *datatype) d->datatype->removeOwnedAttribute(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->datatype)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->datatype)); d->datatype = datatype; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(datatype)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(datatype)); if (datatype) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(datatype)); } if (datatype) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(datatype)); } // Adjust opposite property @@ -487,7 +487,7 @@ void QProperty::addRedefinedProperty(QProperty *redefinedProperty) d->redefinedProperties->insert(redefinedProperty); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedProperty)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); } } @@ -500,7 +500,7 @@ void QProperty::removeRedefinedProperty(QProperty *redefinedProperty) d->redefinedProperties->remove(redefinedProperty); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedProperty)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); } } diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h index 7bc6d363..655fc2b7 100644 --- a/src/mof/qproperty.h +++ b/src/mof/qproperty.h @@ -93,7 +93,7 @@ class Q_MOF_EXPORT QProperty : public QStructuralFeature Q_DECLARE_PRIVATE(QProperty) public: - Q_INVOKABLE explicit QProperty(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProperty(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProperty(); // Attributes from QProperty @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QType *> *subsettingContext() const; protected: - explicit QProperty(QPropertyPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QProperty(QPropertyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qredefinableelement.cpp b/src/mof/qredefinableelement.cpp index 00cd7bf4..91303891 100644 --- a/src/mof/qredefinableelement.cpp +++ b/src/mof/qredefinableelement.cpp @@ -103,12 +103,12 @@ void QRedefinableElementPrivate::removeRedefinitionContext(QClassifier *redefini \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. */ -QRedefinableElement::QRedefinableElement(QMofObject *parent, QMofObject *wrapper) : +QRedefinableElement::QRedefinableElement(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QRedefinableElementPrivate, parent, wrapper) { } -QRedefinableElement::QRedefinableElement(QRedefinableElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QRedefinableElement::QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h index 3d65445e..a53ba7c7 100644 --- a/src/mof/qredefinableelement.h +++ b/src/mof/qredefinableelement.h @@ -72,7 +72,7 @@ class Q_MOF_EXPORT QRedefinableElement : public QNamedElement Q_DECLARE_PRIVATE(QRedefinableElement) public: - Q_INVOKABLE explicit QRedefinableElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRedefinableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRedefinableElement(); // Attributes from QRedefinableElement @@ -88,7 +88,7 @@ public: Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const; protected: - explicit QRedefinableElement(QRedefinableElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivecollection.cpp b/src/mof/qreflectivecollection.cpp index 8da3f2c0..1852e064 100644 --- a/src/mof/qreflectivecollection.cpp +++ b/src/mof/qreflectivecollection.cpp @@ -53,12 +53,12 @@ QReflectiveCollectionPrivate::~QReflectiveCollectionPrivate() } -QReflectiveCollection::QReflectiveCollection(QMofObject *parent, QMofObject *wrapper) : +QReflectiveCollection::QReflectiveCollection(QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(*new QReflectiveCollectionPrivate, parent, wrapper) { } -QReflectiveCollection::QReflectiveCollection(QReflectiveCollectionPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QReflectiveCollection::QReflectiveCollection(QReflectiveCollectionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMofObject(dd, parent, wrapper) { } diff --git a/src/mof/qreflectivecollection.h b/src/mof/qreflectivecollection.h index 47e32942..5d36a135 100644 --- a/src/mof/qreflectivecollection.h +++ b/src/mof/qreflectivecollection.h @@ -62,7 +62,7 @@ class Q_MOF_EXPORT QReflectiveCollection : public QMofObject Q_DECLARE_PRIVATE(QReflectiveCollection) public: - Q_INVOKABLE explicit QReflectiveCollection(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReflectiveCollection(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReflectiveCollection(); // Operations @@ -73,7 +73,7 @@ public: Q_INVOKABLE qint32 size() const; protected: - explicit QReflectiveCollection(QReflectiveCollectionPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QReflectiveCollection(QReflectiveCollectionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivesequence.cpp b/src/mof/qreflectivesequence.cpp index 7f1c3e3b..b3c1ab00 100644 --- a/src/mof/qreflectivesequence.cpp +++ b/src/mof/qreflectivesequence.cpp @@ -55,12 +55,12 @@ QReflectiveSequencePrivate::~QReflectiveSequencePrivate() } -QReflectiveSequence::QReflectiveSequence(QMofObject *parent, QMofObject *wrapper) : +QReflectiveSequence::QReflectiveSequence(QWrappedObject *parent, QWrappedObject *wrapper) : QReflectiveCollection(*new QReflectiveSequencePrivate, parent, wrapper) { } -QReflectiveSequence::QReflectiveSequence(QReflectiveSequencePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QReflectiveSequence::QReflectiveSequence(QReflectiveSequencePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QReflectiveCollection(dd, parent, wrapper) { } diff --git a/src/mof/qreflectivesequence.h b/src/mof/qreflectivesequence.h index 5c9aefc8..c4c5639f 100644 --- a/src/mof/qreflectivesequence.h +++ b/src/mof/qreflectivesequence.h @@ -65,7 +65,7 @@ class Q_MOF_EXPORT QReflectiveSequence : public QReflectiveCollection Q_DECLARE_PRIVATE(QReflectiveSequence) public: - Q_INVOKABLE explicit QReflectiveSequence(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReflectiveSequence(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReflectiveSequence(); // Operations @@ -75,7 +75,7 @@ public: Q_INVOKABLE QMofObject *set(qint32 index, const QMofObject *object); protected: - explicit QReflectiveSequence(QReflectiveSequencePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QReflectiveSequence(QReflectiveSequencePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qrelationship.cpp b/src/mof/qrelationship.cpp index 34f1c30c..1a6b4dd8 100644 --- a/src/mof/qrelationship.cpp +++ b/src/mof/qrelationship.cpp @@ -80,12 +80,12 @@ void QRelationshipPrivate::removeRelatedElement(QElement *relatedElement) \brief Relationship is an abstract concept that specifies some kind of relationship between elements. */ -QRelationship::QRelationship(QMofObject *parent, QMofObject *wrapper) : +QRelationship::QRelationship(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QRelationshipPrivate, parent, wrapper) { } -QRelationship::QRelationship(QRelationshipPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QRelationship::QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/mof/qrelationship.h b/src/mof/qrelationship.h index c02b2004..777454b5 100644 --- a/src/mof/qrelationship.h +++ b/src/mof/qrelationship.h @@ -67,14 +67,14 @@ class Q_MOF_EXPORT QRelationship : public QElement Q_DECLARE_PRIVATE(QRelationship) public: - Q_INVOKABLE explicit QRelationship(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRelationship(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRelationship(); // Association ends from QRelationship Q_INVOKABLE const QSet<QElement *> *relatedElements() const; protected: - explicit QRelationship(QRelationshipPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qslot.cpp b/src/mof/qslot.cpp index 93387d34..dd079b94 100644 --- a/src/mof/qslot.cpp +++ b/src/mof/qslot.cpp @@ -68,12 +68,12 @@ QSlotPrivate::~QSlotPrivate() \brief A slot specifies that an entity modeled by an instance specification has a value or values for a specific structural feature. */ -QSlot::QSlot(QMofObject *parent, QMofObject *wrapper) : +QSlot::QSlot(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QSlotPrivate, parent, wrapper) { } -QSlot::QSlot(QSlotPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QSlot::QSlot(QSlotPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -106,7 +106,7 @@ void QSlot::addValue(QValueSpecification *value) d->values->append(value); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); } } @@ -119,7 +119,7 @@ void QSlot::removeValue(QValueSpecification *value) d->values->removeAll(value); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(value)); } } @@ -168,7 +168,7 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) d->owningInstance = owningInstance; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(owningInstance)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(owningInstance)); // Adjust opposite property if (owningInstance) diff --git a/src/mof/qslot.h b/src/mof/qslot.h index f412c56d..94c95f53 100644 --- a/src/mof/qslot.h +++ b/src/mof/qslot.h @@ -74,7 +74,7 @@ class Q_MOF_EXPORT QSlot : public QElement Q_DECLARE_PRIVATE(QSlot) public: - Q_INVOKABLE explicit QSlot(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSlot(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSlot(); // Association ends from QSlot @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance); protected: - explicit QSlot(QSlotPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QSlot(QSlotPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qstructuralfeature.cpp b/src/mof/qstructuralfeature.cpp index ef3ce1f0..74b3c2a9 100644 --- a/src/mof/qstructuralfeature.cpp +++ b/src/mof/qstructuralfeature.cpp @@ -61,16 +61,16 @@ QStructuralFeaturePrivate::~QStructuralFeaturePrivate() \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. */ -QStructuralFeature::QStructuralFeature(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QStructuralFeaturePrivate, parent, wrapper), +QStructuralFeature::QStructuralFeature(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QStructuralFeaturePrivate, parent, wrapper), _wrappedFeature(new QFeature(this, this)), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)) { } -QStructuralFeature::QStructuralFeature(QStructuralFeaturePrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QStructuralFeature::QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedFeature(new QFeature(this, this)), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)) @@ -90,7 +90,7 @@ QStructuralFeature::~QStructuralFeature() */ const QSet<QElement *> *QStructuralFeature::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -98,7 +98,7 @@ const QSet<QElement *> *QStructuralFeature::ownedElements() const */ QElement *QStructuralFeature::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -106,17 +106,17 @@ QElement *QStructuralFeature::owner() const */ const QSet<QComment *> *QStructuralFeature::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QStructuralFeature::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QStructuralFeature::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -128,12 +128,12 @@ void QStructuralFeature::removeOwnedComment(QComment *ownedComment) */ QString QStructuralFeature::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QStructuralFeature::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -141,12 +141,12 @@ void QStructuralFeature::setName(QString name) */ QtMof::VisibilityKind QStructuralFeature::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QStructuralFeature::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -154,7 +154,7 @@ void QStructuralFeature::setVisibility(QtMof::VisibilityKind visibility) */ QString QStructuralFeature::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -166,7 +166,7 @@ QString QStructuralFeature::qualifiedName() const */ QNamespace *QStructuralFeature::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -178,12 +178,12 @@ QNamespace *QStructuralFeature::namespace_() const */ bool QStructuralFeature::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QStructuralFeature::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -195,7 +195,7 @@ void QStructuralFeature::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -203,7 +203,7 @@ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const */ const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -215,12 +215,12 @@ const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const */ bool QStructuralFeature::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QStructuralFeature::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -232,7 +232,7 @@ void QStructuralFeature::setStatic(bool isStatic) */ const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- @@ -244,12 +244,12 @@ const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const */ QType *QStructuralFeature::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QStructuralFeature::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -261,12 +261,12 @@ void QStructuralFeature::setType(QType *type) */ qint32 QStructuralFeature::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QStructuralFeature::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -274,12 +274,12 @@ void QStructuralFeature::setUpper(qint32 upper) */ bool QStructuralFeature::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QStructuralFeature::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -287,12 +287,12 @@ void QStructuralFeature::setUnique(bool isUnique) */ bool QStructuralFeature::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QStructuralFeature::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -300,12 +300,12 @@ void QStructuralFeature::setOrdered(bool isOrdered) */ qint32 QStructuralFeature::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QStructuralFeature::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -317,12 +317,12 @@ void QStructuralFeature::setLower(qint32 lower) */ QValueSpecification *QStructuralFeature::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QStructuralFeature::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -330,12 +330,12 @@ void QStructuralFeature::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QStructuralFeature::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QStructuralFeature::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h index e6507328..9f4d1af1 100644 --- a/src/mof/qstructuralfeature.h +++ b/src/mof/qstructuralfeature.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QFeature> #include <QtMof/QTypedElement> #include <QtMof/QMultiplicityElement> @@ -57,7 +58,7 @@ QT_MODULE(QtMof) class QStructuralFeaturePrivate; -class Q_MOF_EXPORT QStructuralFeature : public QMofObject +class Q_MOF_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT @@ -67,7 +68,7 @@ class Q_MOF_EXPORT QStructuralFeature : public QMofObject Q_DECLARE_PRIVATE(QStructuralFeature) public: - Q_INVOKABLE explicit QStructuralFeature(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStructuralFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStructuralFeature(); // Association ends from aggregated QElement @@ -127,7 +128,7 @@ public: Q_INVOKABLE void setReadOnly(bool isReadOnly); protected: - explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QFeature *_wrappedFeature; diff --git a/src/mof/qstructuralfeature_p.h b/src/mof/qstructuralfeature_p.h index b94220bc..b75cd5a8 100644 --- a/src/mof/qstructuralfeature_p.h +++ b/src/mof/qstructuralfeature_p.h @@ -42,7 +42,8 @@ #define QTMOF_QSTRUCTURALFEATURE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qfeature_p.h" #include "private/qtypedelement_p.h" #include "private/qmultiplicityelement_p.h" @@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE_QTMOF QT_MODULE(QtMof) -class Q_MOF_EXPORT QStructuralFeaturePrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QStructuralFeaturePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QStructuralFeature) diff --git a/src/mof/qtag.cpp b/src/mof/qtag.cpp index d4be51bf..2f5063c7 100644 --- a/src/mof/qtag.cpp +++ b/src/mof/qtag.cpp @@ -56,12 +56,12 @@ QTagPrivate::~QTagPrivate() } -QTag::QTag(QMofObject *parent, QMofObject *wrapper) : +QTag::QTag(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QTagPrivate, parent, wrapper) { } -QTag::QTag(QTagPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QTag::QTag(QTagPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/mof/qtag.h b/src/mof/qtag.h index 561606b5..12344acc 100644 --- a/src/mof/qtag.h +++ b/src/mof/qtag.h @@ -71,7 +71,7 @@ class Q_MOF_EXPORT QTag : public QElement Q_DECLARE_PRIVATE(QTag) public: - Q_INVOKABLE explicit QTag(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTag(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTag(); // Attributes from QTag @@ -86,7 +86,7 @@ public: Q_INVOKABLE void setTagOwner(QElement *tagOwner); protected: - explicit QTag(QTagPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QTag(QTagPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtype.cpp b/src/mof/qtype.cpp index 36d371f4..77d8040c 100644 --- a/src/mof/qtype.cpp +++ b/src/mof/qtype.cpp @@ -64,12 +64,12 @@ QTypePrivate::~QTypePrivate() \brief A type constrains the values represented by a typed element. */ -QType::QType(QMofObject *parent, QMofObject *wrapper) : +QType::QType(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QTypePrivate, parent, wrapper) { } -QType::QType(QTypePrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QType::QType(QTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } @@ -106,7 +106,7 @@ void QType::setPackage(QPackage *package) d->package = package; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(package)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(package)); // Adjust opposite property if (package) diff --git a/src/mof/qtype.h b/src/mof/qtype.h index 69581efa..9899b587 100644 --- a/src/mof/qtype.h +++ b/src/mof/qtype.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QType : public QPackageableElement Q_DECLARE_PRIVATE(QType) public: - Q_INVOKABLE explicit QType(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QType(); // Association ends from QType @@ -80,7 +80,7 @@ public: Q_INVOKABLE bool isInstance(const QMofObject *object) const; protected: - explicit QType(QTypePrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QType(QTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtypedelement.cpp b/src/mof/qtypedelement.cpp index d3ac4604..b4f06a8c 100644 --- a/src/mof/qtypedelement.cpp +++ b/src/mof/qtypedelement.cpp @@ -63,12 +63,12 @@ QTypedElementPrivate::~QTypedElementPrivate() \brief A typed element has a type. */ -QTypedElement::QTypedElement(QMofObject *parent, QMofObject *wrapper) : +QTypedElement::QTypedElement(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QTypedElementPrivate, parent, wrapper) { } -QTypedElement::QTypedElement(QTypedElementPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QTypedElement::QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/mof/qtypedelement.h b/src/mof/qtypedelement.h index 7fc9522f..df36b8f5 100644 --- a/src/mof/qtypedelement.h +++ b/src/mof/qtypedelement.h @@ -67,7 +67,7 @@ class Q_MOF_EXPORT QTypedElement : public QNamedElement Q_DECLARE_PRIVATE(QTypedElement) public: - Q_INVOKABLE explicit QTypedElement(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTypedElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTypedElement(); // Association ends from QTypedElement @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setType(QType *type); protected: - explicit QTypedElement(QTypedElementPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/quriextent.cpp b/src/mof/quriextent.cpp index 9616d810..768e9e8e 100644 --- a/src/mof/quriextent.cpp +++ b/src/mof/quriextent.cpp @@ -55,12 +55,12 @@ QURIExtentPrivate::~QURIExtentPrivate() } -QURIExtent::QURIExtent(QMofObject *parent, QMofObject *wrapper) : +QURIExtent::QURIExtent(QWrappedObject *parent, QWrappedObject *wrapper) : QExtent(*new QURIExtentPrivate, parent, wrapper) { } -QURIExtent::QURIExtent(QURIExtentPrivate &dd, QMofObject *parent, QMofObject *wrapper) : +QURIExtent::QURIExtent(QURIExtentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QExtent(dd, parent, wrapper) { } diff --git a/src/mof/quriextent.h b/src/mof/quriextent.h index 7ec45af6..9d726b6e 100644 --- a/src/mof/quriextent.h +++ b/src/mof/quriextent.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QURIExtent : public QExtent Q_DECLARE_PRIVATE(QURIExtent) public: - Q_INVOKABLE explicit QURIExtent(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QURIExtent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QURIExtent(); // Operations @@ -77,7 +77,7 @@ public: Q_INVOKABLE QElement *element(QString uri) const; protected: - explicit QURIExtent(QURIExtentPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QURIExtent(QURIExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qvaluespecification.cpp b/src/mof/qvaluespecification.cpp index 96456c0c..4ebd9eb7 100644 --- a/src/mof/qvaluespecification.cpp +++ b/src/mof/qvaluespecification.cpp @@ -60,15 +60,15 @@ QValueSpecificationPrivate::~QValueSpecificationPrivate() \brief A value specification is the specification of a (possibly empty) set of instances, including both objects and data values. */ -QValueSpecification::QValueSpecification(QMofObject *parent, QMofObject *wrapper) : - QMofObject(*new QValueSpecificationPrivate, parent, wrapper), +QValueSpecification::QValueSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QValueSpecificationPrivate, parent, wrapper), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedTypedElement(new QTypedElement(this, this)) { } -QValueSpecification::QValueSpecification(QValueSpecificationPrivate &dd, QMofObject *parent, QMofObject *wrapper) : - QMofObject(dd, parent, wrapper), +QValueSpecification::QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedTypedElement(new QTypedElement(this, this)) { @@ -87,7 +87,7 @@ QValueSpecification::~QValueSpecification() */ const QSet<QElement *> *QValueSpecification::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -95,7 +95,7 @@ const QSet<QElement *> *QValueSpecification::ownedElements() const */ QElement *QValueSpecification::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -103,17 +103,17 @@ QElement *QValueSpecification::owner() const */ const QSet<QComment *> *QValueSpecification::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QValueSpecification::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QValueSpecification::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -125,12 +125,12 @@ void QValueSpecification::removeOwnedComment(QComment *ownedComment) */ QString QValueSpecification::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QValueSpecification::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -138,7 +138,7 @@ void QValueSpecification::setName(QString name) */ QString QValueSpecification::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -150,7 +150,7 @@ QString QValueSpecification::qualifiedName() const */ QNamespace *QValueSpecification::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } // --------------------------------------------------------------- @@ -162,12 +162,12 @@ QNamespace *QValueSpecification::namespace_() const */ QtMof::VisibilityKind QValueSpecification::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QValueSpecification::setVisibility(QtMof::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -179,12 +179,12 @@ void QValueSpecification::setVisibility(QtMof::VisibilityKind visibility) */ QType *QValueSpecification::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QValueSpecification::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } /*! diff --git a/src/mof/qvaluespecification.h b/src/mof/qvaluespecification.h index 2c77b05c..ae68e3a9 100644 --- a/src/mof/qvaluespecification.h +++ b/src/mof/qvaluespecification.h @@ -44,7 +44,8 @@ #include <QtMof/QtMofGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtMof/QPackageableElement> #include <QtMof/QTypedElement> @@ -59,7 +60,7 @@ QT_MODULE(QtMof) class QValueSpecificationPrivate; -class Q_MOF_EXPORT QValueSpecification : public QMofObject +class Q_MOF_EXPORT QValueSpecification : public QWrappedObject { Q_OBJECT @@ -67,7 +68,7 @@ class Q_MOF_EXPORT QValueSpecification : public QMofObject Q_DECLARE_PRIVATE(QValueSpecification) public: - Q_INVOKABLE explicit QValueSpecification(QMofObject *parent = 0, QMofObject *wrapper = 0); + Q_INVOKABLE explicit QValueSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QValueSpecification(); // Association ends from aggregated QElement @@ -103,7 +104,7 @@ public: Q_INVOKABLE qint32 unlimitedValue() const; protected: - explicit QValueSpecification(QValueSpecificationPrivate &dd, QMofObject *parent = 0, QMofObject *wrapper = 0); + explicit QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QPackageableElement *_wrappedPackageableElement; diff --git a/src/mof/qvaluespecification_p.h b/src/mof/qvaluespecification_p.h index aaa96933..f7d44fca 100644 --- a/src/mof/qvaluespecification_p.h +++ b/src/mof/qvaluespecification_p.h @@ -42,7 +42,8 @@ #define QTMOF_QVALUESPECIFICATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qpackageableelement_p.h" #include "private/qtypedelement_p.h" @@ -57,7 +58,7 @@ QT_BEGIN_NAMESPACE_QTMOF QT_MODULE(QtMof) -class Q_MOF_EXPORT QValueSpecificationPrivate : public QMofObjectPrivate +class Q_MOF_EXPORT QValueSpecificationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QValueSpecification) diff --git a/src/src.pro b/src/src.pro index 6ab5e02a..ce39e978 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = mof uml +SUBDIRS = wrappedobjects mof uml diff --git a/src/uml/qabstraction.cpp b/src/uml/qabstraction.cpp index 7bd5d22e..74f29dd2 100644 --- a/src/uml/qabstraction.cpp +++ b/src/uml/qabstraction.cpp @@ -63,12 +63,12 @@ QAbstractionPrivate::~QAbstractionPrivate() \brief An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. */ -QAbstraction::QAbstraction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAbstraction::QAbstraction(QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(*new QAbstractionPrivate, parent, wrapper) { } -QAbstraction::QAbstraction(QAbstractionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAbstraction::QAbstraction(QAbstractionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QAbstraction::setMapping(QOpaqueExpression *mapping) Q_D(QAbstraction); if (d->mapping != mapping) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->mapping)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->mapping)); d->mapping = mapping; // Adjust subsetted property(ies) if (mapping) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(mapping)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(mapping)); } } } diff --git a/src/uml/qabstraction.h b/src/uml/qabstraction.h index 02db7115..634a6d8c 100644 --- a/src/uml/qabstraction.h +++ b/src/uml/qabstraction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QAbstraction : public QDependency Q_DECLARE_PRIVATE(QAbstraction) public: - Q_INVOKABLE explicit QAbstraction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAbstraction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAbstraction(); // Association ends from QAbstraction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setMapping(QOpaqueExpression *mapping); protected: - explicit QAbstraction(QAbstractionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAbstraction(QAbstractionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qacceptcallaction.cpp b/src/uml/qacceptcallaction.cpp index fb86d1f9..a4955226 100644 --- a/src/uml/qacceptcallaction.cpp +++ b/src/uml/qacceptcallaction.cpp @@ -63,12 +63,12 @@ QAcceptCallActionPrivate::~QAcceptCallActionPrivate() \brief An accept call action is an accept event action representing the receipt of a synchronous call request. In addition to the normal operation parameters, the action produces an output that is needed later to supply the information to the reply action necessary to return control to the caller. This action is for synchronous calls. If it is used to handle an asynchronous call, execution of the subsequent reply action will complete immediately with no effects. */ -QAcceptCallAction::QAcceptCallAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAcceptCallAction::QAcceptCallAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAcceptEventAction(*new QAcceptCallActionPrivate, parent, wrapper) { } -QAcceptCallAction::QAcceptCallAction(QAcceptCallActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAcceptCallAction::QAcceptCallAction(QAcceptCallActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAcceptEventAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QAcceptCallAction::setReturnInformation(QOutputPin *returnInformation) Q_D(QAcceptCallAction); if (d->returnInformation != returnInformation) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->returnInformation)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->returnInformation)); d->returnInformation = returnInformation; // Adjust subsetted property(ies) if (returnInformation) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(returnInformation)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(returnInformation)); } } } diff --git a/src/uml/qacceptcallaction.h b/src/uml/qacceptcallaction.h index 709ce374..061052b0 100644 --- a/src/uml/qacceptcallaction.h +++ b/src/uml/qacceptcallaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QAcceptCallAction : public QAcceptEventAction Q_DECLARE_PRIVATE(QAcceptCallAction) public: - Q_INVOKABLE explicit QAcceptCallAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAcceptCallAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAcceptCallAction(); // Association ends from QAcceptCallAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setReturnInformation(QOutputPin *returnInformation); protected: - explicit QAcceptCallAction(QAcceptCallActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAcceptCallAction(QAcceptCallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaccepteventaction.cpp b/src/uml/qaccepteventaction.cpp index 34cf25ef..a139cae0 100644 --- a/src/uml/qaccepteventaction.cpp +++ b/src/uml/qaccepteventaction.cpp @@ -68,12 +68,12 @@ QAcceptEventActionPrivate::~QAcceptEventActionPrivate() \brief A accept event action is an action that waits for the occurrence of an event meeting specified conditions. */ -QAcceptEventAction::QAcceptEventAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAcceptEventAction::QAcceptEventAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QAcceptEventActionPrivate, parent, wrapper) { } -QAcceptEventAction::QAcceptEventAction(QAcceptEventActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAcceptEventAction::QAcceptEventAction(QAcceptEventActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -131,7 +131,7 @@ void QAcceptEventAction::addTrigger(QTrigger *trigger) d->triggers->insert(trigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(trigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(trigger)); } } @@ -144,7 +144,7 @@ void QAcceptEventAction::removeTrigger(QTrigger *trigger) d->triggers->remove(trigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(trigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(trigger)); } } @@ -168,7 +168,7 @@ void QAcceptEventAction::addResult(QOutputPin *result) d->results->insert(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } @@ -181,7 +181,7 @@ void QAcceptEventAction::removeResult(QOutputPin *result) d->results->remove(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); } } diff --git a/src/uml/qaccepteventaction.h b/src/uml/qaccepteventaction.h index 2f8172d9..161a7f41 100644 --- a/src/uml/qaccepteventaction.h +++ b/src/uml/qaccepteventaction.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QAcceptEventAction : public QAction Q_DECLARE_PRIVATE(QAcceptEventAction) public: - Q_INVOKABLE explicit QAcceptEventAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAcceptEventAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAcceptEventAction(); // Attributes from QAcceptEventAction @@ -89,7 +89,7 @@ public: Q_INVOKABLE void removeResult(QOutputPin *result); protected: - explicit QAcceptEventAction(QAcceptEventActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAcceptEventAction(QAcceptEventActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaction.cpp b/src/uml/qaction.cpp index 7a4a051b..c86fa469 100644 --- a/src/uml/qaction.cpp +++ b/src/uml/qaction.cpp @@ -74,7 +74,7 @@ void QActionPrivate::addInput(QInputPin *input) this->inputs->append(input); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->addOwnedElement(qmofobject_cast<QElement *>(input)); + (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(input)); } } @@ -86,7 +86,7 @@ void QActionPrivate::removeInput(QInputPin *input) this->inputs->removeAll(input); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->removeOwnedElement(qmofobject_cast<QElement *>(input)); + (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(input)); } } @@ -98,7 +98,7 @@ void QActionPrivate::addOutput(QOutputPin *output) this->outputs->append(output); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->addOwnedElement(qmofobject_cast<QElement *>(output)); + (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(output)); } } @@ -110,7 +110,7 @@ void QActionPrivate::removeOutput(QOutputPin *output) this->outputs->removeAll(output); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->removeOwnedElement(qmofobject_cast<QElement *>(output)); + (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(output)); } } @@ -122,12 +122,12 @@ void QActionPrivate::removeOutput(QOutputPin *output) \brief An action has pre- and post-conditions.An action represents a single step within an activity, that is, one that is not further decomposed within the activity.An action is a named element that is the fundamental unit of executable functionality. The execution of an action represents some transformation or processing in the modeled system, be it a computer system or otherwise. */ -QAction::QAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAction::QAction(QWrappedObject *parent, QWrappedObject *wrapper) : QExecutableNode(*new QActionPrivate, parent, wrapper) { } -QAction::QAction(QActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAction::QAction(QActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QExecutableNode(dd, parent, wrapper) { } @@ -197,7 +197,7 @@ void QAction::addLocalPostcondition(QConstraint *localPostcondition) d->localPostconditions->insert(localPostcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(localPostcondition)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(localPostcondition)); } } @@ -210,7 +210,7 @@ void QAction::removeLocalPostcondition(QConstraint *localPostcondition) d->localPostconditions->remove(localPostcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(localPostcondition)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(localPostcondition)); } } @@ -234,7 +234,7 @@ void QAction::addLocalPrecondition(QConstraint *localPrecondition) d->localPreconditions->insert(localPrecondition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(localPrecondition)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(localPrecondition)); } } @@ -247,7 +247,7 @@ void QAction::removeLocalPrecondition(QConstraint *localPrecondition) d->localPreconditions->remove(localPrecondition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(localPrecondition)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(localPrecondition)); } } diff --git a/src/uml/qaction.h b/src/uml/qaction.h index be5218c6..b38aed38 100644 --- a/src/uml/qaction.h +++ b/src/uml/qaction.h @@ -79,7 +79,7 @@ class Q_UML_EXPORT QAction : public QExecutableNode Q_DECLARE_PRIVATE(QAction) public: - Q_INVOKABLE explicit QAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAction(); // Attributes from QAction @@ -98,7 +98,7 @@ public: Q_INVOKABLE const QList<QOutputPin *> *outputs() const; protected: - explicit QAction(QActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAction(QActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactionexecutionspecification.cpp b/src/uml/qactionexecutionspecification.cpp index c5e3b1bb..86df3d2e 100644 --- a/src/uml/qactionexecutionspecification.cpp +++ b/src/uml/qactionexecutionspecification.cpp @@ -63,12 +63,12 @@ QActionExecutionSpecificationPrivate::~QActionExecutionSpecificationPrivate() \brief An action execution specification is a kind of execution specification representing the execution of an action. */ -QActionExecutionSpecification::QActionExecutionSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActionExecutionSpecification::QActionExecutionSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QExecutionSpecification(*new QActionExecutionSpecificationPrivate, parent, wrapper) { } -QActionExecutionSpecification::QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActionExecutionSpecification::QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QExecutionSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qactionexecutionspecification.h b/src/uml/qactionexecutionspecification.h index bf6f613f..92fc1c74 100644 --- a/src/uml/qactionexecutionspecification.h +++ b/src/uml/qactionexecutionspecification.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QActionExecutionSpecification : public QExecutionSpecificatio Q_DECLARE_PRIVATE(QActionExecutionSpecification) public: - Q_INVOKABLE explicit QActionExecutionSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActionExecutionSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActionExecutionSpecification(); // Association ends from QActionExecutionSpecification @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setAction(QAction *action); protected: - explicit QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactioninputpin.cpp b/src/uml/qactioninputpin.cpp index 0ed11ec2..cdec825c 100644 --- a/src/uml/qactioninputpin.cpp +++ b/src/uml/qactioninputpin.cpp @@ -63,12 +63,12 @@ QActionInputPinPrivate::~QActionInputPinPrivate() \brief An action input pin is a kind of pin that executes an action to determine the values to input to another. */ -QActionInputPin::QActionInputPin(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActionInputPin::QActionInputPin(QWrappedObject *parent, QWrappedObject *wrapper) : QInputPin(*new QActionInputPinPrivate, parent, wrapper) { } -QActionInputPin::QActionInputPin(QActionInputPinPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActionInputPin::QActionInputPin(QActionInputPinPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInputPin(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QActionInputPin::setFromAction(QAction *fromAction) Q_D(QActionInputPin); if (d->fromAction != fromAction) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->fromAction)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->fromAction)); d->fromAction = fromAction; // Adjust subsetted property(ies) if (fromAction) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(fromAction)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(fromAction)); } } } diff --git a/src/uml/qactioninputpin.h b/src/uml/qactioninputpin.h index 3314ba79..4f12816f 100644 --- a/src/uml/qactioninputpin.h +++ b/src/uml/qactioninputpin.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QActionInputPin : public QInputPin Q_DECLARE_PRIVATE(QActionInputPin) public: - Q_INVOKABLE explicit QActionInputPin(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActionInputPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActionInputPin(); // Association ends from QActionInputPin @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setFromAction(QAction *fromAction); protected: - explicit QActionInputPin(QActionInputPinPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActionInputPin(QActionInputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivity.cpp b/src/uml/qactivity.cpp index 30121ad3..6b59bec4 100644 --- a/src/uml/qactivity.cpp +++ b/src/uml/qactivity.cpp @@ -81,12 +81,12 @@ QActivityPrivate::~QActivityPrivate() \brief An activity is the specification of parameterized behavior as the coordinated sequencing of subordinate units whose individual elements are actions. */ -QActivity::QActivity(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivity::QActivity(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(*new QActivityPrivate, parent, wrapper) { } -QActivity::QActivity(QActivityPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivity::QActivity(QActivityPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(dd, parent, wrapper) { } @@ -165,7 +165,7 @@ void QActivity::addPartition(QActivityPartition *partition) d->partitions->insert(partition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivity *>(this))->addGroup(qmofobject_cast<QActivityGroup *>(partition)); + (qwrappedobject_cast<QActivity *>(this))->addGroup(qwrappedobject_cast<QActivityGroup *>(partition)); } } @@ -178,7 +178,7 @@ void QActivity::removePartition(QActivityPartition *partition) d->partitions->remove(partition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivity *>(this))->removeGroup(qmofobject_cast<QActivityGroup *>(partition)); + (qwrappedobject_cast<QActivity *>(this))->removeGroup(qwrappedobject_cast<QActivityGroup *>(partition)); } } @@ -202,7 +202,7 @@ void QActivity::addNode(QActivityNode *node) d->nodes->insert(node); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(node)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(node)); // Adjust opposite property node->setActivity(this); @@ -218,7 +218,7 @@ void QActivity::removeNode(QActivityNode *node) d->nodes->remove(node); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(node)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(node)); // Adjust opposite property node->setActivity(0); @@ -245,7 +245,7 @@ void QActivity::addVariable(QVariable *variable) d->variables->insert(variable); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(variable)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); // Adjust opposite property variable->setActivityScope(this); @@ -261,7 +261,7 @@ void QActivity::removeVariable(QVariable *variable) d->variables->remove(variable); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(variable)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); // Adjust opposite property variable->setActivityScope(0); @@ -288,8 +288,8 @@ void QActivity::addStructuredNode(QStructuredActivityNode *structuredNode) d->structuredNodes->insert(structuredNode); // Adjust subsetted property(ies) - (qmofobject_cast<QActivity *>(this))->addGroup(qmofobject_cast<QActivityGroup *>(structuredNode)); - (qmofobject_cast<QActivity *>(this))->addNode(qmofobject_cast<QActivityNode *>(structuredNode)); + (qwrappedobject_cast<QActivity *>(this))->addGroup(qwrappedobject_cast<QActivityGroup *>(structuredNode)); + (qwrappedobject_cast<QActivity *>(this))->addNode(qwrappedobject_cast<QActivityNode *>(structuredNode)); // Adjust opposite property structuredNode->setActivity(this); @@ -305,8 +305,8 @@ void QActivity::removeStructuredNode(QStructuredActivityNode *structuredNode) d->structuredNodes->remove(structuredNode); // Adjust subsetted property(ies) - (qmofobject_cast<QActivity *>(this))->removeGroup(qmofobject_cast<QActivityGroup *>(structuredNode)); - (qmofobject_cast<QActivity *>(this))->removeNode(qmofobject_cast<QActivityNode *>(structuredNode)); + (qwrappedobject_cast<QActivity *>(this))->removeGroup(qwrappedobject_cast<QActivityGroup *>(structuredNode)); + (qwrappedobject_cast<QActivity *>(this))->removeNode(qwrappedobject_cast<QActivityNode *>(structuredNode)); // Adjust opposite property structuredNode->setActivity(0); @@ -333,7 +333,7 @@ void QActivity::addGroup(QActivityGroup *group) d->groups->insert(group); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(group)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(group)); // Adjust opposite property group->setInActivity(this); @@ -349,7 +349,7 @@ void QActivity::removeGroup(QActivityGroup *group) d->groups->remove(group); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(group)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(group)); // Adjust opposite property group->setInActivity(0); @@ -376,7 +376,7 @@ void QActivity::addEdge(QActivityEdge *edge) d->edges->insert(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(edge)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(edge)); // Adjust opposite property edge->setActivity(this); @@ -392,7 +392,7 @@ void QActivity::removeEdge(QActivityEdge *edge) d->edges->remove(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(edge)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(edge)); // Adjust opposite property edge->setActivity(0); @@ -401,32 +401,32 @@ void QActivity::removeEdge(QActivityEdge *edge) // Overriden methods for subsetted properties -void QActivity::addGroup(QtMof::QMofPointer<QActivityPartition> partition) +void QActivity::addGroup(QWrappedObjectPointer<QActivityPartition> partition) { addPartition(partition); } -void QActivity::removeGroup(QtMof::QMofPointer<QActivityPartition> partition) +void QActivity::removeGroup(QWrappedObjectPointer<QActivityPartition> partition) { removePartition(partition); } -void QActivity::addGroup(QtMof::QMofPointer<QStructuredActivityNode> structuredNode) +void QActivity::addGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode) { addStructuredNode(structuredNode); } -void QActivity::removeGroup(QtMof::QMofPointer<QStructuredActivityNode> structuredNode) +void QActivity::removeGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode) { removeStructuredNode(structuredNode); } -void QActivity::addNode(QtMof::QMofPointer<QStructuredActivityNode> structuredNode) +void QActivity::addNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode) { addStructuredNode(structuredNode); } -void QActivity::removeNode(QtMof::QMofPointer<QStructuredActivityNode> structuredNode) +void QActivity::removeNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode) { removeStructuredNode(structuredNode); } diff --git a/src/uml/qactivity.h b/src/uml/qactivity.h index a06ac8de..ddca1efb 100644 --- a/src/uml/qactivity.h +++ b/src/uml/qactivity.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -84,7 +85,7 @@ class Q_UML_EXPORT QActivity : public QBehavior Q_DECLARE_PRIVATE(QActivity) public: - Q_INVOKABLE explicit QActivity(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivity(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivity(); // Attributes from QActivity @@ -114,15 +115,15 @@ public: Q_INVOKABLE void removeEdge(QActivityEdge *edge); // Overriden methods for subsetted properties - Q_INVOKABLE void addGroup(QtMof::QMofPointer<QActivityPartition> partition); - Q_INVOKABLE void removeGroup(QtMof::QMofPointer<QActivityPartition> partition); - Q_INVOKABLE void addGroup(QtMof::QMofPointer<QStructuredActivityNode> structuredNode); - Q_INVOKABLE void removeGroup(QtMof::QMofPointer<QStructuredActivityNode> structuredNode); - Q_INVOKABLE void addNode(QtMof::QMofPointer<QStructuredActivityNode> structuredNode); - Q_INVOKABLE void removeNode(QtMof::QMofPointer<QStructuredActivityNode> structuredNode); + Q_INVOKABLE void addGroup(QWrappedObjectPointer<QActivityPartition> partition); + Q_INVOKABLE void removeGroup(QWrappedObjectPointer<QActivityPartition> partition); + Q_INVOKABLE void addGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); + Q_INVOKABLE void removeGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); + Q_INVOKABLE void addNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); + Q_INVOKABLE void removeNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); protected: - explicit QActivity(QActivityPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivity(QActivityPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityedge.cpp b/src/uml/qactivityedge.cpp index e5897558..ffcf8a78 100644 --- a/src/uml/qactivityedge.cpp +++ b/src/uml/qactivityedge.cpp @@ -84,7 +84,7 @@ void QActivityEdgePrivate::addInGroup(QActivityGroup *inGroup) // Adjust opposite property Q_Q(QActivityEdge); - (qmofobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->addContainedEdge(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->addContainedEdge(q); } } @@ -98,7 +98,7 @@ void QActivityEdgePrivate::removeInGroup(QActivityGroup *inGroup) // Adjust opposite property Q_Q(QActivityEdge); if (inGroup) - (qmofobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->removeContainedEdge(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->removeContainedEdge(q); } } @@ -110,12 +110,12 @@ void QActivityEdgePrivate::removeInGroup(QActivityGroup *inGroup) \brief Activity edges can be contained in interruptible regions.An activity edge is an abstract class for directed connections between two activity nodes. */ -QActivityEdge::QActivityEdge(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityEdge::QActivityEdge(QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(*new QActivityEdgePrivate, parent, wrapper) { } -QActivityEdge::QActivityEdge(QActivityEdgePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityEdge::QActivityEdge(QActivityEdgePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(dd, parent, wrapper) { } @@ -177,7 +177,7 @@ void QActivityEdge::addRedefinedEdge(QActivityEdge *redefinedEdge) d->redefinedEdges->insert(redefinedEdge); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedEdge)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedEdge)); } } @@ -190,7 +190,7 @@ void QActivityEdge::removeRedefinedEdge(QActivityEdge *redefinedEdge) d->redefinedEdges->remove(redefinedEdge); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedEdge)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedEdge)); } } @@ -223,13 +223,13 @@ void QActivityEdge::setGuard(QValueSpecification *guard) Q_D(QActivityEdge); if (d->guard != guard) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->guard)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->guard)); d->guard = guard; // Adjust subsetted property(ies) if (guard) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(guard)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(guard)); } } } @@ -254,7 +254,7 @@ void QActivityEdge::addInPartition(QActivityPartition *inPartition) d->inPartition->insert(inPartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityEdgePrivate *>(d))->addInGroup(qmofobject_cast<QActivityGroup *>(inPartition)); + (qwrappedobject_cast<QActivityEdgePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); // Adjust opposite property inPartition->addEdge(this); @@ -270,7 +270,7 @@ void QActivityEdge::removeInPartition(QActivityPartition *inPartition) d->inPartition->remove(inPartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityEdgePrivate *>(d))->removeInGroup(qmofobject_cast<QActivityGroup *>(inPartition)); + (qwrappedobject_cast<QActivityEdgePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); // Adjust opposite property if (inPartition) @@ -302,7 +302,7 @@ void QActivityEdge::setActivity(QActivity *activity) d->activity = activity; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(activity)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(activity)); // Adjust opposite property if (activity) @@ -357,13 +357,13 @@ void QActivityEdge::setWeight(QValueSpecification *weight) Q_D(QActivityEdge); if (d->weight != weight) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->weight)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->weight)); d->weight = weight; // Adjust subsetted property(ies) if (weight) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(weight)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(weight)); } } } @@ -390,15 +390,15 @@ void QActivityEdge::setInStructuredNode(QStructuredActivityNode *inStructuredNod d->inStructuredNode->removeEdge(this); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityEdgePrivate *>(d))->removeInGroup(qmofobject_cast<QActivityGroup *>(d->inStructuredNode)); + (qwrappedobject_cast<QActivityEdgePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(d->inStructuredNode)); d->inStructuredNode = inStructuredNode; // Adjust subsetted property(ies) if (inStructuredNode) { - (qmofobject_cast<QActivityEdgePrivate *>(d))->addInGroup(qmofobject_cast<QActivityGroup *>(inStructuredNode)); + (qwrappedobject_cast<QActivityEdgePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inStructuredNode)); } - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(inStructuredNode)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(inStructuredNode)); // Adjust opposite property if (inStructuredNode) diff --git a/src/uml/qactivityedge.h b/src/uml/qactivityedge.h index d9671f45..6b99811b 100644 --- a/src/uml/qactivityedge.h +++ b/src/uml/qactivityedge.h @@ -85,7 +85,7 @@ class Q_UML_EXPORT QActivityEdge : public QRedefinableElement Q_DECLARE_PRIVATE(QActivityEdge) public: - Q_INVOKABLE explicit QActivityEdge(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityEdge(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityEdge(); // Association ends from QActivityEdge @@ -115,7 +115,7 @@ public: friend class QActivityGroupPrivate; protected: - explicit QActivityEdge(QActivityEdgePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityEdge(QActivityEdgePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityfinalnode.cpp b/src/uml/qactivityfinalnode.cpp index 2f4d686c..51ca959f 100644 --- a/src/uml/qactivityfinalnode.cpp +++ b/src/uml/qactivityfinalnode.cpp @@ -60,12 +60,12 @@ QActivityFinalNodePrivate::~QActivityFinalNodePrivate() \brief An activity final node is a final node that stops all flows in an activity. */ -QActivityFinalNode::QActivityFinalNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityFinalNode::QActivityFinalNode(QWrappedObject *parent, QWrappedObject *wrapper) : QFinalNode(*new QActivityFinalNodePrivate, parent, wrapper) { } -QActivityFinalNode::QActivityFinalNode(QActivityFinalNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityFinalNode::QActivityFinalNode(QActivityFinalNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QFinalNode(dd, parent, wrapper) { } diff --git a/src/uml/qactivityfinalnode.h b/src/uml/qactivityfinalnode.h index ad45c40e..8cca28b5 100644 --- a/src/uml/qactivityfinalnode.h +++ b/src/uml/qactivityfinalnode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QActivityFinalNode : public QFinalNode Q_DECLARE_PRIVATE(QActivityFinalNode) public: - Q_INVOKABLE explicit QActivityFinalNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityFinalNode(); protected: - explicit QActivityFinalNode(QActivityFinalNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityFinalNode(QActivityFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitygroup.cpp b/src/uml/qactivitygroup.cpp index 941168d0..b85dd5d5 100644 --- a/src/uml/qactivitygroup.cpp +++ b/src/uml/qactivitygroup.cpp @@ -76,7 +76,7 @@ void QActivityGroupPrivate::addContainedNode(QActivityNode *containedNode) // Adjust opposite property Q_Q(QActivityGroup); - (qmofobject_cast<QActivityNodePrivate *>(containedNode->d_func()))->addInGroup(q); + (qwrappedobject_cast<QActivityNodePrivate *>(containedNode->d_func()))->addInGroup(q); } } @@ -90,7 +90,7 @@ void QActivityGroupPrivate::removeContainedNode(QActivityNode *containedNode) // Adjust opposite property Q_Q(QActivityGroup); if (containedNode) - (qmofobject_cast<QActivityNodePrivate *>(containedNode->d_func()))->removeInGroup(q); + (qwrappedobject_cast<QActivityNodePrivate *>(containedNode->d_func()))->removeInGroup(q); } } @@ -102,11 +102,11 @@ void QActivityGroupPrivate::addSubgroup(QActivityGroup *subgroup) this->subgroups->insert(subgroup); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->addOwnedElement(qmofobject_cast<QElement *>(subgroup)); + (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(subgroup)); // Adjust opposite property Q_Q(QActivityGroup); - (qmofobject_cast<QActivityGroupPrivate *>(subgroup->d_func()))->setSuperGroup(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(subgroup->d_func()))->setSuperGroup(q); } } @@ -118,10 +118,10 @@ void QActivityGroupPrivate::removeSubgroup(QActivityGroup *subgroup) this->subgroups->remove(subgroup); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->removeOwnedElement(qmofobject_cast<QElement *>(subgroup)); + (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(subgroup)); // Adjust opposite property - (qmofobject_cast<QActivityGroupPrivate *>(subgroup->d_func()))->setSuperGroup(0); + (qwrappedobject_cast<QActivityGroupPrivate *>(subgroup->d_func()))->setSuperGroup(0); } } @@ -134,7 +134,7 @@ void QActivityGroupPrivate::addContainedEdge(QActivityEdge *containedEdge) // Adjust opposite property Q_Q(QActivityGroup); - (qmofobject_cast<QActivityEdgePrivate *>(containedEdge->d_func()))->addInGroup(q); + (qwrappedobject_cast<QActivityEdgePrivate *>(containedEdge->d_func()))->addInGroup(q); } } @@ -148,7 +148,7 @@ void QActivityGroupPrivate::removeContainedEdge(QActivityEdge *containedEdge) // Adjust opposite property Q_Q(QActivityGroup); if (containedEdge) - (qmofobject_cast<QActivityEdgePrivate *>(containedEdge->d_func()))->removeInGroup(q); + (qwrappedobject_cast<QActivityEdgePrivate *>(containedEdge->d_func()))->removeInGroup(q); } } @@ -160,16 +160,16 @@ void QActivityGroupPrivate::setSuperGroup(QActivityGroup *superGroup) Q_Q(QActivityGroup); // Adjust opposite property if (this->superGroup) - (qmofobject_cast<QActivityGroupPrivate *>(this->superGroup->d_func()))->removeSubgroup(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(this->superGroup->d_func()))->removeSubgroup(q); this->superGroup = superGroup; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->setOwner(qmofobject_cast<QElement *>(superGroup)); + (qwrappedobject_cast<QElementPrivate *>(this))->setOwner(qwrappedobject_cast<QElement *>(superGroup)); // Adjust opposite property if (superGroup) - (qmofobject_cast<QActivityGroupPrivate *>(superGroup->d_func()))->addSubgroup(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(superGroup->d_func()))->addSubgroup(q); } } @@ -181,12 +181,12 @@ void QActivityGroupPrivate::setSuperGroup(QActivityGroup *superGroup) \brief ActivityGroup is an abstract class for defining sets of nodes and edges in an activity. */ -QActivityGroup::QActivityGroup(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityGroup::QActivityGroup(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QActivityGroupPrivate, parent, wrapper) { } -QActivityGroup::QActivityGroup(QActivityGroupPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityGroup::QActivityGroup(QActivityGroupPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -223,7 +223,7 @@ void QActivityGroup::setInActivity(QActivity *inActivity) d->inActivity = inActivity; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(inActivity)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(inActivity)); // Adjust opposite property if (inActivity) diff --git a/src/uml/qactivitygroup.h b/src/uml/qactivitygroup.h index d5fe518e..df7966de 100644 --- a/src/uml/qactivitygroup.h +++ b/src/uml/qactivitygroup.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QActivityGroup : public QNamedElement Q_DECLARE_PRIVATE(QActivityGroup) public: - Q_INVOKABLE explicit QActivityGroup(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityGroup(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityGroup(); // Association ends from QActivityGroup @@ -92,7 +92,7 @@ public: friend class QActivityNodePrivate; protected: - explicit QActivityGroup(QActivityGroupPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityGroup(QActivityGroupPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitynode.cpp b/src/uml/qactivitynode.cpp index 86aa1532..7bb362c5 100644 --- a/src/uml/qactivitynode.cpp +++ b/src/uml/qactivitynode.cpp @@ -84,7 +84,7 @@ void QActivityNodePrivate::addInGroup(QActivityGroup *inGroup) // Adjust opposite property Q_Q(QActivityNode); - (qmofobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->addContainedNode(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->addContainedNode(q); } } @@ -98,7 +98,7 @@ void QActivityNodePrivate::removeInGroup(QActivityGroup *inGroup) // Adjust opposite property Q_Q(QActivityNode); if (inGroup) - (qmofobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->removeContainedNode(q); + (qwrappedobject_cast<QActivityGroupPrivate *>(inGroup->d_func()))->removeContainedNode(q); } } @@ -110,12 +110,12 @@ void QActivityNodePrivate::removeInGroup(QActivityGroup *inGroup) \brief ActivityNode is an abstract class for points in the flow of an activity connected by edges. */ -QActivityNode::QActivityNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityNode::QActivityNode(QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(*new QActivityNodePrivate, parent, wrapper) { } -QActivityNode::QActivityNode(QActivityNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityNode::QActivityNode(QActivityNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(dd, parent, wrapper) { } @@ -148,7 +148,7 @@ void QActivityNode::addRedefinedNode(QActivityNode *redefinedNode) d->redefinedNodes->insert(redefinedNode); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedNode)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedNode)); } } @@ -161,7 +161,7 @@ void QActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) d->redefinedNodes->remove(redefinedNode); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedNode)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedNode)); } } @@ -226,7 +226,7 @@ void QActivityNode::setActivity(QActivity *activity) d->activity = activity; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(activity)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(activity)); // Adjust opposite property if (activity) @@ -267,15 +267,15 @@ void QActivityNode::setInStructuredNode(QStructuredActivityNode *inStructuredNod d->inStructuredNode->removeNode(this); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qmofobject_cast<QActivityGroup *>(d->inStructuredNode)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(d->inStructuredNode)); d->inStructuredNode = inStructuredNode; // Adjust subsetted property(ies) if (inStructuredNode) { - (qmofobject_cast<QActivityNodePrivate *>(d))->addInGroup(qmofobject_cast<QActivityGroup *>(inStructuredNode)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inStructuredNode)); } - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(inStructuredNode)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(inStructuredNode)); // Adjust opposite property if (inStructuredNode) @@ -303,7 +303,7 @@ void QActivityNode::addInPartition(QActivityPartition *inPartition) d->inPartition->insert(inPartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityNodePrivate *>(d))->addInGroup(qmofobject_cast<QActivityGroup *>(inPartition)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); // Adjust opposite property inPartition->addNode(this); @@ -319,7 +319,7 @@ void QActivityNode::removeInPartition(QActivityPartition *inPartition) d->inPartition->remove(inPartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qmofobject_cast<QActivityGroup *>(inPartition)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); // Adjust opposite property if (inPartition) @@ -347,7 +347,7 @@ void QActivityNode::addInInterruptibleRegion(QInterruptibleActivityRegion *inInt d->inInterruptibleRegion->insert(inInterruptibleRegion); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityNodePrivate *>(d))->addInGroup(qmofobject_cast<QActivityGroup *>(inInterruptibleRegion)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inInterruptibleRegion)); // Adjust opposite property inInterruptibleRegion->addNode(this); @@ -363,7 +363,7 @@ void QActivityNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *in d->inInterruptibleRegion->remove(inInterruptibleRegion); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qmofobject_cast<QActivityGroup *>(inInterruptibleRegion)); + (qwrappedobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inInterruptibleRegion)); // Adjust opposite property if (inInterruptibleRegion) diff --git a/src/uml/qactivitynode.h b/src/uml/qactivitynode.h index 2de402e0..4681d30c 100644 --- a/src/uml/qactivitynode.h +++ b/src/uml/qactivitynode.h @@ -82,7 +82,7 @@ class Q_UML_EXPORT QActivityNode : public QRedefinableElement Q_DECLARE_PRIVATE(QActivityNode) public: - Q_INVOKABLE explicit QActivityNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityNode(); // Association ends from QActivityNode @@ -111,7 +111,7 @@ public: friend class QActivityGroupPrivate; protected: - explicit QActivityNode(QActivityNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityNode(QActivityNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityparameternode.cpp b/src/uml/qactivityparameternode.cpp index 08c310cb..92a32fc2 100644 --- a/src/uml/qactivityparameternode.cpp +++ b/src/uml/qactivityparameternode.cpp @@ -63,12 +63,12 @@ QActivityParameterNodePrivate::~QActivityParameterNodePrivate() \brief An activity parameter node is an object node for inputs and outputs to activities. */ -QActivityParameterNode::QActivityParameterNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityParameterNode::QActivityParameterNode(QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(*new QActivityParameterNodePrivate, parent, wrapper) { } -QActivityParameterNode::QActivityParameterNode(QActivityParameterNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityParameterNode::QActivityParameterNode(QActivityParameterNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(dd, parent, wrapper) { } diff --git a/src/uml/qactivityparameternode.h b/src/uml/qactivityparameternode.h index c07c2678..8ef2f1f9 100644 --- a/src/uml/qactivityparameternode.h +++ b/src/uml/qactivityparameternode.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QActivityParameterNode : public QObjectNode Q_DECLARE_PRIVATE(QActivityParameterNode) public: - Q_INVOKABLE explicit QActivityParameterNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityParameterNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityParameterNode(); // Association ends from QActivityParameterNode @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setParameter(QParameter *parameter); protected: - explicit QActivityParameterNode(QActivityParameterNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityParameterNode(QActivityParameterNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitypartition.cpp b/src/uml/qactivitypartition.cpp index 77cbd3c7..44ac7653 100644 --- a/src/uml/qactivitypartition.cpp +++ b/src/uml/qactivitypartition.cpp @@ -74,12 +74,12 @@ QActivityPartitionPrivate::~QActivityPartitionPrivate() \brief An activity partition is a kind of activity group for identifying actions that have some characteristic in common. */ -QActivityPartition::QActivityPartition(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityPartition::QActivityPartition(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityGroup(*new QActivityPartitionPrivate, parent, wrapper) { } -QActivityPartition::QActivityPartition(QActivityPartitionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActivityPartition::QActivityPartition(QActivityPartitionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityGroup(dd, parent, wrapper) { } @@ -179,7 +179,7 @@ void QActivityPartition::addSubpartition(QActivityPartition *subpartition) d->subpartitions->insert(subpartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addSubgroup(qmofobject_cast<QActivityGroup *>(subpartition)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addSubgroup(qwrappedobject_cast<QActivityGroup *>(subpartition)); // Adjust opposite property subpartition->setSuperPartition(this); @@ -195,7 +195,7 @@ void QActivityPartition::removeSubpartition(QActivityPartition *subpartition) d->subpartitions->remove(subpartition); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeSubgroup(qmofobject_cast<QActivityGroup *>(subpartition)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeSubgroup(qwrappedobject_cast<QActivityGroup *>(subpartition)); // Adjust opposite property subpartition->setSuperPartition(0); @@ -226,7 +226,7 @@ void QActivityPartition::setSuperPartition(QActivityPartition *superPartition) d->superPartition = superPartition; // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->setSuperGroup(qmofobject_cast<QActivityGroup *>(superPartition)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->setSuperGroup(qwrappedobject_cast<QActivityGroup *>(superPartition)); // Adjust opposite property if (superPartition) @@ -254,7 +254,7 @@ void QActivityPartition::addNode(QActivityNode *node) d->nodes->insert(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qmofobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); // Adjust opposite property node->addInPartition(this); @@ -270,7 +270,7 @@ void QActivityPartition::removeNode(QActivityNode *node) d->nodes->remove(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qmofobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); // Adjust opposite property if (node) @@ -298,7 +298,7 @@ void QActivityPartition::addEdge(QActivityEdge *edge) d->edges->insert(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qmofobject_cast<QActivityEdge *>(edge)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); // Adjust opposite property edge->addInPartition(this); @@ -314,7 +314,7 @@ void QActivityPartition::removeEdge(QActivityEdge *edge) d->edges->remove(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qmofobject_cast<QActivityEdge *>(edge)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); // Adjust opposite property if (edge) diff --git a/src/uml/qactivitypartition.h b/src/uml/qactivitypartition.h index 35f9ead9..47212273 100644 --- a/src/uml/qactivitypartition.h +++ b/src/uml/qactivitypartition.h @@ -78,7 +78,7 @@ class Q_UML_EXPORT QActivityPartition : public QActivityGroup Q_DECLARE_PRIVATE(QActivityPartition) public: - Q_INVOKABLE explicit QActivityPartition(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActivityPartition(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityPartition(); // Attributes from QActivityPartition @@ -103,7 +103,7 @@ public: Q_INVOKABLE void removeEdge(QActivityEdge *edge); protected: - explicit QActivityPartition(QActivityPartitionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActivityPartition(QActivityPartitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactor.cpp b/src/uml/qactor.cpp index caf6ff41..d30918c6 100644 --- a/src/uml/qactor.cpp +++ b/src/uml/qactor.cpp @@ -60,12 +60,12 @@ QActorPrivate::~QActorPrivate() \brief An actor specifies a role played by a user or any other system that interacts with the subject. */ -QActor::QActor(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActor::QActor(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioredClassifier(*new QActorPrivate, parent, wrapper) { } -QActor::QActor(QActorPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QActor::QActor(QActorPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioredClassifier(dd, parent, wrapper) { } diff --git a/src/uml/qactor.h b/src/uml/qactor.h index e0f6419a..2433149a 100644 --- a/src/uml/qactor.h +++ b/src/uml/qactor.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QActor : public QBehavioredClassifier Q_DECLARE_PRIVATE(QActor) public: - Q_INVOKABLE explicit QActor(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QActor(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActor(); protected: - explicit QActor(QActorPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QActor(QActorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaddstructuralfeaturevalueaction.cpp b/src/uml/qaddstructuralfeaturevalueaction.cpp index fa093369..eb7bc095 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.cpp +++ b/src/uml/qaddstructuralfeaturevalueaction.cpp @@ -64,12 +64,12 @@ QAddStructuralFeatureValueActionPrivate::~QAddStructuralFeatureValueActionPrivat \brief An add structural feature value action is a write structural feature action for adding values to a structural feature. */ -QAddStructuralFeatureValueAction::QAddStructuralFeatureValueAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAddStructuralFeatureValueAction::QAddStructuralFeatureValueAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteStructuralFeatureAction(*new QAddStructuralFeatureValueActionPrivate, parent, wrapper) { } -QAddStructuralFeatureValueAction::QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAddStructuralFeatureValueAction::QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteStructuralFeatureAction(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QAddStructuralFeatureValueAction::setInsertAt(QInputPin *insertAt) Q_D(QAddStructuralFeatureValueAction); if (d->insertAt != insertAt) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->insertAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->insertAt)); d->insertAt = insertAt; // Adjust subsetted property(ies) if (insertAt) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(insertAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(insertAt)); } } } diff --git a/src/uml/qaddstructuralfeaturevalueaction.h b/src/uml/qaddstructuralfeaturevalueaction.h index 52a4d717..b6886e67 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.h +++ b/src/uml/qaddstructuralfeaturevalueaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QAddStructuralFeatureValueAction : public QWriteStructuralFea Q_DECLARE_PRIVATE(QAddStructuralFeatureValueAction) public: - Q_INVOKABLE explicit QAddStructuralFeatureValueAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAddStructuralFeatureValueAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAddStructuralFeatureValueAction(); // Attributes from QAddStructuralFeatureValueAction @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setInsertAt(QInputPin *insertAt); protected: - explicit QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaddvariablevalueaction.cpp b/src/uml/qaddvariablevalueaction.cpp index a2f8ff5e..dca8837c 100644 --- a/src/uml/qaddvariablevalueaction.cpp +++ b/src/uml/qaddvariablevalueaction.cpp @@ -64,12 +64,12 @@ QAddVariableValueActionPrivate::~QAddVariableValueActionPrivate() \brief An add variable value action is a write variable action for adding values to a variable. */ -QAddVariableValueAction::QAddVariableValueAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAddVariableValueAction::QAddVariableValueAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteVariableAction(*new QAddVariableValueActionPrivate, parent, wrapper) { } -QAddVariableValueAction::QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAddVariableValueAction::QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteVariableAction(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QAddVariableValueAction::setInsertAt(QInputPin *insertAt) Q_D(QAddVariableValueAction); if (d->insertAt != insertAt) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->insertAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->insertAt)); d->insertAt = insertAt; // Adjust subsetted property(ies) if (insertAt) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(insertAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(insertAt)); } } } diff --git a/src/uml/qaddvariablevalueaction.h b/src/uml/qaddvariablevalueaction.h index 33f0e48e..5abaa6ab 100644 --- a/src/uml/qaddvariablevalueaction.h +++ b/src/uml/qaddvariablevalueaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QAddVariableValueAction : public QWriteVariableAction Q_DECLARE_PRIVATE(QAddVariableValueAction) public: - Q_INVOKABLE explicit QAddVariableValueAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAddVariableValueAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAddVariableValueAction(); // Attributes from QAddVariableValueAction @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setInsertAt(QInputPin *insertAt); protected: - explicit QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qanyreceiveevent.cpp b/src/uml/qanyreceiveevent.cpp index 7d4b0be2..b0dd0a9b 100644 --- a/src/uml/qanyreceiveevent.cpp +++ b/src/uml/qanyreceiveevent.cpp @@ -60,12 +60,12 @@ QAnyReceiveEventPrivate::~QAnyReceiveEventPrivate() \brief A trigger for an AnyReceiveEvent is triggered by the receipt of any message that is not explicitly handled by any related trigger. */ -QAnyReceiveEvent::QAnyReceiveEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAnyReceiveEvent::QAnyReceiveEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(*new QAnyReceiveEventPrivate, parent, wrapper) { } -QAnyReceiveEvent::QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QAnyReceiveEvent::QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(dd, parent, wrapper) { } diff --git a/src/uml/qanyreceiveevent.h b/src/uml/qanyreceiveevent.h index 5a810aad..12b453a2 100644 --- a/src/uml/qanyreceiveevent.h +++ b/src/uml/qanyreceiveevent.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QAnyReceiveEvent : public QMessageEvent Q_DECLARE_PRIVATE(QAnyReceiveEvent) public: - Q_INVOKABLE explicit QAnyReceiveEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAnyReceiveEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAnyReceiveEvent(); protected: - explicit QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qartifact.cpp b/src/uml/qartifact.cpp index 60a9203a..7a7d9600 100644 --- a/src/uml/qartifact.cpp +++ b/src/uml/qartifact.cpp @@ -72,15 +72,15 @@ QArtifactPrivate::~QArtifactPrivate() \brief An artifact is the source of a deployment to a node.An artifact is the specification of a physical piece of information that is used or produced by a software development process, or by deployment and operation of a system. Examples of artifacts include model files, source files, scripts, and binary executable files, a table in a database system, a development deliverable, or a word-processing document, a mail message. */ -QArtifact::QArtifact(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QArtifactPrivate, parent, wrapper), +QArtifact::QArtifact(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QArtifactPrivate, parent, wrapper), _wrappedDeployedArtifact(new QDeployedArtifact(this, this)), _wrappedClassifier(new QClassifier(this, this)) { } -QArtifact::QArtifact(QArtifactPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QArtifact::QArtifact(QArtifactPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedDeployedArtifact(new QDeployedArtifact(this, this)), _wrappedClassifier(new QClassifier(this, this)) { @@ -99,7 +99,7 @@ QArtifact::~QArtifact() */ const QSet<QElement *> *QArtifact::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -107,7 +107,7 @@ const QSet<QElement *> *QArtifact::ownedElements() const */ QElement *QArtifact::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -115,17 +115,17 @@ QElement *QArtifact::owner() const */ const QSet<QComment *> *QArtifact::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QArtifact::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QArtifact::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -137,12 +137,12 @@ void QArtifact::removeOwnedComment(QComment *ownedComment) */ QString QArtifact::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QArtifact::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -150,7 +150,7 @@ void QArtifact::setName(QString name) */ QString QArtifact::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -162,12 +162,12 @@ QString QArtifact::qualifiedName() const */ QStringExpression *QArtifact::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QArtifact::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -175,7 +175,7 @@ void QArtifact::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QArtifact::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -183,17 +183,17 @@ QNamespace *QArtifact::namespace_() const */ const QSet<QDependency *> *QArtifact::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QArtifact::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QArtifact::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -205,17 +205,17 @@ void QArtifact::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QArtifact::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QArtifact::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QArtifact::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -223,7 +223,7 @@ void QArtifact::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QArtifact::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -231,7 +231,7 @@ const QSet<QNamedElement *> *QArtifact::members() const */ const QSet<QPackageableElement *> *QArtifact::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -239,17 +239,17 @@ const QSet<QPackageableElement *> *QArtifact::importedMembers() const */ const QSet<QElementImport *> *QArtifact::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QArtifact::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QArtifact::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -257,17 +257,17 @@ void QArtifact::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QArtifact::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QArtifact::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QArtifact::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -275,7 +275,7 @@ void QArtifact::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QArtifact::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -287,12 +287,12 @@ const QSet<QNamedElement *> *QArtifact::ownedMembers() const */ QTemplateParameter *QArtifact::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QArtifact::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -304,12 +304,12 @@ void QArtifact::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar */ QtUml::VisibilityKind QArtifact::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QArtifact::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -321,12 +321,12 @@ void QArtifact::setVisibility(QtUml::VisibilityKind visibility) */ QPackage *QArtifact::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QArtifact::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -338,12 +338,12 @@ void QArtifact::setPackage(QPackage *package) */ bool QArtifact::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QArtifact::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -355,7 +355,7 @@ void QArtifact::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QArtifact::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -363,7 +363,7 @@ const QSet<QRedefinableElement *> *QArtifact::redefinedElements() const */ const QSet<QClassifier *> *QArtifact::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -375,17 +375,17 @@ const QSet<QClassifier *> *QArtifact::redefinitionContexts() const */ const QSet<QTemplateBinding *> *QArtifact::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QArtifact::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QArtifact::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -397,12 +397,12 @@ void QArtifact::removeTemplateBinding(QTemplateBinding *templateBinding) */ bool QArtifact::isAbstract() const { - return (qmofobject_cast<const QClassifier *>(this))->isAbstract(); + return (qwrappedobject_cast<const QClassifier *>(this))->isAbstract(); } void QArtifact::setAbstract(bool isAbstract) { - (qmofobject_cast<QClassifier *>(this))->setAbstract(isAbstract); + (qwrappedobject_cast<QClassifier *>(this))->setAbstract(isAbstract); } /*! @@ -410,12 +410,12 @@ void QArtifact::setAbstract(bool isAbstract) */ bool QArtifact::isFinalSpecialization() const { - return (qmofobject_cast<const QClassifier *>(this))->isFinalSpecialization(); + return (qwrappedobject_cast<const QClassifier *>(this))->isFinalSpecialization(); } void QArtifact::setFinalSpecialization(bool isFinalSpecialization) { - (qmofobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); + (qwrappedobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); } // --------------------------------------------------------------- @@ -427,17 +427,17 @@ void QArtifact::setFinalSpecialization(bool isFinalSpecialization) */ const QSet<QUseCase *> *QArtifact::ownedUseCases() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedUseCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } void QArtifact::addOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); } void QArtifact::removeOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); } /*! @@ -445,17 +445,17 @@ void QArtifact::removeOwnedUseCase(QUseCase *ownedUseCase) */ const QSet<QGeneralizationSet *> *QArtifact::powertypeExtents() const { - return (qmofobject_cast<const QClassifier *>(this))->powertypeExtents(); + return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } void QArtifact::addPowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); } void QArtifact::removePowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); } /*! @@ -463,17 +463,17 @@ void QArtifact::removePowertypeExtent(QGeneralizationSet *powertypeExtent) */ const QSet<QUseCase *> *QArtifact::useCases() const { - return (qmofobject_cast<const QClassifier *>(this))->useCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } void QArtifact::addUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->addUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->addUseCase(useCase); } void QArtifact::removeUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->removeUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->removeUseCase(useCase); } /*! @@ -481,12 +481,12 @@ void QArtifact::removeUseCase(QUseCase *useCase) */ QClassifierTemplateParameter *QArtifact::templateParameter() const { - return (qmofobject_cast<const QClassifier *>(this))->templateParameter(); + return (qwrappedobject_cast<const QClassifier *>(this))->templateParameter(); } void QArtifact::setTemplateParameter(QClassifierTemplateParameter *templateParameter) { - (qmofobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); } /*! @@ -494,17 +494,17 @@ void QArtifact::setTemplateParameter(QClassifierTemplateParameter *templateParam */ const QSet<QClassifier *> *QArtifact::redefinedClassifiers() const { - return (qmofobject_cast<const QClassifier *>(this))->redefinedClassifiers(); + return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } void QArtifact::addRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); } void QArtifact::removeRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); } /*! @@ -512,12 +512,12 @@ void QArtifact::removeRedefinedClassifier(QClassifier *redefinedClassifier) */ QRedefinableTemplateSignature *QArtifact::ownedTemplateSignature() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); } void QArtifact::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -525,17 +525,17 @@ void QArtifact::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTe */ const QSet<QCollaborationUse *> *QArtifact::collaborationUses() const { - return (qmofobject_cast<const QClassifier *>(this))->collaborationUses(); + return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } void QArtifact::addCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); } void QArtifact::removeCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); } /*! @@ -543,7 +543,7 @@ void QArtifact::removeCollaborationUse(QCollaborationUse *collaborationUse) */ const QSet<QProperty *> *QArtifact::attributes() const { - return (qmofobject_cast<const QClassifier *>(this))->attributes(); + return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } /*! @@ -551,7 +551,7 @@ const QSet<QProperty *> *QArtifact::attributes() const */ const QSet<QFeature *> *QArtifact::features() const { - return (qmofobject_cast<const QClassifier *>(this))->features(); + return (qwrappedobject_cast<const QClassifier *>(this))->features(); } /*! @@ -559,17 +559,17 @@ const QSet<QFeature *> *QArtifact::features() const */ const QSet<QClassifier *> *QArtifact::generals() const { - return (qmofobject_cast<const QClassifier *>(this))->generals(); + return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } void QArtifact::addGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->addGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->addGeneral(general); } void QArtifact::removeGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->removeGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneral(general); } /*! @@ -577,12 +577,12 @@ void QArtifact::removeGeneral(QClassifier *general) */ QCollaborationUse *QArtifact::representation() const { - return (qmofobject_cast<const QClassifier *>(this))->representation(); + return (qwrappedobject_cast<const QClassifier *>(this))->representation(); } void QArtifact::setRepresentation(QCollaborationUse *representation) { - (qmofobject_cast<QClassifier *>(this))->setRepresentation(representation); + (qwrappedobject_cast<QClassifier *>(this))->setRepresentation(representation); } /*! @@ -590,17 +590,17 @@ void QArtifact::setRepresentation(QCollaborationUse *representation) */ const QSet<QGeneralization *> *QArtifact::generalizations() const { - return (qmofobject_cast<const QClassifier *>(this))->generalizations(); + return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } void QArtifact::addGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->addGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->addGeneralization(generalization); } void QArtifact::removeGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->removeGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneralization(generalization); } /*! @@ -608,7 +608,7 @@ void QArtifact::removeGeneralization(QGeneralization *generalization) */ const QSet<QNamedElement *> *QArtifact::inheritedMembers() const { - return (qmofobject_cast<const QClassifier *>(this))->inheritedMembers(); + return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } /*! @@ -616,17 +616,17 @@ const QSet<QNamedElement *> *QArtifact::inheritedMembers() const */ const QSet<QSubstitution *> *QArtifact::substitutions() const { - return (qmofobject_cast<const QClassifier *>(this))->substitutions(); + return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } void QArtifact::addSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->addSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->addSubstitution(substitution); } void QArtifact::removeSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->removeSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->removeSubstitution(substitution); } // --------------------------------------------------------------- @@ -678,8 +678,8 @@ void QArtifact::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); } } @@ -692,8 +692,8 @@ void QArtifact::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); } } @@ -717,8 +717,8 @@ void QArtifact::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); } } @@ -731,8 +731,8 @@ void QArtifact::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); } } @@ -756,8 +756,8 @@ void QArtifact::addManifestation(QManifestation *manifestation) d->manifestations->insert(manifestation); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(manifestation)); - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(qmofobject_cast<QDependency *>(manifestation)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(manifestation)); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(qwrappedobject_cast<QDependency *>(manifestation)); } } @@ -770,8 +770,8 @@ void QArtifact::removeManifestation(QManifestation *manifestation) d->manifestations->remove(manifestation); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(manifestation)); - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(qmofobject_cast<QDependency *>(manifestation)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(manifestation)); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(qwrappedobject_cast<QDependency *>(manifestation)); } } @@ -795,7 +795,7 @@ void QArtifact::addNestedArtifact(QArtifact *nestedArtifact) d->nestedArtifacts->insert(nestedArtifact); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(nestedArtifact)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedArtifact)); } } @@ -808,18 +808,18 @@ void QArtifact::removeNestedArtifact(QArtifact *nestedArtifact) d->nestedArtifacts->remove(nestedArtifact); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(nestedArtifact)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedArtifact)); } } // Overriden methods for subsetted properties -void QArtifact::addClientDependency(QtMof::QMofPointer<QManifestation> manifestation) +void QArtifact::addClientDependency(QWrappedObjectPointer<QManifestation> manifestation) { addManifestation(manifestation); } -void QArtifact::removeClientDependency(QtMof::QMofPointer<QManifestation> manifestation) +void QArtifact::removeClientDependency(QWrappedObjectPointer<QManifestation> manifestation) { removeManifestation(manifestation); } diff --git a/src/uml/qartifact.h b/src/uml/qartifact.h index 11fd4454..59efa746 100644 --- a/src/uml/qartifact.h +++ b/src/uml/qartifact.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QDeployedArtifact> #include <QtUml/QClassifier> @@ -53,7 +54,8 @@ #include <QtCore/QList> #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -68,7 +70,7 @@ class QManifestation; class QArtifactPrivate; -class Q_UML_EXPORT QArtifact : public QtMof::QMofObject +class Q_UML_EXPORT QArtifact : public QWrappedObject { Q_OBJECT @@ -82,7 +84,7 @@ class Q_UML_EXPORT QArtifact : public QtMof::QMofObject Q_DECLARE_PRIVATE(QArtifact) public: - Q_INVOKABLE explicit QArtifact(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QArtifact(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QArtifact(); // Association ends from aggregated QElement @@ -204,11 +206,11 @@ public: Q_INVOKABLE void removeNestedArtifact(QArtifact *nestedArtifact); // Overriden methods for subsetted properties - Q_INVOKABLE void addClientDependency(QtMof::QMofPointer<QManifestation> manifestation); - Q_INVOKABLE void removeClientDependency(QtMof::QMofPointer<QManifestation> manifestation); + Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QManifestation> manifestation); + Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QManifestation> manifestation); protected: - explicit QArtifact(QArtifactPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QArtifact(QArtifactPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QDeployedArtifact *_wrappedDeployedArtifact; diff --git a/src/uml/qartifact_p.h b/src/uml/qartifact_p.h index 542c2386..b56d2448 100644 --- a/src/uml/qartifact_p.h +++ b/src/uml/qartifact_p.h @@ -42,7 +42,8 @@ #define QTUML_QARTIFACT_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qdeployedartifact_p.h" #include "private/qclassifier_p.h" @@ -65,7 +66,7 @@ class QProperty; class QManifestation; class QArtifact; -class Q_UML_EXPORT QArtifactPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QArtifactPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QArtifact) diff --git a/src/uml/qassociation.cpp b/src/uml/qassociation.cpp index 6b09253e..1b082228 100644 --- a/src/uml/qassociation.cpp +++ b/src/uml/qassociation.cpp @@ -70,15 +70,15 @@ QAssociationPrivate::~QAssociationPrivate() \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.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. */ -QAssociation::QAssociation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QAssociationPrivate, parent, wrapper), +QAssociation::QAssociation(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QAssociationPrivate, parent, wrapper), _wrappedClassifier(new QClassifier(this, this)), _wrappedRelationship(new QRelationship(this, this)) { } -QAssociation::QAssociation(QAssociationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QAssociation::QAssociation(QAssociationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedClassifier(new QClassifier(this, this)), _wrappedRelationship(new QRelationship(this, this)) { @@ -97,7 +97,7 @@ QAssociation::~QAssociation() */ const QSet<QElement *> *QAssociation::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -105,7 +105,7 @@ const QSet<QElement *> *QAssociation::ownedElements() const */ QElement *QAssociation::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -113,17 +113,17 @@ QElement *QAssociation::owner() const */ const QSet<QComment *> *QAssociation::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QAssociation::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QAssociation::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -135,12 +135,12 @@ void QAssociation::removeOwnedComment(QComment *ownedComment) */ QString QAssociation::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QAssociation::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -148,7 +148,7 @@ void QAssociation::setName(QString name) */ QString QAssociation::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -160,12 +160,12 @@ QString QAssociation::qualifiedName() const */ QStringExpression *QAssociation::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QAssociation::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -173,7 +173,7 @@ void QAssociation::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QAssociation::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -181,17 +181,17 @@ QNamespace *QAssociation::namespace_() const */ const QSet<QDependency *> *QAssociation::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QAssociation::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QAssociation::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -203,17 +203,17 @@ void QAssociation::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QAssociation::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QAssociation::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QAssociation::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -221,7 +221,7 @@ void QAssociation::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QAssociation::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -229,7 +229,7 @@ const QSet<QNamedElement *> *QAssociation::members() const */ const QSet<QPackageableElement *> *QAssociation::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -237,17 +237,17 @@ const QSet<QPackageableElement *> *QAssociation::importedMembers() const */ const QSet<QElementImport *> *QAssociation::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QAssociation::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QAssociation::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -255,17 +255,17 @@ void QAssociation::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QAssociation::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QAssociation::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QAssociation::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -273,7 +273,7 @@ void QAssociation::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QAssociation::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -285,12 +285,12 @@ const QSet<QNamedElement *> *QAssociation::ownedMembers() const */ QTemplateParameter *QAssociation::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QAssociation::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -302,12 +302,12 @@ void QAssociation::setOwningTemplateParameter(QTemplateParameter *owningTemplate */ QtUml::VisibilityKind QAssociation::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QAssociation::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -319,12 +319,12 @@ void QAssociation::setVisibility(QtUml::VisibilityKind visibility) */ QPackage *QAssociation::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QAssociation::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -336,12 +336,12 @@ void QAssociation::setPackage(QPackage *package) */ bool QAssociation::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QAssociation::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -353,7 +353,7 @@ void QAssociation::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -361,7 +361,7 @@ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const */ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -373,17 +373,17 @@ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const */ const QSet<QTemplateBinding *> *QAssociation::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QAssociation::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QAssociation::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -395,12 +395,12 @@ void QAssociation::removeTemplateBinding(QTemplateBinding *templateBinding) */ bool QAssociation::isAbstract() const { - return (qmofobject_cast<const QClassifier *>(this))->isAbstract(); + return (qwrappedobject_cast<const QClassifier *>(this))->isAbstract(); } void QAssociation::setAbstract(bool isAbstract) { - (qmofobject_cast<QClassifier *>(this))->setAbstract(isAbstract); + (qwrappedobject_cast<QClassifier *>(this))->setAbstract(isAbstract); } /*! @@ -408,12 +408,12 @@ void QAssociation::setAbstract(bool isAbstract) */ bool QAssociation::isFinalSpecialization() const { - return (qmofobject_cast<const QClassifier *>(this))->isFinalSpecialization(); + return (qwrappedobject_cast<const QClassifier *>(this))->isFinalSpecialization(); } void QAssociation::setFinalSpecialization(bool isFinalSpecialization) { - (qmofobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); + (qwrappedobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); } // --------------------------------------------------------------- @@ -425,17 +425,17 @@ void QAssociation::setFinalSpecialization(bool isFinalSpecialization) */ const QSet<QUseCase *> *QAssociation::ownedUseCases() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedUseCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } void QAssociation::addOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); } void QAssociation::removeOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); } /*! @@ -443,17 +443,17 @@ void QAssociation::removeOwnedUseCase(QUseCase *ownedUseCase) */ const QSet<QGeneralizationSet *> *QAssociation::powertypeExtents() const { - return (qmofobject_cast<const QClassifier *>(this))->powertypeExtents(); + return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } void QAssociation::addPowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); } void QAssociation::removePowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); } /*! @@ -461,17 +461,17 @@ void QAssociation::removePowertypeExtent(QGeneralizationSet *powertypeExtent) */ const QSet<QUseCase *> *QAssociation::useCases() const { - return (qmofobject_cast<const QClassifier *>(this))->useCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } void QAssociation::addUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->addUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->addUseCase(useCase); } void QAssociation::removeUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->removeUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->removeUseCase(useCase); } /*! @@ -479,12 +479,12 @@ void QAssociation::removeUseCase(QUseCase *useCase) */ QClassifierTemplateParameter *QAssociation::templateParameter() const { - return (qmofobject_cast<const QClassifier *>(this))->templateParameter(); + return (qwrappedobject_cast<const QClassifier *>(this))->templateParameter(); } void QAssociation::setTemplateParameter(QClassifierTemplateParameter *templateParameter) { - (qmofobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); } /*! @@ -492,17 +492,17 @@ void QAssociation::setTemplateParameter(QClassifierTemplateParameter *templatePa */ const QSet<QClassifier *> *QAssociation::redefinedClassifiers() const { - return (qmofobject_cast<const QClassifier *>(this))->redefinedClassifiers(); + return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } void QAssociation::addRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); } void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); } /*! @@ -510,12 +510,12 @@ void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) */ QRedefinableTemplateSignature *QAssociation::ownedTemplateSignature() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); } void QAssociation::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -523,17 +523,17 @@ void QAssociation::setOwnedTemplateSignature(QRedefinableTemplateSignature *owne */ const QSet<QCollaborationUse *> *QAssociation::collaborationUses() const { - return (qmofobject_cast<const QClassifier *>(this))->collaborationUses(); + return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } void QAssociation::addCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); } void QAssociation::removeCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); } /*! @@ -541,7 +541,7 @@ void QAssociation::removeCollaborationUse(QCollaborationUse *collaborationUse) */ const QSet<QProperty *> *QAssociation::attributes() const { - return (qmofobject_cast<const QClassifier *>(this))->attributes(); + return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } /*! @@ -549,7 +549,7 @@ const QSet<QProperty *> *QAssociation::attributes() const */ const QSet<QFeature *> *QAssociation::features() const { - return (qmofobject_cast<const QClassifier *>(this))->features(); + return (qwrappedobject_cast<const QClassifier *>(this))->features(); } /*! @@ -557,17 +557,17 @@ const QSet<QFeature *> *QAssociation::features() const */ const QSet<QClassifier *> *QAssociation::generals() const { - return (qmofobject_cast<const QClassifier *>(this))->generals(); + return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } void QAssociation::addGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->addGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->addGeneral(general); } void QAssociation::removeGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->removeGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneral(general); } /*! @@ -575,12 +575,12 @@ void QAssociation::removeGeneral(QClassifier *general) */ QCollaborationUse *QAssociation::representation() const { - return (qmofobject_cast<const QClassifier *>(this))->representation(); + return (qwrappedobject_cast<const QClassifier *>(this))->representation(); } void QAssociation::setRepresentation(QCollaborationUse *representation) { - (qmofobject_cast<QClassifier *>(this))->setRepresentation(representation); + (qwrappedobject_cast<QClassifier *>(this))->setRepresentation(representation); } /*! @@ -588,17 +588,17 @@ void QAssociation::setRepresentation(QCollaborationUse *representation) */ const QSet<QGeneralization *> *QAssociation::generalizations() const { - return (qmofobject_cast<const QClassifier *>(this))->generalizations(); + return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } void QAssociation::addGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->addGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->addGeneralization(generalization); } void QAssociation::removeGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->removeGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneralization(generalization); } /*! @@ -606,7 +606,7 @@ void QAssociation::removeGeneralization(QGeneralization *generalization) */ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const { - return (qmofobject_cast<const QClassifier *>(this))->inheritedMembers(); + return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } /*! @@ -614,17 +614,17 @@ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const */ const QSet<QSubstitution *> *QAssociation::substitutions() const { - return (qmofobject_cast<const QClassifier *>(this))->substitutions(); + return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } void QAssociation::addSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->addSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->addSubstitution(substitution); } void QAssociation::removeSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->removeSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->removeSubstitution(substitution); } // --------------------------------------------------------------- @@ -636,7 +636,7 @@ void QAssociation::removeSubstitution(QSubstitution *substitution) */ const QSet<QElement *> *QAssociation::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -700,7 +700,7 @@ void QAssociation::addNavigableOwnedEnd(QProperty *navigableOwnedEnd) d->navigableOwnedEnds->insert(navigableOwnedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->addOwnedEnd(qmofobject_cast<QProperty *>(navigableOwnedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->addOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); } } @@ -713,7 +713,7 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) d->navigableOwnedEnds->remove(navigableOwnedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->removeOwnedEnd(qmofobject_cast<QProperty *>(navigableOwnedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->removeOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); } } @@ -737,9 +737,9 @@ void QAssociation::addOwnedEnd(QProperty *ownedEnd) d->ownedEnds->append(ownedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->addMemberEnd(qmofobject_cast<QProperty *>(ownedEnd)); - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedEnd)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->addMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedEnd)); // Adjust opposite property ownedEnd->setOwningAssociation(this); @@ -755,9 +755,9 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) d->ownedEnds->removeAll(ownedEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QAssociation *>(this))->removeMemberEnd(qmofobject_cast<QProperty *>(ownedEnd)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedEnd)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedEnd)); + (qwrappedobject_cast<QAssociation *>(this))->removeMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedEnd)); // Adjust opposite property ownedEnd->setOwningAssociation(0); @@ -784,7 +784,7 @@ void QAssociation::addMemberEnd(QProperty *memberEnd) d->memberEnds->append(memberEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addMember(qmofobject_cast<QNamedElement *>(memberEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); // Adjust opposite property memberEnd->setAssociation(this); @@ -800,7 +800,7 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) d->memberEnds->removeAll(memberEnd); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeMember(qmofobject_cast<QNamedElement *>(memberEnd)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); // Adjust opposite property memberEnd->setAssociation(0); diff --git a/src/uml/qassociation.h b/src/uml/qassociation.h index a9a44cb9..3351c1b0 100644 --- a/src/uml/qassociation.h +++ b/src/uml/qassociation.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QClassifier> #include <QtUml/QRelationship> @@ -64,7 +65,7 @@ class QProperty; class QAssociationPrivate; -class Q_UML_EXPORT QAssociation : public QtMof::QMofObject +class Q_UML_EXPORT QAssociation : public QWrappedObject { Q_OBJECT @@ -78,7 +79,7 @@ class Q_UML_EXPORT QAssociation : public QtMof::QMofObject Q_DECLARE_PRIVATE(QAssociation) public: - Q_INVOKABLE explicit QAssociation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAssociation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAssociation(); // Association ends from aggregated QElement @@ -201,7 +202,7 @@ public: Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd); protected: - explicit QAssociation(QAssociationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAssociation(QAssociationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QClassifier *_wrappedClassifier; diff --git a/src/uml/qassociation_p.h b/src/uml/qassociation_p.h index 38e3fbfe..d0a29c68 100644 --- a/src/uml/qassociation_p.h +++ b/src/uml/qassociation_p.h @@ -42,7 +42,8 @@ #define QTUML_QASSOCIATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qclassifier_p.h" #include "private/qrelationship_p.h" @@ -63,7 +64,7 @@ class QType; class QProperty; class QAssociation; -class Q_UML_EXPORT QAssociationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QAssociationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QAssociation) diff --git a/src/uml/qassociationclass.cpp b/src/uml/qassociationclass.cpp index e90802ae..35f4d7c5 100644 --- a/src/uml/qassociationclass.cpp +++ b/src/uml/qassociationclass.cpp @@ -60,15 +60,15 @@ QAssociationClassPrivate::~QAssociationClassPrivate() \brief A model element that has both association and class properties. An AssociationClass can be seen as an association that also has class properties, or as a class that also has association properties. It not only connects a set of classifiers but also defines a set of features that belong to the relationship itself and not to any of the classifiers. */ -QAssociationClass::QAssociationClass(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QAssociationClassPrivate, parent, wrapper), +QAssociationClass::QAssociationClass(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QAssociationClassPrivate, parent, wrapper), _wrappedClass(new QClass(this, this)), _wrappedAssociation(new QAssociation(this, this)) { } -QAssociationClass::QAssociationClass(QAssociationClassPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QAssociationClass::QAssociationClass(QAssociationClassPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedClass(new QClass(this, this)), _wrappedAssociation(new QAssociation(this, this)) { diff --git a/src/uml/qassociationclass.h b/src/uml/qassociationclass.h index 0ad84fde..9a072a00 100644 --- a/src/uml/qassociationclass.h +++ b/src/uml/qassociationclass.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QClass> #include <QtUml/QAssociation> @@ -56,7 +57,7 @@ QT_MODULE(QtUml) class QAssociationClassPrivate; -class Q_UML_EXPORT QAssociationClass : public QtMof::QMofObject +class Q_UML_EXPORT QAssociationClass : public QWrappedObject { Q_OBJECT @@ -64,11 +65,11 @@ class Q_UML_EXPORT QAssociationClass : public QtMof::QMofObject Q_DECLARE_PRIVATE(QAssociationClass) public: - Q_INVOKABLE explicit QAssociationClass(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QAssociationClass(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAssociationClass(); protected: - explicit QAssociationClass(QAssociationClassPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QAssociationClass(QAssociationClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QClass *_wrappedClass; diff --git a/src/uml/qassociationclass_p.h b/src/uml/qassociationclass_p.h index 968b6828..91ae8e11 100644 --- a/src/uml/qassociationclass_p.h +++ b/src/uml/qassociationclass_p.h @@ -42,7 +42,8 @@ #define QTUML_QASSOCIATIONCLASS_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qclass_p.h" #include "private/qassociation_p.h" @@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE_QTUML QT_MODULE(QtUml) class QAssociationClass; -class Q_UML_EXPORT QAssociationClassPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QAssociationClassPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QAssociationClass) diff --git a/src/uml/qbehavior.cpp b/src/uml/qbehavior.cpp index 7c2fd997..53cfe6ff 100644 --- a/src/uml/qbehavior.cpp +++ b/src/uml/qbehavior.cpp @@ -78,12 +78,12 @@ QBehaviorPrivate::~QBehaviorPrivate() \brief Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution.A behavior owns zero or more parameter sets. */ -QBehavior::QBehavior(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehavior::QBehavior(QWrappedObject *parent, QWrappedObject *wrapper) : QClass(*new QBehaviorPrivate, parent, wrapper) { } -QBehavior::QBehavior(QBehaviorPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehavior::QBehavior(QBehaviorPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClass(dd, parent, wrapper) { } @@ -170,7 +170,7 @@ void QBehavior::addPostcondition(QConstraint *postcondition) d->postconditions->insert(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -183,7 +183,7 @@ void QBehavior::removePostcondition(QConstraint *postcondition) d->postconditions->remove(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -207,7 +207,7 @@ void QBehavior::addPrecondition(QConstraint *precondition) d->preconditions->insert(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -220,7 +220,7 @@ void QBehavior::removePrecondition(QConstraint *precondition) d->preconditions->remove(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -244,7 +244,7 @@ void QBehavior::addRedefinedBehavior(QBehavior *redefinedBehavior) d->redefinedBehaviors->insert(redefinedBehavior); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(qmofobject_cast<QClassifier *>(redefinedBehavior)); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedBehavior)); } } @@ -257,7 +257,7 @@ void QBehavior::removeRedefinedBehavior(QBehavior *redefinedBehavior) d->redefinedBehaviors->remove(redefinedBehavior); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qmofobject_cast<QClassifier *>(redefinedBehavior)); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedBehavior)); } } @@ -281,7 +281,7 @@ void QBehavior::addOwnedParameter(QParameter *ownedParameter) d->ownedParameters->append(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } @@ -294,7 +294,7 @@ void QBehavior::removeOwnedParameter(QParameter *ownedParameter) d->ownedParameters->removeAll(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } @@ -318,7 +318,7 @@ void QBehavior::addOwnedParameterSet(QParameterSet *ownedParameterSet) d->ownedParameterSets->insert(ownedParameterSet); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameterSet)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); } } @@ -331,7 +331,7 @@ void QBehavior::removeOwnedParameterSet(QParameterSet *ownedParameterSet) d->ownedParameterSets->remove(ownedParameterSet); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameterSet)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); } } @@ -349,12 +349,12 @@ QBehavioredClassifier *QBehavior::context() const // Overriden methods for subsetted properties -void QBehavior::addRedefinedClassifier(QtMof::QMofPointer<QBehavior> redefinedBehavior) +void QBehavior::addRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior) { addRedefinedBehavior(redefinedBehavior); } -void QBehavior::removeRedefinedClassifier(QtMof::QMofPointer<QBehavior> redefinedBehavior) +void QBehavior::removeRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior) { removeRedefinedBehavior(redefinedBehavior); } diff --git a/src/uml/qbehavior.h b/src/uml/qbehavior.h index 1d986f5f..98891bed 100644 --- a/src/uml/qbehavior.h +++ b/src/uml/qbehavior.h @@ -50,7 +50,8 @@ #include <QtCore/QList> #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -84,7 +85,7 @@ class Q_UML_EXPORT QBehavior : public QClass Q_DECLARE_PRIVATE(QBehavior) public: - Q_INVOKABLE explicit QBehavior(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBehavior(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBehavior(); // Attributes from QBehavior @@ -112,11 +113,11 @@ public: Q_INVOKABLE QBehavioredClassifier *context() const; // Overriden methods for subsetted properties - Q_INVOKABLE void addRedefinedClassifier(QtMof::QMofPointer<QBehavior> redefinedBehavior); - Q_INVOKABLE void removeRedefinedClassifier(QtMof::QMofPointer<QBehavior> redefinedBehavior); + Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior); + Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior); protected: - explicit QBehavior(QBehaviorPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QBehavior(QBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehavioralfeature.cpp b/src/uml/qbehavioralfeature.cpp index e7155871..4608ad47 100644 --- a/src/uml/qbehavioralfeature.cpp +++ b/src/uml/qbehavioralfeature.cpp @@ -76,15 +76,15 @@ QBehavioralFeaturePrivate::~QBehavioralFeaturePrivate() \brief A behavioral feature is a feature of a classifier that specifies an aspect of the behavior of its instances.A behavioral feature is implemented (realized) by a behavior. A behavioral feature specifies that a classifier will respond to a designated request by invoking its implementing method.A behavioral feature owns zero or more parameter sets. */ -QBehavioralFeature::QBehavioralFeature(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QBehavioralFeaturePrivate, parent, wrapper), +QBehavioralFeature::QBehavioralFeature(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QBehavioralFeaturePrivate, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedFeature(new QFeature(this, this)) { } -QBehavioralFeature::QBehavioralFeature(QBehavioralFeaturePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QBehavioralFeature::QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedFeature(new QFeature(this, this)) { @@ -103,7 +103,7 @@ QBehavioralFeature::~QBehavioralFeature() */ const QSet<QElement *> *QBehavioralFeature::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -111,7 +111,7 @@ const QSet<QElement *> *QBehavioralFeature::ownedElements() const */ QElement *QBehavioralFeature::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -119,17 +119,17 @@ QElement *QBehavioralFeature::owner() const */ const QSet<QComment *> *QBehavioralFeature::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QBehavioralFeature::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QBehavioralFeature::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -141,12 +141,12 @@ void QBehavioralFeature::removeOwnedComment(QComment *ownedComment) */ QString QBehavioralFeature::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QBehavioralFeature::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -154,12 +154,12 @@ void QBehavioralFeature::setName(QString name) */ QtUml::VisibilityKind QBehavioralFeature::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QBehavioralFeature::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -167,7 +167,7 @@ void QBehavioralFeature::setVisibility(QtUml::VisibilityKind visibility) */ QString QBehavioralFeature::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -179,12 +179,12 @@ QString QBehavioralFeature::qualifiedName() const */ QStringExpression *QBehavioralFeature::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QBehavioralFeature::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -192,7 +192,7 @@ void QBehavioralFeature::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QBehavioralFeature::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -200,17 +200,17 @@ QNamespace *QBehavioralFeature::namespace_() const */ const QSet<QDependency *> *QBehavioralFeature::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QBehavioralFeature::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QBehavioralFeature::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -222,17 +222,17 @@ void QBehavioralFeature::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QBehavioralFeature::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QBehavioralFeature::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -240,7 +240,7 @@ void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QBehavioralFeature::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -248,7 +248,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::members() const */ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -256,17 +256,17 @@ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const */ const QSet<QElementImport *> *QBehavioralFeature::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QBehavioralFeature::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QBehavioralFeature::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -274,17 +274,17 @@ void QBehavioralFeature::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QBehavioralFeature::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QBehavioralFeature::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -292,7 +292,7 @@ void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -304,12 +304,12 @@ const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const */ bool QBehavioralFeature::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QBehavioralFeature::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -321,7 +321,7 @@ void QBehavioralFeature::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -329,7 +329,7 @@ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const */ const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -341,12 +341,12 @@ const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const */ bool QBehavioralFeature::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QBehavioralFeature::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -358,7 +358,7 @@ void QBehavioralFeature::setStatic(bool isStatic) */ const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- @@ -462,7 +462,7 @@ void QBehavioralFeature::addOwnedParameter(QParameter *ownedParameter) d->ownedParameters->append(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } @@ -475,7 +475,7 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) d->ownedParameters->removeAll(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameter)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); } } @@ -499,7 +499,7 @@ void QBehavioralFeature::addOwnedParameterSet(QParameterSet *ownedParameterSet) d->ownedParameterSets->insert(ownedParameterSet); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameterSet)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); } } @@ -512,7 +512,7 @@ void QBehavioralFeature::removeOwnedParameterSet(QParameterSet *ownedParameterSe d->ownedParameterSets->remove(ownedParameterSet); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedParameterSet)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); } } diff --git a/src/uml/qbehavioralfeature.h b/src/uml/qbehavioralfeature.h index a2fbc4f1..25cd2aac 100644 --- a/src/uml/qbehavioralfeature.h +++ b/src/uml/qbehavioralfeature.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QNamespace> #include <QtUml/QFeature> @@ -70,7 +71,7 @@ class QParameter; class QBehavioralFeaturePrivate; -class Q_UML_EXPORT QBehavioralFeature : public QtMof::QMofObject +class Q_UML_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT @@ -85,7 +86,7 @@ class Q_UML_EXPORT QBehavioralFeature : public QtMof::QMofObject Q_DECLARE_PRIVATE(QBehavioralFeature) public: - Q_INVOKABLE explicit QBehavioralFeature(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBehavioralFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBehavioralFeature(); // Association ends from aggregated QElement @@ -163,7 +164,7 @@ public: Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; protected: - explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QNamespace *_wrappedNamespace; diff --git a/src/uml/qbehavioralfeature_p.h b/src/uml/qbehavioralfeature_p.h index 22f50a00..328f1776 100644 --- a/src/uml/qbehavioralfeature_p.h +++ b/src/uml/qbehavioralfeature_p.h @@ -42,7 +42,8 @@ #define QTUML_QBEHAVIORALFEATURE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qnamespace_p.h" #include "private/qfeature_p.h" @@ -68,7 +69,7 @@ class QParameterSet; class QBehavior; class QParameter; -class Q_UML_EXPORT QBehavioralFeaturePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QBehavioralFeaturePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QBehavioralFeature) diff --git a/src/uml/qbehavioredclassifier.cpp b/src/uml/qbehavioredclassifier.cpp index d8f1c83b..bdb04f6c 100644 --- a/src/uml/qbehavioredclassifier.cpp +++ b/src/uml/qbehavioredclassifier.cpp @@ -68,12 +68,12 @@ QBehavioredClassifierPrivate::~QBehavioredClassifierPrivate() \brief A behaviored classifier may have an interface realization.A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. */ -QBehavioredClassifier::QBehavioredClassifier(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehavioredClassifier::QBehavioredClassifier(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QBehavioredClassifierPrivate, parent, wrapper) { } -QBehavioredClassifier::QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehavioredClassifier::QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -106,7 +106,7 @@ void QBehavioredClassifier::addOwnedBehavior(QBehavior *ownedBehavior) d->ownedBehaviors->insert(ownedBehavior); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedBehavior)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedBehavior)); } } @@ -119,7 +119,7 @@ void QBehavioredClassifier::removeOwnedBehavior(QBehavior *ownedBehavior) d->ownedBehaviors->remove(ownedBehavior); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedBehavior)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedBehavior)); } } @@ -143,8 +143,8 @@ void QBehavioredClassifier::addInterfaceRealization(QInterfaceRealization *inter d->interfaceRealizations->insert(interfaceRealization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(interfaceRealization)); - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(qmofobject_cast<QDependency *>(interfaceRealization)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(interfaceRealization)); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(qwrappedobject_cast<QDependency *>(interfaceRealization)); // Adjust opposite property interfaceRealization->setImplementingClassifier(this); @@ -160,8 +160,8 @@ void QBehavioredClassifier::removeInterfaceRealization(QInterfaceRealization *in d->interfaceRealizations->remove(interfaceRealization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(interfaceRealization)); - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(qmofobject_cast<QDependency *>(interfaceRealization)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(interfaceRealization)); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(qwrappedobject_cast<QDependency *>(interfaceRealization)); // Adjust opposite property interfaceRealization->setImplementingClassifier(0); @@ -186,25 +186,25 @@ void QBehavioredClassifier::setClassifierBehavior(QBehavior *classifierBehavior) Q_D(QBehavioredClassifier); if (d->classifierBehavior != classifierBehavior) { // Adjust subsetted property(ies) - (qmofobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(qmofobject_cast<QBehavior *>(d->classifierBehavior)); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(qwrappedobject_cast<QBehavior *>(d->classifierBehavior)); d->classifierBehavior = classifierBehavior; // Adjust subsetted property(ies) if (classifierBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(qmofobject_cast<QBehavior *>(classifierBehavior)); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(qwrappedobject_cast<QBehavior *>(classifierBehavior)); } } } // Overriden methods for subsetted properties -void QBehavioredClassifier::addClientDependency(QtMof::QMofPointer<QInterfaceRealization> interfaceRealization) +void QBehavioredClassifier::addClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization) { addInterfaceRealization(interfaceRealization); } -void QBehavioredClassifier::removeClientDependency(QtMof::QMofPointer<QInterfaceRealization> interfaceRealization) +void QBehavioredClassifier::removeClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization) { removeInterfaceRealization(interfaceRealization); } diff --git a/src/uml/qbehavioredclassifier.h b/src/uml/qbehavioredclassifier.h index 17a5405b..627c2733 100644 --- a/src/uml/qbehavioredclassifier.h +++ b/src/uml/qbehavioredclassifier.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -75,7 +76,7 @@ class Q_UML_EXPORT QBehavioredClassifier : public QClassifier Q_DECLARE_PRIVATE(QBehavioredClassifier) public: - Q_INVOKABLE explicit QBehavioredClassifier(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBehavioredClassifier(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBehavioredClassifier(); // Association ends from QBehavioredClassifier @@ -89,11 +90,11 @@ public: Q_INVOKABLE void setClassifierBehavior(QBehavior *classifierBehavior); // Overriden methods for subsetted properties - Q_INVOKABLE void addClientDependency(QtMof::QMofPointer<QInterfaceRealization> interfaceRealization); - Q_INVOKABLE void removeClientDependency(QtMof::QMofPointer<QInterfaceRealization> interfaceRealization); + Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization); + Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization); protected: - explicit QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehaviorexecutionspecification.cpp b/src/uml/qbehaviorexecutionspecification.cpp index 6311895b..4a821a7f 100644 --- a/src/uml/qbehaviorexecutionspecification.cpp +++ b/src/uml/qbehaviorexecutionspecification.cpp @@ -63,12 +63,12 @@ QBehaviorExecutionSpecificationPrivate::~QBehaviorExecutionSpecificationPrivate( \brief A behavior execution specification is a kind of execution specification representing the execution of a behavior. */ -QBehaviorExecutionSpecification::QBehaviorExecutionSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehaviorExecutionSpecification::QBehaviorExecutionSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QExecutionSpecification(*new QBehaviorExecutionSpecificationPrivate, parent, wrapper) { } -QBehaviorExecutionSpecification::QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBehaviorExecutionSpecification::QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QExecutionSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qbehaviorexecutionspecification.h b/src/uml/qbehaviorexecutionspecification.h index e29082f5..f0dab167 100644 --- a/src/uml/qbehaviorexecutionspecification.h +++ b/src/uml/qbehaviorexecutionspecification.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QBehaviorExecutionSpecification : public QExecutionSpecificat Q_DECLARE_PRIVATE(QBehaviorExecutionSpecification) public: - Q_INVOKABLE explicit QBehaviorExecutionSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBehaviorExecutionSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBehaviorExecutionSpecification(); // Association ends from QBehaviorExecutionSpecification @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setBehavior(QBehavior *behavior); protected: - explicit QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbroadcastsignalaction.cpp b/src/uml/qbroadcastsignalaction.cpp index 657f6540..c8b4ab08 100644 --- a/src/uml/qbroadcastsignalaction.cpp +++ b/src/uml/qbroadcastsignalaction.cpp @@ -63,12 +63,12 @@ QBroadcastSignalActionPrivate::~QBroadcastSignalActionPrivate() \brief A broadcast signal action is an action that transmits a signal instance to all the potential target objects in the system, which may cause the firing of a state machine transitions or the execution of associated activities of a target object. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately after the signals are sent out. It does not wait for receipt. Any reply messages are ignored and are not transmitted to the requestor. */ -QBroadcastSignalAction::QBroadcastSignalAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBroadcastSignalAction::QBroadcastSignalAction(QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(*new QBroadcastSignalActionPrivate, parent, wrapper) { } -QBroadcastSignalAction::QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QBroadcastSignalAction::QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(dd, parent, wrapper) { } diff --git a/src/uml/qbroadcastsignalaction.h b/src/uml/qbroadcastsignalaction.h index 0844d602..b40166dc 100644 --- a/src/uml/qbroadcastsignalaction.h +++ b/src/uml/qbroadcastsignalaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QBroadcastSignalAction : public QInvocationAction Q_DECLARE_PRIVATE(QBroadcastSignalAction) public: - Q_INVOKABLE explicit QBroadcastSignalAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QBroadcastSignalAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QBroadcastSignalAction(); // Association ends from QBroadcastSignalAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setSignal(QSignal *signal); protected: - explicit QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallaction.cpp b/src/uml/qcallaction.cpp index e3a34196..bd0d623f 100644 --- a/src/uml/qcallaction.cpp +++ b/src/uml/qcallaction.cpp @@ -65,12 +65,12 @@ QCallActionPrivate::~QCallActionPrivate() \brief CallAction is an abstract class for actions that invoke behavior and receive return values. */ -QCallAction::QCallAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallAction::QCallAction(QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(*new QCallActionPrivate, parent, wrapper) { } -QCallAction::QCallAction(QCallActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallAction::QCallAction(QCallActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(dd, parent, wrapper) { } @@ -128,7 +128,7 @@ void QCallAction::addResult(QOutputPin *result) d->results->append(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } @@ -141,7 +141,7 @@ void QCallAction::removeResult(QOutputPin *result) d->results->removeAll(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); } } diff --git a/src/uml/qcallaction.h b/src/uml/qcallaction.h index 941fdf5f..3ee982f7 100644 --- a/src/uml/qcallaction.h +++ b/src/uml/qcallaction.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QCallAction : public QInvocationAction Q_DECLARE_PRIVATE(QCallAction) public: - Q_INVOKABLE explicit QCallAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCallAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCallAction(); // Attributes from QCallAction @@ -84,7 +84,7 @@ public: Q_INVOKABLE void removeResult(QOutputPin *result); protected: - explicit QCallAction(QCallActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCallAction(QCallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallbehavioraction.cpp b/src/uml/qcallbehavioraction.cpp index a695b3d1..b61e852c 100644 --- a/src/uml/qcallbehavioraction.cpp +++ b/src/uml/qcallbehavioraction.cpp @@ -63,12 +63,12 @@ QCallBehaviorActionPrivate::~QCallBehaviorActionPrivate() \brief A call behavior action is a call action that invokes a behavior directly rather than invoking a behavioral feature that, in turn, results in the invocation of that behavior. The argument values of the action are available to the execution of the invoked behavior. For synchronous calls the execution of the call behavior action waits until the execution of the invoked behavior completes and a result is returned on its output pin. The action completes immediately without a result, if the call is asynchronous. In particular, the invoked behavior may be an activity. */ -QCallBehaviorAction::QCallBehaviorAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallBehaviorAction::QCallBehaviorAction(QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(*new QCallBehaviorActionPrivate, parent, wrapper) { } -QCallBehaviorAction::QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallBehaviorAction::QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(dd, parent, wrapper) { } diff --git a/src/uml/qcallbehavioraction.h b/src/uml/qcallbehavioraction.h index 636277d8..0343a4e4 100644 --- a/src/uml/qcallbehavioraction.h +++ b/src/uml/qcallbehavioraction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QCallBehaviorAction : public QCallAction Q_DECLARE_PRIVATE(QCallBehaviorAction) public: - Q_INVOKABLE explicit QCallBehaviorAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCallBehaviorAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCallBehaviorAction(); // Association ends from QCallBehaviorAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setBehavior(QBehavior *behavior); protected: - explicit QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallevent.cpp b/src/uml/qcallevent.cpp index ad3736d5..84df102f 100644 --- a/src/uml/qcallevent.cpp +++ b/src/uml/qcallevent.cpp @@ -63,12 +63,12 @@ QCallEventPrivate::~QCallEventPrivate() \brief A call event models the receipt by an object of a message invoking a call of an operation. */ -QCallEvent::QCallEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallEvent::QCallEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(*new QCallEventPrivate, parent, wrapper) { } -QCallEvent::QCallEvent(QCallEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallEvent::QCallEvent(QCallEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(dd, parent, wrapper) { } diff --git a/src/uml/qcallevent.h b/src/uml/qcallevent.h index 282287f7..b44b3d6d 100644 --- a/src/uml/qcallevent.h +++ b/src/uml/qcallevent.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QCallEvent : public QMessageEvent Q_DECLARE_PRIVATE(QCallEvent) public: - Q_INVOKABLE explicit QCallEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCallEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCallEvent(); // Association ends from QCallEvent @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setOperation(QOperation *operation); protected: - explicit QCallEvent(QCallEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCallEvent(QCallEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcalloperationaction.cpp b/src/uml/qcalloperationaction.cpp index 18fbe675..9595bf95 100644 --- a/src/uml/qcalloperationaction.cpp +++ b/src/uml/qcalloperationaction.cpp @@ -65,12 +65,12 @@ QCallOperationActionPrivate::~QCallOperationActionPrivate() \brief A call operation action is an action that transmits an operation call request to the target object, where it may cause the invocation of associated behavior. The argument values of the action are available to the execution of the invoked behavior. If the action is marked synchronous, the execution of the call operation action waits until the execution of the invoked behavior completes and a reply transmission is returned to the caller; otherwise execution of the action is complete when the invocation of the operation is established and the execution of the invoked operation proceeds concurrently with the execution of the calling behavior. Any values returned as part of the reply transmission are put on the result output pins of the call operation action. Upon receipt of the reply transmission, execution of the call operation action is complete. */ -QCallOperationAction::QCallOperationAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallOperationAction::QCallOperationAction(QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(*new QCallOperationActionPrivate, parent, wrapper) { } -QCallOperationAction::QCallOperationAction(QCallOperationActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCallOperationAction::QCallOperationAction(QCallOperationActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(dd, parent, wrapper) { } @@ -122,13 +122,13 @@ void QCallOperationAction::setTarget(QInputPin *target) Q_D(QCallOperationAction); if (d->target != target) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->target)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->target)); d->target = target; // Adjust subsetted property(ies) if (target) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(target)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(target)); } } } diff --git a/src/uml/qcalloperationaction.h b/src/uml/qcalloperationaction.h index c40e7fc7..4ea929d6 100644 --- a/src/uml/qcalloperationaction.h +++ b/src/uml/qcalloperationaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QCallOperationAction : public QCallAction Q_DECLARE_PRIVATE(QCallOperationAction) public: - Q_INVOKABLE explicit QCallOperationAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCallOperationAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCallOperationAction(); // Association ends from QCallOperationAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setTarget(QInputPin *target); protected: - explicit QCallOperationAction(QCallOperationActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCallOperationAction(QCallOperationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcentralbuffernode.cpp b/src/uml/qcentralbuffernode.cpp index ee7bd515..bdef1925 100644 --- a/src/uml/qcentralbuffernode.cpp +++ b/src/uml/qcentralbuffernode.cpp @@ -60,12 +60,12 @@ QCentralBufferNodePrivate::~QCentralBufferNodePrivate() \brief A central buffer node is an object node for managing flows from multiple sources and destinations. */ -QCentralBufferNode::QCentralBufferNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCentralBufferNode::QCentralBufferNode(QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(*new QCentralBufferNodePrivate, parent, wrapper) { } -QCentralBufferNode::QCentralBufferNode(QCentralBufferNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCentralBufferNode::QCentralBufferNode(QCentralBufferNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(dd, parent, wrapper) { } diff --git a/src/uml/qcentralbuffernode.h b/src/uml/qcentralbuffernode.h index 8a0aaabd..1556cf52 100644 --- a/src/uml/qcentralbuffernode.h +++ b/src/uml/qcentralbuffernode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QCentralBufferNode : public QObjectNode Q_DECLARE_PRIVATE(QCentralBufferNode) public: - Q_INVOKABLE explicit QCentralBufferNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCentralBufferNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCentralBufferNode(); protected: - explicit QCentralBufferNode(QCentralBufferNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCentralBufferNode(QCentralBufferNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qchangeevent.cpp b/src/uml/qchangeevent.cpp index 7f4d4504..b5110076 100644 --- a/src/uml/qchangeevent.cpp +++ b/src/uml/qchangeevent.cpp @@ -63,12 +63,12 @@ QChangeEventPrivate::~QChangeEventPrivate() \brief A change event models a change in the system configuration that makes a condition true. */ -QChangeEvent::QChangeEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QChangeEvent::QChangeEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(*new QChangeEventPrivate, parent, wrapper) { } -QChangeEvent::QChangeEvent(QChangeEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QChangeEvent::QChangeEvent(QChangeEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QChangeEvent::setChangeExpression(QValueSpecification *changeExpression) Q_D(QChangeEvent); if (d->changeExpression != changeExpression) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->changeExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->changeExpression)); d->changeExpression = changeExpression; // Adjust subsetted property(ies) if (changeExpression) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(changeExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(changeExpression)); } } } diff --git a/src/uml/qchangeevent.h b/src/uml/qchangeevent.h index 0b347851..ea60ef27 100644 --- a/src/uml/qchangeevent.h +++ b/src/uml/qchangeevent.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QChangeEvent : public QEvent Q_DECLARE_PRIVATE(QChangeEvent) public: - Q_INVOKABLE explicit QChangeEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QChangeEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QChangeEvent(); // Association ends from QChangeEvent @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setChangeExpression(QValueSpecification *changeExpression); protected: - explicit QChangeEvent(QChangeEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QChangeEvent(QChangeEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclass.cpp b/src/uml/qclass.cpp index c356f26e..fb91b3a3 100644 --- a/src/uml/qclass.cpp +++ b/src/uml/qclass.cpp @@ -83,7 +83,7 @@ void QClassPrivate::addExtension(QExtension *extension) // Adjust opposite property Q_Q(QClass); - (qmofobject_cast<QExtensionPrivate *>(extension->d_func()))->setMetaclass(q); + (qwrappedobject_cast<QExtensionPrivate *>(extension->d_func()))->setMetaclass(q); } } @@ -98,7 +98,7 @@ void QClassPrivate::removeExtension(QExtension *extension) // <derived-code> // Adjust opposite property - (qmofobject_cast<QExtensionPrivate *>(extension->d_func()))->setMetaclass(0); + (qwrappedobject_cast<QExtensionPrivate *>(extension->d_func()))->setMetaclass(0); } } @@ -110,15 +110,15 @@ void QClassPrivate::removeExtension(QExtension *extension) \brief A class may be designated as active (i.e., each of its instances having its own thread of control) or passive (i.e., each of its instances executing within the context of some other object). A class may also specify which signals the instances of this class handle.A class describes a set of objects that share the same specifications of features, constraints, and semantics.A class has the capability to have an internal structure and ports.Class has derived association that indicates how it may be extended through one or more stereotypes. Stereotype is the only kind of metaclass that cannot be extended by stereotypes. */ -QClass::QClass(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QClassPrivate, parent, wrapper), +QClass::QClass(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QClassPrivate, parent, wrapper), _wrappedEncapsulatedClassifier(new QEncapsulatedClassifier(this, this)), _wrappedBehavioredClassifier(new QBehavioredClassifier(this, this)) { } -QClass::QClass(QClassPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QClass::QClass(QClassPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedEncapsulatedClassifier(new QEncapsulatedClassifier(this, this)), _wrappedBehavioredClassifier(new QBehavioredClassifier(this, this)) { @@ -137,7 +137,7 @@ QClass::~QClass() */ const QSet<QElement *> *QClass::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -145,7 +145,7 @@ const QSet<QElement *> *QClass::ownedElements() const */ QElement *QClass::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -153,17 +153,17 @@ QElement *QClass::owner() const */ const QSet<QComment *> *QClass::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QClass::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QClass::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -175,12 +175,12 @@ void QClass::removeOwnedComment(QComment *ownedComment) */ QString QClass::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QClass::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -188,7 +188,7 @@ void QClass::setName(QString name) */ QString QClass::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -200,12 +200,12 @@ QString QClass::qualifiedName() const */ QStringExpression *QClass::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QClass::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -213,7 +213,7 @@ void QClass::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QClass::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -221,17 +221,17 @@ QNamespace *QClass::namespace_() const */ const QSet<QDependency *> *QClass::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QClass::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QClass::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -243,17 +243,17 @@ void QClass::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QClass::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QClass::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QClass::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -261,7 +261,7 @@ void QClass::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QClass::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -269,7 +269,7 @@ const QSet<QNamedElement *> *QClass::members() const */ const QSet<QPackageableElement *> *QClass::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -277,17 +277,17 @@ const QSet<QPackageableElement *> *QClass::importedMembers() const */ const QSet<QElementImport *> *QClass::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QClass::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QClass::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -295,17 +295,17 @@ void QClass::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QClass::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QClass::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QClass::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -313,7 +313,7 @@ void QClass::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QClass::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -325,12 +325,12 @@ const QSet<QNamedElement *> *QClass::ownedMembers() const */ QTemplateParameter *QClass::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QClass::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -342,12 +342,12 @@ void QClass::setOwningTemplateParameter(QTemplateParameter *owningTemplateParame */ QtUml::VisibilityKind QClass::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QClass::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -359,12 +359,12 @@ void QClass::setVisibility(QtUml::VisibilityKind visibility) */ QPackage *QClass::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QClass::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -376,12 +376,12 @@ void QClass::setPackage(QPackage *package) */ bool QClass::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QClass::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -393,7 +393,7 @@ void QClass::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QClass::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -401,7 +401,7 @@ const QSet<QRedefinableElement *> *QClass::redefinedElements() const */ const QSet<QClassifier *> *QClass::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -413,17 +413,17 @@ const QSet<QClassifier *> *QClass::redefinitionContexts() const */ const QSet<QTemplateBinding *> *QClass::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QClass::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QClass::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -435,12 +435,12 @@ void QClass::removeTemplateBinding(QTemplateBinding *templateBinding) */ bool QClass::isFinalSpecialization() const { - return (qmofobject_cast<const QClassifier *>(this))->isFinalSpecialization(); + return (qwrappedobject_cast<const QClassifier *>(this))->isFinalSpecialization(); } void QClass::setFinalSpecialization(bool isFinalSpecialization) { - (qmofobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); + (qwrappedobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); } // --------------------------------------------------------------- @@ -452,17 +452,17 @@ void QClass::setFinalSpecialization(bool isFinalSpecialization) */ const QSet<QUseCase *> *QClass::ownedUseCases() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedUseCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } void QClass::addOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); } void QClass::removeOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); } /*! @@ -470,17 +470,17 @@ void QClass::removeOwnedUseCase(QUseCase *ownedUseCase) */ const QSet<QGeneralizationSet *> *QClass::powertypeExtents() const { - return (qmofobject_cast<const QClassifier *>(this))->powertypeExtents(); + return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } void QClass::addPowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); } void QClass::removePowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); } /*! @@ -488,17 +488,17 @@ void QClass::removePowertypeExtent(QGeneralizationSet *powertypeExtent) */ const QSet<QUseCase *> *QClass::useCases() const { - return (qmofobject_cast<const QClassifier *>(this))->useCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } void QClass::addUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->addUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->addUseCase(useCase); } void QClass::removeUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->removeUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->removeUseCase(useCase); } /*! @@ -506,12 +506,12 @@ void QClass::removeUseCase(QUseCase *useCase) */ QClassifierTemplateParameter *QClass::templateParameter() const { - return (qmofobject_cast<const QClassifier *>(this))->templateParameter(); + return (qwrappedobject_cast<const QClassifier *>(this))->templateParameter(); } void QClass::setTemplateParameter(QClassifierTemplateParameter *templateParameter) { - (qmofobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); } /*! @@ -519,17 +519,17 @@ void QClass::setTemplateParameter(QClassifierTemplateParameter *templateParamete */ const QSet<QClassifier *> *QClass::redefinedClassifiers() const { - return (qmofobject_cast<const QClassifier *>(this))->redefinedClassifiers(); + return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } void QClass::addRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); } void QClass::removeRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); } /*! @@ -537,12 +537,12 @@ void QClass::removeRedefinedClassifier(QClassifier *redefinedClassifier) */ QRedefinableTemplateSignature *QClass::ownedTemplateSignature() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); } void QClass::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -550,17 +550,17 @@ void QClass::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTempl */ const QSet<QCollaborationUse *> *QClass::collaborationUses() const { - return (qmofobject_cast<const QClassifier *>(this))->collaborationUses(); + return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } void QClass::addCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); } void QClass::removeCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); } /*! @@ -568,7 +568,7 @@ void QClass::removeCollaborationUse(QCollaborationUse *collaborationUse) */ const QSet<QProperty *> *QClass::attributes() const { - return (qmofobject_cast<const QClassifier *>(this))->attributes(); + return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } /*! @@ -576,7 +576,7 @@ const QSet<QProperty *> *QClass::attributes() const */ const QSet<QFeature *> *QClass::features() const { - return (qmofobject_cast<const QClassifier *>(this))->features(); + return (qwrappedobject_cast<const QClassifier *>(this))->features(); } /*! @@ -584,12 +584,12 @@ const QSet<QFeature *> *QClass::features() const */ QCollaborationUse *QClass::representation() const { - return (qmofobject_cast<const QClassifier *>(this))->representation(); + return (qwrappedobject_cast<const QClassifier *>(this))->representation(); } void QClass::setRepresentation(QCollaborationUse *representation) { - (qmofobject_cast<QClassifier *>(this))->setRepresentation(representation); + (qwrappedobject_cast<QClassifier *>(this))->setRepresentation(representation); } /*! @@ -597,17 +597,17 @@ void QClass::setRepresentation(QCollaborationUse *representation) */ const QSet<QGeneralization *> *QClass::generalizations() const { - return (qmofobject_cast<const QClassifier *>(this))->generalizations(); + return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } void QClass::addGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->addGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->addGeneralization(generalization); } void QClass::removeGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->removeGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneralization(generalization); } /*! @@ -615,7 +615,7 @@ void QClass::removeGeneralization(QGeneralization *generalization) */ const QSet<QNamedElement *> *QClass::inheritedMembers() const { - return (qmofobject_cast<const QClassifier *>(this))->inheritedMembers(); + return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } /*! @@ -623,17 +623,17 @@ const QSet<QNamedElement *> *QClass::inheritedMembers() const */ const QSet<QSubstitution *> *QClass::substitutions() const { - return (qmofobject_cast<const QClassifier *>(this))->substitutions(); + return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } void QClass::addSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->addSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->addSubstitution(substitution); } void QClass::removeSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->removeSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->removeSubstitution(substitution); } // --------------------------------------------------------------- @@ -645,7 +645,7 @@ void QClass::removeSubstitution(QSubstitution *substitution) */ const QSet<QConnectableElement *> *QClass::roles() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->roles(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->roles(); } /*! @@ -653,7 +653,7 @@ const QSet<QConnectableElement *> *QClass::roles() const */ const QSet<QProperty *> *QClass::parts() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->parts(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->parts(); } /*! @@ -661,17 +661,17 @@ const QSet<QProperty *> *QClass::parts() const */ const QSet<QConnector *> *QClass::ownedConnectors() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); } void QClass::addOwnedConnector(QConnector *ownedConnector) { - (qmofobject_cast<QStructuredClassifier *>(this))->addOwnedConnector(ownedConnector); + (qwrappedobject_cast<QStructuredClassifier *>(this))->addOwnedConnector(ownedConnector); } void QClass::removeOwnedConnector(QConnector *ownedConnector) { - (qmofobject_cast<QStructuredClassifier *>(this))->removeOwnedConnector(ownedConnector); + (qwrappedobject_cast<QStructuredClassifier *>(this))->removeOwnedConnector(ownedConnector); } // --------------------------------------------------------------- @@ -683,7 +683,7 @@ void QClass::removeOwnedConnector(QConnector *ownedConnector) */ const QSet<QPort *> *QClass::ownedPorts() const { - return (qmofobject_cast<const QEncapsulatedClassifier *>(this))->ownedPorts(); + return (qwrappedobject_cast<const QEncapsulatedClassifier *>(this))->ownedPorts(); } // --------------------------------------------------------------- @@ -695,17 +695,17 @@ const QSet<QPort *> *QClass::ownedPorts() const */ const QSet<QBehavior *> *QClass::ownedBehaviors() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); } void QClass::addOwnedBehavior(QBehavior *ownedBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(ownedBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(ownedBehavior); } void QClass::removeOwnedBehavior(QBehavior *ownedBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(ownedBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(ownedBehavior); } /*! @@ -713,17 +713,17 @@ void QClass::removeOwnedBehavior(QBehavior *ownedBehavior) */ const QSet<QInterfaceRealization *> *QClass::interfaceRealizations() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); } void QClass::addInterfaceRealization(QInterfaceRealization *interfaceRealization) { - (qmofobject_cast<QBehavioredClassifier *>(this))->addInterfaceRealization(interfaceRealization); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->addInterfaceRealization(interfaceRealization); } void QClass::removeInterfaceRealization(QInterfaceRealization *interfaceRealization) { - (qmofobject_cast<QBehavioredClassifier *>(this))->removeInterfaceRealization(interfaceRealization); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->removeInterfaceRealization(interfaceRealization); } /*! @@ -731,12 +731,12 @@ void QClass::removeInterfaceRealization(QInterfaceRealization *interfaceRealizat */ QBehavior *QClass::classifierBehavior() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->classifierBehavior(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->classifierBehavior(); } void QClass::setClassifierBehavior(QBehavior *classifierBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->setClassifierBehavior(classifierBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->setClassifierBehavior(classifierBehavior); } // --------------------------------------------------------------- @@ -809,7 +809,7 @@ void QClass::addNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->append(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -822,7 +822,7 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->removeAll(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -846,8 +846,8 @@ void QClass::addOwnedReception(QReception *ownedReception) d->ownedReceptions->insert(ownedReception); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedReception)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedReception)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedReception)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedReception)); } } @@ -860,8 +860,8 @@ void QClass::removeOwnedReception(QReception *ownedReception) d->ownedReceptions->remove(ownedReception); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedReception)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedReception)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedReception)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedReception)); } } @@ -897,8 +897,8 @@ void QClass::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setClass_(this); @@ -914,8 +914,8 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setClass_(0); @@ -942,8 +942,8 @@ void QClass::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setClass_(this); @@ -959,8 +959,8 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setClass_(0); diff --git a/src/uml/qclass.h b/src/uml/qclass.h index 2953f1c7..3b419a18 100644 --- a/src/uml/qclass.h +++ b/src/uml/qclass.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QEncapsulatedClassifier> #include <QtUml/QBehavioredClassifier> @@ -68,7 +69,7 @@ class QProperty; class QClassPrivate; -class Q_UML_EXPORT QClass : public QtMof::QMofObject +class Q_UML_EXPORT QClass : public QWrappedObject { Q_OBJECT @@ -85,7 +86,7 @@ class Q_UML_EXPORT QClass : public QtMof::QMofObject Q_DECLARE_PRIVATE(QClass) public: - Q_INVOKABLE explicit QClass(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClass(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClass(); // Association ends from aggregated QElement @@ -234,7 +235,7 @@ public: friend class QExtensionPrivate; protected: - explicit QClass(QClassPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClass(QClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QEncapsulatedClassifier *_wrappedEncapsulatedClassifier; diff --git a/src/uml/qclass_p.h b/src/uml/qclass_p.h index 8b639014..2aeef6d4 100644 --- a/src/uml/qclass_p.h +++ b/src/uml/qclass_p.h @@ -42,7 +42,8 @@ #define QTUML_QCLASS_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qencapsulatedclassifier_p.h" #include "private/qbehavioredclassifier_p.h" @@ -67,7 +68,7 @@ class QClassifier; class QExtension; class QProperty; -class Q_UML_EXPORT QClassPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QClassPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QClass) diff --git a/src/uml/qclassifier.cpp b/src/uml/qclassifier.cpp index f967d7c5..0b0d3b27 100644 --- a/src/uml/qclassifier.cpp +++ b/src/uml/qclassifier.cpp @@ -97,7 +97,7 @@ void QClassifierPrivate::addAttribute(QProperty *attribute) this->attributes->insert(attribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(this))->addFeature(qmofobject_cast<QFeature *>(attribute)); + (qwrappedobject_cast<QClassifierPrivate *>(this))->addFeature(qwrappedobject_cast<QFeature *>(attribute)); } } @@ -109,7 +109,7 @@ void QClassifierPrivate::removeAttribute(QProperty *attribute) this->attributes->remove(attribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(this))->removeFeature(qmofobject_cast<QFeature *>(attribute)); + (qwrappedobject_cast<QClassifierPrivate *>(this))->removeFeature(qwrappedobject_cast<QFeature *>(attribute)); } } @@ -121,11 +121,11 @@ void QClassifierPrivate::addFeature(QFeature *feature) this->features->insert(feature); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->addMember(qmofobject_cast<QNamedElement *>(feature)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(feature)); // Adjust opposite property Q_Q(QClassifier); - (qmofobject_cast<QFeaturePrivate *>(feature->d_func()))->addFeaturingClassifier(q); + (qwrappedobject_cast<QFeaturePrivate *>(feature->d_func()))->addFeaturingClassifier(q); } } @@ -137,12 +137,12 @@ void QClassifierPrivate::removeFeature(QFeature *feature) this->features->remove(feature); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->removeMember(qmofobject_cast<QNamedElement *>(feature)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(feature)); // Adjust opposite property Q_Q(QClassifier); if (feature) - (qmofobject_cast<QFeaturePrivate *>(feature->d_func()))->removeFeaturingClassifier(q); + (qwrappedobject_cast<QFeaturePrivate *>(feature->d_func()))->removeFeaturingClassifier(q); } } @@ -154,8 +154,8 @@ void QClassifierPrivate::removeFeature(QFeature *feature) \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.A classifier has the capability to own use cases. Although the owning classifier typically represents the subject to which the owned use cases apply, this is not necessarily the case. In principle, the same use case can be applied to multiple subjects, as identified by the subject association role of a use case.Classifier is defined to be a kind of templateable element so that a classifier can be parameterized. It is also defined to be a kind of parameterable element so that a classifier can be a formal template parameter.A classifier has the capability to own collaboration uses. These collaboration uses link a collaboration with the classifier to give a description of the workings of the classifier. */ -QClassifier::QClassifier(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QClassifierPrivate, parent, wrapper), +QClassifier::QClassifier(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QClassifierPrivate, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedType(new QType(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), @@ -163,8 +163,8 @@ QClassifier::QClassifier(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) { } -QClassifier::QClassifier(QClassifierPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QClassifier::QClassifier(QClassifierPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedType(new QType(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), @@ -185,7 +185,7 @@ QClassifier::~QClassifier() */ const QSet<QElement *> *QClassifier::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -193,7 +193,7 @@ const QSet<QElement *> *QClassifier::ownedElements() const */ QElement *QClassifier::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -201,17 +201,17 @@ QElement *QClassifier::owner() const */ const QSet<QComment *> *QClassifier::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QClassifier::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QClassifier::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -223,12 +223,12 @@ void QClassifier::removeOwnedComment(QComment *ownedComment) */ QString QClassifier::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QClassifier::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -236,7 +236,7 @@ void QClassifier::setName(QString name) */ QString QClassifier::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -248,12 +248,12 @@ QString QClassifier::qualifiedName() const */ QStringExpression *QClassifier::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QClassifier::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -261,7 +261,7 @@ void QClassifier::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QClassifier::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -269,17 +269,17 @@ QNamespace *QClassifier::namespace_() const */ const QSet<QDependency *> *QClassifier::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QClassifier::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QClassifier::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -291,17 +291,17 @@ void QClassifier::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QClassifier::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QClassifier::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QClassifier::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -309,7 +309,7 @@ void QClassifier::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QClassifier::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -317,7 +317,7 @@ const QSet<QNamedElement *> *QClassifier::members() const */ const QSet<QPackageableElement *> *QClassifier::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -325,17 +325,17 @@ const QSet<QPackageableElement *> *QClassifier::importedMembers() const */ const QSet<QElementImport *> *QClassifier::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QClassifier::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QClassifier::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -343,17 +343,17 @@ void QClassifier::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QClassifier::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QClassifier::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QClassifier::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -361,7 +361,7 @@ void QClassifier::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QClassifier::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -373,12 +373,12 @@ const QSet<QNamedElement *> *QClassifier::ownedMembers() const */ QTemplateParameter *QClassifier::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QClassifier::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -390,12 +390,12 @@ void QClassifier::setOwningTemplateParameter(QTemplateParameter *owningTemplateP */ QtUml::VisibilityKind QClassifier::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QClassifier::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -407,12 +407,12 @@ void QClassifier::setVisibility(QtUml::VisibilityKind visibility) */ QPackage *QClassifier::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QClassifier::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -424,12 +424,12 @@ void QClassifier::setPackage(QPackage *package) */ bool QClassifier::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QClassifier::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -441,7 +441,7 @@ void QClassifier::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -449,7 +449,7 @@ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const */ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -461,17 +461,17 @@ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const */ const QSet<QTemplateBinding *> *QClassifier::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QClassifier::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QClassifier::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -544,7 +544,7 @@ void QClassifier::addOwnedUseCase(QUseCase *ownedUseCase) d->ownedUseCases->insert(ownedUseCase); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedUseCase)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedUseCase)); } } @@ -557,7 +557,7 @@ void QClassifier::removeOwnedUseCase(QUseCase *ownedUseCase) d->ownedUseCases->remove(ownedUseCase); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedUseCase)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedUseCase)); } } @@ -682,7 +682,7 @@ void QClassifier::addRedefinedClassifier(QClassifier *redefinedClassifier) d->redefinedClassifiers->insert(redefinedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedClassifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); } } @@ -695,7 +695,7 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) d->redefinedClassifiers->remove(redefinedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedClassifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); } } @@ -745,7 +745,7 @@ void QClassifier::addCollaborationUse(QCollaborationUse *collaborationUse) d->collaborationUses->insert(collaborationUse); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(collaborationUse)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(collaborationUse)); } } @@ -758,7 +758,7 @@ void QClassifier::removeCollaborationUse(QCollaborationUse *collaborationUse) d->collaborationUses->remove(collaborationUse); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(collaborationUse)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(collaborationUse)); } } @@ -838,13 +838,13 @@ void QClassifier::setRepresentation(QCollaborationUse *representation) Q_D(QClassifier); if (d->representation != representation) { // Adjust subsetted property(ies) - (qmofobject_cast<QClassifier *>(this))->removeCollaborationUse(qmofobject_cast<QCollaborationUse *>(d->representation)); + (qwrappedobject_cast<QClassifier *>(this))->removeCollaborationUse(qwrappedobject_cast<QCollaborationUse *>(d->representation)); d->representation = representation; // Adjust subsetted property(ies) if (representation) { - (qmofobject_cast<QClassifier *>(this))->addCollaborationUse(qmofobject_cast<QCollaborationUse *>(representation)); + (qwrappedobject_cast<QClassifier *>(this))->addCollaborationUse(qwrappedobject_cast<QCollaborationUse *>(representation)); } } } @@ -869,7 +869,7 @@ void QClassifier::addGeneralization(QGeneralization *generalization) d->generalizations->insert(generalization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(generalization)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalization)); // Adjust opposite property generalization->setSpecific(this); @@ -885,7 +885,7 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) d->generalizations->remove(generalization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(generalization)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalization)); // Adjust opposite property generalization->setSpecific(0); @@ -924,8 +924,8 @@ void QClassifier::addSubstitution(QSubstitution *substitution) d->substitutions->insert(substitution); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(substitution)); - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(qmofobject_cast<QDependency *>(substitution)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(substitution)); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(qwrappedobject_cast<QDependency *>(substitution)); // Adjust opposite property substitution->setSubstitutingClassifier(this); @@ -941,8 +941,8 @@ void QClassifier::removeSubstitution(QSubstitution *substitution) d->substitutions->remove(substitution); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(substitution)); - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(qmofobject_cast<QDependency *>(substitution)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(substitution)); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(qwrappedobject_cast<QDependency *>(substitution)); // Adjust opposite property substitution->setSubstitutingClassifier(0); @@ -1046,12 +1046,12 @@ const QSet<QClassifier *> *QClassifier::parents() const // Overriden methods for subsetted properties -void QClassifier::addClientDependency(QtMof::QMofPointer<QSubstitution> substitution) +void QClassifier::addClientDependency(QWrappedObjectPointer<QSubstitution> substitution) { addSubstitution(substitution); } -void QClassifier::removeClientDependency(QtMof::QMofPointer<QSubstitution> substitution) +void QClassifier::removeClientDependency(QWrappedObjectPointer<QSubstitution> substitution) { removeSubstitution(substitution); } diff --git a/src/uml/qclassifier.h b/src/uml/qclassifier.h index ef740210..0264989e 100644 --- a/src/uml/qclassifier.h +++ b/src/uml/qclassifier.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QNamespace> #include <QtUml/QType> #include <QtUml/QRedefinableElement> @@ -53,7 +54,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -75,7 +77,7 @@ class QFeature; class QClassifierPrivate; -class Q_UML_EXPORT QClassifier : public QtMof::QMofObject +class Q_UML_EXPORT QClassifier : public QWrappedObject { Q_OBJECT @@ -100,7 +102,7 @@ class Q_UML_EXPORT QClassifier : public QtMof::QMofObject Q_DECLARE_PRIVATE(QClassifier) public: - Q_INVOKABLE explicit QClassifier(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClassifier(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClassifier(); // Association ends from aggregated QElement @@ -215,14 +217,14 @@ public: Q_INVOKABLE const QSet<QClassifier *> *parents() const; // Overriden methods for subsetted properties - Q_INVOKABLE void addClientDependency(QtMof::QMofPointer<QSubstitution> substitution); - Q_INVOKABLE void removeClientDependency(QtMof::QMofPointer<QSubstitution> substitution); + Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QSubstitution> substitution); + Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QSubstitution> substitution); // Classes which access read-only opposite properties should be friend friend class QFeaturePrivate; protected: - explicit QClassifier(QClassifierPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClassifier(QClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QNamespace *_wrappedNamespace; diff --git a/src/uml/qclassifier_p.h b/src/uml/qclassifier_p.h index 98456da0..e2496f1a 100644 --- a/src/uml/qclassifier_p.h +++ b/src/uml/qclassifier_p.h @@ -42,7 +42,8 @@ #define QTUML_QCLASSIFIER_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qnamespace_p.h" #include "private/qtype_p.h" #include "private/qredefinableelement_p.h" @@ -72,7 +73,7 @@ class QCollaborationUse; class QClassifier; class QFeature; -class Q_UML_EXPORT QClassifierPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QClassifierPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QClassifier) diff --git a/src/uml/qclassifiertemplateparameter.cpp b/src/uml/qclassifiertemplateparameter.cpp index e51943bb..e28534ba 100644 --- a/src/uml/qclassifiertemplateparameter.cpp +++ b/src/uml/qclassifiertemplateparameter.cpp @@ -66,12 +66,12 @@ QClassifierTemplateParameterPrivate::~QClassifierTemplateParameterPrivate() \brief A classifier template parameter exposes a classifier as a formal template parameter. */ -QClassifierTemplateParameter::QClassifierTemplateParameter(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClassifierTemplateParameter::QClassifierTemplateParameter(QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(*new QClassifierTemplateParameterPrivate, parent, wrapper) { } -QClassifierTemplateParameter::QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClassifierTemplateParameter::QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(dd, parent, wrapper) { } diff --git a/src/uml/qclassifiertemplateparameter.h b/src/uml/qclassifiertemplateparameter.h index 33096c1b..81468dc4 100644 --- a/src/uml/qclassifiertemplateparameter.h +++ b/src/uml/qclassifiertemplateparameter.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QClassifierTemplateParameter : public QTemplateParameter Q_DECLARE_PRIVATE(QClassifierTemplateParameter) public: - Q_INVOKABLE explicit QClassifierTemplateParameter(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClassifierTemplateParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClassifierTemplateParameter(); // Attributes from QClassifierTemplateParameter @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeConstrainingClassifier(QClassifier *constrainingClassifier); protected: - explicit QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclause.cpp b/src/uml/qclause.cpp index 6b6637dc..800cf513 100644 --- a/src/uml/qclause.cpp +++ b/src/uml/qclause.cpp @@ -74,12 +74,12 @@ QClausePrivate::~QClausePrivate() \brief A clause is an element that represents a single branch of a conditional construct, including a test and a body section. The body section is executed only if (but not necessarily if) the test section evaluates true. */ -QClause::QClause(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClause::QClause(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QClausePrivate, parent, wrapper) { } -QClause::QClause(QClausePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClause::QClause(QClausePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/uml/qclause.h b/src/uml/qclause.h index 39a4c31d..02925d70 100644 --- a/src/uml/qclause.h +++ b/src/uml/qclause.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QClause : public QElement Q_DECLARE_PRIVATE(QClause) public: - Q_INVOKABLE explicit QClause(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClause(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClause(); // Association ends from QClause @@ -100,7 +100,7 @@ public: Q_INVOKABLE void removeTest(QExecutableNode *test); protected: - explicit QClause(QClausePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClause(QClausePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearassociationaction.cpp b/src/uml/qclearassociationaction.cpp index 0f5210f3..dbae4c02 100644 --- a/src/uml/qclearassociationaction.cpp +++ b/src/uml/qclearassociationaction.cpp @@ -65,12 +65,12 @@ QClearAssociationActionPrivate::~QClearAssociationActionPrivate() \brief A clear association action is an action that destroys all links of an association in which a particular object participates. */ -QClearAssociationAction::QClearAssociationAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearAssociationAction::QClearAssociationAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QClearAssociationActionPrivate, parent, wrapper) { } -QClearAssociationAction::QClearAssociationAction(QClearAssociationActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearAssociationAction::QClearAssociationAction(QClearAssociationActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QClearAssociationAction::setObject(QInputPin *object) Q_D(QClearAssociationAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qclearassociationaction.h b/src/uml/qclearassociationaction.h index cd6cbc45..5013f0bb 100644 --- a/src/uml/qclearassociationaction.h +++ b/src/uml/qclearassociationaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QClearAssociationAction : public QAction Q_DECLARE_PRIVATE(QClearAssociationAction) public: - Q_INVOKABLE explicit QClearAssociationAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClearAssociationAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClearAssociationAction(); // Association ends from QClearAssociationAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setAssociation(QAssociation *association); protected: - explicit QClearAssociationAction(QClearAssociationActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClearAssociationAction(QClearAssociationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearstructuralfeatureaction.cpp b/src/uml/qclearstructuralfeatureaction.cpp index 10d4a8af..0b4b77c2 100644 --- a/src/uml/qclearstructuralfeatureaction.cpp +++ b/src/uml/qclearstructuralfeatureaction.cpp @@ -63,12 +63,12 @@ QClearStructuralFeatureActionPrivate::~QClearStructuralFeatureActionPrivate() \brief A clear structural feature action is a structural feature action that removes all values of a structural feature. */ -QClearStructuralFeatureAction::QClearStructuralFeatureAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearStructuralFeatureAction::QClearStructuralFeatureAction(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(*new QClearStructuralFeatureActionPrivate, parent, wrapper) { } -QClearStructuralFeatureAction::QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearStructuralFeatureAction::QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QClearStructuralFeatureAction::setResult(QOutputPin *result) Q_D(QClearStructuralFeatureAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qclearstructuralfeatureaction.h b/src/uml/qclearstructuralfeatureaction.h index feaade9d..6e01aec0 100644 --- a/src/uml/qclearstructuralfeatureaction.h +++ b/src/uml/qclearstructuralfeatureaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QClearStructuralFeatureAction : public QStructuralFeatureActi Q_DECLARE_PRIVATE(QClearStructuralFeatureAction) public: - Q_INVOKABLE explicit QClearStructuralFeatureAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClearStructuralFeatureAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClearStructuralFeatureAction(); // Association ends from QClearStructuralFeatureAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearvariableaction.cpp b/src/uml/qclearvariableaction.cpp index 2d92114d..3ec3bab0 100644 --- a/src/uml/qclearvariableaction.cpp +++ b/src/uml/qclearvariableaction.cpp @@ -60,12 +60,12 @@ QClearVariableActionPrivate::~QClearVariableActionPrivate() \brief A clear variable action is a variable action that removes all values of a variable. */ -QClearVariableAction::QClearVariableAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearVariableAction::QClearVariableAction(QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(*new QClearVariableActionPrivate, parent, wrapper) { } -QClearVariableAction::QClearVariableAction(QClearVariableActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QClearVariableAction::QClearVariableAction(QClearVariableActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(dd, parent, wrapper) { } diff --git a/src/uml/qclearvariableaction.h b/src/uml/qclearvariableaction.h index cfd00cb1..3e194d51 100644 --- a/src/uml/qclearvariableaction.h +++ b/src/uml/qclearvariableaction.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QClearVariableAction : public QVariableAction Q_DECLARE_PRIVATE(QClearVariableAction) public: - Q_INVOKABLE explicit QClearVariableAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QClearVariableAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClearVariableAction(); protected: - explicit QClearVariableAction(QClearVariableActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QClearVariableAction(QClearVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcollaboration.cpp b/src/uml/qcollaboration.cpp index 8bd45049..81d89216 100644 --- a/src/uml/qcollaboration.cpp +++ b/src/uml/qcollaboration.cpp @@ -64,15 +64,15 @@ QCollaborationPrivate::~QCollaborationPrivate() \brief A collaboration use represents the application of the pattern described by a collaboration to a specific situation involving specific classes or instances playing the roles of the collaboration. */ -QCollaboration::QCollaboration(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QCollaborationPrivate, parent, wrapper), +QCollaboration::QCollaboration(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QCollaborationPrivate, parent, wrapper), _wrappedStructuredClassifier(new QStructuredClassifier(this, this)), _wrappedBehavioredClassifier(new QBehavioredClassifier(this, this)) { } -QCollaboration::QCollaboration(QCollaborationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QCollaboration::QCollaboration(QCollaborationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedStructuredClassifier(new QStructuredClassifier(this, this)), _wrappedBehavioredClassifier(new QBehavioredClassifier(this, this)) { @@ -91,7 +91,7 @@ QCollaboration::~QCollaboration() */ const QSet<QElement *> *QCollaboration::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -99,7 +99,7 @@ const QSet<QElement *> *QCollaboration::ownedElements() const */ QElement *QCollaboration::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -107,17 +107,17 @@ QElement *QCollaboration::owner() const */ const QSet<QComment *> *QCollaboration::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QCollaboration::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QCollaboration::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -129,12 +129,12 @@ void QCollaboration::removeOwnedComment(QComment *ownedComment) */ QString QCollaboration::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QCollaboration::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -142,7 +142,7 @@ void QCollaboration::setName(QString name) */ QString QCollaboration::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -154,12 +154,12 @@ QString QCollaboration::qualifiedName() const */ QStringExpression *QCollaboration::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QCollaboration::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -167,7 +167,7 @@ void QCollaboration::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QCollaboration::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -175,17 +175,17 @@ QNamespace *QCollaboration::namespace_() const */ const QSet<QDependency *> *QCollaboration::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QCollaboration::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QCollaboration::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -197,17 +197,17 @@ void QCollaboration::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QCollaboration::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QCollaboration::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QCollaboration::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -215,7 +215,7 @@ void QCollaboration::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QCollaboration::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -223,7 +223,7 @@ const QSet<QNamedElement *> *QCollaboration::members() const */ const QSet<QPackageableElement *> *QCollaboration::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -231,17 +231,17 @@ const QSet<QPackageableElement *> *QCollaboration::importedMembers() const */ const QSet<QElementImport *> *QCollaboration::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QCollaboration::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QCollaboration::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -249,17 +249,17 @@ void QCollaboration::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QCollaboration::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QCollaboration::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QCollaboration::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -267,7 +267,7 @@ void QCollaboration::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QCollaboration::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -279,12 +279,12 @@ const QSet<QNamedElement *> *QCollaboration::ownedMembers() const */ QTemplateParameter *QCollaboration::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QCollaboration::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -296,12 +296,12 @@ void QCollaboration::setOwningTemplateParameter(QTemplateParameter *owningTempla */ QtUml::VisibilityKind QCollaboration::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QCollaboration::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -313,12 +313,12 @@ void QCollaboration::setVisibility(QtUml::VisibilityKind visibility) */ QPackage *QCollaboration::package() const { - return (qmofobject_cast<const QType *>(this))->package(); + return (qwrappedobject_cast<const QType *>(this))->package(); } void QCollaboration::setPackage(QPackage *package) { - (qmofobject_cast<QType *>(this))->setPackage(package); + (qwrappedobject_cast<QType *>(this))->setPackage(package); } // --------------------------------------------------------------- @@ -330,12 +330,12 @@ void QCollaboration::setPackage(QPackage *package) */ bool QCollaboration::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QCollaboration::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -347,7 +347,7 @@ void QCollaboration::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QCollaboration::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -355,7 +355,7 @@ const QSet<QRedefinableElement *> *QCollaboration::redefinedElements() const */ const QSet<QClassifier *> *QCollaboration::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -367,17 +367,17 @@ const QSet<QClassifier *> *QCollaboration::redefinitionContexts() const */ const QSet<QTemplateBinding *> *QCollaboration::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QCollaboration::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QCollaboration::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -389,12 +389,12 @@ void QCollaboration::removeTemplateBinding(QTemplateBinding *templateBinding) */ bool QCollaboration::isAbstract() const { - return (qmofobject_cast<const QClassifier *>(this))->isAbstract(); + return (qwrappedobject_cast<const QClassifier *>(this))->isAbstract(); } void QCollaboration::setAbstract(bool isAbstract) { - (qmofobject_cast<QClassifier *>(this))->setAbstract(isAbstract); + (qwrappedobject_cast<QClassifier *>(this))->setAbstract(isAbstract); } /*! @@ -402,12 +402,12 @@ void QCollaboration::setAbstract(bool isAbstract) */ bool QCollaboration::isFinalSpecialization() const { - return (qmofobject_cast<const QClassifier *>(this))->isFinalSpecialization(); + return (qwrappedobject_cast<const QClassifier *>(this))->isFinalSpecialization(); } void QCollaboration::setFinalSpecialization(bool isFinalSpecialization) { - (qmofobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); + (qwrappedobject_cast<QClassifier *>(this))->setFinalSpecialization(isFinalSpecialization); } // --------------------------------------------------------------- @@ -419,17 +419,17 @@ void QCollaboration::setFinalSpecialization(bool isFinalSpecialization) */ const QSet<QUseCase *> *QCollaboration::ownedUseCases() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedUseCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } void QCollaboration::addOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->addOwnedUseCase(ownedUseCase); } void QCollaboration::removeOwnedUseCase(QUseCase *ownedUseCase) { - (qmofobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); + (qwrappedobject_cast<QClassifier *>(this))->removeOwnedUseCase(ownedUseCase); } /*! @@ -437,17 +437,17 @@ void QCollaboration::removeOwnedUseCase(QUseCase *ownedUseCase) */ const QSet<QGeneralizationSet *> *QCollaboration::powertypeExtents() const { - return (qmofobject_cast<const QClassifier *>(this))->powertypeExtents(); + return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } void QCollaboration::addPowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->addPowertypeExtent(powertypeExtent); } void QCollaboration::removePowertypeExtent(QGeneralizationSet *powertypeExtent) { - (qmofobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); + (qwrappedobject_cast<QClassifier *>(this))->removePowertypeExtent(powertypeExtent); } /*! @@ -455,17 +455,17 @@ void QCollaboration::removePowertypeExtent(QGeneralizationSet *powertypeExtent) */ const QSet<QUseCase *> *QCollaboration::useCases() const { - return (qmofobject_cast<const QClassifier *>(this))->useCases(); + return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } void QCollaboration::addUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->addUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->addUseCase(useCase); } void QCollaboration::removeUseCase(QUseCase *useCase) { - (qmofobject_cast<QClassifier *>(this))->removeUseCase(useCase); + (qwrappedobject_cast<QClassifier *>(this))->removeUseCase(useCase); } /*! @@ -473,12 +473,12 @@ void QCollaboration::removeUseCase(QUseCase *useCase) */ QClassifierTemplateParameter *QCollaboration::templateParameter() const { - return (qmofobject_cast<const QClassifier *>(this))->templateParameter(); + return (qwrappedobject_cast<const QClassifier *>(this))->templateParameter(); } void QCollaboration::setTemplateParameter(QClassifierTemplateParameter *templateParameter) { - (qmofobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QClassifier *>(this))->setTemplateParameter(templateParameter); } /*! @@ -486,17 +486,17 @@ void QCollaboration::setTemplateParameter(QClassifierTemplateParameter *template */ const QSet<QClassifier *> *QCollaboration::redefinedClassifiers() const { - return (qmofobject_cast<const QClassifier *>(this))->redefinedClassifiers(); + return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } void QCollaboration::addRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(redefinedClassifier); } void QCollaboration::removeRedefinedClassifier(QClassifier *redefinedClassifier) { - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(redefinedClassifier); } /*! @@ -504,12 +504,12 @@ void QCollaboration::removeRedefinedClassifier(QClassifier *redefinedClassifier) */ QRedefinableTemplateSignature *QCollaboration::ownedTemplateSignature() const { - return (qmofobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QClassifier *>(this))->ownedTemplateSignature(); } void QCollaboration::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QClassifier *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -517,17 +517,17 @@ void QCollaboration::setOwnedTemplateSignature(QRedefinableTemplateSignature *ow */ const QSet<QCollaborationUse *> *QCollaboration::collaborationUses() const { - return (qmofobject_cast<const QClassifier *>(this))->collaborationUses(); + return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } void QCollaboration::addCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->addCollaborationUse(collaborationUse); } void QCollaboration::removeCollaborationUse(QCollaborationUse *collaborationUse) { - (qmofobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); + (qwrappedobject_cast<QClassifier *>(this))->removeCollaborationUse(collaborationUse); } /*! @@ -535,7 +535,7 @@ void QCollaboration::removeCollaborationUse(QCollaborationUse *collaborationUse) */ const QSet<QProperty *> *QCollaboration::attributes() const { - return (qmofobject_cast<const QClassifier *>(this))->attributes(); + return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } /*! @@ -543,7 +543,7 @@ const QSet<QProperty *> *QCollaboration::attributes() const */ const QSet<QFeature *> *QCollaboration::features() const { - return (qmofobject_cast<const QClassifier *>(this))->features(); + return (qwrappedobject_cast<const QClassifier *>(this))->features(); } /*! @@ -551,17 +551,17 @@ const QSet<QFeature *> *QCollaboration::features() const */ const QSet<QClassifier *> *QCollaboration::generals() const { - return (qmofobject_cast<const QClassifier *>(this))->generals(); + return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } void QCollaboration::addGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->addGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->addGeneral(general); } void QCollaboration::removeGeneral(QClassifier *general) { - (qmofobject_cast<QClassifier *>(this))->removeGeneral(general); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneral(general); } /*! @@ -569,12 +569,12 @@ void QCollaboration::removeGeneral(QClassifier *general) */ QCollaborationUse *QCollaboration::representation() const { - return (qmofobject_cast<const QClassifier *>(this))->representation(); + return (qwrappedobject_cast<const QClassifier *>(this))->representation(); } void QCollaboration::setRepresentation(QCollaborationUse *representation) { - (qmofobject_cast<QClassifier *>(this))->setRepresentation(representation); + (qwrappedobject_cast<QClassifier *>(this))->setRepresentation(representation); } /*! @@ -582,17 +582,17 @@ void QCollaboration::setRepresentation(QCollaborationUse *representation) */ const QSet<QGeneralization *> *QCollaboration::generalizations() const { - return (qmofobject_cast<const QClassifier *>(this))->generalizations(); + return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } void QCollaboration::addGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->addGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->addGeneralization(generalization); } void QCollaboration::removeGeneralization(QGeneralization *generalization) { - (qmofobject_cast<QClassifier *>(this))->removeGeneralization(generalization); + (qwrappedobject_cast<QClassifier *>(this))->removeGeneralization(generalization); } /*! @@ -600,7 +600,7 @@ void QCollaboration::removeGeneralization(QGeneralization *generalization) */ const QSet<QNamedElement *> *QCollaboration::inheritedMembers() const { - return (qmofobject_cast<const QClassifier *>(this))->inheritedMembers(); + return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } /*! @@ -608,17 +608,17 @@ const QSet<QNamedElement *> *QCollaboration::inheritedMembers() const */ const QSet<QSubstitution *> *QCollaboration::substitutions() const { - return (qmofobject_cast<const QClassifier *>(this))->substitutions(); + return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } void QCollaboration::addSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->addSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->addSubstitution(substitution); } void QCollaboration::removeSubstitution(QSubstitution *substitution) { - (qmofobject_cast<QClassifier *>(this))->removeSubstitution(substitution); + (qwrappedobject_cast<QClassifier *>(this))->removeSubstitution(substitution); } // --------------------------------------------------------------- @@ -630,7 +630,7 @@ void QCollaboration::removeSubstitution(QSubstitution *substitution) */ const QSet<QConnectableElement *> *QCollaboration::roles() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->roles(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->roles(); } /*! @@ -638,17 +638,17 @@ const QSet<QConnectableElement *> *QCollaboration::roles() const */ const QList<QProperty *> *QCollaboration::ownedAttributes() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->ownedAttributes(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedAttributes(); } void QCollaboration::addOwnedAttribute(QProperty *ownedAttribute) { - (qmofobject_cast<QStructuredClassifier *>(this))->addOwnedAttribute(ownedAttribute); + (qwrappedobject_cast<QStructuredClassifier *>(this))->addOwnedAttribute(ownedAttribute); } void QCollaboration::removeOwnedAttribute(QProperty *ownedAttribute) { - (qmofobject_cast<QStructuredClassifier *>(this))->removeOwnedAttribute(ownedAttribute); + (qwrappedobject_cast<QStructuredClassifier *>(this))->removeOwnedAttribute(ownedAttribute); } /*! @@ -656,7 +656,7 @@ void QCollaboration::removeOwnedAttribute(QProperty *ownedAttribute) */ const QSet<QProperty *> *QCollaboration::parts() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->parts(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->parts(); } /*! @@ -664,17 +664,17 @@ const QSet<QProperty *> *QCollaboration::parts() const */ const QSet<QConnector *> *QCollaboration::ownedConnectors() const { - return (qmofobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); + return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); } void QCollaboration::addOwnedConnector(QConnector *ownedConnector) { - (qmofobject_cast<QStructuredClassifier *>(this))->addOwnedConnector(ownedConnector); + (qwrappedobject_cast<QStructuredClassifier *>(this))->addOwnedConnector(ownedConnector); } void QCollaboration::removeOwnedConnector(QConnector *ownedConnector) { - (qmofobject_cast<QStructuredClassifier *>(this))->removeOwnedConnector(ownedConnector); + (qwrappedobject_cast<QStructuredClassifier *>(this))->removeOwnedConnector(ownedConnector); } // --------------------------------------------------------------- @@ -686,17 +686,17 @@ void QCollaboration::removeOwnedConnector(QConnector *ownedConnector) */ const QSet<QBehavior *> *QCollaboration::ownedBehaviors() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); } void QCollaboration::addOwnedBehavior(QBehavior *ownedBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(ownedBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->addOwnedBehavior(ownedBehavior); } void QCollaboration::removeOwnedBehavior(QBehavior *ownedBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(ownedBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->removeOwnedBehavior(ownedBehavior); } /*! @@ -704,17 +704,17 @@ void QCollaboration::removeOwnedBehavior(QBehavior *ownedBehavior) */ const QSet<QInterfaceRealization *> *QCollaboration::interfaceRealizations() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); } void QCollaboration::addInterfaceRealization(QInterfaceRealization *interfaceRealization) { - (qmofobject_cast<QBehavioredClassifier *>(this))->addInterfaceRealization(interfaceRealization); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->addInterfaceRealization(interfaceRealization); } void QCollaboration::removeInterfaceRealization(QInterfaceRealization *interfaceRealization) { - (qmofobject_cast<QBehavioredClassifier *>(this))->removeInterfaceRealization(interfaceRealization); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->removeInterfaceRealization(interfaceRealization); } /*! @@ -722,12 +722,12 @@ void QCollaboration::removeInterfaceRealization(QInterfaceRealization *interface */ QBehavior *QCollaboration::classifierBehavior() const { - return (qmofobject_cast<const QBehavioredClassifier *>(this))->classifierBehavior(); + return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->classifierBehavior(); } void QCollaboration::setClassifierBehavior(QBehavior *classifierBehavior) { - (qmofobject_cast<QBehavioredClassifier *>(this))->setClassifierBehavior(classifierBehavior); + (qwrappedobject_cast<QBehavioredClassifier *>(this))->setClassifierBehavior(classifierBehavior); } // --------------------------------------------------------------- @@ -754,7 +754,7 @@ void QCollaboration::addCollaborationRole(QConnectableElement *collaborationRole d->collaborationRoles->insert(collaborationRole); // Adjust subsetted property(ies) - (qmofobject_cast<QStructuredClassifierPrivate *>(d))->addRole(qmofobject_cast<QConnectableElement *>(collaborationRole)); + (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->addRole(qwrappedobject_cast<QConnectableElement *>(collaborationRole)); } } @@ -767,7 +767,7 @@ void QCollaboration::removeCollaborationRole(QConnectableElement *collaborationR d->collaborationRoles->remove(collaborationRole); // Adjust subsetted property(ies) - (qmofobject_cast<QStructuredClassifierPrivate *>(d))->removeRole(qmofobject_cast<QConnectableElement *>(collaborationRole)); + (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->removeRole(qwrappedobject_cast<QConnectableElement *>(collaborationRole)); } } diff --git a/src/uml/qcollaboration.h b/src/uml/qcollaboration.h index 186e747a..81f64ce6 100644 --- a/src/uml/qcollaboration.h +++ b/src/uml/qcollaboration.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QStructuredClassifier> #include <QtUml/QBehavioredClassifier> @@ -62,7 +63,7 @@ class QConnectableElement; class QCollaborationPrivate; -class Q_UML_EXPORT QCollaboration : public QtMof::QMofObject +class Q_UML_EXPORT QCollaboration : public QWrappedObject { Q_OBJECT @@ -72,7 +73,7 @@ class Q_UML_EXPORT QCollaboration : public QtMof::QMofObject Q_DECLARE_PRIVATE(QCollaboration) public: - Q_INVOKABLE explicit QCollaboration(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCollaboration(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCollaboration(); // Association ends from aggregated QElement @@ -201,7 +202,7 @@ public: Q_INVOKABLE void removeCollaborationRole(QConnectableElement *collaborationRole); protected: - explicit QCollaboration(QCollaborationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCollaboration(QCollaborationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QStructuredClassifier *_wrappedStructuredClassifier; diff --git a/src/uml/qcollaboration_p.h b/src/uml/qcollaboration_p.h index 924a6c10..ba367f32 100644 --- a/src/uml/qcollaboration_p.h +++ b/src/uml/qcollaboration_p.h @@ -42,7 +42,8 @@ #define QTUML_QCOLLABORATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qstructuredclassifier_p.h" #include "private/qbehavioredclassifier_p.h" @@ -61,7 +62,7 @@ QT_MODULE(QtUml) class QConnectableElement; class QCollaboration; -class Q_UML_EXPORT QCollaborationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QCollaborationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QCollaboration) diff --git a/src/uml/qcollaborationuse.cpp b/src/uml/qcollaborationuse.cpp index 7ada55cb..3d8197d1 100644 --- a/src/uml/qcollaborationuse.cpp +++ b/src/uml/qcollaborationuse.cpp @@ -66,12 +66,12 @@ QCollaborationUsePrivate::~QCollaborationUsePrivate() \brief A collaboration use represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration use shows how the pattern described by a collaboration is applied in a given context, by binding specific entities from that context to the roles of the collaboration. Depending on the context, these entities could be structural features of a classifier, instance specifications, or even roles in some containing collaboration. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. */ -QCollaborationUse::QCollaborationUse(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCollaborationUse::QCollaborationUse(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QCollaborationUsePrivate, parent, wrapper) { } -QCollaborationUse::QCollaborationUse(QCollaborationUsePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCollaborationUse::QCollaborationUse(QCollaborationUsePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -125,7 +125,7 @@ void QCollaborationUse::addRoleBinding(QDependency *roleBinding) d->roleBindings->insert(roleBinding); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(roleBinding)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(roleBinding)); } } @@ -138,7 +138,7 @@ void QCollaborationUse::removeRoleBinding(QDependency *roleBinding) d->roleBindings->remove(roleBinding); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(roleBinding)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(roleBinding)); } } diff --git a/src/uml/qcollaborationuse.h b/src/uml/qcollaborationuse.h index 390ef4bb..602be3d8 100644 --- a/src/uml/qcollaborationuse.h +++ b/src/uml/qcollaborationuse.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QCollaborationUse : public QNamedElement Q_DECLARE_PRIVATE(QCollaborationUse) public: - Q_INVOKABLE explicit QCollaborationUse(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCollaborationUse(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCollaborationUse(); // Association ends from QCollaborationUse @@ -83,7 +83,7 @@ public: Q_INVOKABLE void removeRoleBinding(QDependency *roleBinding); protected: - explicit QCollaborationUse(QCollaborationUsePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCollaborationUse(QCollaborationUsePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcombinedfragment.cpp b/src/uml/qcombinedfragment.cpp index e26f54f6..039aba03 100644 --- a/src/uml/qcombinedfragment.cpp +++ b/src/uml/qcombinedfragment.cpp @@ -68,12 +68,12 @@ QCombinedFragmentPrivate::~QCombinedFragmentPrivate() \brief A combined fragment defines an expression of interaction fragments. A combined fragment is defined by an interaction operator and corresponding interaction operands. Through the use of combined fragments the user will be able to describe a number of traces in a compact and concise manner. */ -QCombinedFragment::QCombinedFragment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCombinedFragment::QCombinedFragment(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QCombinedFragmentPrivate, parent, wrapper) { } -QCombinedFragment::QCombinedFragment(QCombinedFragmentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCombinedFragment::QCombinedFragment(QCombinedFragmentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } @@ -131,7 +131,7 @@ void QCombinedFragment::addCfragmentGate(QGate *cfragmentGate) d->cfragmentGates->insert(cfragmentGate); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(cfragmentGate)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(cfragmentGate)); } } @@ -144,7 +144,7 @@ void QCombinedFragment::removeCfragmentGate(QGate *cfragmentGate) d->cfragmentGates->remove(cfragmentGate); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(cfragmentGate)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(cfragmentGate)); } } @@ -168,7 +168,7 @@ void QCombinedFragment::addOperand(QInteractionOperand *operand) d->operands->append(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } @@ -181,7 +181,7 @@ void QCombinedFragment::removeOperand(QInteractionOperand *operand) d->operands->removeAll(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } diff --git a/src/uml/qcombinedfragment.h b/src/uml/qcombinedfragment.h index 9df73e12..72948487 100644 --- a/src/uml/qcombinedfragment.h +++ b/src/uml/qcombinedfragment.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QCombinedFragment : public QInteractionFragment Q_DECLARE_PRIVATE(QCombinedFragment) public: - Q_INVOKABLE explicit QCombinedFragment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCombinedFragment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCombinedFragment(); // Attributes from QCombinedFragment @@ -93,7 +93,7 @@ public: Q_INVOKABLE void removeOperand(QInteractionOperand *operand); protected: - explicit QCombinedFragment(QCombinedFragmentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCombinedFragment(QCombinedFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomment.cpp b/src/uml/qcomment.cpp index fcb0aa59..39fe7b00 100644 --- a/src/uml/qcomment.cpp +++ b/src/uml/qcomment.cpp @@ -62,12 +62,12 @@ QCommentPrivate::~QCommentPrivate() \brief A comment is a textual annotation that can be attached to a set of elements. */ -QComment::QComment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComment::QComment(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QCommentPrivate, parent, wrapper) { } -QComment::QComment(QCommentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComment::QComment(QCommentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/uml/qcomment.h b/src/uml/qcomment.h index 86fdc2c2..960f64f1 100644 --- a/src/uml/qcomment.h +++ b/src/uml/qcomment.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QComment : public QElement Q_DECLARE_PRIVATE(QComment) public: - Q_INVOKABLE explicit QComment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QComment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QComment(); // Attributes from QComment @@ -82,7 +82,7 @@ public: Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement); protected: - explicit QComment(QCommentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QComment(QCommentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcommunicationpath.cpp b/src/uml/qcommunicationpath.cpp index 5c2f5b8b..544ae15a 100644 --- a/src/uml/qcommunicationpath.cpp +++ b/src/uml/qcommunicationpath.cpp @@ -60,12 +60,12 @@ QCommunicationPathPrivate::~QCommunicationPathPrivate() \brief A communication path is an association between two deployment targets, through which they are able to exchange signals and messages. */ -QCommunicationPath::QCommunicationPath(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCommunicationPath::QCommunicationPath(QWrappedObject *parent, QWrappedObject *wrapper) : QAssociation(*new QCommunicationPathPrivate, parent, wrapper) { } -QCommunicationPath::QCommunicationPath(QCommunicationPathPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCommunicationPath::QCommunicationPath(QCommunicationPathPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAssociation(dd, parent, wrapper) { } diff --git a/src/uml/qcommunicationpath.h b/src/uml/qcommunicationpath.h index 3e243cdd..4c17453e 100644 --- a/src/uml/qcommunicationpath.h +++ b/src/uml/qcommunicationpath.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QCommunicationPath : public QAssociation Q_DECLARE_PRIVATE(QCommunicationPath) public: - Q_INVOKABLE explicit QCommunicationPath(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCommunicationPath(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCommunicationPath(); protected: - explicit QCommunicationPath(QCommunicationPathPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCommunicationPath(QCommunicationPathPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomponent.cpp b/src/uml/qcomponent.cpp index 1949ce8d..bc34995c 100644 --- a/src/uml/qcomponent.cpp +++ b/src/uml/qcomponent.cpp @@ -70,12 +70,12 @@ QComponentPrivate::~QComponentPrivate() \brief In the namespace of a component, all model elements that are involved in or related to its definition are either owned or imported explicitly. This may include, for example, use cases and dependencies (e.g. mappings), packages, components, and artifacts.A component represents a modular part of a system that encapsulates its contents and whose manifestation is replaceable within its environment. */ -QComponent::QComponent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComponent::QComponent(QWrappedObject *parent, QWrappedObject *wrapper) : QClass(*new QComponentPrivate, parent, wrapper) { } -QComponent::QComponent(QComponentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComponent::QComponent(QComponentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClass(dd, parent, wrapper) { } @@ -133,7 +133,7 @@ void QComponent::addRealization(QComponentRealization *realization) d->realizations->insert(realization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(realization)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(realization)); // Adjust opposite property realization->setAbstraction(this); @@ -149,7 +149,7 @@ void QComponent::removeRealization(QComponentRealization *realization) d->realizations->remove(realization); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(realization)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(realization)); // Adjust opposite property realization->setAbstraction(0); @@ -200,7 +200,7 @@ void QComponent::addPackagedElement(QPackageableElement *packagedElement) d->packagedElements->insert(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } @@ -213,7 +213,7 @@ void QComponent::removePackagedElement(QPackageableElement *packagedElement) d->packagedElements->remove(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } diff --git a/src/uml/qcomponent.h b/src/uml/qcomponent.h index e424213a..8273b59c 100644 --- a/src/uml/qcomponent.h +++ b/src/uml/qcomponent.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QComponent : public QClass Q_DECLARE_PRIVATE(QComponent) public: - Q_INVOKABLE explicit QComponent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QComponent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QComponent(); // Attributes from QComponent @@ -99,7 +99,7 @@ public: Q_INVOKABLE const QSet<QInterface *> *usedInterfaces(const QClassifier *classifier) const; protected: - explicit QComponent(QComponentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QComponent(QComponentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomponentrealization.cpp b/src/uml/qcomponentrealization.cpp index 82c2b0f2..6b23fd6d 100644 --- a/src/uml/qcomponentrealization.cpp +++ b/src/uml/qcomponentrealization.cpp @@ -66,12 +66,12 @@ QComponentRealizationPrivate::~QComponentRealizationPrivate() \brief The realization concept is specialized to (optionally) define the classifiers that realize the contract offered by a component in terms of its provided and required interfaces. The component forms an abstraction from these various classifiers. */ -QComponentRealization::QComponentRealization(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComponentRealization::QComponentRealization(QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(*new QComponentRealizationPrivate, parent, wrapper) { } -QComponentRealization::QComponentRealization(QComponentRealizationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QComponentRealization::QComponentRealization(QComponentRealizationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(dd, parent, wrapper) { } @@ -106,15 +106,15 @@ void QComponentRealization::setAbstraction(QComponent *abstraction) d->abstraction->removeRealization(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeSupplier(qmofobject_cast<QNamedElement *>(d->abstraction)); + (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(d->abstraction)); d->abstraction = abstraction; // Adjust subsetted property(ies) if (abstraction) { - (qmofobject_cast<QDependency *>(this))->addSupplier(qmofobject_cast<QNamedElement *>(abstraction)); + (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(abstraction)); } - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(abstraction)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(abstraction)); // Adjust opposite property if (abstraction) @@ -142,7 +142,7 @@ void QComponentRealization::addRealizingClassifier(QClassifier *realizingClassif d->realizingClassifiers->insert(realizingClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->addClient(qmofobject_cast<QNamedElement *>(realizingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->addClient(qwrappedobject_cast<QNamedElement *>(realizingClassifier)); } } @@ -155,29 +155,29 @@ void QComponentRealization::removeRealizingClassifier(QClassifier *realizingClas d->realizingClassifiers->remove(realizingClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeClient(qmofobject_cast<QNamedElement *>(realizingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->removeClient(qwrappedobject_cast<QNamedElement *>(realizingClassifier)); } } // Overriden methods for subsetted properties -void QComponentRealization::addSupplier(QtMof::QMofPointer<QComponent> abstraction) +void QComponentRealization::addSupplier(QWrappedObjectPointer<QComponent> abstraction) { setAbstraction(abstraction); } -void QComponentRealization::removeSupplier(QtMof::QMofPointer<QComponent> abstraction) +void QComponentRealization::removeSupplier(QWrappedObjectPointer<QComponent> abstraction) { Q_UNUSED(abstraction); setAbstraction(0); } -void QComponentRealization::addClient(QtMof::QMofPointer<QClassifier> realizingClassifier) +void QComponentRealization::addClient(QWrappedObjectPointer<QClassifier> realizingClassifier) { addRealizingClassifier(realizingClassifier); } -void QComponentRealization::removeClient(QtMof::QMofPointer<QClassifier> realizingClassifier) +void QComponentRealization::removeClient(QWrappedObjectPointer<QClassifier> realizingClassifier) { removeRealizingClassifier(realizingClassifier); } diff --git a/src/uml/qcomponentrealization.h b/src/uml/qcomponentrealization.h index a877ad6c..7eba0e00 100644 --- a/src/uml/qcomponentrealization.h +++ b/src/uml/qcomponentrealization.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -74,7 +75,7 @@ class Q_UML_EXPORT QComponentRealization : public QRealization Q_DECLARE_PRIVATE(QComponentRealization) public: - Q_INVOKABLE explicit QComponentRealization(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QComponentRealization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QComponentRealization(); // Association ends from QComponentRealization @@ -85,13 +86,13 @@ public: Q_INVOKABLE void removeRealizingClassifier(QClassifier *realizingClassifier); // Overriden methods for subsetted properties - Q_INVOKABLE void addSupplier(QtMof::QMofPointer<QComponent> abstraction); - Q_INVOKABLE void removeSupplier(QtMof::QMofPointer<QComponent> abstraction); - Q_INVOKABLE void addClient(QtMof::QMofPointer<QClassifier> realizingClassifier); - Q_INVOKABLE void removeClient(QtMof::QMofPointer<QClassifier> realizingClassifier); + Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QComponent> abstraction); + Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QComponent> abstraction); + Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> realizingClassifier); + Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> realizingClassifier); protected: - explicit QComponentRealization(QComponentRealizationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QComponentRealization(QComponentRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconditionalnode.cpp b/src/uml/qconditionalnode.cpp index 8377f509..5b4a42c3 100644 --- a/src/uml/qconditionalnode.cpp +++ b/src/uml/qconditionalnode.cpp @@ -69,12 +69,12 @@ QConditionalNodePrivate::~QConditionalNodePrivate() \brief A conditional node is a structured activity node that represents an exclusive choice among some number of alternatives. */ -QConditionalNode::QConditionalNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConditionalNode::QConditionalNode(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(*new QConditionalNodePrivate, parent, wrapper) { } -QConditionalNode::QConditionalNode(QConditionalNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConditionalNode::QConditionalNode(QConditionalNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(dd, parent, wrapper) { } @@ -153,7 +153,7 @@ void QConditionalNode::addClause(QClause *clause) d->clauses->insert(clause); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(clause)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(clause)); } } @@ -166,7 +166,7 @@ void QConditionalNode::removeClause(QClause *clause) d->clauses->remove(clause); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(clause)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(clause)); } } @@ -188,7 +188,7 @@ void QConditionalNode::addResult(QOutputPin *result) Q_D(QConditionalNode); if (!d->results->contains(result)) { d->results->append(result); - qmof_topLevelWrapper(result)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(result)->setParent(qTopLevelWrapper(this)); } } @@ -199,7 +199,7 @@ void QConditionalNode::removeResult(QOutputPin *result) Q_D(QConditionalNode); if (d->results->contains(result)) { d->results->removeAll(result); - qmof_topLevelWrapper(result)->setParent(0); + qTopLevelWrapper(result)->setParent(0); } } diff --git a/src/uml/qconditionalnode.h b/src/uml/qconditionalnode.h index 6ca4b4f9..9f477426 100644 --- a/src/uml/qconditionalnode.h +++ b/src/uml/qconditionalnode.h @@ -75,7 +75,7 @@ class Q_UML_EXPORT QConditionalNode : public QStructuredActivityNode Q_DECLARE_PRIVATE(QConditionalNode) public: - Q_INVOKABLE explicit QConditionalNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConditionalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConditionalNode(); // Attributes from QConditionalNode @@ -93,7 +93,7 @@ public: Q_INVOKABLE void removeResult(QOutputPin *result); protected: - explicit QConditionalNode(QConditionalNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConditionalNode(QConditionalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectableelement.cpp b/src/uml/qconnectableelement.cpp index 01be90ca..2151a55f 100644 --- a/src/uml/qconnectableelement.cpp +++ b/src/uml/qconnectableelement.cpp @@ -95,15 +95,15 @@ void QConnectableElementPrivate::removeEnd(QConnectorEnd *end) \brief ConnectableElement is an abstract metaclass representing a set of instances that play roles of a classifier. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier.A connectable element may be exposed as a connectable element template parameter. */ -QConnectableElement::QConnectableElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QConnectableElementPrivate, parent, wrapper), +QConnectableElement::QConnectableElement(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QConnectableElementPrivate, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedParameterableElement(new QParameterableElement(this, this)) { } -QConnectableElement::QConnectableElement(QConnectableElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QConnectableElement::QConnectableElement(QConnectableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedParameterableElement(new QParameterableElement(this, this)) { @@ -122,7 +122,7 @@ QConnectableElement::~QConnectableElement() */ const QSet<QElement *> *QConnectableElement::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -130,7 +130,7 @@ const QSet<QElement *> *QConnectableElement::ownedElements() const */ QElement *QConnectableElement::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -138,17 +138,17 @@ QElement *QConnectableElement::owner() const */ const QSet<QComment *> *QConnectableElement::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QConnectableElement::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QConnectableElement::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -160,12 +160,12 @@ void QConnectableElement::removeOwnedComment(QComment *ownedComment) */ QString QConnectableElement::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QConnectableElement::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -173,12 +173,12 @@ void QConnectableElement::setName(QString name) */ QtUml::VisibilityKind QConnectableElement::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QConnectableElement::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -186,7 +186,7 @@ void QConnectableElement::setVisibility(QtUml::VisibilityKind visibility) */ QString QConnectableElement::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -198,12 +198,12 @@ QString QConnectableElement::qualifiedName() const */ QStringExpression *QConnectableElement::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QConnectableElement::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -211,7 +211,7 @@ void QConnectableElement::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QConnectableElement::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -219,17 +219,17 @@ QNamespace *QConnectableElement::namespace_() const */ const QSet<QDependency *> *QConnectableElement::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QConnectableElement::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QConnectableElement::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -241,12 +241,12 @@ void QConnectableElement::removeClientDependency(QDependency *clientDependency) */ QType *QConnectableElement::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QConnectableElement::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -258,12 +258,12 @@ void QConnectableElement::setType(QType *type) */ QTemplateParameter *QConnectableElement::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QConnectableElement::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- diff --git a/src/uml/qconnectableelement.h b/src/uml/qconnectableelement.h index 5dd7692e..515d43c9 100644 --- a/src/uml/qconnectableelement.h +++ b/src/uml/qconnectableelement.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QTypedElement> #include <QtUml/QParameterableElement> @@ -63,7 +64,7 @@ class QConnectableElementTemplateParameter; class QConnectableElementPrivate; -class Q_UML_EXPORT QConnectableElement : public QtMof::QMofObject +class Q_UML_EXPORT QConnectableElement : public QWrappedObject { Q_OBJECT @@ -74,7 +75,7 @@ class Q_UML_EXPORT QConnectableElement : public QtMof::QMofObject Q_DECLARE_PRIVATE(QConnectableElement) public: - Q_INVOKABLE explicit QConnectableElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConnectableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConnectableElement(); // Association ends from aggregated QElement @@ -116,7 +117,7 @@ public: friend class QConnectorEnd; protected: - explicit QConnectableElement(QConnectableElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConnectableElement(QConnectableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTypedElement *_wrappedTypedElement; diff --git a/src/uml/qconnectableelement_p.h b/src/uml/qconnectableelement_p.h index c36c9675..36f4f42c 100644 --- a/src/uml/qconnectableelement_p.h +++ b/src/uml/qconnectableelement_p.h @@ -42,7 +42,8 @@ #define QTUML_QCONNECTABLEELEMENT_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtypedelement_p.h" #include "private/qparameterableelement_p.h" @@ -61,7 +62,7 @@ QT_MODULE(QtUml) class QConnectorEnd; class QConnectableElementTemplateParameter; -class Q_UML_EXPORT QConnectableElementPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QConnectableElementPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QConnectableElement) diff --git a/src/uml/qconnectableelementtemplateparameter.cpp b/src/uml/qconnectableelementtemplateparameter.cpp index f471b7ef..4c84193d 100644 --- a/src/uml/qconnectableelementtemplateparameter.cpp +++ b/src/uml/qconnectableelementtemplateparameter.cpp @@ -63,12 +63,12 @@ QConnectableElementTemplateParameterPrivate::~QConnectableElementTemplateParamet \brief A connectable element template parameter exposes a connectable element as a formal parameter for a template. */ -QConnectableElementTemplateParameter::QConnectableElementTemplateParameter(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectableElementTemplateParameter::QConnectableElementTemplateParameter(QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(*new QConnectableElementTemplateParameterPrivate, parent, wrapper) { } -QConnectableElementTemplateParameter::QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectableElementTemplateParameter::QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(dd, parent, wrapper) { } diff --git a/src/uml/qconnectableelementtemplateparameter.h b/src/uml/qconnectableelementtemplateparameter.h index 9868f02a..d0b0812d 100644 --- a/src/uml/qconnectableelementtemplateparameter.h +++ b/src/uml/qconnectableelementtemplateparameter.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QConnectableElementTemplateParameter : public QTemplateParame Q_DECLARE_PRIVATE(QConnectableElementTemplateParameter) public: - Q_INVOKABLE explicit QConnectableElementTemplateParameter(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConnectableElementTemplateParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConnectableElementTemplateParameter(); // Association ends from QConnectableElementTemplateParameter @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setParameteredElement(QConnectableElement *parameteredElement); protected: - explicit QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectionpointreference.cpp b/src/uml/qconnectionpointreference.cpp index b42ce9d3..45ca52a4 100644 --- a/src/uml/qconnectionpointreference.cpp +++ b/src/uml/qconnectionpointreference.cpp @@ -68,12 +68,12 @@ QConnectionPointReferencePrivate::~QConnectionPointReferencePrivate() \brief A connection point reference represents a usage (as part of a submachine state) of an entry/exit point defined in the statemachine reference by the submachine state. */ -QConnectionPointReference::QConnectionPointReference(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectionPointReference::QConnectionPointReference(QWrappedObject *parent, QWrappedObject *wrapper) : QVertex(*new QConnectionPointReferencePrivate, parent, wrapper) { } -QConnectionPointReference::QConnectionPointReference(QConnectionPointReferencePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectionPointReference::QConnectionPointReference(QConnectionPointReferencePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QVertex(dd, parent, wrapper) { } @@ -141,7 +141,7 @@ void QConnectionPointReference::setState(QState *state) d->state = state; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(state)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(state)); // Adjust opposite property if (state) diff --git a/src/uml/qconnectionpointreference.h b/src/uml/qconnectionpointreference.h index 4e814325..0428160b 100644 --- a/src/uml/qconnectionpointreference.h +++ b/src/uml/qconnectionpointreference.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QConnectionPointReference : public QVertex Q_DECLARE_PRIVATE(QConnectionPointReference) public: - Q_INVOKABLE explicit QConnectionPointReference(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConnectionPointReference(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConnectionPointReference(); // Association ends from QConnectionPointReference @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeEntry(QPseudostate *entry); protected: - explicit QConnectionPointReference(QConnectionPointReferencePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConnectionPointReference(QConnectionPointReferencePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnector.cpp b/src/uml/qconnector.cpp index 1b84466a..c7182cb1 100644 --- a/src/uml/qconnector.cpp +++ b/src/uml/qconnector.cpp @@ -71,12 +71,12 @@ QConnectorPrivate::~QConnectorPrivate() \brief A delegation connector is a connector that links the external contract of a component (as specified by its ports) to the realization of that behavior. It represents the forwarding of events (operation requests and events): a signal that arrives at a port that has a delegation connector to one or more parts or ports on parts will be passed on to those targets for handling. An assembly connector is a connector between two or more parts or ports on parts that defines that one or more parts provide the services that other parts use.Specifies a link that enables communication between two or more instances. This link may be an instance of an association, or it may represent the possibility of the instances being able to communicate because their identities are known by virtue of being passed in as parameters, held in variables or slots, or because the communicating instances are the same instance. The link may be realized by something as simple as a pointer or by something as complex as a network connection. In contrast to associations, which specify links between any instance of the associated classifiers, connectors specify links between instances playing the connected parts only. */ -QConnector::QConnector(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnector::QConnector(QWrappedObject *parent, QWrappedObject *wrapper) : QFeature(*new QConnectorPrivate, parent, wrapper) { } -QConnector::QConnector(QConnectorPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnector::QConnector(QConnectorPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QFeature(dd, parent, wrapper) { } @@ -125,7 +125,7 @@ void QConnector::addRedefinedConnector(QConnector *redefinedConnector) d->redefinedConnectors->insert(redefinedConnector); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedConnector)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedConnector)); } } @@ -138,7 +138,7 @@ void QConnector::removeRedefinedConnector(QConnector *redefinedConnector) d->redefinedConnectors->remove(redefinedConnector); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedConnector)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedConnector)); } } @@ -214,7 +214,7 @@ void QConnector::addEnd(QConnectorEnd *end) d->ends->append(end); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(end)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(end)); } } @@ -227,7 +227,7 @@ void QConnector::removeEnd(QConnectorEnd *end) d->ends->removeAll(end); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(end)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(end)); } } diff --git a/src/uml/qconnector.h b/src/uml/qconnector.h index 7f28cfcf..076ab01a 100644 --- a/src/uml/qconnector.h +++ b/src/uml/qconnector.h @@ -80,7 +80,7 @@ class Q_UML_EXPORT QConnector : public QFeature Q_DECLARE_PRIVATE(QConnector) public: - Q_INVOKABLE explicit QConnector(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConnector(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConnector(); // Attributes from QConnector @@ -100,7 +100,7 @@ public: Q_INVOKABLE void removeEnd(QConnectorEnd *end); protected: - explicit QConnector(QConnectorPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConnector(QConnectorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectorend.cpp b/src/uml/qconnectorend.cpp index 22c4e8e4..e487858f 100644 --- a/src/uml/qconnectorend.cpp +++ b/src/uml/qconnectorend.cpp @@ -67,12 +67,12 @@ QConnectorEndPrivate::~QConnectorEndPrivate() \brief A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. */ -QConnectorEnd::QConnectorEnd(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectorEnd::QConnectorEnd(QWrappedObject *parent, QWrappedObject *wrapper) : QMultiplicityElement(*new QConnectorEndPrivate, parent, wrapper) { } -QConnectorEnd::QConnectorEnd(QConnectorEndPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConnectorEnd::QConnectorEnd(QConnectorEndPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMultiplicityElement(dd, parent, wrapper) { } @@ -104,13 +104,13 @@ void QConnectorEnd::setRole(QConnectableElement *role) if (d->role != role) { // Adjust opposite property if (d->role) - (qmofobject_cast<QConnectableElementPrivate *>(d->role->d_func()))->removeEnd(this); + (qwrappedobject_cast<QConnectableElementPrivate *>(d->role->d_func()))->removeEnd(this); d->role = role; // Adjust opposite property if (role) - (qmofobject_cast<QConnectableElementPrivate *>(role->d_func()))->addEnd(this); + (qwrappedobject_cast<QConnectableElementPrivate *>(role->d_func()))->addEnd(this); } } diff --git a/src/uml/qconnectorend.h b/src/uml/qconnectorend.h index 734f63ef..225c6791 100644 --- a/src/uml/qconnectorend.h +++ b/src/uml/qconnectorend.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QConnectorEnd : public QMultiplicityElement Q_DECLARE_PRIVATE(QConnectorEnd) public: - Q_INVOKABLE explicit QConnectorEnd(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConnectorEnd(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConnectorEnd(); // Association ends from QConnectorEnd @@ -81,7 +81,7 @@ public: Q_INVOKABLE QProperty *definingEnd() const; protected: - explicit QConnectorEnd(QConnectorEndPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConnectorEnd(QConnectorEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconsiderignorefragment.cpp b/src/uml/qconsiderignorefragment.cpp index ef1b18cb..a173740f 100644 --- a/src/uml/qconsiderignorefragment.cpp +++ b/src/uml/qconsiderignorefragment.cpp @@ -64,12 +64,12 @@ QConsiderIgnoreFragmentPrivate::~QConsiderIgnoreFragmentPrivate() \brief A consider ignore fragment is a kind of combined fragment that is used for the consider and ignore cases, which require lists of pertinent messages to be specified. */ -QConsiderIgnoreFragment::QConsiderIgnoreFragment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConsiderIgnoreFragment::QConsiderIgnoreFragment(QWrappedObject *parent, QWrappedObject *wrapper) : QCombinedFragment(*new QConsiderIgnoreFragmentPrivate, parent, wrapper) { } -QConsiderIgnoreFragment::QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConsiderIgnoreFragment::QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCombinedFragment(dd, parent, wrapper) { } diff --git a/src/uml/qconsiderignorefragment.h b/src/uml/qconsiderignorefragment.h index 7f3b736d..ccf85241 100644 --- a/src/uml/qconsiderignorefragment.h +++ b/src/uml/qconsiderignorefragment.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QConsiderIgnoreFragment : public QCombinedFragment Q_DECLARE_PRIVATE(QConsiderIgnoreFragment) public: - Q_INVOKABLE explicit QConsiderIgnoreFragment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConsiderIgnoreFragment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConsiderIgnoreFragment(); // Association ends from QConsiderIgnoreFragment @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeMessage(QNamedElement *message); protected: - explicit QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconstraint.cpp b/src/uml/qconstraint.cpp index b9d4e8d4..46346b00 100644 --- a/src/uml/qconstraint.cpp +++ b/src/uml/qconstraint.cpp @@ -68,12 +68,12 @@ QConstraintPrivate::~QConstraintPrivate() \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. */ -QConstraint::QConstraint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConstraint::QConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QConstraintPrivate, parent, wrapper) { } -QConstraint::QConstraint(QConstraintPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QConstraint::QConstraint(QConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } @@ -110,7 +110,7 @@ void QConstraint::setContext(QNamespace *context) d->context = context; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(context)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(context)); // Adjust opposite property if (context) @@ -136,13 +136,13 @@ void QConstraint::setSpecification(QValueSpecification *specification) Q_D(QConstraint); if (d->specification != specification) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->specification)); d->specification = specification; // Adjust subsetted property(ies) if (specification) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(specification)); } } } diff --git a/src/uml/qconstraint.h b/src/uml/qconstraint.h index 191c7338..47e0871e 100644 --- a/src/uml/qconstraint.h +++ b/src/uml/qconstraint.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QConstraint : public QPackageableElement Q_DECLARE_PRIVATE(QConstraint) public: - Q_INVOKABLE explicit QConstraint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QConstraint(); // Association ends from QConstraint @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement); protected: - explicit QConstraint(QConstraintPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontinuation.cpp b/src/uml/qcontinuation.cpp index 84e7ec7f..2ac2c7d0 100644 --- a/src/uml/qcontinuation.cpp +++ b/src/uml/qcontinuation.cpp @@ -61,12 +61,12 @@ QContinuationPrivate::~QContinuationPrivate() \brief A continuation is a syntactic way to define continuations of different branches of an alternative combined fragment. Continuations is intuitively similar to labels representing intermediate points in a flow of control. */ -QContinuation::QContinuation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QContinuation::QContinuation(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QContinuationPrivate, parent, wrapper) { } -QContinuation::QContinuation(QContinuationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QContinuation::QContinuation(QContinuationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } diff --git a/src/uml/qcontinuation.h b/src/uml/qcontinuation.h index 436dd998..83f2a4a5 100644 --- a/src/uml/qcontinuation.h +++ b/src/uml/qcontinuation.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QContinuation : public QInteractionFragment Q_DECLARE_PRIVATE(QContinuation) public: - Q_INVOKABLE explicit QContinuation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QContinuation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QContinuation(); // Attributes from QContinuation @@ -72,7 +72,7 @@ public: Q_INVOKABLE void setSetting(bool setting); protected: - explicit QContinuation(QContinuationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QContinuation(QContinuationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontrolflow.cpp b/src/uml/qcontrolflow.cpp index b104e540..8cb049ce 100644 --- a/src/uml/qcontrolflow.cpp +++ b/src/uml/qcontrolflow.cpp @@ -60,12 +60,12 @@ QControlFlowPrivate::~QControlFlowPrivate() \brief A control flow is an edge that starts an activity node after the previous one is finished. */ -QControlFlow::QControlFlow(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QControlFlow::QControlFlow(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityEdge(*new QControlFlowPrivate, parent, wrapper) { } -QControlFlow::QControlFlow(QControlFlowPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QControlFlow::QControlFlow(QControlFlowPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityEdge(dd, parent, wrapper) { } diff --git a/src/uml/qcontrolflow.h b/src/uml/qcontrolflow.h index fbaad4a2..b904d325 100644 --- a/src/uml/qcontrolflow.h +++ b/src/uml/qcontrolflow.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QControlFlow : public QActivityEdge Q_DECLARE_PRIVATE(QControlFlow) public: - Q_INVOKABLE explicit QControlFlow(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QControlFlow(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QControlFlow(); protected: - explicit QControlFlow(QControlFlowPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QControlFlow(QControlFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontrolnode.cpp b/src/uml/qcontrolnode.cpp index 9acecde7..d7e92379 100644 --- a/src/uml/qcontrolnode.cpp +++ b/src/uml/qcontrolnode.cpp @@ -60,12 +60,12 @@ QControlNodePrivate::~QControlNodePrivate() \brief A control node is an abstract activity node that coordinates flows in an activity. */ -QControlNode::QControlNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QControlNode::QControlNode(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityNode(*new QControlNodePrivate, parent, wrapper) { } -QControlNode::QControlNode(QControlNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QControlNode::QControlNode(QControlNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityNode(dd, parent, wrapper) { } diff --git a/src/uml/qcontrolnode.h b/src/uml/qcontrolnode.h index f89ef024..3aa2bc8f 100644 --- a/src/uml/qcontrolnode.h +++ b/src/uml/qcontrolnode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QControlNode : public QActivityNode Q_DECLARE_PRIVATE(QControlNode) public: - Q_INVOKABLE explicit QControlNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QControlNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QControlNode(); protected: - explicit QControlNode(QControlNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QControlNode(QControlNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreatelinkaction.cpp b/src/uml/qcreatelinkaction.cpp index fe444059..1e298028 100644 --- a/src/uml/qcreatelinkaction.cpp +++ b/src/uml/qcreatelinkaction.cpp @@ -64,12 +64,12 @@ QCreateLinkActionPrivate::~QCreateLinkActionPrivate() \brief A create link action is a write link action for creating links. */ -QCreateLinkAction::QCreateLinkAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateLinkAction::QCreateLinkAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteLinkAction(*new QCreateLinkActionPrivate, parent, wrapper) { } -QCreateLinkAction::QCreateLinkAction(QCreateLinkActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateLinkAction::QCreateLinkAction(QCreateLinkActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteLinkAction(dd, parent, wrapper) { } @@ -100,7 +100,7 @@ void QCreateLinkAction::addEndData(QLinkEndCreationData *endData) Q_D(QCreateLinkAction); if (!d->endData->contains(endData)) { d->endData->insert(endData); - qmof_topLevelWrapper(endData)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(endData)->setParent(qTopLevelWrapper(this)); } } @@ -111,7 +111,7 @@ void QCreateLinkAction::removeEndData(QLinkEndCreationData *endData) Q_D(QCreateLinkAction); if (d->endData->contains(endData)) { d->endData->remove(endData); - qmof_topLevelWrapper(endData)->setParent(0); + qTopLevelWrapper(endData)->setParent(0); } } diff --git a/src/uml/qcreatelinkaction.h b/src/uml/qcreatelinkaction.h index 8a54faee..bbffc9df 100644 --- a/src/uml/qcreatelinkaction.h +++ b/src/uml/qcreatelinkaction.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QCreateLinkAction : public QWriteLinkAction Q_DECLARE_PRIVATE(QCreateLinkAction) public: - Q_INVOKABLE explicit QCreateLinkAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCreateLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCreateLinkAction(); // Association ends from QCreateLinkAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeEndData(QLinkEndCreationData *endData); protected: - explicit QCreateLinkAction(QCreateLinkActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCreateLinkAction(QCreateLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreatelinkobjectaction.cpp b/src/uml/qcreatelinkobjectaction.cpp index a2089022..c0752e81 100644 --- a/src/uml/qcreatelinkobjectaction.cpp +++ b/src/uml/qcreatelinkobjectaction.cpp @@ -63,12 +63,12 @@ QCreateLinkObjectActionPrivate::~QCreateLinkObjectActionPrivate() \brief A create link object action creates a link object. */ -QCreateLinkObjectAction::QCreateLinkObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateLinkObjectAction::QCreateLinkObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QCreateLinkAction(*new QCreateLinkObjectActionPrivate, parent, wrapper) { } -QCreateLinkObjectAction::QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateLinkObjectAction::QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCreateLinkAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QCreateLinkObjectAction::setResult(QOutputPin *result) Q_D(QCreateLinkObjectAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qcreatelinkobjectaction.h b/src/uml/qcreatelinkobjectaction.h index 0c628f13..85800925 100644 --- a/src/uml/qcreatelinkobjectaction.h +++ b/src/uml/qcreatelinkobjectaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QCreateLinkObjectAction : public QCreateLinkAction Q_DECLARE_PRIVATE(QCreateLinkObjectAction) public: - Q_INVOKABLE explicit QCreateLinkObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCreateLinkObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCreateLinkObjectAction(); // Association ends from QCreateLinkObjectAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreateobjectaction.cpp b/src/uml/qcreateobjectaction.cpp index f99cf82b..e16e9a19 100644 --- a/src/uml/qcreateobjectaction.cpp +++ b/src/uml/qcreateobjectaction.cpp @@ -65,12 +65,12 @@ QCreateObjectActionPrivate::~QCreateObjectActionPrivate() \brief A create object action is an action that creates an object that conforms to a statically specified classifier and puts it on an output pin at runtime. */ -QCreateObjectAction::QCreateObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateObjectAction::QCreateObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QCreateObjectActionPrivate, parent, wrapper) { } -QCreateObjectAction::QCreateObjectAction(QCreateObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QCreateObjectAction::QCreateObjectAction(QCreateObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -122,13 +122,13 @@ void QCreateObjectAction::setResult(QOutputPin *result) Q_D(QCreateObjectAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qcreateobjectaction.h b/src/uml/qcreateobjectaction.h index 7613fd8a..9b0f4f2f 100644 --- a/src/uml/qcreateobjectaction.h +++ b/src/uml/qcreateobjectaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QCreateObjectAction : public QAction Q_DECLARE_PRIVATE(QCreateObjectAction) public: - Q_INVOKABLE explicit QCreateObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QCreateObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCreateObjectAction(); // Association ends from QCreateObjectAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QCreateObjectAction(QCreateObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QCreateObjectAction(QCreateObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdatastorenode.cpp b/src/uml/qdatastorenode.cpp index f3e8920c..09dab2e3 100644 --- a/src/uml/qdatastorenode.cpp +++ b/src/uml/qdatastorenode.cpp @@ -60,12 +60,12 @@ QDataStoreNodePrivate::~QDataStoreNodePrivate() \brief A data store node is a central buffer node for non-transient information. */ -QDataStoreNode::QDataStoreNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDataStoreNode::QDataStoreNode(QWrappedObject *parent, QWrappedObject *wrapper) : QCentralBufferNode(*new QDataStoreNodePrivate, parent, wrapper) { } -QDataStoreNode::QDataStoreNode(QDataStoreNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDataStoreNode::QDataStoreNode(QDataStoreNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCentralBufferNode(dd, parent, wrapper) { } diff --git a/src/uml/qdatastorenode.h b/src/uml/qdatastorenode.h index 3ec28561..7036ee48 100644 --- a/src/uml/qdatastorenode.h +++ b/src/uml/qdatastorenode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QDataStoreNode : public QCentralBufferNode Q_DECLARE_PRIVATE(QDataStoreNode) public: - Q_INVOKABLE explicit QDataStoreNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDataStoreNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDataStoreNode(); protected: - explicit QDataStoreNode(QDataStoreNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDataStoreNode(QDataStoreNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdatatype.cpp b/src/uml/qdatatype.cpp index b389a7a0..b5748fca 100644 --- a/src/uml/qdatatype.cpp +++ b/src/uml/qdatatype.cpp @@ -68,12 +68,12 @@ QDataTypePrivate::~QDataTypePrivate() \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. */ -QDataType::QDataType(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDataType::QDataType(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QDataTypePrivate, parent, wrapper) { } -QDataType::QDataType(QDataTypePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDataType::QDataType(QDataTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -106,8 +106,8 @@ void QDataType::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setDatatype(this); @@ -123,8 +123,8 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setDatatype(0); @@ -151,8 +151,8 @@ void QDataType::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setDatatype(this); @@ -168,8 +168,8 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setDatatype(0); diff --git a/src/uml/qdatatype.h b/src/uml/qdatatype.h index b8b8000e..244c03f9 100644 --- a/src/uml/qdatatype.h +++ b/src/uml/qdatatype.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QDataType : public QClassifier Q_DECLARE_PRIVATE(QDataType) public: - Q_INVOKABLE explicit QDataType(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDataType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDataType(); // Association ends from QDataType @@ -89,7 +89,7 @@ public: Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; protected: - explicit QDataType(QDataTypePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDataType(QDataTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdecisionnode.cpp b/src/uml/qdecisionnode.cpp index 78f84f03..4e4cd5fb 100644 --- a/src/uml/qdecisionnode.cpp +++ b/src/uml/qdecisionnode.cpp @@ -65,12 +65,12 @@ QDecisionNodePrivate::~QDecisionNodePrivate() \brief A decision node is a control node that chooses between outgoing flows. */ -QDecisionNode::QDecisionNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDecisionNode::QDecisionNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QDecisionNodePrivate, parent, wrapper) { } -QDecisionNode::QDecisionNode(QDecisionNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDecisionNode::QDecisionNode(QDecisionNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } diff --git a/src/uml/qdecisionnode.h b/src/uml/qdecisionnode.h index 64c3ebe0..9bf82336 100644 --- a/src/uml/qdecisionnode.h +++ b/src/uml/qdecisionnode.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QDecisionNode : public QControlNode Q_DECLARE_PRIVATE(QDecisionNode) public: - Q_INVOKABLE explicit QDecisionNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDecisionNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDecisionNode(); // Association ends from QDecisionNode @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setDecisionInput(QBehavior *decisionInput); protected: - explicit QDecisionNode(QDecisionNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDecisionNode(QDecisionNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdependency.cpp b/src/uml/qdependency.cpp index e9f6f907..fa633455 100644 --- a/src/uml/qdependency.cpp +++ b/src/uml/qdependency.cpp @@ -66,15 +66,15 @@ QDependencyPrivate::~QDependencyPrivate() \brief A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). */ -QDependency::QDependency(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QDependencyPrivate, parent, wrapper), +QDependency::QDependency(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QDependencyPrivate, parent, wrapper), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)) { } -QDependency::QDependency(QDependencyPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QDependency::QDependency(QDependencyPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)) { @@ -93,7 +93,7 @@ QDependency::~QDependency() */ const QSet<QElement *> *QDependency::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -101,7 +101,7 @@ const QSet<QElement *> *QDependency::ownedElements() const */ QElement *QDependency::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -109,17 +109,17 @@ QElement *QDependency::owner() const */ const QSet<QComment *> *QDependency::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QDependency::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QDependency::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -131,12 +131,12 @@ void QDependency::removeOwnedComment(QComment *ownedComment) */ QTemplateParameter *QDependency::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QDependency::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -144,12 +144,12 @@ void QDependency::setOwningTemplateParameter(QTemplateParameter *owningTemplateP */ QTemplateParameter *QDependency::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QDependency::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -161,12 +161,12 @@ void QDependency::setTemplateParameter(QTemplateParameter *templateParameter) */ QString QDependency::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QDependency::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -174,7 +174,7 @@ void QDependency::setName(QString name) */ QString QDependency::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -186,12 +186,12 @@ QString QDependency::qualifiedName() const */ QStringExpression *QDependency::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QDependency::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -199,7 +199,7 @@ void QDependency::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QDependency::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -207,17 +207,17 @@ QNamespace *QDependency::namespace_() const */ const QSet<QDependency *> *QDependency::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QDependency::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QDependency::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -229,12 +229,12 @@ void QDependency::removeClientDependency(QDependency *clientDependency) */ QtUml::VisibilityKind QDependency::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QDependency::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -246,7 +246,7 @@ void QDependency::setVisibility(QtUml::VisibilityKind visibility) */ const QSet<QElement *> *QDependency::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -258,7 +258,7 @@ const QSet<QElement *> *QDependency::relatedElements() const */ const QSet<QElement *> *QDependency::sources() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->sources(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } /*! @@ -266,7 +266,7 @@ const QSet<QElement *> *QDependency::sources() const */ const QSet<QElement *> *QDependency::targets() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->targets(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } // --------------------------------------------------------------- @@ -293,7 +293,7 @@ void QDependency::addClient(QNamedElement *client) d->clients->insert(client); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(client)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(client)); // Adjust opposite property client->addClientDependency(this); @@ -309,7 +309,7 @@ void QDependency::removeClient(QNamedElement *client) d->clients->remove(client); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(client)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(client)); // Adjust opposite property if (client) @@ -337,7 +337,7 @@ void QDependency::addSupplier(QNamedElement *supplier) d->suppliers->insert(supplier); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(supplier)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(supplier)); } } @@ -350,7 +350,7 @@ void QDependency::removeSupplier(QNamedElement *supplier) d->suppliers->remove(supplier); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(supplier)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(supplier)); } } diff --git a/src/uml/qdependency.h b/src/uml/qdependency.h index a046f277..a8c90d0b 100644 --- a/src/uml/qdependency.h +++ b/src/uml/qdependency.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QPackageableElement> #include <QtUml/QDirectedRelationship> @@ -62,7 +63,7 @@ class QNamedElement; class QDependencyPrivate; -class Q_UML_EXPORT QDependency : public QtMof::QMofObject +class Q_UML_EXPORT QDependency : public QWrappedObject { Q_OBJECT @@ -73,7 +74,7 @@ class Q_UML_EXPORT QDependency : public QtMof::QMofObject Q_DECLARE_PRIVATE(QDependency) public: - Q_INVOKABLE explicit QDependency(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDependency(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDependency(); // Association ends from aggregated QElement @@ -122,7 +123,7 @@ public: Q_INVOKABLE void removeSupplier(QNamedElement *supplier); protected: - explicit QDependency(QDependencyPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDependency(QDependencyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QPackageableElement *_wrappedPackageableElement; diff --git a/src/uml/qdependency_p.h b/src/uml/qdependency_p.h index 6969c17f..1ac5d562 100644 --- a/src/uml/qdependency_p.h +++ b/src/uml/qdependency_p.h @@ -42,7 +42,8 @@ #define QTUML_QDEPENDENCY_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qpackageableelement_p.h" #include "private/qdirectedrelationship_p.h" @@ -61,7 +62,7 @@ QT_MODULE(QtUml) class QNamedElement; class QDependency; -class Q_UML_EXPORT QDependencyPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QDependencyPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QDependency) diff --git a/src/uml/qdeployedartifact.cpp b/src/uml/qdeployedartifact.cpp index c7562810..5fb51f42 100644 --- a/src/uml/qdeployedartifact.cpp +++ b/src/uml/qdeployedartifact.cpp @@ -60,12 +60,12 @@ QDeployedArtifactPrivate::~QDeployedArtifactPrivate() \brief A deployed artifact is an artifact or artifact instance that has been deployed to a deployment target. */ -QDeployedArtifact::QDeployedArtifact(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeployedArtifact::QDeployedArtifact(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QDeployedArtifactPrivate, parent, wrapper) { } -QDeployedArtifact::QDeployedArtifact(QDeployedArtifactPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeployedArtifact::QDeployedArtifact(QDeployedArtifactPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qdeployedartifact.h b/src/uml/qdeployedartifact.h index 6c75876a..0b173b01 100644 --- a/src/uml/qdeployedartifact.h +++ b/src/uml/qdeployedartifact.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QDeployedArtifact : public QNamedElement Q_DECLARE_PRIVATE(QDeployedArtifact) public: - Q_INVOKABLE explicit QDeployedArtifact(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDeployedArtifact(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDeployedArtifact(); protected: - explicit QDeployedArtifact(QDeployedArtifactPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDeployedArtifact(QDeployedArtifactPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeployment.cpp b/src/uml/qdeployment.cpp index 85feb2c1..bef16334 100644 --- a/src/uml/qdeployment.cpp +++ b/src/uml/qdeployment.cpp @@ -69,12 +69,12 @@ QDeploymentPrivate::~QDeploymentPrivate() \brief A deployment is the allocation of an artifact or artifact instance to a deployment target.A component deployment is the deployment of one or more artifacts or artifact instances to a deployment target, optionally parameterized by a deployment specification. Examples are executables and configuration files. */ -QDeployment::QDeployment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeployment::QDeployment(QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(*new QDeploymentPrivate, parent, wrapper) { } -QDeployment::QDeployment(QDeploymentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeployment::QDeployment(QDeploymentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(dd, parent, wrapper) { } @@ -109,14 +109,14 @@ void QDeployment::setLocation(QDeploymentTarget *location) d->location->removeDeployment(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeClient(qmofobject_cast<QNamedElement *>(d->location)); + (qwrappedobject_cast<QDependency *>(this))->removeClient(qwrappedobject_cast<QNamedElement *>(d->location)); d->location = location; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(location)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(location)); if (location) { - (qmofobject_cast<QDependency *>(this))->addClient(qmofobject_cast<QNamedElement *>(location)); + (qwrappedobject_cast<QDependency *>(this))->addClient(qwrappedobject_cast<QNamedElement *>(location)); } // Adjust opposite property @@ -145,7 +145,7 @@ void QDeployment::addConfiguration(QDeploymentSpecification *configuration) d->configurations->insert(configuration); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(configuration)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(configuration)); // Adjust opposite property configuration->setDeployment(this); @@ -161,7 +161,7 @@ void QDeployment::removeConfiguration(QDeploymentSpecification *configuration) d->configurations->remove(configuration); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(configuration)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(configuration)); // Adjust opposite property configuration->setDeployment(0); @@ -188,7 +188,7 @@ void QDeployment::addDeployedArtifact(QDeployedArtifact *deployedArtifact) d->deployedArtifacts->insert(deployedArtifact); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->addSupplier(qmofobject_cast<QNamedElement *>(deployedArtifact)); + (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(deployedArtifact)); } } @@ -201,29 +201,29 @@ void QDeployment::removeDeployedArtifact(QDeployedArtifact *deployedArtifact) d->deployedArtifacts->remove(deployedArtifact); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeSupplier(qmofobject_cast<QNamedElement *>(deployedArtifact)); + (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(deployedArtifact)); } } // Overriden methods for subsetted properties -void QDeployment::addClient(QtMof::QMofPointer<QDeploymentTarget> location) +void QDeployment::addClient(QWrappedObjectPointer<QDeploymentTarget> location) { setLocation(location); } -void QDeployment::removeClient(QtMof::QMofPointer<QDeploymentTarget> location) +void QDeployment::removeClient(QWrappedObjectPointer<QDeploymentTarget> location) { Q_UNUSED(location); setLocation(0); } -void QDeployment::addSupplier(QtMof::QMofPointer<QDeployedArtifact> deployedArtifact) +void QDeployment::addSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact) { addDeployedArtifact(deployedArtifact); } -void QDeployment::removeSupplier(QtMof::QMofPointer<QDeployedArtifact> deployedArtifact) +void QDeployment::removeSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact) { removeDeployedArtifact(deployedArtifact); } diff --git a/src/uml/qdeployment.h b/src/uml/qdeployment.h index 1b55a5e6..507a6694 100644 --- a/src/uml/qdeployment.h +++ b/src/uml/qdeployment.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -76,7 +77,7 @@ class Q_UML_EXPORT QDeployment : public QDependency Q_DECLARE_PRIVATE(QDeployment) public: - Q_INVOKABLE explicit QDeployment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDeployment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDeployment(); // Association ends from QDeployment @@ -90,13 +91,13 @@ public: Q_INVOKABLE void removeDeployedArtifact(QDeployedArtifact *deployedArtifact); // Overriden methods for subsetted properties - Q_INVOKABLE void addClient(QtMof::QMofPointer<QDeploymentTarget> location); - Q_INVOKABLE void removeClient(QtMof::QMofPointer<QDeploymentTarget> location); - Q_INVOKABLE void addSupplier(QtMof::QMofPointer<QDeployedArtifact> deployedArtifact); - Q_INVOKABLE void removeSupplier(QtMof::QMofPointer<QDeployedArtifact> deployedArtifact); + Q_INVOKABLE void addClient(QWrappedObjectPointer<QDeploymentTarget> location); + Q_INVOKABLE void removeClient(QWrappedObjectPointer<QDeploymentTarget> location); + Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact); + Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact); protected: - explicit QDeployment(QDeploymentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDeployment(QDeploymentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeploymentspecification.cpp b/src/uml/qdeploymentspecification.cpp index 24c71ebe..e99de56a 100644 --- a/src/uml/qdeploymentspecification.cpp +++ b/src/uml/qdeploymentspecification.cpp @@ -63,12 +63,12 @@ QDeploymentSpecificationPrivate::~QDeploymentSpecificationPrivate() \brief A deployment specification specifies a set of properties that determine execution parameters of a component artifact that is deployed on a node. A deployment specification can be aimed at a specific type of container. An artifact that reifies or implements deployment specification properties is a deployment descriptor. */ -QDeploymentSpecification::QDeploymentSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeploymentSpecification::QDeploymentSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QArtifact(*new QDeploymentSpecificationPrivate, parent, wrapper) { } -QDeploymentSpecification::QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeploymentSpecification::QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QArtifact(dd, parent, wrapper) { } @@ -151,7 +151,7 @@ void QDeploymentSpecification::setDeployment(QDeployment *deployment) d->deployment = deployment; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(deployment)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(deployment)); // Adjust opposite property if (deployment) diff --git a/src/uml/qdeploymentspecification.h b/src/uml/qdeploymentspecification.h index 64562b9f..1b7570b9 100644 --- a/src/uml/qdeploymentspecification.h +++ b/src/uml/qdeploymentspecification.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QDeploymentSpecification : public QArtifact Q_DECLARE_PRIVATE(QDeploymentSpecification) public: - Q_INVOKABLE explicit QDeploymentSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDeploymentSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDeploymentSpecification(); // Attributes from QDeploymentSpecification @@ -86,7 +86,7 @@ public: Q_INVOKABLE void setDeployment(QDeployment *deployment); protected: - explicit QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeploymenttarget.cpp b/src/uml/qdeploymenttarget.cpp index 0bb448ab..704e80cb 100644 --- a/src/uml/qdeploymenttarget.cpp +++ b/src/uml/qdeploymenttarget.cpp @@ -65,12 +65,12 @@ QDeploymentTargetPrivate::~QDeploymentTargetPrivate() \brief A deployment target is the location for a deployed artifact. */ -QDeploymentTarget::QDeploymentTarget(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeploymentTarget::QDeploymentTarget(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QDeploymentTargetPrivate, parent, wrapper) { } -QDeploymentTarget::QDeploymentTarget(QDeploymentTargetPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDeploymentTarget::QDeploymentTarget(QDeploymentTargetPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -115,8 +115,8 @@ void QDeploymentTarget::addDeployment(QDeployment *deployment) d->deployments->insert(deployment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(deployment)); - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(qmofobject_cast<QDependency *>(deployment)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(deployment)); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(qwrappedobject_cast<QDependency *>(deployment)); // Adjust opposite property deployment->setLocation(this); @@ -132,8 +132,8 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment) d->deployments->remove(deployment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(deployment)); - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(qmofobject_cast<QDependency *>(deployment)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(deployment)); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(qwrappedobject_cast<QDependency *>(deployment)); // Adjust opposite property deployment->setLocation(0); @@ -142,12 +142,12 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment) // Overriden methods for subsetted properties -void QDeploymentTarget::addClientDependency(QtMof::QMofPointer<QDeployment> deployment) +void QDeploymentTarget::addClientDependency(QWrappedObjectPointer<QDeployment> deployment) { addDeployment(deployment); } -void QDeploymentTarget::removeClientDependency(QtMof::QMofPointer<QDeployment> deployment) +void QDeploymentTarget::removeClientDependency(QWrappedObjectPointer<QDeployment> deployment) { removeDeployment(deployment); } diff --git a/src/uml/qdeploymenttarget.h b/src/uml/qdeploymenttarget.h index e6c720e6..cbbbbcee 100644 --- a/src/uml/qdeploymenttarget.h +++ b/src/uml/qdeploymenttarget.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -74,7 +75,7 @@ class Q_UML_EXPORT QDeploymentTarget : public QNamedElement Q_DECLARE_PRIVATE(QDeploymentTarget) public: - Q_INVOKABLE explicit QDeploymentTarget(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDeploymentTarget(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDeploymentTarget(); // Association ends from QDeploymentTarget @@ -84,11 +85,11 @@ public: Q_INVOKABLE void removeDeployment(QDeployment *deployment); // Overriden methods for subsetted properties - Q_INVOKABLE void addClientDependency(QtMof::QMofPointer<QDeployment> deployment); - Q_INVOKABLE void removeClientDependency(QtMof::QMofPointer<QDeployment> deployment); + Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QDeployment> deployment); + Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QDeployment> deployment); protected: - explicit QDeploymentTarget(QDeploymentTargetPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDeploymentTarget(QDeploymentTargetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroylinkaction.cpp b/src/uml/qdestroylinkaction.cpp index 239539ba..49af58b7 100644 --- a/src/uml/qdestroylinkaction.cpp +++ b/src/uml/qdestroylinkaction.cpp @@ -64,12 +64,12 @@ QDestroyLinkActionPrivate::~QDestroyLinkActionPrivate() \brief A destroy link action is a write link action that destroys links and link objects. */ -QDestroyLinkAction::QDestroyLinkAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestroyLinkAction::QDestroyLinkAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteLinkAction(*new QDestroyLinkActionPrivate, parent, wrapper) { } -QDestroyLinkAction::QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestroyLinkAction::QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteLinkAction(dd, parent, wrapper) { } @@ -100,7 +100,7 @@ void QDestroyLinkAction::addEndData(QLinkEndDestructionData *endData) Q_D(QDestroyLinkAction); if (!d->endData->contains(endData)) { d->endData->insert(endData); - qmof_topLevelWrapper(endData)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(endData)->setParent(qTopLevelWrapper(this)); } } @@ -111,7 +111,7 @@ void QDestroyLinkAction::removeEndData(QLinkEndDestructionData *endData) Q_D(QDestroyLinkAction); if (d->endData->contains(endData)) { d->endData->remove(endData); - qmof_topLevelWrapper(endData)->setParent(0); + qTopLevelWrapper(endData)->setParent(0); } } diff --git a/src/uml/qdestroylinkaction.h b/src/uml/qdestroylinkaction.h index ea1b4509..df8b6548 100644 --- a/src/uml/qdestroylinkaction.h +++ b/src/uml/qdestroylinkaction.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QDestroyLinkAction : public QWriteLinkAction Q_DECLARE_PRIVATE(QDestroyLinkAction) public: - Q_INVOKABLE explicit QDestroyLinkAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDestroyLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDestroyLinkAction(); // Association ends from QDestroyLinkAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeEndData(QLinkEndDestructionData *endData); protected: - explicit QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroyobjectaction.cpp b/src/uml/qdestroyobjectaction.cpp index 81a40d79..01745731 100644 --- a/src/uml/qdestroyobjectaction.cpp +++ b/src/uml/qdestroyobjectaction.cpp @@ -65,12 +65,12 @@ QDestroyObjectActionPrivate::~QDestroyObjectActionPrivate() \brief A destroy object action is an action that destroys objects. */ -QDestroyObjectAction::QDestroyObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestroyObjectAction::QDestroyObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QDestroyObjectActionPrivate, parent, wrapper) { } -QDestroyObjectAction::QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestroyObjectAction::QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -147,13 +147,13 @@ void QDestroyObjectAction::setTarget(QInputPin *target) Q_D(QDestroyObjectAction); if (d->target != target) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->target)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->target)); d->target = target; // Adjust subsetted property(ies) if (target) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(target)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(target)); } } } diff --git a/src/uml/qdestroyobjectaction.h b/src/uml/qdestroyobjectaction.h index ecf79097..cfe1de16 100644 --- a/src/uml/qdestroyobjectaction.h +++ b/src/uml/qdestroyobjectaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QDestroyObjectAction : public QAction Q_DECLARE_PRIVATE(QDestroyObjectAction) public: - Q_INVOKABLE explicit QDestroyObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDestroyObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDestroyObjectAction(); // Attributes from QDestroyObjectAction @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setTarget(QInputPin *target); protected: - explicit QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestructionoccurrencespecification.cpp b/src/uml/qdestructionoccurrencespecification.cpp index 7d219b22..ef58db3e 100644 --- a/src/uml/qdestructionoccurrencespecification.cpp +++ b/src/uml/qdestructionoccurrencespecification.cpp @@ -60,12 +60,12 @@ QDestructionOccurrenceSpecificationPrivate::~QDestructionOccurrenceSpecification \brief A destruction event models the destruction of an object. */ -QDestructionOccurrenceSpecification::QDestructionOccurrenceSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestructionOccurrenceSpecification::QDestructionOccurrenceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QMessageOccurrenceSpecification(*new QDestructionOccurrenceSpecificationPrivate, parent, wrapper) { } -QDestructionOccurrenceSpecification::QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDestructionOccurrenceSpecification::QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMessageOccurrenceSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qdestructionoccurrencespecification.h b/src/uml/qdestructionoccurrencespecification.h index 8ef3cfb0..7d39a672 100644 --- a/src/uml/qdestructionoccurrencespecification.h +++ b/src/uml/qdestructionoccurrencespecification.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QDestructionOccurrenceSpecification : public QMessageOccurren Q_DECLARE_PRIVATE(QDestructionOccurrenceSpecification) public: - Q_INVOKABLE explicit QDestructionOccurrenceSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDestructionOccurrenceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDestructionOccurrenceSpecification(); protected: - explicit QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdevice.cpp b/src/uml/qdevice.cpp index c18ccb4e..9e3bf300 100644 --- a/src/uml/qdevice.cpp +++ b/src/uml/qdevice.cpp @@ -60,12 +60,12 @@ QDevicePrivate::~QDevicePrivate() \brief A device is a physical computational resource with processing capability upon which artifacts may be deployed for execution. Devices may be complex (i.e., they may consist of other devices). */ -QDevice::QDevice(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDevice::QDevice(QWrappedObject *parent, QWrappedObject *wrapper) : QNode(*new QDevicePrivate, parent, wrapper) { } -QDevice::QDevice(QDevicePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDevice::QDevice(QDevicePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNode(dd, parent, wrapper) { } diff --git a/src/uml/qdevice.h b/src/uml/qdevice.h index 778e98f1..5fb156bc 100644 --- a/src/uml/qdevice.h +++ b/src/uml/qdevice.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QDevice : public QNode Q_DECLARE_PRIVATE(QDevice) public: - Q_INVOKABLE explicit QDevice(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDevice(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDevice(); protected: - explicit QDevice(QDevicePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDevice(QDevicePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdirectedrelationship.cpp b/src/uml/qdirectedrelationship.cpp index a4ebdf18..5f34f3d6 100644 --- a/src/uml/qdirectedrelationship.cpp +++ b/src/uml/qdirectedrelationship.cpp @@ -66,7 +66,7 @@ void QDirectedRelationshipPrivate::addSource(QElement *source) this->sources->insert(source); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qmofobject_cast<QElement *>(source)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(source)); } } @@ -78,7 +78,7 @@ void QDirectedRelationshipPrivate::removeSource(QElement *source) this->sources->remove(source); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qmofobject_cast<QElement *>(source)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(source)); } } @@ -90,7 +90,7 @@ void QDirectedRelationshipPrivate::addTarget(QElement *target) this->targets->insert(target); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qmofobject_cast<QElement *>(target)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(target)); } } @@ -102,7 +102,7 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) this->targets->remove(target); // Adjust subsetted property(ies) - (qmofobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qmofobject_cast<QElement *>(target)); + (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(target)); } } @@ -114,12 +114,12 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) \brief A directed relationship represents a relationship between a collection of source model elements and a collection of target model elements. */ -QDirectedRelationship::QDirectedRelationship(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDirectedRelationship::QDirectedRelationship(QWrappedObject *parent, QWrappedObject *wrapper) : QRelationship(*new QDirectedRelationshipPrivate, parent, wrapper) { } -QDirectedRelationship::QDirectedRelationship(QDirectedRelationshipPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDirectedRelationship::QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRelationship(dd, parent, wrapper) { } diff --git a/src/uml/qdirectedrelationship.h b/src/uml/qdirectedrelationship.h index c93c25c5..260c9f7f 100644 --- a/src/uml/qdirectedrelationship.h +++ b/src/uml/qdirectedrelationship.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QDirectedRelationship : public QRelationship Q_DECLARE_PRIVATE(QDirectedRelationship) public: - Q_INVOKABLE explicit QDirectedRelationship(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDirectedRelationship(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDirectedRelationship(); // Association ends from QDirectedRelationship @@ -79,7 +79,7 @@ public: Q_INVOKABLE const QSet<QElement *> *targets() const; protected: - explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qduration.cpp b/src/uml/qduration.cpp index 27bbf85c..a1f8b4f3 100644 --- a/src/uml/qduration.cpp +++ b/src/uml/qduration.cpp @@ -65,12 +65,12 @@ QDurationPrivate::~QDurationPrivate() \brief Duration defines a value specification that specifies the temporal distance between two time instants. */ -QDuration::QDuration(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDuration::QDuration(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QDurationPrivate, parent, wrapper) { } -QDuration::QDuration(QDurationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDuration::QDuration(QDurationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QDuration::setExpr(QValueSpecification *expr) Q_D(QDuration); if (d->expr != expr) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->expr)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->expr)); d->expr = expr; // Adjust subsetted property(ies) if (expr) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(expr)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(expr)); } } } diff --git a/src/uml/qduration.h b/src/uml/qduration.h index 5e8bdae5..a100b156 100644 --- a/src/uml/qduration.h +++ b/src/uml/qduration.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QDuration : public QValueSpecification Q_DECLARE_PRIVATE(QDuration) public: - Q_INVOKABLE explicit QDuration(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDuration(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDuration(); // Association ends from QDuration @@ -82,7 +82,7 @@ public: Q_INVOKABLE void removeObservation(QObservation *observation); protected: - explicit QDuration(QDurationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDuration(QDurationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationconstraint.cpp b/src/uml/qdurationconstraint.cpp index 5de40d99..3c70a1b5 100644 --- a/src/uml/qdurationconstraint.cpp +++ b/src/uml/qdurationconstraint.cpp @@ -66,12 +66,12 @@ QDurationConstraintPrivate::~QDurationConstraintPrivate() \brief A duration constraint is a constraint that refers to a duration interval. */ -QDurationConstraint::QDurationConstraint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationConstraint::QDurationConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QIntervalConstraint(*new QDurationConstraintPrivate, parent, wrapper) { } -QDurationConstraint::QDurationConstraint(QDurationConstraintPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationConstraint::QDurationConstraint(QDurationConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QIntervalConstraint(dd, parent, wrapper) { } diff --git a/src/uml/qdurationconstraint.h b/src/uml/qdurationconstraint.h index f0c2966c..55531bf9 100644 --- a/src/uml/qdurationconstraint.h +++ b/src/uml/qdurationconstraint.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QDurationConstraint : public QIntervalConstraint Q_DECLARE_PRIVATE(QDurationConstraint) public: - Q_INVOKABLE explicit QDurationConstraint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDurationConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDurationConstraint(); // Attributes from QDurationConstraint @@ -84,7 +84,7 @@ public: Q_INVOKABLE void setSpecification(QDurationInterval *specification); protected: - explicit QDurationConstraint(QDurationConstraintPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDurationConstraint(QDurationConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationinterval.cpp b/src/uml/qdurationinterval.cpp index fef6d447..78d068b1 100644 --- a/src/uml/qdurationinterval.cpp +++ b/src/uml/qdurationinterval.cpp @@ -64,12 +64,12 @@ QDurationIntervalPrivate::~QDurationIntervalPrivate() \brief A duration interval defines the range between two durations. */ -QDurationInterval::QDurationInterval(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationInterval::QDurationInterval(QWrappedObject *parent, QWrappedObject *wrapper) : QInterval(*new QDurationIntervalPrivate, parent, wrapper) { } -QDurationInterval::QDurationInterval(QDurationIntervalPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationInterval::QDurationInterval(QDurationIntervalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInterval(dd, parent, wrapper) { } diff --git a/src/uml/qdurationinterval.h b/src/uml/qdurationinterval.h index 7de8df78..472433e9 100644 --- a/src/uml/qdurationinterval.h +++ b/src/uml/qdurationinterval.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QDurationInterval : public QInterval Q_DECLARE_PRIVATE(QDurationInterval) public: - Q_INVOKABLE explicit QDurationInterval(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDurationInterval(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDurationInterval(); // Association ends from QDurationInterval @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setMin(QDuration *min); protected: - explicit QDurationInterval(QDurationIntervalPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDurationInterval(QDurationIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationobservation.cpp b/src/uml/qdurationobservation.cpp index 02bf32c4..1bfa1504 100644 --- a/src/uml/qdurationobservation.cpp +++ b/src/uml/qdurationobservation.cpp @@ -66,12 +66,12 @@ QDurationObservationPrivate::~QDurationObservationPrivate() \brief A duration observation is a reference to a duration during an execution. It points out the element(s) in the model to observe and whether the observations are when this model element is entered or when it is exited. */ -QDurationObservation::QDurationObservation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationObservation::QDurationObservation(QWrappedObject *parent, QWrappedObject *wrapper) : QObservation(*new QDurationObservationPrivate, parent, wrapper) { } -QDurationObservation::QDurationObservation(QDurationObservationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QDurationObservation::QDurationObservation(QDurationObservationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QObservation(dd, parent, wrapper) { } diff --git a/src/uml/qdurationobservation.h b/src/uml/qdurationobservation.h index 31bebf41..7fe8d94f 100644 --- a/src/uml/qdurationobservation.h +++ b/src/uml/qdurationobservation.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QDurationObservation : public QObservation Q_DECLARE_PRIVATE(QDurationObservation) public: - Q_INVOKABLE explicit QDurationObservation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QDurationObservation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDurationObservation(); // Attributes from QDurationObservation @@ -85,7 +85,7 @@ public: Q_INVOKABLE void removeEvent(QNamedElement *event); protected: - explicit QDurationObservation(QDurationObservationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QDurationObservation(QDurationObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qelement.cpp b/src/uml/qelement.cpp index 16b95053..b1789044 100644 --- a/src/uml/qelement.cpp +++ b/src/uml/qelement.cpp @@ -66,10 +66,10 @@ void QElementPrivate::addOwnedElement(QElement *ownedElement) if (!this->ownedElements->contains(ownedElement)) { this->ownedElements->insert(ownedElement); Q_Q(QElement); - qmof_topLevelWrapper(ownedElement)->setParent(qmof_topLevelWrapper(q)); + qTopLevelWrapper(ownedElement)->setParent(qTopLevelWrapper(q)); // Adjust opposite property - (qmofobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(q); + (qwrappedobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(q); } } @@ -79,10 +79,10 @@ void QElementPrivate::removeOwnedElement(QElement *ownedElement) if (this->ownedElements->contains(ownedElement)) { this->ownedElements->remove(ownedElement); - qmof_topLevelWrapper(ownedElement)->setParent(0); + qTopLevelWrapper(ownedElement)->setParent(0); // Adjust opposite property - (qmofobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(0); + (qwrappedobject_cast<QElementPrivate *>(ownedElement->d_func()))->setOwner(0); } } @@ -94,13 +94,13 @@ void QElementPrivate::setOwner(QElement *owner) Q_Q(QElement); // Adjust opposite property if (this->owner) - (qmofobject_cast<QElementPrivate *>(this->owner->d_func()))->removeOwnedElement(q); + (qwrappedobject_cast<QElementPrivate *>(this->owner->d_func()))->removeOwnedElement(q); this->owner = owner; // Adjust opposite property if (owner) - (qmofobject_cast<QElementPrivate *>(owner->d_func()))->addOwnedElement(q); + (qwrappedobject_cast<QElementPrivate *>(owner->d_func()))->addOwnedElement(q); } } @@ -112,13 +112,13 @@ void QElementPrivate::setOwner(QElement *owner) \brief An element is a constituent of a model. As such, it has the capability of owning other elements. */ -QElement::QElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QElementPrivate, parent, wrapper) +QElement::QElement(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QElementPrivate, parent, wrapper) { } -QElement::QElement(QElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper) +QElement::QElement(QElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper) { } @@ -172,7 +172,7 @@ void QElement::addOwnedComment(QComment *ownedComment) d->ownedComments->insert(ownedComment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedComment)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); } } @@ -185,7 +185,7 @@ void QElement::removeOwnedComment(QComment *ownedComment) d->ownedComments->remove(ownedComment); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(ownedComment)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); } } diff --git a/src/uml/qelement.h b/src/uml/qelement.h index 74812c84..380984cc 100644 --- a/src/uml/qelement.h +++ b/src/uml/qelement.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; // Qt includes #include <QtCore/QSet> @@ -60,7 +61,7 @@ class QComment; class QElementPrivate; -class Q_UML_EXPORT QElement : public QtMof::QMofObject +class Q_UML_EXPORT QElement : public QWrappedObject { Q_OBJECT @@ -72,7 +73,7 @@ class Q_UML_EXPORT QElement : public QtMof::QMofObject Q_DECLARE_PRIVATE(QElement) public: - Q_INVOKABLE explicit QElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QElement(); // Association ends from QElement @@ -87,7 +88,7 @@ public: Q_INVOKABLE bool mustBeOwned() const; protected: - explicit QElement(QElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QElement(QElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: void allOwnedElements(QSet<QElement *> *allOwnedElements_) const; diff --git a/src/uml/qelement_p.h b/src/uml/qelement_p.h index 49be8415..0de2591e 100644 --- a/src/uml/qelement_p.h +++ b/src/uml/qelement_p.h @@ -42,7 +42,8 @@ #define QTUML_QELEMENT_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "QtUml/QElement" @@ -59,7 +60,7 @@ QT_MODULE(QtUml) class QComment; class QElement; -class Q_UML_EXPORT QElementPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QElementPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QElement) diff --git a/src/uml/qelementimport.cpp b/src/uml/qelementimport.cpp index 9044505e..ed09a6c1 100644 --- a/src/uml/qelementimport.cpp +++ b/src/uml/qelementimport.cpp @@ -66,12 +66,12 @@ QElementImportPrivate::~QElementImportPrivate() \brief An element import identifies an element in another package, and allows the element to be referenced using its name without a qualifier. */ -QElementImport::QElementImport(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QElementImport::QElementImport(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QElementImportPrivate, parent, wrapper) { } -QElementImport::QElementImport(QElementImportPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QElementImport::QElementImport(QElementImportPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -148,13 +148,13 @@ void QElementImport::setImportedElement(QPackageableElement *importedElement) Q_D(QElementImport); if (d->importedElement != importedElement) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->importedElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->importedElement)); d->importedElement = importedElement; // Adjust subsetted property(ies) if (importedElement) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(importedElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(importedElement)); } } } @@ -181,14 +181,14 @@ void QElementImport::setImportingNamespace(QNamespace *importingNamespace) d->importingNamespace->removeElementImport(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->importingNamespace)); d->importingNamespace = importingNamespace; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(importingNamespace)); if (importingNamespace) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(importingNamespace)); } // Adjust opposite property diff --git a/src/uml/qelementimport.h b/src/uml/qelementimport.h index 6d986116..66c12198 100644 --- a/src/uml/qelementimport.h +++ b/src/uml/qelementimport.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QElementImport : public QDirectedRelationship Q_DECLARE_PRIVATE(QElementImport) public: - Q_INVOKABLE explicit QElementImport(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QElementImport(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QElementImport(); // Attributes from QElementImport @@ -96,7 +96,7 @@ public: Q_INVOKABLE QString getName() const; protected: - explicit QElementImport(QElementImportPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qencapsulatedclassifier.cpp b/src/uml/qencapsulatedclassifier.cpp index 43d8b86b..2b934627 100644 --- a/src/uml/qencapsulatedclassifier.cpp +++ b/src/uml/qencapsulatedclassifier.cpp @@ -62,12 +62,12 @@ QEncapsulatedClassifierPrivate::~QEncapsulatedClassifierPrivate() \brief A classifier has the ability to own ports as specific and type checked interaction points. */ -QEncapsulatedClassifier::QEncapsulatedClassifier(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEncapsulatedClassifier::QEncapsulatedClassifier(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredClassifier(*new QEncapsulatedClassifierPrivate, parent, wrapper) { } -QEncapsulatedClassifier::QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEncapsulatedClassifier::QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredClassifier(dd, parent, wrapper) { } diff --git a/src/uml/qencapsulatedclassifier.h b/src/uml/qencapsulatedclassifier.h index 574b6e13..2d6809ca 100644 --- a/src/uml/qencapsulatedclassifier.h +++ b/src/uml/qencapsulatedclassifier.h @@ -70,14 +70,14 @@ class Q_UML_EXPORT QEncapsulatedClassifier : public QStructuredClassifier Q_DECLARE_PRIVATE(QEncapsulatedClassifier) public: - Q_INVOKABLE explicit QEncapsulatedClassifier(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEncapsulatedClassifier(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEncapsulatedClassifier(); // Association ends from QEncapsulatedClassifier Q_INVOKABLE const QSet<QPort *> *ownedPorts() const; protected: - explicit QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qenumeration.cpp b/src/uml/qenumeration.cpp index e70846d3..dca59e81 100644 --- a/src/uml/qenumeration.cpp +++ b/src/uml/qenumeration.cpp @@ -64,12 +64,12 @@ QEnumerationPrivate::~QEnumerationPrivate() \brief An enumeration is a data type whose values are enumerated in the model as enumeration literals. */ -QEnumeration::QEnumeration(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEnumeration::QEnumeration(QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(*new QEnumerationPrivate, parent, wrapper) { } -QEnumeration::QEnumeration(QEnumerationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEnumeration::QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(dd, parent, wrapper) { } @@ -102,7 +102,7 @@ void QEnumeration::addOwnedLiteral(QEnumerationLiteral *ownedLiteral) d->ownedLiterals->append(ownedLiteral); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedLiteral)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); // Adjust opposite property ownedLiteral->setEnumeration(this); @@ -118,7 +118,7 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) d->ownedLiterals->removeAll(ownedLiteral); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedLiteral)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); // Adjust opposite property ownedLiteral->setEnumeration(0); diff --git a/src/uml/qenumeration.h b/src/uml/qenumeration.h index a296cb99..89d45697 100644 --- a/src/uml/qenumeration.h +++ b/src/uml/qenumeration.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QEnumeration : public QDataType Q_DECLARE_PRIVATE(QEnumeration) public: - Q_INVOKABLE explicit QEnumeration(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEnumeration(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEnumeration(); // Association ends from QEnumeration @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral); protected: - explicit QEnumeration(QEnumerationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qenumerationliteral.cpp b/src/uml/qenumerationliteral.cpp index fbbfffd4..8321fcdf 100644 --- a/src/uml/qenumerationliteral.cpp +++ b/src/uml/qenumerationliteral.cpp @@ -63,12 +63,12 @@ QEnumerationLiteralPrivate::~QEnumerationLiteralPrivate() \brief An enumeration literal is a user-defined data value for an enumeration. */ -QEnumerationLiteral::QEnumerationLiteral(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEnumerationLiteral::QEnumerationLiteral(QWrappedObject *parent, QWrappedObject *wrapper) : QInstanceSpecification(*new QEnumerationLiteralPrivate, parent, wrapper) { } -QEnumerationLiteral::QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEnumerationLiteral::QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInstanceSpecification(dd, parent, wrapper) { } @@ -117,7 +117,7 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) d->enumeration = enumeration; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(enumeration)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(enumeration)); // Adjust opposite property if (enumeration) diff --git a/src/uml/qenumerationliteral.h b/src/uml/qenumerationliteral.h index 3872cf71..39e18f05 100644 --- a/src/uml/qenumerationliteral.h +++ b/src/uml/qenumerationliteral.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QEnumerationLiteral : public QInstanceSpecification Q_DECLARE_PRIVATE(QEnumerationLiteral) public: - Q_INVOKABLE explicit QEnumerationLiteral(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEnumerationLiteral(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEnumerationLiteral(); // Association ends from QEnumerationLiteral @@ -77,7 +77,7 @@ public: Q_INVOKABLE void setEnumeration(QEnumeration *enumeration); protected: - explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qevent.cpp b/src/uml/qevent.cpp index c7ca850b..5cd6fc99 100644 --- a/src/uml/qevent.cpp +++ b/src/uml/qevent.cpp @@ -60,12 +60,12 @@ QEventPrivate::~QEventPrivate() \brief An event is the specification of some occurrence that may potentially trigger effects by an object. */ -QEvent::QEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEvent::QEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QEventPrivate, parent, wrapper) { } -QEvent::QEvent(QEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QEvent::QEvent(QEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } diff --git a/src/uml/qevent.h b/src/uml/qevent.h index b00b35cb..7b81b23e 100644 --- a/src/uml/qevent.h +++ b/src/uml/qevent.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QEvent : public QPackageableElement Q_DECLARE_PRIVATE(QEvent) public: - Q_INVOKABLE explicit QEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEvent(); protected: - explicit QEvent(QEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QEvent(QEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexceptionhandler.cpp b/src/uml/qexceptionhandler.cpp index 2ab4fdb2..f8d1dcc4 100644 --- a/src/uml/qexceptionhandler.cpp +++ b/src/uml/qexceptionhandler.cpp @@ -69,12 +69,12 @@ QExceptionHandlerPrivate::~QExceptionHandlerPrivate() \brief An exception handler is an element that specifies a body to execute in case the specified exception occurs during the execution of the protected node. */ -QExceptionHandler::QExceptionHandler(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExceptionHandler::QExceptionHandler(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QExceptionHandlerPrivate, parent, wrapper) { } -QExceptionHandler::QExceptionHandler(QExceptionHandlerPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExceptionHandler::QExceptionHandler(QExceptionHandlerPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -163,7 +163,7 @@ void QExceptionHandler::setProtectedNode(QExecutableNode *protectedNode) d->protectedNode = protectedNode; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(protectedNode)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(protectedNode)); // Adjust opposite property if (protectedNode) diff --git a/src/uml/qexceptionhandler.h b/src/uml/qexceptionhandler.h index b42afcef..62340273 100644 --- a/src/uml/qexceptionhandler.h +++ b/src/uml/qexceptionhandler.h @@ -75,7 +75,7 @@ class Q_UML_EXPORT QExceptionHandler : public QElement Q_DECLARE_PRIVATE(QExceptionHandler) public: - Q_INVOKABLE explicit QExceptionHandler(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExceptionHandler(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExceptionHandler(); // Association ends from QExceptionHandler @@ -90,7 +90,7 @@ public: Q_INVOKABLE void setExceptionInput(QObjectNode *exceptionInput); protected: - explicit QExceptionHandler(QExceptionHandlerPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExceptionHandler(QExceptionHandlerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutablenode.cpp b/src/uml/qexecutablenode.cpp index 3defe39c..70037164 100644 --- a/src/uml/qexecutablenode.cpp +++ b/src/uml/qexecutablenode.cpp @@ -64,12 +64,12 @@ QExecutableNodePrivate::~QExecutableNodePrivate() \brief An executable node is an abstract class for activity nodes that may be executed. It is used as an attachment point for exception handlers.An executable node is an abstract class for activity nodes that may be executed. It is used as an attachment point for exception handlers. */ -QExecutableNode::QExecutableNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutableNode::QExecutableNode(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityNode(*new QExecutableNodePrivate, parent, wrapper) { } -QExecutableNode::QExecutableNode(QExecutableNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutableNode::QExecutableNode(QExecutableNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityNode(dd, parent, wrapper) { } @@ -102,7 +102,7 @@ void QExecutableNode::addHandler(QExceptionHandler *handler) d->handlers->insert(handler); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(handler)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(handler)); // Adjust opposite property handler->setProtectedNode(this); @@ -118,7 +118,7 @@ void QExecutableNode::removeHandler(QExceptionHandler *handler) d->handlers->remove(handler); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(handler)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(handler)); // Adjust opposite property handler->setProtectedNode(0); diff --git a/src/uml/qexecutablenode.h b/src/uml/qexecutablenode.h index 140416e9..899b9a4b 100644 --- a/src/uml/qexecutablenode.h +++ b/src/uml/qexecutablenode.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QExecutableNode : public QActivityNode Q_DECLARE_PRIVATE(QExecutableNode) public: - Q_INVOKABLE explicit QExecutableNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExecutableNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExecutableNode(); // Association ends from QExecutableNode @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeHandler(QExceptionHandler *handler); protected: - explicit QExecutableNode(QExecutableNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExecutableNode(QExecutableNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionenvironment.cpp b/src/uml/qexecutionenvironment.cpp index cc364062..eba3013b 100644 --- a/src/uml/qexecutionenvironment.cpp +++ b/src/uml/qexecutionenvironment.cpp @@ -60,12 +60,12 @@ QExecutionEnvironmentPrivate::~QExecutionEnvironmentPrivate() \brief An execution environment is a node that offers an execution environment for specific types of components that are deployed on it in the form of executable artifacts. */ -QExecutionEnvironment::QExecutionEnvironment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionEnvironment::QExecutionEnvironment(QWrappedObject *parent, QWrappedObject *wrapper) : QNode(*new QExecutionEnvironmentPrivate, parent, wrapper) { } -QExecutionEnvironment::QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionEnvironment::QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNode(dd, parent, wrapper) { } diff --git a/src/uml/qexecutionenvironment.h b/src/uml/qexecutionenvironment.h index 0f381344..79559c48 100644 --- a/src/uml/qexecutionenvironment.h +++ b/src/uml/qexecutionenvironment.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QExecutionEnvironment : public QNode Q_DECLARE_PRIVATE(QExecutionEnvironment) public: - Q_INVOKABLE explicit QExecutionEnvironment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExecutionEnvironment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExecutionEnvironment(); protected: - explicit QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionoccurrencespecification.cpp b/src/uml/qexecutionoccurrencespecification.cpp index ed061f2e..9d1b7c77 100644 --- a/src/uml/qexecutionoccurrencespecification.cpp +++ b/src/uml/qexecutionoccurrencespecification.cpp @@ -63,12 +63,12 @@ QExecutionOccurrenceSpecificationPrivate::~QExecutionOccurrenceSpecificationPriv \brief An execution occurrence specification represents moments in time at which actions or behaviors start or finish. */ -QExecutionOccurrenceSpecification::QExecutionOccurrenceSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionOccurrenceSpecification::QExecutionOccurrenceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QOccurrenceSpecification(*new QExecutionOccurrenceSpecificationPrivate, parent, wrapper) { } -QExecutionOccurrenceSpecification::QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionOccurrenceSpecification::QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QOccurrenceSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qexecutionoccurrencespecification.h b/src/uml/qexecutionoccurrencespecification.h index 1c0abe6f..4e3f21d9 100644 --- a/src/uml/qexecutionoccurrencespecification.h +++ b/src/uml/qexecutionoccurrencespecification.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QExecutionOccurrenceSpecification : public QOccurrenceSpecifi Q_DECLARE_PRIVATE(QExecutionOccurrenceSpecification) public: - Q_INVOKABLE explicit QExecutionOccurrenceSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExecutionOccurrenceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExecutionOccurrenceSpecification(); // Association ends from QExecutionOccurrenceSpecification @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setExecution(QExecutionSpecification *execution); protected: - explicit QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionspecification.cpp b/src/uml/qexecutionspecification.cpp index 9819577c..c9f8574e 100644 --- a/src/uml/qexecutionspecification.cpp +++ b/src/uml/qexecutionspecification.cpp @@ -64,12 +64,12 @@ QExecutionSpecificationPrivate::~QExecutionSpecificationPrivate() \brief An execution specification is a specification of the execution of a unit of behavior or action within the lifeline. The duration of an execution specification is represented by two cccurrence specifications, the start occurrence specification and the finish occurrence specification. */ -QExecutionSpecification::QExecutionSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionSpecification::QExecutionSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QExecutionSpecificationPrivate, parent, wrapper) { } -QExecutionSpecification::QExecutionSpecification(QExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExecutionSpecification::QExecutionSpecification(QExecutionSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } diff --git a/src/uml/qexecutionspecification.h b/src/uml/qexecutionspecification.h index b49757e0..2baa3456 100644 --- a/src/uml/qexecutionspecification.h +++ b/src/uml/qexecutionspecification.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QExecutionSpecification : public QInteractionFragment Q_DECLARE_PRIVATE(QExecutionSpecification) public: - Q_INVOKABLE explicit QExecutionSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExecutionSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExecutionSpecification(); // Association ends from QExecutionSpecification @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setFinish(QOccurrenceSpecification *finish); protected: - explicit QExecutionSpecification(QExecutionSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExecutionSpecification(QExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpansionnode.cpp b/src/uml/qexpansionnode.cpp index 74d3fcd9..88f69d7f 100644 --- a/src/uml/qexpansionnode.cpp +++ b/src/uml/qexpansionnode.cpp @@ -64,12 +64,12 @@ QExpansionNodePrivate::~QExpansionNodePrivate() \brief An expansion node is an object node used to indicate a flow across the boundary of an expansion region. A flow into a region contains a collection that is broken into its individual elements inside the region, which is executed once per element. A flow out of a region combines individual elements into a collection for use outside the region. */ -QExpansionNode::QExpansionNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpansionNode::QExpansionNode(QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(*new QExpansionNodePrivate, parent, wrapper) { } -QExpansionNode::QExpansionNode(QExpansionNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpansionNode::QExpansionNode(QExpansionNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QObjectNode(dd, parent, wrapper) { } diff --git a/src/uml/qexpansionnode.h b/src/uml/qexpansionnode.h index e560b4b4..d5e8ee85 100644 --- a/src/uml/qexpansionnode.h +++ b/src/uml/qexpansionnode.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QExpansionNode : public QObjectNode Q_DECLARE_PRIVATE(QExpansionNode) public: - Q_INVOKABLE explicit QExpansionNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExpansionNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExpansionNode(); // Association ends from QExpansionNode @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setRegionAsInput(QExpansionRegion *regionAsInput); protected: - explicit QExpansionNode(QExpansionNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExpansionNode(QExpansionNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpansionregion.cpp b/src/uml/qexpansionregion.cpp index aafcde62..c66b1f8e 100644 --- a/src/uml/qexpansionregion.cpp +++ b/src/uml/qexpansionregion.cpp @@ -67,12 +67,12 @@ QExpansionRegionPrivate::~QExpansionRegionPrivate() \brief An expansion region is a structured activity region that executes multiple times corresponding to elements of an input collection. */ -QExpansionRegion::QExpansionRegion(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpansionRegion::QExpansionRegion(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(*new QExpansionRegionPrivate, parent, wrapper) { } -QExpansionRegion::QExpansionRegion(QExpansionRegionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpansionRegion::QExpansionRegion(QExpansionRegionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(dd, parent, wrapper) { } diff --git a/src/uml/qexpansionregion.h b/src/uml/qexpansionregion.h index 4f276181..aefd2974 100644 --- a/src/uml/qexpansionregion.h +++ b/src/uml/qexpansionregion.h @@ -75,7 +75,7 @@ class Q_UML_EXPORT QExpansionRegion : public QStructuredActivityNode Q_DECLARE_PRIVATE(QExpansionRegion) public: - Q_INVOKABLE explicit QExpansionRegion(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExpansionRegion(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExpansionRegion(); // Attributes from QExpansionRegion @@ -91,7 +91,7 @@ public: Q_INVOKABLE void removeOutputElement(QExpansionNode *outputElement); protected: - explicit QExpansionRegion(QExpansionRegionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExpansionRegion(QExpansionRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpression.cpp b/src/uml/qexpression.cpp index ec926b01..5812da7c 100644 --- a/src/uml/qexpression.cpp +++ b/src/uml/qexpression.cpp @@ -62,12 +62,12 @@ QExpressionPrivate::~QExpressionPrivate() \brief An expression is a structured tree of symbols that denotes a (possibly empty) set of values when evaluated in a context.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. */ -QExpression::QExpression(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpression::QExpression(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QExpressionPrivate, parent, wrapper) { } -QExpression::QExpression(QExpressionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExpression::QExpression(QExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } @@ -125,7 +125,7 @@ void QExpression::addOperand(QValueSpecification *operand) d->operands->append(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } @@ -138,7 +138,7 @@ void QExpression::removeOperand(QValueSpecification *operand) d->operands->removeAll(operand); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(operand)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } diff --git a/src/uml/qexpression.h b/src/uml/qexpression.h index d037c72f..a6451a7e 100644 --- a/src/uml/qexpression.h +++ b/src/uml/qexpression.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QExpression : public QValueSpecification Q_DECLARE_PRIVATE(QExpression) public: - Q_INVOKABLE explicit QExpression(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExpression(); // Attributes from QExpression @@ -82,7 +82,7 @@ public: Q_INVOKABLE void removeOperand(QValueSpecification *operand); protected: - explicit QExpression(QExpressionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExpression(QExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextend.cpp b/src/uml/qextend.cpp index f6dd0a1d..329b2458 100644 --- a/src/uml/qextend.cpp +++ b/src/uml/qextend.cpp @@ -69,15 +69,15 @@ QExtendPrivate::~QExtendPrivate() \brief A relationship from an extending use case to an extended use case that specifies how and when the behavior defined in the extending use case can be inserted into the behavior defined in the extended use case. */ -QExtend::QExtend(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QExtendPrivate, parent, wrapper), +QExtend::QExtend(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QExtendPrivate, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { } -QExtend::QExtend(QExtendPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QExtend::QExtend(QExtendPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { @@ -96,7 +96,7 @@ QExtend::~QExtend() */ const QSet<QElement *> *QExtend::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -104,7 +104,7 @@ const QSet<QElement *> *QExtend::ownedElements() const */ QElement *QExtend::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -112,17 +112,17 @@ QElement *QExtend::owner() const */ const QSet<QComment *> *QExtend::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QExtend::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QExtend::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -134,7 +134,7 @@ void QExtend::removeOwnedComment(QComment *ownedComment) */ const QSet<QElement *> *QExtend::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -146,7 +146,7 @@ const QSet<QElement *> *QExtend::relatedElements() const */ const QSet<QElement *> *QExtend::sources() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->sources(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } /*! @@ -154,7 +154,7 @@ const QSet<QElement *> *QExtend::sources() const */ const QSet<QElement *> *QExtend::targets() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->targets(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } // --------------------------------------------------------------- @@ -166,12 +166,12 @@ const QSet<QElement *> *QExtend::targets() const */ QString QExtend::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QExtend::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -179,12 +179,12 @@ void QExtend::setName(QString name) */ QtUml::VisibilityKind QExtend::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QExtend::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -192,7 +192,7 @@ void QExtend::setVisibility(QtUml::VisibilityKind visibility) */ QString QExtend::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -204,12 +204,12 @@ QString QExtend::qualifiedName() const */ QStringExpression *QExtend::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QExtend::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -217,7 +217,7 @@ void QExtend::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QExtend::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -225,17 +225,17 @@ QNamespace *QExtend::namespace_() const */ const QSet<QDependency *> *QExtend::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QExtend::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QExtend::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -260,13 +260,13 @@ void QExtend::setExtendedCase(QUseCase *extendedCase) Q_D(QExtend); if (d->extendedCase != extendedCase) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->extendedCase)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->extendedCase)); d->extendedCase = extendedCase; // Adjust subsetted property(ies) if (extendedCase) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(extendedCase)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(extendedCase)); } } } @@ -293,15 +293,15 @@ void QExtend::setExtension(QUseCase *extension) d->extension->removeExtend(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->extension)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->extension)); d->extension = extension; // Adjust subsetted property(ies) if (extension) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(extension)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(extension)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(extension)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(extension)); // Adjust opposite property if (extension) @@ -358,13 +358,13 @@ void QExtend::setCondition(QConstraint *condition) Q_D(QExtend); if (d->condition != condition) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->condition)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->condition)); d->condition = condition; // Adjust subsetted property(ies) if (condition) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(condition)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(condition)); } } } diff --git a/src/uml/qextend.h b/src/uml/qextend.h index f0f716b0..f59e5a7a 100644 --- a/src/uml/qextend.h +++ b/src/uml/qextend.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QDirectedRelationship> #include <QtUml/QNamedElement> @@ -64,7 +65,7 @@ class QExtensionPoint; class QExtendPrivate; -class Q_UML_EXPORT QExtend : public QtMof::QMofObject +class Q_UML_EXPORT QExtend : public QWrappedObject { Q_OBJECT @@ -77,7 +78,7 @@ class Q_UML_EXPORT QExtend : public QtMof::QMofObject Q_DECLARE_PRIVATE(QExtend) public: - Q_INVOKABLE explicit QExtend(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExtend(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExtend(); // Association ends from aggregated QElement @@ -121,7 +122,7 @@ public: Q_INVOKABLE void setCondition(QConstraint *condition); protected: - explicit QExtend(QExtendPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExtend(QExtendPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QDirectedRelationship *_wrappedDirectedRelationship; diff --git a/src/uml/qextend_p.h b/src/uml/qextend_p.h index 4a7925c1..d9d05000 100644 --- a/src/uml/qextend_p.h +++ b/src/uml/qextend_p.h @@ -42,7 +42,8 @@ #define QTUML_QEXTEND_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qdirectedrelationship_p.h" #include "private/qnamedelement_p.h" @@ -63,7 +64,7 @@ class QUseCase; class QExtensionPoint; class QExtend; -class Q_UML_EXPORT QExtendPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QExtendPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QExtend) diff --git a/src/uml/qextension.cpp b/src/uml/qextension.cpp index 1278a91a..cef60311 100644 --- a/src/uml/qextension.cpp +++ b/src/uml/qextension.cpp @@ -71,13 +71,13 @@ void QExtensionPrivate::setMetaclass(QClass *metaclass) Q_Q(QExtension); // Adjust opposite property // if (this->metaclass) - // (qmofobject_cast<QClassPrivate *>(this->metaclass->d_func()))->removeExtension(q); + // (qwrappedobject_cast<QClassPrivate *>(this->metaclass->d_func()))->removeExtension(q); // <derived-code> // Adjust opposite property if (metaclass) - (qmofobject_cast<QClassPrivate *>(metaclass->d_func()))->addExtension(q); + (qwrappedobject_cast<QClassPrivate *>(metaclass->d_func()))->addExtension(q); } } @@ -89,12 +89,12 @@ void QExtensionPrivate::setMetaclass(QClass *metaclass) \brief An extension is used to indicate that the properties of a metaclass are extended through a stereotype, and gives the ability to flexibly add (and later remove) stereotypes to classes. */ -QExtension::QExtension(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtension::QExtension(QWrappedObject *parent, QWrappedObject *wrapper) : QAssociation(*new QExtensionPrivate, parent, wrapper) { } -QExtension::QExtension(QExtensionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtension::QExtension(QExtensionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAssociation(dd, parent, wrapper) { } diff --git a/src/uml/qextension.h b/src/uml/qextension.h index 27a94962..07cddbb9 100644 --- a/src/uml/qextension.h +++ b/src/uml/qextension.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QExtension : public QAssociation Q_DECLARE_PRIVATE(QExtension) public: - Q_INVOKABLE explicit QExtension(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExtension(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExtension(); // Attributes from QExtension @@ -89,7 +89,7 @@ public: friend class QClassPrivate; protected: - explicit QExtension(QExtensionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExtension(QExtensionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextensionend.cpp b/src/uml/qextensionend.cpp index e4bf0764..f1893f40 100644 --- a/src/uml/qextensionend.cpp +++ b/src/uml/qextensionend.cpp @@ -63,12 +63,12 @@ QExtensionEndPrivate::~QExtensionEndPrivate() \brief An extension end is used to tie an extension to a stereotype when extending a metaclass.The default multiplicity of an extension end is 0..1. */ -QExtensionEnd::QExtensionEnd(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtensionEnd::QExtensionEnd(QWrappedObject *parent, QWrappedObject *wrapper) : QProperty(*new QExtensionEndPrivate, parent, wrapper) { } -QExtensionEnd::QExtensionEnd(QExtensionEndPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtensionEnd::QExtensionEnd(QExtensionEndPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QProperty(dd, parent, wrapper) { } diff --git a/src/uml/qextensionend.h b/src/uml/qextensionend.h index 244c57b1..9209aa89 100644 --- a/src/uml/qextensionend.h +++ b/src/uml/qextensionend.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QExtensionEnd : public QProperty Q_DECLARE_PRIVATE(QExtensionEnd) public: - Q_INVOKABLE explicit QExtensionEnd(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExtensionEnd(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExtensionEnd(); // Attributes from QExtensionEnd @@ -83,7 +83,7 @@ public: Q_INVOKABLE qint32 lowerBound() const; protected: - explicit QExtensionEnd(QExtensionEndPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExtensionEnd(QExtensionEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextensionpoint.cpp b/src/uml/qextensionpoint.cpp index d29852ae..73978570 100644 --- a/src/uml/qextensionpoint.cpp +++ b/src/uml/qextensionpoint.cpp @@ -63,12 +63,12 @@ QExtensionPointPrivate::~QExtensionPointPrivate() \brief An extension point identifies a point in the behavior of a use case where that behavior can be extended by the behavior of some other (extending) use case, as specified by an extend relationship. */ -QExtensionPoint::QExtensionPoint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtensionPoint::QExtensionPoint(QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(*new QExtensionPointPrivate, parent, wrapper) { } -QExtensionPoint::QExtensionPoint(QExtensionPointPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QExtensionPoint::QExtensionPoint(QExtensionPointPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(dd, parent, wrapper) { } @@ -105,7 +105,7 @@ void QExtensionPoint::setUseCase(QUseCase *useCase) d->useCase = useCase; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(useCase)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(useCase)); // Adjust opposite property if (useCase) diff --git a/src/uml/qextensionpoint.h b/src/uml/qextensionpoint.h index afb07062..a31826bd 100644 --- a/src/uml/qextensionpoint.h +++ b/src/uml/qextensionpoint.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QExtensionPoint : public QRedefinableElement Q_DECLARE_PRIVATE(QExtensionPoint) public: - Q_INVOKABLE explicit QExtensionPoint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QExtensionPoint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExtensionPoint(); // Association ends from QExtensionPoint @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setUseCase(QUseCase *useCase); protected: - explicit QExtensionPoint(QExtensionPointPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QExtensionPoint(QExtensionPointPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfeature.cpp b/src/uml/qfeature.cpp index 3853d15e..7e503d52 100644 --- a/src/uml/qfeature.cpp +++ b/src/uml/qfeature.cpp @@ -68,7 +68,7 @@ void QFeaturePrivate::addFeaturingClassifier(QClassifier *featuringClassifier) // Adjust opposite property Q_Q(QFeature); - (qmofobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->addFeature(q); + (qwrappedobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->addFeature(q); } } @@ -82,7 +82,7 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier // Adjust opposite property Q_Q(QFeature); if (featuringClassifier) - (qmofobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->removeFeature(q); + (qwrappedobject_cast<QClassifierPrivate *>(featuringClassifier->d_func()))->removeFeature(q); } } @@ -94,12 +94,12 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier \brief A feature declares a behavioral or structural characteristic of instances of classifiers. */ -QFeature::QFeature(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFeature::QFeature(QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(*new QFeaturePrivate, parent, wrapper) { } -QFeature::QFeature(QFeaturePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFeature::QFeature(QFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRedefinableElement(dd, parent, wrapper) { } diff --git a/src/uml/qfeature.h b/src/uml/qfeature.h index 9baefb5f..85f746f9 100644 --- a/src/uml/qfeature.h +++ b/src/uml/qfeature.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QFeature : public QRedefinableElement Q_DECLARE_PRIVATE(QFeature) public: - Q_INVOKABLE explicit QFeature(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFeature(); // Attributes from QFeature @@ -85,7 +85,7 @@ public: friend class QClassifierPrivate; protected: - explicit QFeature(QFeaturePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QFeature(QFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfinalnode.cpp b/src/uml/qfinalnode.cpp index 8cbb49c6..fce1129e 100644 --- a/src/uml/qfinalnode.cpp +++ b/src/uml/qfinalnode.cpp @@ -60,12 +60,12 @@ QFinalNodePrivate::~QFinalNodePrivate() \brief A final node is an abstract control node at which a flow in an activity stops. */ -QFinalNode::QFinalNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFinalNode::QFinalNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QFinalNodePrivate, parent, wrapper) { } -QFinalNode::QFinalNode(QFinalNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFinalNode::QFinalNode(QFinalNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } diff --git a/src/uml/qfinalnode.h b/src/uml/qfinalnode.h index a487a02e..8f18dd3a 100644 --- a/src/uml/qfinalnode.h +++ b/src/uml/qfinalnode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QFinalNode : public QControlNode Q_DECLARE_PRIVATE(QFinalNode) public: - Q_INVOKABLE explicit QFinalNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFinalNode(); protected: - explicit QFinalNode(QFinalNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QFinalNode(QFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfinalstate.cpp b/src/uml/qfinalstate.cpp index b62dffc0..9c47c6f6 100644 --- a/src/uml/qfinalstate.cpp +++ b/src/uml/qfinalstate.cpp @@ -60,12 +60,12 @@ QFinalStatePrivate::~QFinalStatePrivate() \brief A special kind of state signifying that the enclosing region is completed. If the enclosing region is directly contained in a state machine and all other regions in the state machine also are completed, then it means that the entire state machine is completed. */ -QFinalState::QFinalState(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFinalState::QFinalState(QWrappedObject *parent, QWrappedObject *wrapper) : QState(*new QFinalStatePrivate, parent, wrapper) { } -QFinalState::QFinalState(QFinalStatePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFinalState::QFinalState(QFinalStatePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QState(dd, parent, wrapper) { } diff --git a/src/uml/qfinalstate.h b/src/uml/qfinalstate.h index 15724022..86f11603 100644 --- a/src/uml/qfinalstate.h +++ b/src/uml/qfinalstate.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QFinalState : public QState Q_DECLARE_PRIVATE(QFinalState) public: - Q_INVOKABLE explicit QFinalState(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFinalState(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFinalState(); protected: - explicit QFinalState(QFinalStatePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QFinalState(QFinalStatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qflowfinalnode.cpp b/src/uml/qflowfinalnode.cpp index ca1a14e1..1ee4b1f1 100644 --- a/src/uml/qflowfinalnode.cpp +++ b/src/uml/qflowfinalnode.cpp @@ -60,12 +60,12 @@ QFlowFinalNodePrivate::~QFlowFinalNodePrivate() \brief A flow final node is a final node that terminates a flow. */ -QFlowFinalNode::QFlowFinalNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFlowFinalNode::QFlowFinalNode(QWrappedObject *parent, QWrappedObject *wrapper) : QFinalNode(*new QFlowFinalNodePrivate, parent, wrapper) { } -QFlowFinalNode::QFlowFinalNode(QFlowFinalNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFlowFinalNode::QFlowFinalNode(QFlowFinalNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QFinalNode(dd, parent, wrapper) { } diff --git a/src/uml/qflowfinalnode.h b/src/uml/qflowfinalnode.h index 5eca110a..20ebcaee 100644 --- a/src/uml/qflowfinalnode.h +++ b/src/uml/qflowfinalnode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QFlowFinalNode : public QFinalNode Q_DECLARE_PRIVATE(QFlowFinalNode) public: - Q_INVOKABLE explicit QFlowFinalNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFlowFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFlowFinalNode(); protected: - explicit QFlowFinalNode(QFlowFinalNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QFlowFinalNode(QFlowFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qforknode.cpp b/src/uml/qforknode.cpp index 909ea772..8f69d485 100644 --- a/src/uml/qforknode.cpp +++ b/src/uml/qforknode.cpp @@ -60,12 +60,12 @@ QForkNodePrivate::~QForkNodePrivate() \brief A fork node is a control node that splits a flow into multiple concurrent flows. */ -QForkNode::QForkNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QForkNode::QForkNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QForkNodePrivate, parent, wrapper) { } -QForkNode::QForkNode(QForkNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QForkNode::QForkNode(QForkNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } diff --git a/src/uml/qforknode.h b/src/uml/qforknode.h index 7b6e0268..b122999c 100644 --- a/src/uml/qforknode.h +++ b/src/uml/qforknode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QForkNode : public QControlNode Q_DECLARE_PRIVATE(QForkNode) public: - Q_INVOKABLE explicit QForkNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QForkNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QForkNode(); protected: - explicit QForkNode(QForkNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QForkNode(QForkNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfunctionbehavior.cpp b/src/uml/qfunctionbehavior.cpp index 2187a860..6c00125a 100644 --- a/src/uml/qfunctionbehavior.cpp +++ b/src/uml/qfunctionbehavior.cpp @@ -60,12 +60,12 @@ QFunctionBehaviorPrivate::~QFunctionBehaviorPrivate() \brief A function behavior is an opaque behavior that does not access or modify any objects or other external data. */ -QFunctionBehavior::QFunctionBehavior(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFunctionBehavior::QFunctionBehavior(QWrappedObject *parent, QWrappedObject *wrapper) : QOpaqueBehavior(*new QFunctionBehaviorPrivate, parent, wrapper) { } -QFunctionBehavior::QFunctionBehavior(QFunctionBehaviorPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QFunctionBehavior::QFunctionBehavior(QFunctionBehaviorPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QOpaqueBehavior(dd, parent, wrapper) { } diff --git a/src/uml/qfunctionbehavior.h b/src/uml/qfunctionbehavior.h index 5c251570..0daa0284 100644 --- a/src/uml/qfunctionbehavior.h +++ b/src/uml/qfunctionbehavior.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QFunctionBehavior : public QOpaqueBehavior Q_DECLARE_PRIVATE(QFunctionBehavior) public: - Q_INVOKABLE explicit QFunctionBehavior(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QFunctionBehavior(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFunctionBehavior(); protected: - explicit QFunctionBehavior(QFunctionBehaviorPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QFunctionBehavior(QFunctionBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgate.cpp b/src/uml/qgate.cpp index 680605d0..82341481 100644 --- a/src/uml/qgate.cpp +++ b/src/uml/qgate.cpp @@ -60,12 +60,12 @@ QGatePrivate::~QGatePrivate() \brief A gate is a connection point for relating a message outside an interaction fragment with a message inside the interaction fragment. */ -QGate::QGate(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGate::QGate(QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEnd(*new QGatePrivate, parent, wrapper) { } -QGate::QGate(QGatePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGate::QGate(QGatePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEnd(dd, parent, wrapper) { } diff --git a/src/uml/qgate.h b/src/uml/qgate.h index 010fc62a..b85e5619 100644 --- a/src/uml/qgate.h +++ b/src/uml/qgate.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QGate : public QMessageEnd Q_DECLARE_PRIVATE(QGate) public: - Q_INVOKABLE explicit QGate(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QGate(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGate(); protected: - explicit QGate(QGatePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QGate(QGatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralization.cpp b/src/uml/qgeneralization.cpp index 00c3b431..94e89030 100644 --- a/src/uml/qgeneralization.cpp +++ b/src/uml/qgeneralization.cpp @@ -68,12 +68,12 @@ QGeneralizationPrivate::~QGeneralizationPrivate() \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.A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. */ -QGeneralization::QGeneralization(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralization::QGeneralization(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QGeneralizationPrivate, parent, wrapper) { } -QGeneralization::QGeneralization(QGeneralizationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralization::QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -133,14 +133,14 @@ void QGeneralization::setSpecific(QClassifier *specific) d->specific->removeGeneralization(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->specific)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->specific)); d->specific = specific; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(specific)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(specific)); if (specific) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(specific)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(specific)); } // Adjust opposite property @@ -205,13 +205,13 @@ void QGeneralization::setGeneral(QClassifier *general) Q_D(QGeneralization); if (d->general != general) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->general)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->general)); d->general = general; // Adjust subsetted property(ies) if (general) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(general)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(general)); } } } diff --git a/src/uml/qgeneralization.h b/src/uml/qgeneralization.h index b96e2aa1..3ea82817 100644 --- a/src/uml/qgeneralization.h +++ b/src/uml/qgeneralization.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QGeneralization : public QDirectedRelationship Q_DECLARE_PRIVATE(QGeneralization) public: - Q_INVOKABLE explicit QGeneralization(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QGeneralization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGeneralization(); // Attributes from QGeneralization @@ -91,7 +91,7 @@ public: Q_INVOKABLE void setGeneral(QClassifier *general); protected: - explicit QGeneralization(QGeneralizationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralizationset.cpp b/src/uml/qgeneralizationset.cpp index bc6e3035..c78b9416 100644 --- a/src/uml/qgeneralizationset.cpp +++ b/src/uml/qgeneralizationset.cpp @@ -68,12 +68,12 @@ QGeneralizationSetPrivate::~QGeneralizationSetPrivate() \brief A generalization set is a packageable element whose instances define collections of subsets of generalization relationships. */ -QGeneralizationSet::QGeneralizationSet(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralizationSet::QGeneralizationSet(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QGeneralizationSetPrivate, parent, wrapper) { } -QGeneralizationSet::QGeneralizationSet(QGeneralizationSetPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralizationSet::QGeneralizationSet(QGeneralizationSetPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } diff --git a/src/uml/qgeneralizationset.h b/src/uml/qgeneralizationset.h index cd4a2ee7..30daa015 100644 --- a/src/uml/qgeneralizationset.h +++ b/src/uml/qgeneralizationset.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QGeneralizationSet : public QPackageableElement Q_DECLARE_PRIVATE(QGeneralizationSet) public: - Q_INVOKABLE explicit QGeneralizationSet(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QGeneralizationSet(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGeneralizationSet(); // Attributes from QGeneralizationSet @@ -91,7 +91,7 @@ public: Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); protected: - explicit QGeneralizationSet(QGeneralizationSetPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QGeneralizationSet(QGeneralizationSetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralordering.cpp b/src/uml/qgeneralordering.cpp index 9a971c41..281268fb 100644 --- a/src/uml/qgeneralordering.cpp +++ b/src/uml/qgeneralordering.cpp @@ -64,12 +64,12 @@ QGeneralOrderingPrivate::~QGeneralOrderingPrivate() \brief A general ordering represents a binary relation between two occurrence specifications, to describe that one occurrence specification must occur before the other in a valid trace. This mechanism provides the ability to define partial orders of occurrence cpecifications that may otherwise not have a specified order. */ -QGeneralOrdering::QGeneralOrdering(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralOrdering::QGeneralOrdering(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QGeneralOrderingPrivate, parent, wrapper) { } -QGeneralOrdering::QGeneralOrdering(QGeneralOrderingPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QGeneralOrdering::QGeneralOrdering(QGeneralOrderingPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qgeneralordering.h b/src/uml/qgeneralordering.h index eb8da4b5..cf3efdb5 100644 --- a/src/uml/qgeneralordering.h +++ b/src/uml/qgeneralordering.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QGeneralOrdering : public QNamedElement Q_DECLARE_PRIVATE(QGeneralOrdering) public: - Q_INVOKABLE explicit QGeneralOrdering(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QGeneralOrdering(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGeneralOrdering(); // Association ends from QGeneralOrdering @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setAfter(QOccurrenceSpecification *after); protected: - explicit QGeneralOrdering(QGeneralOrderingPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QGeneralOrdering(QGeneralOrderingPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qimage.cpp b/src/uml/qimage.cpp index a123373c..95249ee0 100644 --- a/src/uml/qimage.cpp +++ b/src/uml/qimage.cpp @@ -60,12 +60,12 @@ QImagePrivate::~QImagePrivate() \brief Physical definition of a graphical image. */ -QImage::QImage(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QImage::QImage(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QImagePrivate, parent, wrapper) { } -QImage::QImage(QImagePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QImage::QImage(QImagePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/uml/qimage.h b/src/uml/qimage.h index 589681f8..b265554d 100644 --- a/src/uml/qimage.h +++ b/src/uml/qimage.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QImage : public QElement Q_DECLARE_PRIVATE(QImage) public: - Q_INVOKABLE explicit QImage(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QImage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QImage(); // Attributes from QImage @@ -81,7 +81,7 @@ public: Q_INVOKABLE void setContent(QString content); protected: - explicit QImage(QImagePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QImage(QImagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinclude.cpp b/src/uml/qinclude.cpp index 155f3f1b..a715a512 100644 --- a/src/uml/qinclude.cpp +++ b/src/uml/qinclude.cpp @@ -64,15 +64,15 @@ QIncludePrivate::~QIncludePrivate() \brief An include relationship defines that a use case contains the behavior defined in another use case. */ -QInclude::QInclude(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QIncludePrivate, parent, wrapper), +QInclude::QInclude(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QIncludePrivate, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { } -QInclude::QInclude(QIncludePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QInclude::QInclude(QIncludePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { @@ -91,7 +91,7 @@ QInclude::~QInclude() */ const QSet<QElement *> *QInclude::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -99,7 +99,7 @@ const QSet<QElement *> *QInclude::ownedElements() const */ QElement *QInclude::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -107,17 +107,17 @@ QElement *QInclude::owner() const */ const QSet<QComment *> *QInclude::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QInclude::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QInclude::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -129,7 +129,7 @@ void QInclude::removeOwnedComment(QComment *ownedComment) */ const QSet<QElement *> *QInclude::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -141,7 +141,7 @@ const QSet<QElement *> *QInclude::relatedElements() const */ const QSet<QElement *> *QInclude::sources() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->sources(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } /*! @@ -149,7 +149,7 @@ const QSet<QElement *> *QInclude::sources() const */ const QSet<QElement *> *QInclude::targets() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->targets(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } // --------------------------------------------------------------- @@ -161,12 +161,12 @@ const QSet<QElement *> *QInclude::targets() const */ QString QInclude::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QInclude::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -174,12 +174,12 @@ void QInclude::setName(QString name) */ QtUml::VisibilityKind QInclude::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QInclude::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -187,7 +187,7 @@ void QInclude::setVisibility(QtUml::VisibilityKind visibility) */ QString QInclude::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -199,12 +199,12 @@ QString QInclude::qualifiedName() const */ QStringExpression *QInclude::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QInclude::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -212,7 +212,7 @@ void QInclude::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QInclude::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -220,17 +220,17 @@ QNamespace *QInclude::namespace_() const */ const QSet<QDependency *> *QInclude::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QInclude::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QInclude::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -259,15 +259,15 @@ void QInclude::setIncludingCase(QUseCase *includingCase) d->includingCase->removeInclude(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->includingCase)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->includingCase)); d->includingCase = includingCase; // Adjust subsetted property(ies) if (includingCase) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(includingCase)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(includingCase)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(includingCase)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(includingCase)); // Adjust opposite property if (includingCase) @@ -293,13 +293,13 @@ void QInclude::setAddition(QUseCase *addition) Q_D(QInclude); if (d->addition != addition) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->addition)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->addition)); d->addition = addition; // Adjust subsetted property(ies) if (addition) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(addition)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(addition)); } } } diff --git a/src/uml/qinclude.h b/src/uml/qinclude.h index 2b840cf7..52427c53 100644 --- a/src/uml/qinclude.h +++ b/src/uml/qinclude.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QDirectedRelationship> #include <QtUml/QNamedElement> @@ -59,7 +60,7 @@ class QUseCase; class QIncludePrivate; -class Q_UML_EXPORT QInclude : public QtMof::QMofObject +class Q_UML_EXPORT QInclude : public QWrappedObject { Q_OBJECT @@ -70,7 +71,7 @@ class Q_UML_EXPORT QInclude : public QtMof::QMofObject Q_DECLARE_PRIVATE(QInclude) public: - Q_INVOKABLE explicit QInclude(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInclude(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInclude(); // Association ends from aggregated QElement @@ -109,7 +110,7 @@ public: Q_INVOKABLE void setAddition(QUseCase *addition); protected: - explicit QInclude(QIncludePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInclude(QIncludePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QDirectedRelationship *_wrappedDirectedRelationship; diff --git a/src/uml/qinclude_p.h b/src/uml/qinclude_p.h index 9fe6e0c3..e2e22d39 100644 --- a/src/uml/qinclude_p.h +++ b/src/uml/qinclude_p.h @@ -42,7 +42,8 @@ #define QTUML_QINCLUDE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qdirectedrelationship_p.h" #include "private/qnamedelement_p.h" @@ -58,7 +59,7 @@ QT_MODULE(QtUml) class QUseCase; class QInclude; -class Q_UML_EXPORT QIncludePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QIncludePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QInclude) diff --git a/src/uml/qinformationflow.cpp b/src/uml/qinformationflow.cpp index f2c6961a..62ec366a 100644 --- a/src/uml/qinformationflow.cpp +++ b/src/uml/qinformationflow.cpp @@ -81,15 +81,15 @@ QInformationFlowPrivate::~QInformationFlowPrivate() \brief An information flow specifies that one or more information items circulates from its sources to its targets. Information flows require some kind of information channel for transmitting information items from the source to the destination. An information channel is represented in various ways depending on the nature of its sources and targets. It may be represented by connectors, links, associations, or even dependencies. For example, if the source and destination are parts in some composite structure such as a collaboration, then the information channel is likely to be represented by a connector between them. Or, if the source and target are objects (which are a kind of instance specification), they may be represented by a link that joins the two, and so on. */ -QInformationFlow::QInformationFlow(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QInformationFlowPrivate, parent, wrapper), +QInformationFlow::QInformationFlow(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QInformationFlowPrivate, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { } -QInformationFlow::QInformationFlow(QInformationFlowPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QInformationFlow::QInformationFlow(QInformationFlowPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedDirectedRelationship(new QDirectedRelationship(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { @@ -108,7 +108,7 @@ QInformationFlow::~QInformationFlow() */ const QSet<QElement *> *QInformationFlow::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -116,7 +116,7 @@ const QSet<QElement *> *QInformationFlow::ownedElements() const */ QElement *QInformationFlow::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -124,17 +124,17 @@ QElement *QInformationFlow::owner() const */ const QSet<QComment *> *QInformationFlow::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QInformationFlow::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QInformationFlow::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -146,7 +146,7 @@ void QInformationFlow::removeOwnedComment(QComment *ownedComment) */ const QSet<QElement *> *QInformationFlow::relatedElements() const { - return (qmofobject_cast<const QRelationship *>(this))->relatedElements(); + return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } // --------------------------------------------------------------- @@ -158,7 +158,7 @@ const QSet<QElement *> *QInformationFlow::relatedElements() const */ const QSet<QElement *> *QInformationFlow::sources() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->sources(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } /*! @@ -166,7 +166,7 @@ const QSet<QElement *> *QInformationFlow::sources() const */ const QSet<QElement *> *QInformationFlow::targets() const { - return (qmofobject_cast<const QDirectedRelationship *>(this))->targets(); + return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } // --------------------------------------------------------------- @@ -178,12 +178,12 @@ const QSet<QElement *> *QInformationFlow::targets() const */ QTemplateParameter *QInformationFlow::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QInformationFlow::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -191,12 +191,12 @@ void QInformationFlow::setOwningTemplateParameter(QTemplateParameter *owningTemp */ QTemplateParameter *QInformationFlow::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QInformationFlow::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -208,12 +208,12 @@ void QInformationFlow::setTemplateParameter(QTemplateParameter *templateParamete */ QString QInformationFlow::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QInformationFlow::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -221,7 +221,7 @@ void QInformationFlow::setName(QString name) */ QString QInformationFlow::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -233,12 +233,12 @@ QString QInformationFlow::qualifiedName() const */ QStringExpression *QInformationFlow::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QInformationFlow::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -246,7 +246,7 @@ void QInformationFlow::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QInformationFlow::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -254,17 +254,17 @@ QNamespace *QInformationFlow::namespace_() const */ const QSet<QDependency *> *QInformationFlow::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QInformationFlow::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QInformationFlow::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -276,12 +276,12 @@ void QInformationFlow::removeClientDependency(QDependency *clientDependency) */ QtUml::VisibilityKind QInformationFlow::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QInformationFlow::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -308,7 +308,7 @@ void QInformationFlow::addInformationTarget(QNamedElement *informationTarget) d->informationTargets->insert(informationTarget); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(informationTarget)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(informationTarget)); } } @@ -321,7 +321,7 @@ void QInformationFlow::removeInformationTarget(QNamedElement *informationTarget) d->informationTargets->remove(informationTarget); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(informationTarget)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(informationTarget)); } } @@ -407,7 +407,7 @@ void QInformationFlow::addInformationSource(QNamedElement *informationSource) d->informationSources->insert(informationSource); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(informationSource)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(informationSource)); } } @@ -420,7 +420,7 @@ void QInformationFlow::removeInformationSource(QNamedElement *informationSource) d->informationSources->remove(informationSource); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(informationSource)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(informationSource)); } } diff --git a/src/uml/qinformationflow.h b/src/uml/qinformationflow.h index 6ed88b07..d482bd9e 100644 --- a/src/uml/qinformationflow.h +++ b/src/uml/qinformationflow.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QDirectedRelationship> #include <QtUml/QPackageableElement> @@ -67,7 +68,7 @@ class QRelationship; class QInformationFlowPrivate; -class Q_UML_EXPORT QInformationFlow : public QtMof::QMofObject +class Q_UML_EXPORT QInformationFlow : public QWrappedObject { Q_OBJECT @@ -83,7 +84,7 @@ class Q_UML_EXPORT QInformationFlow : public QtMof::QMofObject Q_DECLARE_PRIVATE(QInformationFlow) public: - Q_INVOKABLE explicit QInformationFlow(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInformationFlow(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInformationFlow(); // Association ends from aggregated QElement @@ -147,7 +148,7 @@ public: Q_INVOKABLE void removeRealization(QRelationship *realization); protected: - explicit QInformationFlow(QInformationFlowPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInformationFlow(QInformationFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QDirectedRelationship *_wrappedDirectedRelationship; diff --git a/src/uml/qinformationflow_p.h b/src/uml/qinformationflow_p.h index c268e9dc..d3d9539e 100644 --- a/src/uml/qinformationflow_p.h +++ b/src/uml/qinformationflow_p.h @@ -42,7 +42,8 @@ #define QTUML_QINFORMATIONFLOW_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qdirectedrelationship_p.h" #include "private/qpackageableelement_p.h" @@ -66,7 +67,7 @@ class QClassifier; class QRelationship; class QInformationFlow; -class Q_UML_EXPORT QInformationFlowPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QInformationFlowPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QInformationFlow) diff --git a/src/uml/qinformationitem.cpp b/src/uml/qinformationitem.cpp index 54734909..082316b5 100644 --- a/src/uml/qinformationitem.cpp +++ b/src/uml/qinformationitem.cpp @@ -62,12 +62,12 @@ QInformationItemPrivate::~QInformationItemPrivate() \brief An information item is an abstraction of all kinds of information that can be exchanged between objects. It is a kind of classifier intended for representing information in a very abstract way, one which cannot be instantiated. */ -QInformationItem::QInformationItem(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInformationItem::QInformationItem(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QInformationItemPrivate, parent, wrapper) { } -QInformationItem::QInformationItem(QInformationItemPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInformationItem::QInformationItem(QInformationItemPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } diff --git a/src/uml/qinformationitem.h b/src/uml/qinformationitem.h index 174ec482..ed3d65c0 100644 --- a/src/uml/qinformationitem.h +++ b/src/uml/qinformationitem.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QInformationItem : public QClassifier Q_DECLARE_PRIVATE(QInformationItem) public: - Q_INVOKABLE explicit QInformationItem(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInformationItem(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInformationItem(); // Association ends from QInformationItem @@ -76,7 +76,7 @@ public: Q_INVOKABLE void removeRepresented(QClassifier *represented); protected: - explicit QInformationItem(QInformationItemPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInformationItem(QInformationItemPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinitialnode.cpp b/src/uml/qinitialnode.cpp index fc051379..7b92daa5 100644 --- a/src/uml/qinitialnode.cpp +++ b/src/uml/qinitialnode.cpp @@ -60,12 +60,12 @@ QInitialNodePrivate::~QInitialNodePrivate() \brief An initial node is a control node at which flow starts when the activity is invoked. */ -QInitialNode::QInitialNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInitialNode::QInitialNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QInitialNodePrivate, parent, wrapper) { } -QInitialNode::QInitialNode(QInitialNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInitialNode::QInitialNode(QInitialNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } diff --git a/src/uml/qinitialnode.h b/src/uml/qinitialnode.h index 767e5490..537dfb11 100644 --- a/src/uml/qinitialnode.h +++ b/src/uml/qinitialnode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QInitialNode : public QControlNode Q_DECLARE_PRIVATE(QInitialNode) public: - Q_INVOKABLE explicit QInitialNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInitialNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInitialNode(); protected: - explicit QInitialNode(QInitialNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInitialNode(QInitialNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinputpin.cpp b/src/uml/qinputpin.cpp index 69d6f702..b8f6e3be 100644 --- a/src/uml/qinputpin.cpp +++ b/src/uml/qinputpin.cpp @@ -60,12 +60,12 @@ QInputPinPrivate::~QInputPinPrivate() \brief An input pin is a pin that holds input values to be consumed by an action. */ -QInputPin::QInputPin(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInputPin::QInputPin(QWrappedObject *parent, QWrappedObject *wrapper) : QPin(*new QInputPinPrivate, parent, wrapper) { } -QInputPin::QInputPin(QInputPinPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInputPin::QInputPin(QInputPinPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPin(dd, parent, wrapper) { } diff --git a/src/uml/qinputpin.h b/src/uml/qinputpin.h index 498494b2..878747e2 100644 --- a/src/uml/qinputpin.h +++ b/src/uml/qinputpin.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QInputPin : public QPin Q_DECLARE_PRIVATE(QInputPin) public: - Q_INVOKABLE explicit QInputPin(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInputPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInputPin(); protected: - explicit QInputPin(QInputPinPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInputPin(QInputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinstancespecification.cpp b/src/uml/qinstancespecification.cpp index a0d87e48..803180df 100644 --- a/src/uml/qinstancespecification.cpp +++ b/src/uml/qinstancespecification.cpp @@ -69,16 +69,16 @@ QInstanceSpecificationPrivate::~QInstanceSpecificationPrivate() \brief An instance specification has the capability of being a deployment target in a deployment relationship, in the case that it is an instance of a node. It is also has the capability of being a deployed artifact, if it is an instance of an artifact.An instance specification is a model element that represents an instance in a modeled system. */ -QInstanceSpecification::QInstanceSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QInstanceSpecificationPrivate, parent, wrapper), +QInstanceSpecification::QInstanceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QInstanceSpecificationPrivate, parent, wrapper), _wrappedDeployedArtifact(new QDeployedArtifact(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) { } -QInstanceSpecification::QInstanceSpecification(QInstanceSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QInstanceSpecification::QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedDeployedArtifact(new QDeployedArtifact(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) @@ -98,7 +98,7 @@ QInstanceSpecification::~QInstanceSpecification() */ const QSet<QElement *> *QInstanceSpecification::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -106,7 +106,7 @@ const QSet<QElement *> *QInstanceSpecification::ownedElements() const */ QElement *QInstanceSpecification::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -114,17 +114,17 @@ QElement *QInstanceSpecification::owner() const */ const QSet<QComment *> *QInstanceSpecification::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QInstanceSpecification::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QInstanceSpecification::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -136,12 +136,12 @@ void QInstanceSpecification::removeOwnedComment(QComment *ownedComment) */ QString QInstanceSpecification::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QInstanceSpecification::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -149,7 +149,7 @@ void QInstanceSpecification::setName(QString name) */ QString QInstanceSpecification::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -161,12 +161,12 @@ QString QInstanceSpecification::qualifiedName() const */ QStringExpression *QInstanceSpecification::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QInstanceSpecification::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -174,7 +174,7 @@ void QInstanceSpecification::setNameExpression(QStringExpression *nameExpression */ QNamespace *QInstanceSpecification::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -182,17 +182,17 @@ QNamespace *QInstanceSpecification::namespace_() const */ const QSet<QDependency *> *QInstanceSpecification::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QInstanceSpecification::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QInstanceSpecification::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -204,12 +204,12 @@ void QInstanceSpecification::removeClientDependency(QDependency *clientDependenc */ QTemplateParameter *QInstanceSpecification::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QInstanceSpecification::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -217,12 +217,12 @@ void QInstanceSpecification::setOwningTemplateParameter(QTemplateParameter *owni */ QTemplateParameter *QInstanceSpecification::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QInstanceSpecification::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -234,12 +234,12 @@ void QInstanceSpecification::setTemplateParameter(QTemplateParameter *templatePa */ QtUml::VisibilityKind QInstanceSpecification::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QInstanceSpecification::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -251,7 +251,7 @@ void QInstanceSpecification::setVisibility(QtUml::VisibilityKind visibility) */ const QSet<QPackageableElement *> *QInstanceSpecification::deployedElements() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployedElements(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } /*! @@ -259,17 +259,17 @@ const QSet<QPackageableElement *> *QInstanceSpecification::deployedElements() co */ const QSet<QDeployment *> *QInstanceSpecification::deployments() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployments(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } void QInstanceSpecification::addDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); } void QInstanceSpecification::removeDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); } // --------------------------------------------------------------- @@ -325,13 +325,13 @@ void QInstanceSpecification::setSpecification(QValueSpecification *specification Q_D(QInstanceSpecification); if (d->specification != specification) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->specification)); d->specification = specification; // Adjust subsetted property(ies) if (specification) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(specification)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(specification)); } } } @@ -356,7 +356,7 @@ void QInstanceSpecification::addSlot_(QSlot *slot_) d->slots_->insert(slot_); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(slot_)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(slot_)); // Adjust opposite property slot_->setOwningInstance(this); @@ -372,7 +372,7 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) d->slots_->remove(slot_); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(slot_)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(slot_)); // Adjust opposite property slot_->setOwningInstance(0); diff --git a/src/uml/qinstancespecification.h b/src/uml/qinstancespecification.h index ee485f6f..a474feb1 100644 --- a/src/uml/qinstancespecification.h +++ b/src/uml/qinstancespecification.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QDeployedArtifact> #include <QtUml/QPackageableElement> #include <QtUml/QDeploymentTarget> @@ -65,7 +66,7 @@ class QValueSpecification; class QInstanceSpecificationPrivate; -class Q_UML_EXPORT QInstanceSpecification : public QtMof::QMofObject +class Q_UML_EXPORT QInstanceSpecification : public QWrappedObject { Q_OBJECT @@ -77,7 +78,7 @@ class Q_UML_EXPORT QInstanceSpecification : public QtMof::QMofObject Q_DECLARE_PRIVATE(QInstanceSpecification) public: - Q_INVOKABLE explicit QInstanceSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInstanceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInstanceSpecification(); // Association ends from aggregated QElement @@ -127,7 +128,7 @@ public: Q_INVOKABLE void removeSlot_(QSlot *slot_); protected: - explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QDeployedArtifact *_wrappedDeployedArtifact; diff --git a/src/uml/qinstancespecification_p.h b/src/uml/qinstancespecification_p.h index a142950f..24ae0b57 100644 --- a/src/uml/qinstancespecification_p.h +++ b/src/uml/qinstancespecification_p.h @@ -42,7 +42,8 @@ #define QTUML_QINSTANCESPECIFICATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qdeployedartifact_p.h" #include "private/qpackageableelement_p.h" #include "private/qdeploymenttarget_p.h" @@ -64,7 +65,7 @@ class QSlot; class QValueSpecification; class QInstanceSpecification; -class Q_UML_EXPORT QInstanceSpecificationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QInstanceSpecificationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QInstanceSpecification) diff --git a/src/uml/qinstancevalue.cpp b/src/uml/qinstancevalue.cpp index 951c6b76..3c3b1e3c 100644 --- a/src/uml/qinstancevalue.cpp +++ b/src/uml/qinstancevalue.cpp @@ -63,12 +63,12 @@ QInstanceValuePrivate::~QInstanceValuePrivate() \brief An instance value is a value specification that identifies an instance. */ -QInstanceValue::QInstanceValue(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInstanceValue::QInstanceValue(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QInstanceValuePrivate, parent, wrapper) { } -QInstanceValue::QInstanceValue(QInstanceValuePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInstanceValue::QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qinstancevalue.h b/src/uml/qinstancevalue.h index 06f3d7ea..9d442986 100644 --- a/src/uml/qinstancevalue.h +++ b/src/uml/qinstancevalue.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QInstanceValue : public QValueSpecification Q_DECLARE_PRIVATE(QInstanceValue) public: - Q_INVOKABLE explicit QInstanceValue(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInstanceValue(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInstanceValue(); // Association ends from QInstanceValue @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setInstance(QInstanceSpecification *instance); protected: - explicit QInstanceValue(QInstanceValuePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteraction.cpp b/src/uml/qinteraction.cpp index 7137898a..685321d3 100644 --- a/src/uml/qinteraction.cpp +++ b/src/uml/qinteraction.cpp @@ -75,15 +75,15 @@ QInteractionPrivate::~QInteractionPrivate() \brief An interaction is a unit of behavior that focuses on the observable exchange of information between connectable elements. */ -QInteraction::QInteraction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QInteractionPrivate, parent, wrapper), +QInteraction::QInteraction(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QInteractionPrivate, parent, wrapper), _wrappedBehavior(new QBehavior(this, this)), _wrappedInteractionFragment(new QInteractionFragment(this, this)) { } -QInteraction::QInteraction(QInteractionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QInteraction::QInteraction(QInteractionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedBehavior(new QBehavior(this, this)), _wrappedInteractionFragment(new QInteractionFragment(this, this)) { @@ -102,12 +102,12 @@ QInteraction::~QInteraction() */ bool QInteraction::isReentrant() const { - return (qmofobject_cast<const QBehavior *>(this))->isReentrant(); + return (qwrappedobject_cast<const QBehavior *>(this))->isReentrant(); } void QInteraction::setReentrant(bool isReentrant) { - (qmofobject_cast<QBehavior *>(this))->setReentrant(isReentrant); + (qwrappedobject_cast<QBehavior *>(this))->setReentrant(isReentrant); } // --------------------------------------------------------------- @@ -119,12 +119,12 @@ void QInteraction::setReentrant(bool isReentrant) */ QBehavioralFeature *QInteraction::specification() const { - return (qmofobject_cast<const QBehavior *>(this))->specification(); + return (qwrappedobject_cast<const QBehavior *>(this))->specification(); } void QInteraction::setSpecification(QBehavioralFeature *specification) { - (qmofobject_cast<QBehavior *>(this))->setSpecification(specification); + (qwrappedobject_cast<QBehavior *>(this))->setSpecification(specification); } /*! @@ -132,17 +132,17 @@ void QInteraction::setSpecification(QBehavioralFeature *specification) */ const QSet<QConstraint *> *QInteraction::postconditions() const { - return (qmofobject_cast<const QBehavior *>(this))->postconditions(); + return (qwrappedobject_cast<const QBehavior *>(this))->postconditions(); } void QInteraction::addPostcondition(QConstraint *postcondition) { - (qmofobject_cast<QBehavior *>(this))->addPostcondition(postcondition); + (qwrappedobject_cast<QBehavior *>(this))->addPostcondition(postcondition); } void QInteraction::removePostcondition(QConstraint *postcondition) { - (qmofobject_cast<QBehavior *>(this))->removePostcondition(postcondition); + (qwrappedobject_cast<QBehavior *>(this))->removePostcondition(postcondition); } /*! @@ -150,17 +150,17 @@ void QInteraction::removePostcondition(QConstraint *postcondition) */ const QSet<QConstraint *> *QInteraction::preconditions() const { - return (qmofobject_cast<const QBehavior *>(this))->preconditions(); + return (qwrappedobject_cast<const QBehavior *>(this))->preconditions(); } void QInteraction::addPrecondition(QConstraint *precondition) { - (qmofobject_cast<QBehavior *>(this))->addPrecondition(precondition); + (qwrappedobject_cast<QBehavior *>(this))->addPrecondition(precondition); } void QInteraction::removePrecondition(QConstraint *precondition) { - (qmofobject_cast<QBehavior *>(this))->removePrecondition(precondition); + (qwrappedobject_cast<QBehavior *>(this))->removePrecondition(precondition); } /*! @@ -168,17 +168,17 @@ void QInteraction::removePrecondition(QConstraint *precondition) */ const QSet<QBehavior *> *QInteraction::redefinedBehaviors() const { - return (qmofobject_cast<const QBehavior *>(this))->redefinedBehaviors(); + return (qwrappedobject_cast<const QBehavior *>(this))->redefinedBehaviors(); } void QInteraction::addRedefinedBehavior(QBehavior *redefinedBehavior) { - (qmofobject_cast<QBehavior *>(this))->addRedefinedBehavior(redefinedBehavior); + (qwrappedobject_cast<QBehavior *>(this))->addRedefinedBehavior(redefinedBehavior); } void QInteraction::removeRedefinedBehavior(QBehavior *redefinedBehavior) { - (qmofobject_cast<QBehavior *>(this))->removeRedefinedBehavior(redefinedBehavior); + (qwrappedobject_cast<QBehavior *>(this))->removeRedefinedBehavior(redefinedBehavior); } /*! @@ -186,17 +186,17 @@ void QInteraction::removeRedefinedBehavior(QBehavior *redefinedBehavior) */ const QList<QParameter *> *QInteraction::ownedParameters() const { - return (qmofobject_cast<const QBehavior *>(this))->ownedParameters(); + return (qwrappedobject_cast<const QBehavior *>(this))->ownedParameters(); } void QInteraction::addOwnedParameter(QParameter *ownedParameter) { - (qmofobject_cast<QBehavior *>(this))->addOwnedParameter(ownedParameter); + (qwrappedobject_cast<QBehavior *>(this))->addOwnedParameter(ownedParameter); } void QInteraction::removeOwnedParameter(QParameter *ownedParameter) { - (qmofobject_cast<QBehavior *>(this))->removeOwnedParameter(ownedParameter); + (qwrappedobject_cast<QBehavior *>(this))->removeOwnedParameter(ownedParameter); } /*! @@ -204,17 +204,17 @@ void QInteraction::removeOwnedParameter(QParameter *ownedParameter) */ const QSet<QParameterSet *> *QInteraction::ownedParameterSets() const { - return (qmofobject_cast<const QBehavior *>(this))->ownedParameterSets(); + return (qwrappedobject_cast<const QBehavior *>(this))->ownedParameterSets(); } void QInteraction::addOwnedParameterSet(QParameterSet *ownedParameterSet) { - (qmofobject_cast<QBehavior *>(this))->addOwnedParameterSet(ownedParameterSet); + (qwrappedobject_cast<QBehavior *>(this))->addOwnedParameterSet(ownedParameterSet); } void QInteraction::removeOwnedParameterSet(QParameterSet *ownedParameterSet) { - (qmofobject_cast<QBehavior *>(this))->removeOwnedParameterSet(ownedParameterSet); + (qwrappedobject_cast<QBehavior *>(this))->removeOwnedParameterSet(ownedParameterSet); } /*! @@ -222,7 +222,7 @@ void QInteraction::removeOwnedParameterSet(QParameterSet *ownedParameterSet) */ QBehavioredClassifier *QInteraction::context() const { - return (qmofobject_cast<const QBehavior *>(this))->context(); + return (qwrappedobject_cast<const QBehavior *>(this))->context(); } // --------------------------------------------------------------- @@ -234,7 +234,7 @@ QBehavioredClassifier *QInteraction::context() const */ const QSet<QElement *> *QInteraction::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -242,7 +242,7 @@ const QSet<QElement *> *QInteraction::ownedElements() const */ QElement *QInteraction::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -250,17 +250,17 @@ QElement *QInteraction::owner() const */ const QSet<QComment *> *QInteraction::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QInteraction::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QInteraction::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -272,12 +272,12 @@ void QInteraction::removeOwnedComment(QComment *ownedComment) */ QString QInteraction::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QInteraction::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -285,12 +285,12 @@ void QInteraction::setName(QString name) */ QtUml::VisibilityKind QInteraction::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QInteraction::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -298,7 +298,7 @@ void QInteraction::setVisibility(QtUml::VisibilityKind visibility) */ QString QInteraction::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -310,12 +310,12 @@ QString QInteraction::qualifiedName() const */ QStringExpression *QInteraction::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QInteraction::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -323,7 +323,7 @@ void QInteraction::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QInteraction::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -331,17 +331,17 @@ QNamespace *QInteraction::namespace_() const */ const QSet<QDependency *> *QInteraction::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QInteraction::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QInteraction::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -353,17 +353,17 @@ void QInteraction::removeClientDependency(QDependency *clientDependency) */ const QSet<QGeneralOrdering *> *QInteraction::generalOrderings() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->generalOrderings(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->generalOrderings(); } void QInteraction::addGeneralOrdering(QGeneralOrdering *generalOrdering) { - (qmofobject_cast<QInteractionFragment *>(this))->addGeneralOrdering(generalOrdering); + (qwrappedobject_cast<QInteractionFragment *>(this))->addGeneralOrdering(generalOrdering); } void QInteraction::removeGeneralOrdering(QGeneralOrdering *generalOrdering) { - (qmofobject_cast<QInteractionFragment *>(this))->removeGeneralOrdering(generalOrdering); + (qwrappedobject_cast<QInteractionFragment *>(this))->removeGeneralOrdering(generalOrdering); } /*! @@ -371,12 +371,12 @@ void QInteraction::removeGeneralOrdering(QGeneralOrdering *generalOrdering) */ QInteraction *QInteraction::enclosingInteraction() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->enclosingInteraction(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->enclosingInteraction(); } void QInteraction::setEnclosingInteraction(QInteraction *enclosingInteraction) { - (qmofobject_cast<QInteractionFragment *>(this))->setEnclosingInteraction(enclosingInteraction); + (qwrappedobject_cast<QInteractionFragment *>(this))->setEnclosingInteraction(enclosingInteraction); } /*! @@ -384,17 +384,17 @@ void QInteraction::setEnclosingInteraction(QInteraction *enclosingInteraction) */ const QSet<QLifeline *> *QInteraction::covered() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->covered(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->covered(); } void QInteraction::addCovered(QLifeline *covered) { - (qmofobject_cast<QInteractionFragment *>(this))->addCovered(covered); + (qwrappedobject_cast<QInteractionFragment *>(this))->addCovered(covered); } void QInteraction::removeCovered(QLifeline *covered) { - (qmofobject_cast<QInteractionFragment *>(this))->removeCovered(covered); + (qwrappedobject_cast<QInteractionFragment *>(this))->removeCovered(covered); } /*! @@ -402,12 +402,12 @@ void QInteraction::removeCovered(QLifeline *covered) */ QInteractionOperand *QInteraction::enclosingOperand() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->enclosingOperand(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->enclosingOperand(); } void QInteraction::setEnclosingOperand(QInteractionOperand *enclosingOperand) { - (qmofobject_cast<QInteractionFragment *>(this))->setEnclosingOperand(enclosingOperand); + (qwrappedobject_cast<QInteractionFragment *>(this))->setEnclosingOperand(enclosingOperand); } // --------------------------------------------------------------- @@ -434,7 +434,7 @@ void QInteraction::addAction(QAction *action) d->actions->insert(action); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(action)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(action)); } } @@ -447,7 +447,7 @@ void QInteraction::removeAction(QAction *action) d->actions->remove(action); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(action)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(action)); } } @@ -471,7 +471,7 @@ void QInteraction::addMessage(QMessage *message) d->messages->insert(message); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(message)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(message)); // Adjust opposite property message->setInteraction(this); @@ -487,7 +487,7 @@ void QInteraction::removeMessage(QMessage *message) d->messages->remove(message); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(message)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(message)); // Adjust opposite property message->setInteraction(0); @@ -514,7 +514,7 @@ void QInteraction::addFormalGate(QGate *formalGate) d->formalGates->insert(formalGate); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(formalGate)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(formalGate)); } } @@ -527,7 +527,7 @@ void QInteraction::removeFormalGate(QGate *formalGate) d->formalGates->remove(formalGate); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(formalGate)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(formalGate)); } } @@ -551,7 +551,7 @@ void QInteraction::addFragment(QInteractionFragment *fragment) d->fragments->append(fragment); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(fragment)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); // Adjust opposite property fragment->setEnclosingInteraction(this); @@ -567,7 +567,7 @@ void QInteraction::removeFragment(QInteractionFragment *fragment) d->fragments->removeAll(fragment); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(fragment)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); // Adjust opposite property fragment->setEnclosingInteraction(0); @@ -594,7 +594,7 @@ void QInteraction::addLifeline(QLifeline *lifeline) d->lifelines->insert(lifeline); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(lifeline)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(lifeline)); // Adjust opposite property lifeline->setInteraction(this); @@ -610,7 +610,7 @@ void QInteraction::removeLifeline(QLifeline *lifeline) d->lifelines->remove(lifeline); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(lifeline)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(lifeline)); // Adjust opposite property lifeline->setInteraction(0); diff --git a/src/uml/qinteraction.h b/src/uml/qinteraction.h index f75258af..5daec423 100644 --- a/src/uml/qinteraction.h +++ b/src/uml/qinteraction.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QBehavior> #include <QtUml/QInteractionFragment> @@ -66,7 +67,7 @@ class QGate; class QInteractionPrivate; -class Q_UML_EXPORT QInteraction : public QtMof::QMofObject +class Q_UML_EXPORT QInteraction : public QWrappedObject { Q_OBJECT @@ -80,7 +81,7 @@ class Q_UML_EXPORT QInteraction : public QtMof::QMofObject Q_DECLARE_PRIVATE(QInteraction) public: - Q_INVOKABLE explicit QInteraction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInteraction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInteraction(); // Attributes from aggregated QBehavior @@ -159,7 +160,7 @@ public: Q_INVOKABLE void removeLifeline(QLifeline *lifeline); protected: - explicit QInteraction(QInteractionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInteraction(QInteractionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QBehavior *_wrappedBehavior; diff --git a/src/uml/qinteraction_p.h b/src/uml/qinteraction_p.h index 34af5e67..a2c29d92 100644 --- a/src/uml/qinteraction_p.h +++ b/src/uml/qinteraction_p.h @@ -42,7 +42,8 @@ #define QTUML_QINTERACTION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qbehavior_p.h" #include "private/qinteractionfragment_p.h" @@ -65,7 +66,7 @@ class QAction; class QGate; class QInteraction; -class Q_UML_EXPORT QInteractionPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QInteractionPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QInteraction) diff --git a/src/uml/qinteractionconstraint.cpp b/src/uml/qinteractionconstraint.cpp index f0fa50f5..d9d82f5c 100644 --- a/src/uml/qinteractionconstraint.cpp +++ b/src/uml/qinteractionconstraint.cpp @@ -64,12 +64,12 @@ QInteractionConstraintPrivate::~QInteractionConstraintPrivate() \brief An interaction constraint is a Boolean expression that guards an operand in a combined fragment. */ -QInteractionConstraint::QInteractionConstraint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionConstraint::QInteractionConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QConstraint(*new QInteractionConstraintPrivate, parent, wrapper) { } -QInteractionConstraint::QInteractionConstraint(QInteractionConstraintPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionConstraint::QInteractionConstraint(QInteractionConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QConstraint(dd, parent, wrapper) { } @@ -100,13 +100,13 @@ void QInteractionConstraint::setMaxint(QValueSpecification *maxint) Q_D(QInteractionConstraint); if (d->maxint != maxint) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->maxint)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->maxint)); d->maxint = maxint; // Adjust subsetted property(ies) if (maxint) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(maxint)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(maxint)); } } } @@ -129,13 +129,13 @@ void QInteractionConstraint::setMinint(QValueSpecification *minint) Q_D(QInteractionConstraint); if (d->minint != minint) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->minint)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->minint)); d->minint = minint; // Adjust subsetted property(ies) if (minint) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(minint)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(minint)); } } } diff --git a/src/uml/qinteractionconstraint.h b/src/uml/qinteractionconstraint.h index bcb4a96c..f56e5107 100644 --- a/src/uml/qinteractionconstraint.h +++ b/src/uml/qinteractionconstraint.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QInteractionConstraint : public QConstraint Q_DECLARE_PRIVATE(QInteractionConstraint) public: - Q_INVOKABLE explicit QInteractionConstraint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInteractionConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInteractionConstraint(); // Association ends from QInteractionConstraint @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setMinint(QValueSpecification *minint); protected: - explicit QInteractionConstraint(QInteractionConstraintPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInteractionConstraint(QInteractionConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionfragment.cpp b/src/uml/qinteractionfragment.cpp index 26248f70..e6232b39 100644 --- a/src/uml/qinteractionfragment.cpp +++ b/src/uml/qinteractionfragment.cpp @@ -71,12 +71,12 @@ QInteractionFragmentPrivate::~QInteractionFragmentPrivate() \brief InteractionFragment is an abstract notion of the most general interaction unit. An interaction fragment is a piece of an interaction. Each interaction fragment is conceptually like an interaction by itself. */ -QInteractionFragment::QInteractionFragment(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionFragment::QInteractionFragment(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QInteractionFragmentPrivate, parent, wrapper) { } -QInteractionFragment::QInteractionFragment(QInteractionFragmentPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionFragment::QInteractionFragment(QInteractionFragmentPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -109,7 +109,7 @@ void QInteractionFragment::addGeneralOrdering(QGeneralOrdering *generalOrdering) d->generalOrderings->insert(generalOrdering); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(generalOrdering)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalOrdering)); } } @@ -122,7 +122,7 @@ void QInteractionFragment::removeGeneralOrdering(QGeneralOrdering *generalOrderi d->generalOrderings->remove(generalOrdering); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(generalOrdering)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalOrdering)); } } @@ -150,7 +150,7 @@ void QInteractionFragment::setEnclosingInteraction(QInteraction *enclosingIntera d->enclosingInteraction = enclosingInteraction; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(enclosingInteraction)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(enclosingInteraction)); // Adjust opposite property if (enclosingInteraction) @@ -220,7 +220,7 @@ void QInteractionFragment::setEnclosingOperand(QInteractionOperand *enclosingOpe d->enclosingOperand = enclosingOperand; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(enclosingOperand)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(enclosingOperand)); // Adjust opposite property if (enclosingOperand) diff --git a/src/uml/qinteractionfragment.h b/src/uml/qinteractionfragment.h index 172f3041..c2999970 100644 --- a/src/uml/qinteractionfragment.h +++ b/src/uml/qinteractionfragment.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QInteractionFragment : public QNamedElement Q_DECLARE_PRIVATE(QInteractionFragment) public: - Q_INVOKABLE explicit QInteractionFragment(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInteractionFragment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInteractionFragment(); // Association ends from QInteractionFragment @@ -92,7 +92,7 @@ public: Q_INVOKABLE void setEnclosingOperand(QInteractionOperand *enclosingOperand); protected: - explicit QInteractionFragment(QInteractionFragmentPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInteractionFragment(QInteractionFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionoperand.cpp b/src/uml/qinteractionoperand.cpp index 0889005f..70560cf6 100644 --- a/src/uml/qinteractionoperand.cpp +++ b/src/uml/qinteractionoperand.cpp @@ -65,15 +65,15 @@ QInteractionOperandPrivate::~QInteractionOperandPrivate() \brief An interaction operand is contained in a combined fragment. An interaction operand represents one operand of the expression given by the enclosing combined fragment. */ -QInteractionOperand::QInteractionOperand(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QInteractionOperandPrivate, parent, wrapper), +QInteractionOperand::QInteractionOperand(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QInteractionOperandPrivate, parent, wrapper), _wrappedInteractionFragment(new QInteractionFragment(this, this)), _wrappedNamespace(new QNamespace(this, this)) { } -QInteractionOperand::QInteractionOperand(QInteractionOperandPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QInteractionOperand::QInteractionOperand(QInteractionOperandPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedInteractionFragment(new QInteractionFragment(this, this)), _wrappedNamespace(new QNamespace(this, this)) { @@ -92,7 +92,7 @@ QInteractionOperand::~QInteractionOperand() */ const QSet<QElement *> *QInteractionOperand::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -100,7 +100,7 @@ const QSet<QElement *> *QInteractionOperand::ownedElements() const */ QElement *QInteractionOperand::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -108,17 +108,17 @@ QElement *QInteractionOperand::owner() const */ const QSet<QComment *> *QInteractionOperand::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QInteractionOperand::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QInteractionOperand::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -130,12 +130,12 @@ void QInteractionOperand::removeOwnedComment(QComment *ownedComment) */ QString QInteractionOperand::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QInteractionOperand::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -143,12 +143,12 @@ void QInteractionOperand::setName(QString name) */ QtUml::VisibilityKind QInteractionOperand::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QInteractionOperand::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -156,7 +156,7 @@ void QInteractionOperand::setVisibility(QtUml::VisibilityKind visibility) */ QString QInteractionOperand::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -168,12 +168,12 @@ QString QInteractionOperand::qualifiedName() const */ QStringExpression *QInteractionOperand::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QInteractionOperand::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -181,7 +181,7 @@ void QInteractionOperand::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QInteractionOperand::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -189,17 +189,17 @@ QNamespace *QInteractionOperand::namespace_() const */ const QSet<QDependency *> *QInteractionOperand::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QInteractionOperand::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QInteractionOperand::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -211,17 +211,17 @@ void QInteractionOperand::removeClientDependency(QDependency *clientDependency) */ const QSet<QGeneralOrdering *> *QInteractionOperand::generalOrderings() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->generalOrderings(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->generalOrderings(); } void QInteractionOperand::addGeneralOrdering(QGeneralOrdering *generalOrdering) { - (qmofobject_cast<QInteractionFragment *>(this))->addGeneralOrdering(generalOrdering); + (qwrappedobject_cast<QInteractionFragment *>(this))->addGeneralOrdering(generalOrdering); } void QInteractionOperand::removeGeneralOrdering(QGeneralOrdering *generalOrdering) { - (qmofobject_cast<QInteractionFragment *>(this))->removeGeneralOrdering(generalOrdering); + (qwrappedobject_cast<QInteractionFragment *>(this))->removeGeneralOrdering(generalOrdering); } /*! @@ -229,12 +229,12 @@ void QInteractionOperand::removeGeneralOrdering(QGeneralOrdering *generalOrderin */ QInteraction *QInteractionOperand::enclosingInteraction() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->enclosingInteraction(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->enclosingInteraction(); } void QInteractionOperand::setEnclosingInteraction(QInteraction *enclosingInteraction) { - (qmofobject_cast<QInteractionFragment *>(this))->setEnclosingInteraction(enclosingInteraction); + (qwrappedobject_cast<QInteractionFragment *>(this))->setEnclosingInteraction(enclosingInteraction); } /*! @@ -242,17 +242,17 @@ void QInteractionOperand::setEnclosingInteraction(QInteraction *enclosingInterac */ const QSet<QLifeline *> *QInteractionOperand::covered() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->covered(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->covered(); } void QInteractionOperand::addCovered(QLifeline *covered) { - (qmofobject_cast<QInteractionFragment *>(this))->addCovered(covered); + (qwrappedobject_cast<QInteractionFragment *>(this))->addCovered(covered); } void QInteractionOperand::removeCovered(QLifeline *covered) { - (qmofobject_cast<QInteractionFragment *>(this))->removeCovered(covered); + (qwrappedobject_cast<QInteractionFragment *>(this))->removeCovered(covered); } /*! @@ -260,12 +260,12 @@ void QInteractionOperand::removeCovered(QLifeline *covered) */ QInteractionOperand *QInteractionOperand::enclosingOperand() const { - return (qmofobject_cast<const QInteractionFragment *>(this))->enclosingOperand(); + return (qwrappedobject_cast<const QInteractionFragment *>(this))->enclosingOperand(); } void QInteractionOperand::setEnclosingOperand(QInteractionOperand *enclosingOperand) { - (qmofobject_cast<QInteractionFragment *>(this))->setEnclosingOperand(enclosingOperand); + (qwrappedobject_cast<QInteractionFragment *>(this))->setEnclosingOperand(enclosingOperand); } // --------------------------------------------------------------- @@ -277,17 +277,17 @@ void QInteractionOperand::setEnclosingOperand(QInteractionOperand *enclosingOper */ const QSet<QPackageImport *> *QInteractionOperand::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QInteractionOperand::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QInteractionOperand::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -295,7 +295,7 @@ void QInteractionOperand::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QInteractionOperand::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -303,7 +303,7 @@ const QSet<QNamedElement *> *QInteractionOperand::members() const */ const QSet<QPackageableElement *> *QInteractionOperand::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -311,17 +311,17 @@ const QSet<QPackageableElement *> *QInteractionOperand::importedMembers() const */ const QSet<QElementImport *> *QInteractionOperand::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QInteractionOperand::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QInteractionOperand::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -329,17 +329,17 @@ void QInteractionOperand::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QInteractionOperand::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QInteractionOperand::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QInteractionOperand::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -347,7 +347,7 @@ void QInteractionOperand::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QInteractionOperand::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -374,7 +374,7 @@ void QInteractionOperand::addFragment(QInteractionFragment *fragment) d->fragments->append(fragment); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(fragment)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); // Adjust opposite property fragment->setEnclosingOperand(this); @@ -390,7 +390,7 @@ void QInteractionOperand::removeFragment(QInteractionFragment *fragment) d->fragments->removeAll(fragment); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(fragment)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); // Adjust opposite property fragment->setEnclosingOperand(0); @@ -415,13 +415,13 @@ void QInteractionOperand::setGuard(QInteractionConstraint *guard) Q_D(QInteractionOperand); if (d->guard != guard) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->guard)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->guard)); d->guard = guard; // Adjust subsetted property(ies) if (guard) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(guard)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(guard)); } } } diff --git a/src/uml/qinteractionoperand.h b/src/uml/qinteractionoperand.h index e5eb0c5d..7d9b26cf 100644 --- a/src/uml/qinteractionoperand.h +++ b/src/uml/qinteractionoperand.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QInteractionFragment> #include <QtUml/QNamespace> @@ -62,7 +63,7 @@ class QInteractionConstraint; class QInteractionOperandPrivate; -class Q_UML_EXPORT QInteractionOperand : public QtMof::QMofObject +class Q_UML_EXPORT QInteractionOperand : public QWrappedObject { Q_OBJECT @@ -73,7 +74,7 @@ class Q_UML_EXPORT QInteractionOperand : public QtMof::QMofObject Q_DECLARE_PRIVATE(QInteractionOperand) public: - Q_INVOKABLE explicit QInteractionOperand(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInteractionOperand(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInteractionOperand(); // Association ends from aggregated QElement @@ -132,7 +133,7 @@ public: Q_INVOKABLE void setGuard(QInteractionConstraint *guard); protected: - explicit QInteractionOperand(QInteractionOperandPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInteractionOperand(QInteractionOperandPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QInteractionFragment *_wrappedInteractionFragment; diff --git a/src/uml/qinteractionoperand_p.h b/src/uml/qinteractionoperand_p.h index 73c90c83..d2ba0328 100644 --- a/src/uml/qinteractionoperand_p.h +++ b/src/uml/qinteractionoperand_p.h @@ -42,7 +42,8 @@ #define QTUML_QINTERACTIONOPERAND_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qinteractionfragment_p.h" #include "private/qnamespace_p.h" @@ -61,7 +62,7 @@ QT_MODULE(QtUml) class QInteractionConstraint; class QInteractionOperand; -class Q_UML_EXPORT QInteractionOperandPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QInteractionOperandPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QInteractionOperand) diff --git a/src/uml/qinteractionuse.cpp b/src/uml/qinteractionuse.cpp index 90862b65..9e8fc634 100644 --- a/src/uml/qinteractionuse.cpp +++ b/src/uml/qinteractionuse.cpp @@ -72,12 +72,12 @@ QInteractionUsePrivate::~QInteractionUsePrivate() \brief An interaction use refers to an interaction. The interaction use is a shorthand for copying the contents of the referenced interaction where the interaction use is. To be accurate the copying must take into account substituting parameters with arguments and connect the formal gates with the actual ones. */ -QInteractionUse::QInteractionUse(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionUse::QInteractionUse(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QInteractionUsePrivate, parent, wrapper) { } -QInteractionUse::QInteractionUse(QInteractionUsePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInteractionUse::QInteractionUse(QInteractionUsePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } @@ -110,7 +110,7 @@ void QInteractionUse::addActualGate(QGate *actualGate) d->actualGates->insert(actualGate); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(actualGate)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(actualGate)); } } @@ -123,7 +123,7 @@ void QInteractionUse::removeActualGate(QGate *actualGate) d->actualGates->remove(actualGate); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(actualGate)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(actualGate)); } } @@ -145,13 +145,13 @@ void QInteractionUse::setReturnValue(QValueSpecification *returnValue) Q_D(QInteractionUse); if (d->returnValue != returnValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->returnValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->returnValue)); d->returnValue = returnValue; // Adjust subsetted property(ies) if (returnValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(returnValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(returnValue)); } } } @@ -197,7 +197,7 @@ void QInteractionUse::addArgument(QValueSpecification *argument) d->arguments->append(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(argument)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(argument)); } } @@ -210,7 +210,7 @@ void QInteractionUse::removeArgument(QValueSpecification *argument) d->arguments->removeAll(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(argument)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(argument)); } } diff --git a/src/uml/qinteractionuse.h b/src/uml/qinteractionuse.h index c08c79fd..28723808 100644 --- a/src/uml/qinteractionuse.h +++ b/src/uml/qinteractionuse.h @@ -78,7 +78,7 @@ class Q_UML_EXPORT QInteractionUse : public QInteractionFragment Q_DECLARE_PRIVATE(QInteractionUse) public: - Q_INVOKABLE explicit QInteractionUse(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInteractionUse(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInteractionUse(); // Association ends from QInteractionUse @@ -96,7 +96,7 @@ public: Q_INVOKABLE void setReturnValueRecipient(QProperty *returnValueRecipient); protected: - explicit QInteractionUse(QInteractionUsePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInteractionUse(QInteractionUsePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterface.cpp b/src/uml/qinterface.cpp index 88bdf6b3..f320cba3 100644 --- a/src/uml/qinterface.cpp +++ b/src/uml/qinterface.cpp @@ -76,12 +76,12 @@ QInterfacePrivate::~QInterfacePrivate() \brief Since an interface specifies conformance characteristics, it does not own detailed behavior specifications. Instead, interfaces may own a protocol state machine that specifies event sequences and pre/post conditions for the operations and receptions described by the interface.Interfaces may include receptions (in addition to operations).An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. An interface specifies a contract; any instance of a classifier that realizes the interface must fulfill that contract. The obligations that may be associated with an interface are in the form of various kinds of constraints (such as pre- and post-conditions) or protocol specifications, which may impose ordering restrictions on interactions through the interface. */ -QInterface::QInterface(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterface::QInterface(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QInterfacePrivate, parent, wrapper) { } -QInterface::QInterface(QInterfacePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterface::QInterface(QInterfacePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -112,13 +112,13 @@ void QInterface::setProtocol(QProtocolStateMachine *protocol) Q_D(QInterface); if (d->protocol != protocol) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(d->protocol)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(d->protocol)); d->protocol = protocol; // Adjust subsetted property(ies) if (protocol) { - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(protocol)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(protocol)); } } } @@ -143,7 +143,7 @@ void QInterface::addRedefinedInterface(QInterface *redefinedInterface) d->redefinedInterfaces->insert(redefinedInterface); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifier *>(this))->addRedefinedClassifier(qmofobject_cast<QClassifier *>(redefinedInterface)); + (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedInterface)); } } @@ -156,7 +156,7 @@ void QInterface::removeRedefinedInterface(QInterface *redefinedInterface) d->redefinedInterfaces->remove(redefinedInterface); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qmofobject_cast<QClassifier *>(redefinedInterface)); + (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedInterface)); } } @@ -180,8 +180,8 @@ void QInterface::addOwnedReception(QReception *ownedReception) d->ownedReceptions->insert(ownedReception); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedReception)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedReception)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedReception)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedReception)); } } @@ -194,8 +194,8 @@ void QInterface::removeOwnedReception(QReception *ownedReception) d->ownedReceptions->remove(ownedReception); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedReception)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedReception)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedReception)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedReception)); } } @@ -219,8 +219,8 @@ void QInterface::addOwnedOperation(QOperation *ownedOperation) d->ownedOperations->append(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setInterface(this); @@ -236,8 +236,8 @@ void QInterface::removeOwnedOperation(QOperation *ownedOperation) d->ownedOperations->removeAll(ownedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedOperation)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedOperation)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedOperation)); // Adjust opposite property ownedOperation->setInterface(0); @@ -264,7 +264,7 @@ void QInterface::addNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->append(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -277,7 +277,7 @@ void QInterface::removeNestedClassifier(QClassifier *nestedClassifier) d->nestedClassifiers->removeAll(nestedClassifier); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(nestedClassifier)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); } } @@ -301,8 +301,8 @@ void QInterface::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setInterface(this); @@ -318,8 +318,8 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); // Adjust opposite property ownedAttribute->setInterface(0); @@ -328,12 +328,12 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute) // Overriden methods for subsetted properties -void QInterface::addRedefinedClassifier(QtMof::QMofPointer<QInterface> redefinedInterface) +void QInterface::addRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface) { addRedefinedInterface(redefinedInterface); } -void QInterface::removeRedefinedClassifier(QtMof::QMofPointer<QInterface> redefinedInterface) +void QInterface::removeRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface) { removeRedefinedInterface(redefinedInterface); } diff --git a/src/uml/qinterface.h b/src/uml/qinterface.h index 5b75e4a4..173df225 100644 --- a/src/uml/qinterface.h +++ b/src/uml/qinterface.h @@ -50,7 +50,8 @@ #include <QtCore/QList> #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -81,7 +82,7 @@ class Q_UML_EXPORT QInterface : public QClassifier Q_DECLARE_PRIVATE(QInterface) public: - Q_INVOKABLE explicit QInterface(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInterface(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInterface(); // Association ends from QInterface @@ -104,11 +105,11 @@ public: Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); // Overriden methods for subsetted properties - Q_INVOKABLE void addRedefinedClassifier(QtMof::QMofPointer<QInterface> redefinedInterface); - Q_INVOKABLE void removeRedefinedClassifier(QtMof::QMofPointer<QInterface> redefinedInterface); + Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface); + Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface); protected: - explicit QInterface(QInterfacePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInterface(QInterfacePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterfacerealization.cpp b/src/uml/qinterfacerealization.cpp index a1d7422f..315a3a85 100644 --- a/src/uml/qinterfacerealization.cpp +++ b/src/uml/qinterfacerealization.cpp @@ -65,12 +65,12 @@ QInterfaceRealizationPrivate::~QInterfaceRealizationPrivate() \brief An interface realization is a specialized realization relationship between a classifier and an interface. This relationship signifies that the realizing classifier conforms to the contract specified by the interface. */ -QInterfaceRealization::QInterfaceRealization(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterfaceRealization::QInterfaceRealization(QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(*new QInterfaceRealizationPrivate, parent, wrapper) { } -QInterfaceRealization::QInterfaceRealization(QInterfaceRealizationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterfaceRealization::QInterfaceRealization(QInterfaceRealizationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(dd, parent, wrapper) { } @@ -105,14 +105,14 @@ void QInterfaceRealization::setImplementingClassifier(QBehavioredClassifier *imp d->implementingClassifier->removeInterfaceRealization(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeClient(qmofobject_cast<QNamedElement *>(d->implementingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->removeClient(qwrappedobject_cast<QNamedElement *>(d->implementingClassifier)); d->implementingClassifier = implementingClassifier; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(implementingClassifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(implementingClassifier)); if (implementingClassifier) { - (qmofobject_cast<QDependency *>(this))->addClient(qmofobject_cast<QNamedElement *>(implementingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->addClient(qwrappedobject_cast<QNamedElement *>(implementingClassifier)); } // Adjust opposite property @@ -139,36 +139,36 @@ void QInterfaceRealization::setContract(QInterface *contract) Q_D(QInterfaceRealization); if (d->contract != contract) { // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeSupplier(qmofobject_cast<QNamedElement *>(d->contract)); + (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(d->contract)); d->contract = contract; // Adjust subsetted property(ies) if (contract) { - (qmofobject_cast<QDependency *>(this))->addSupplier(qmofobject_cast<QNamedElement *>(contract)); + (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(contract)); } } } // Overriden methods for subsetted properties -void QInterfaceRealization::addClient(QtMof::QMofPointer<QBehavioredClassifier> implementingClassifier) +void QInterfaceRealization::addClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier) { setImplementingClassifier(implementingClassifier); } -void QInterfaceRealization::removeClient(QtMof::QMofPointer<QBehavioredClassifier> implementingClassifier) +void QInterfaceRealization::removeClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier) { Q_UNUSED(implementingClassifier); setImplementingClassifier(0); } -void QInterfaceRealization::addSupplier(QtMof::QMofPointer<QInterface> contract) +void QInterfaceRealization::addSupplier(QWrappedObjectPointer<QInterface> contract) { setContract(contract); } -void QInterfaceRealization::removeSupplier(QtMof::QMofPointer<QInterface> contract) +void QInterfaceRealization::removeSupplier(QWrappedObjectPointer<QInterface> contract) { Q_UNUSED(contract); setContract(0); diff --git a/src/uml/qinterfacerealization.h b/src/uml/qinterfacerealization.h index d719d6e8..55a268a6 100644 --- a/src/uml/qinterfacerealization.h +++ b/src/uml/qinterfacerealization.h @@ -46,7 +46,8 @@ // Base class includes #include <QtUml/QRealization> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -71,7 +72,7 @@ class Q_UML_EXPORT QInterfaceRealization : public QRealization Q_DECLARE_PRIVATE(QInterfaceRealization) public: - Q_INVOKABLE explicit QInterfaceRealization(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInterfaceRealization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInterfaceRealization(); // Association ends from QInterfaceRealization @@ -81,13 +82,13 @@ public: Q_INVOKABLE void setContract(QInterface *contract); // Overriden methods for subsetted properties - Q_INVOKABLE void addClient(QtMof::QMofPointer<QBehavioredClassifier> implementingClassifier); - Q_INVOKABLE void removeClient(QtMof::QMofPointer<QBehavioredClassifier> implementingClassifier); - Q_INVOKABLE void addSupplier(QtMof::QMofPointer<QInterface> contract); - Q_INVOKABLE void removeSupplier(QtMof::QMofPointer<QInterface> contract); + Q_INVOKABLE void addClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier); + Q_INVOKABLE void removeClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier); + Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QInterface> contract); + Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QInterface> contract); protected: - explicit QInterfaceRealization(QInterfaceRealizationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInterfaceRealization(QInterfaceRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterruptibleactivityregion.cpp b/src/uml/qinterruptibleactivityregion.cpp index fa268a24..7744de5a 100644 --- a/src/uml/qinterruptibleactivityregion.cpp +++ b/src/uml/qinterruptibleactivityregion.cpp @@ -67,12 +67,12 @@ QInterruptibleActivityRegionPrivate::~QInterruptibleActivityRegionPrivate() \brief An interruptible activity region is an activity group that supports termination of tokens flowing in the portions of an activity. */ -QInterruptibleActivityRegion::QInterruptibleActivityRegion(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterruptibleActivityRegion::QInterruptibleActivityRegion(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityGroup(*new QInterruptibleActivityRegionPrivate, parent, wrapper) { } -QInterruptibleActivityRegion::QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterruptibleActivityRegion::QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityGroup(dd, parent, wrapper) { } @@ -142,7 +142,7 @@ void QInterruptibleActivityRegion::addNode(QActivityNode *node) d->nodes->insert(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qmofobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); // Adjust opposite property node->addInInterruptibleRegion(this); @@ -158,7 +158,7 @@ void QInterruptibleActivityRegion::removeNode(QActivityNode *node) d->nodes->remove(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qmofobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); // Adjust opposite property if (node) diff --git a/src/uml/qinterruptibleactivityregion.h b/src/uml/qinterruptibleactivityregion.h index d8429080..e926a64e 100644 --- a/src/uml/qinterruptibleactivityregion.h +++ b/src/uml/qinterruptibleactivityregion.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QInterruptibleActivityRegion : public QActivityGroup Q_DECLARE_PRIVATE(QInterruptibleActivityRegion) public: - Q_INVOKABLE explicit QInterruptibleActivityRegion(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInterruptibleActivityRegion(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInterruptibleActivityRegion(); // Association ends from QInterruptibleActivityRegion @@ -84,7 +84,7 @@ public: Q_INVOKABLE void removeNode(QActivityNode *node); protected: - explicit QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterval.cpp b/src/uml/qinterval.cpp index 79e8b3ff..da2e08ca 100644 --- a/src/uml/qinterval.cpp +++ b/src/uml/qinterval.cpp @@ -62,12 +62,12 @@ QIntervalPrivate::~QIntervalPrivate() \brief An interval defines the range between two value specifications. */ -QInterval::QInterval(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterval::QInterval(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QIntervalPrivate, parent, wrapper) { } -QInterval::QInterval(QIntervalPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInterval::QInterval(QIntervalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qinterval.h b/src/uml/qinterval.h index fa330ff8..e0a4d7e1 100644 --- a/src/uml/qinterval.h +++ b/src/uml/qinterval.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QInterval : public QValueSpecification Q_DECLARE_PRIVATE(QInterval) public: - Q_INVOKABLE explicit QInterval(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInterval(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInterval(); // Association ends from QInterval @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setMax(QValueSpecification *max); protected: - explicit QInterval(QIntervalPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInterval(QIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qintervalconstraint.cpp b/src/uml/qintervalconstraint.cpp index 4582c49e..a3789521 100644 --- a/src/uml/qintervalconstraint.cpp +++ b/src/uml/qintervalconstraint.cpp @@ -64,12 +64,12 @@ QIntervalConstraintPrivate::~QIntervalConstraintPrivate() \brief An interval constraint is a constraint that refers to an interval. */ -QIntervalConstraint::QIntervalConstraint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QIntervalConstraint::QIntervalConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QConstraint(*new QIntervalConstraintPrivate, parent, wrapper) { } -QIntervalConstraint::QIntervalConstraint(QIntervalConstraintPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QIntervalConstraint::QIntervalConstraint(QIntervalConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QConstraint(dd, parent, wrapper) { } diff --git a/src/uml/qintervalconstraint.h b/src/uml/qintervalconstraint.h index 3baf38f0..2051ccd9 100644 --- a/src/uml/qintervalconstraint.h +++ b/src/uml/qintervalconstraint.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QIntervalConstraint : public QConstraint Q_DECLARE_PRIVATE(QIntervalConstraint) public: - Q_INVOKABLE explicit QIntervalConstraint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QIntervalConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QIntervalConstraint(); // Association ends from QIntervalConstraint @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setSpecification(QInterval *specification); protected: - explicit QIntervalConstraint(QIntervalConstraintPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QIntervalConstraint(QIntervalConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinvocationaction.cpp b/src/uml/qinvocationaction.cpp index b3c8f568..e3951b63 100644 --- a/src/uml/qinvocationaction.cpp +++ b/src/uml/qinvocationaction.cpp @@ -66,12 +66,12 @@ QInvocationActionPrivate::~QInvocationActionPrivate() \brief InvocationAction is an abstract class for the various actions that invoke behavior.In addition to targeting an object, invocation actions can also invoke behavioral features on ports from where the invocation requests are routed onwards on links deriving from attached connectors. Invocation actions may also be sent to a target via a given port, either on the sending object or on another object. */ -QInvocationAction::QInvocationAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInvocationAction::QInvocationAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QInvocationActionPrivate, parent, wrapper) { } -QInvocationAction::QInvocationAction(QInvocationActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QInvocationAction::QInvocationAction(QInvocationActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -104,7 +104,7 @@ void QInvocationAction::addArgument(QInputPin *argument) d->arguments->append(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(argument)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(argument)); } } @@ -117,7 +117,7 @@ void QInvocationAction::removeArgument(QInputPin *argument) d->arguments->removeAll(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(argument)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(argument)); } } diff --git a/src/uml/qinvocationaction.h b/src/uml/qinvocationaction.h index 8f511e6c..9bf95e1d 100644 --- a/src/uml/qinvocationaction.h +++ b/src/uml/qinvocationaction.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QInvocationAction : public QAction Q_DECLARE_PRIVATE(QInvocationAction) public: - Q_INVOKABLE explicit QInvocationAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QInvocationAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInvocationAction(); // Association ends from QInvocationAction @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setOnPort(QPort *onPort); protected: - explicit QInvocationAction(QInvocationActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QInvocationAction(QInvocationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qjoinnode.cpp b/src/uml/qjoinnode.cpp index 2c5ddaf9..41d0639e 100644 --- a/src/uml/qjoinnode.cpp +++ b/src/uml/qjoinnode.cpp @@ -64,12 +64,12 @@ QJoinNodePrivate::~QJoinNodePrivate() \brief A join node is a control node that synchronizes multiple flows.Join nodes have a Boolean value specification using the names of the incoming edges to specify the conditions under which the join will emit a token. */ -QJoinNode::QJoinNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QJoinNode::QJoinNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QJoinNodePrivate, parent, wrapper) { } -QJoinNode::QJoinNode(QJoinNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QJoinNode::QJoinNode(QJoinNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QJoinNode::setJoinSpec(QValueSpecification *joinSpec) Q_D(QJoinNode); if (d->joinSpec != joinSpec) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->joinSpec)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->joinSpec)); d->joinSpec = joinSpec; // Adjust subsetted property(ies) if (joinSpec) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(joinSpec)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(joinSpec)); } } } diff --git a/src/uml/qjoinnode.h b/src/uml/qjoinnode.h index ab1bf8c4..5f439586 100644 --- a/src/uml/qjoinnode.h +++ b/src/uml/qjoinnode.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QJoinNode : public QControlNode Q_DECLARE_PRIVATE(QJoinNode) public: - Q_INVOKABLE explicit QJoinNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QJoinNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QJoinNode(); // Attributes from QJoinNode @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setJoinSpec(QValueSpecification *joinSpec); protected: - explicit QJoinNode(QJoinNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QJoinNode(QJoinNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlifeline.cpp b/src/uml/qlifeline.cpp index 6d0dceac..2f2bda5d 100644 --- a/src/uml/qlifeline.cpp +++ b/src/uml/qlifeline.cpp @@ -72,12 +72,12 @@ QLifelinePrivate::~QLifelinePrivate() \brief A lifeline represents an individual participant in the interaction. While parts and structural features may have multiplicity greater than 1, lifelines represent only one interacting entity. */ -QLifeline::QLifeline(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLifeline::QLifeline(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QLifelinePrivate, parent, wrapper) { } -QLifeline::QLifeline(QLifelinePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLifeline::QLifeline(QLifelinePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -194,7 +194,7 @@ void QLifeline::setInteraction(QInteraction *interaction) d->interaction = interaction; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(interaction)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(interaction)); // Adjust opposite property if (interaction) @@ -220,13 +220,13 @@ void QLifeline::setSelector(QValueSpecification *selector) Q_D(QLifeline); if (d->selector != selector) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->selector)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->selector)); d->selector = selector; // Adjust subsetted property(ies) if (selector) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(selector)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(selector)); } } } diff --git a/src/uml/qlifeline.h b/src/uml/qlifeline.h index aca61c5b..ae3ad517 100644 --- a/src/uml/qlifeline.h +++ b/src/uml/qlifeline.h @@ -78,7 +78,7 @@ class Q_UML_EXPORT QLifeline : public QNamedElement Q_DECLARE_PRIVATE(QLifeline) public: - Q_INVOKABLE explicit QLifeline(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLifeline(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLifeline(); // Association ends from QLifeline @@ -95,7 +95,7 @@ public: Q_INVOKABLE void setSelector(QValueSpecification *selector); protected: - explicit QLifeline(QLifelinePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLifeline(QLifelinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkaction.cpp b/src/uml/qlinkaction.cpp index cddd1147..19f9c069 100644 --- a/src/uml/qlinkaction.cpp +++ b/src/uml/qlinkaction.cpp @@ -68,12 +68,12 @@ QLinkActionPrivate::~QLinkActionPrivate() \brief LinkAction is an abstract class for all link actions that identify their links by the objects at the ends of the links and by the qualifiers at ends of the links. */ -QLinkAction::QLinkAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkAction::QLinkAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QLinkActionPrivate, parent, wrapper) { } -QLinkAction::QLinkAction(QLinkActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkAction::QLinkAction(QLinkActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -106,7 +106,7 @@ void QLinkAction::addInputValue(QInputPin *inputValue) d->inputValues->insert(inputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(inputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(inputValue)); } } @@ -119,7 +119,7 @@ void QLinkAction::removeInputValue(QInputPin *inputValue) d->inputValues->remove(inputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(inputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(inputValue)); } } @@ -143,7 +143,7 @@ void QLinkAction::addEndData(QLinkEndData *endData) d->endData->insert(endData); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(endData)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(endData)); } } @@ -156,7 +156,7 @@ void QLinkAction::removeEndData(QLinkEndData *endData) d->endData->remove(endData); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(endData)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(endData)); } } diff --git a/src/uml/qlinkaction.h b/src/uml/qlinkaction.h index 37cbeb24..292ae3c4 100644 --- a/src/uml/qlinkaction.h +++ b/src/uml/qlinkaction.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QLinkAction : public QAction Q_DECLARE_PRIVATE(QLinkAction) public: - Q_INVOKABLE explicit QLinkAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLinkAction(); // Association ends from QLinkAction @@ -88,7 +88,7 @@ public: Q_INVOKABLE QAssociation *association() const; protected: - explicit QLinkAction(QLinkActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLinkAction(QLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkendcreationdata.cpp b/src/uml/qlinkendcreationdata.cpp index 39bc7aca..de2fd6b1 100644 --- a/src/uml/qlinkendcreationdata.cpp +++ b/src/uml/qlinkendcreationdata.cpp @@ -64,12 +64,12 @@ QLinkEndCreationDataPrivate::~QLinkEndCreationDataPrivate() \brief A link end creation data is not an action. It is an element that identifies links. It identifies one end of a link to be created by a create link action. */ -QLinkEndCreationData::QLinkEndCreationData(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndCreationData::QLinkEndCreationData(QWrappedObject *parent, QWrappedObject *wrapper) : QLinkEndData(*new QLinkEndCreationDataPrivate, parent, wrapper) { } -QLinkEndCreationData::QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndCreationData::QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLinkEndData(dd, parent, wrapper) { } diff --git a/src/uml/qlinkendcreationdata.h b/src/uml/qlinkendcreationdata.h index 0ae2d81f..657916ab 100644 --- a/src/uml/qlinkendcreationdata.h +++ b/src/uml/qlinkendcreationdata.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QLinkEndCreationData : public QLinkEndData Q_DECLARE_PRIVATE(QLinkEndCreationData) public: - Q_INVOKABLE explicit QLinkEndCreationData(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLinkEndCreationData(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLinkEndCreationData(); // Attributes from QLinkEndCreationData @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setInsertAt(QInputPin *insertAt); protected: - explicit QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkenddata.cpp b/src/uml/qlinkenddata.cpp index 2c7918f6..28d99d0e 100644 --- a/src/uml/qlinkenddata.cpp +++ b/src/uml/qlinkenddata.cpp @@ -68,12 +68,12 @@ QLinkEndDataPrivate::~QLinkEndDataPrivate() \brief A link end data is not an action. It is an element that identifies links. It identifies one end of a link to be read or written by the children of a link action. A link cannot be passed as a runtime value to or from an action. Instead, a link is identified by its end objects and qualifier values, if any. This requires more than one piece of data, namely, the statically-specified end in the user model, the object on the end, and the qualifier values for that end, if any. These pieces are brought together around a link end data. Each association end is identified separately with an instance of the LinkEndData class. */ -QLinkEndData::QLinkEndData(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndData::QLinkEndData(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QLinkEndDataPrivate, parent, wrapper) { } -QLinkEndData::QLinkEndData(QLinkEndDataPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndData::QLinkEndData(QLinkEndDataPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -148,7 +148,7 @@ void QLinkEndData::addQualifier(QQualifierValue *qualifier) d->qualifiers->insert(qualifier); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(qualifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); } } @@ -161,7 +161,7 @@ void QLinkEndData::removeQualifier(QQualifierValue *qualifier) d->qualifiers->remove(qualifier); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(qualifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); } } diff --git a/src/uml/qlinkenddata.h b/src/uml/qlinkenddata.h index 30ae2c36..636488da 100644 --- a/src/uml/qlinkenddata.h +++ b/src/uml/qlinkenddata.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QLinkEndData : public QElement Q_DECLARE_PRIVATE(QLinkEndData) public: - Q_INVOKABLE explicit QLinkEndData(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLinkEndData(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLinkEndData(); // Association ends from QLinkEndData @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeQualifier(QQualifierValue *qualifier); protected: - explicit QLinkEndData(QLinkEndDataPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLinkEndData(QLinkEndDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkenddestructiondata.cpp b/src/uml/qlinkenddestructiondata.cpp index cdd4c365..f24418a0 100644 --- a/src/uml/qlinkenddestructiondata.cpp +++ b/src/uml/qlinkenddestructiondata.cpp @@ -64,12 +64,12 @@ QLinkEndDestructionDataPrivate::~QLinkEndDestructionDataPrivate() \brief A link end destruction data is not an action. It is an element that identifies links. It identifies one end of a link to be destroyed by destroy link action. */ -QLinkEndDestructionData::QLinkEndDestructionData(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndDestructionData::QLinkEndDestructionData(QWrappedObject *parent, QWrappedObject *wrapper) : QLinkEndData(*new QLinkEndDestructionDataPrivate, parent, wrapper) { } -QLinkEndDestructionData::QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLinkEndDestructionData::QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLinkEndData(dd, parent, wrapper) { } diff --git a/src/uml/qlinkenddestructiondata.h b/src/uml/qlinkenddestructiondata.h index a24b790e..49ccc6bd 100644 --- a/src/uml/qlinkenddestructiondata.h +++ b/src/uml/qlinkenddestructiondata.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QLinkEndDestructionData : public QLinkEndData Q_DECLARE_PRIVATE(QLinkEndDestructionData) public: - Q_INVOKABLE explicit QLinkEndDestructionData(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLinkEndDestructionData(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLinkEndDestructionData(); // Attributes from QLinkEndDestructionData @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setDestroyAt(QInputPin *destroyAt); protected: - explicit QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralboolean.cpp b/src/uml/qliteralboolean.cpp index c5ee253b..db18b5c0 100644 --- a/src/uml/qliteralboolean.cpp +++ b/src/uml/qliteralboolean.cpp @@ -61,12 +61,12 @@ QLiteralBooleanPrivate::~QLiteralBooleanPrivate() \brief A literal Boolean is a specification of a Boolean value. */ -QLiteralBoolean::QLiteralBoolean(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralBoolean::QLiteralBoolean(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralBooleanPrivate, parent, wrapper) { } -QLiteralBoolean::QLiteralBoolean(QLiteralBooleanPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralBoolean::QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralboolean.h b/src/uml/qliteralboolean.h index 3805e35f..bf19d836 100644 --- a/src/uml/qliteralboolean.h +++ b/src/uml/qliteralboolean.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QLiteralBoolean : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralBoolean) public: - Q_INVOKABLE explicit QLiteralBoolean(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralBoolean(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralBoolean(); // Attributes from QLiteralBoolean @@ -76,7 +76,7 @@ public: Q_INVOKABLE bool isComputable() const; protected: - explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralinteger.cpp b/src/uml/qliteralinteger.cpp index 9d9e2d50..c53312e2 100644 --- a/src/uml/qliteralinteger.cpp +++ b/src/uml/qliteralinteger.cpp @@ -60,12 +60,12 @@ QLiteralIntegerPrivate::~QLiteralIntegerPrivate() \brief A literal integer is a specification of an integer value. */ -QLiteralInteger::QLiteralInteger(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralInteger::QLiteralInteger(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralIntegerPrivate, parent, wrapper) { } -QLiteralInteger::QLiteralInteger(QLiteralIntegerPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralInteger::QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralinteger.h b/src/uml/qliteralinteger.h index c42cb8ff..0e679a93 100644 --- a/src/uml/qliteralinteger.h +++ b/src/uml/qliteralinteger.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QLiteralInteger : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralInteger) public: - Q_INVOKABLE explicit QLiteralInteger(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralInteger(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralInteger(); // Attributes from QLiteralInteger @@ -76,7 +76,7 @@ public: Q_INVOKABLE bool isComputable() const; protected: - explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralnull.cpp b/src/uml/qliteralnull.cpp index eb61fcc3..98e0714c 100644 --- a/src/uml/qliteralnull.cpp +++ b/src/uml/qliteralnull.cpp @@ -60,12 +60,12 @@ QLiteralNullPrivate::~QLiteralNullPrivate() \brief A literal null specifies the lack of a value. */ -QLiteralNull::QLiteralNull(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralNull::QLiteralNull(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralNullPrivate, parent, wrapper) { } -QLiteralNull::QLiteralNull(QLiteralNullPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralNull::QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralnull.h b/src/uml/qliteralnull.h index f33c05ef..8b084b71 100644 --- a/src/uml/qliteralnull.h +++ b/src/uml/qliteralnull.h @@ -62,7 +62,7 @@ class Q_UML_EXPORT QLiteralNull : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralNull) public: - Q_INVOKABLE explicit QLiteralNull(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralNull(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralNull(); // Operations @@ -70,7 +70,7 @@ public: Q_INVOKABLE bool isNull() const; protected: - explicit QLiteralNull(QLiteralNullPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralreal.cpp b/src/uml/qliteralreal.cpp index 8b3a1379..8c33c868 100644 --- a/src/uml/qliteralreal.cpp +++ b/src/uml/qliteralreal.cpp @@ -60,12 +60,12 @@ QLiteralRealPrivate::~QLiteralRealPrivate() \brief A literal real is a specification of a real value. */ -QLiteralReal::QLiteralReal(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralReal::QLiteralReal(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralRealPrivate, parent, wrapper) { } -QLiteralReal::QLiteralReal(QLiteralRealPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralReal::QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralreal.h b/src/uml/qliteralreal.h index 5d2f217c..86dd21ec 100644 --- a/src/uml/qliteralreal.h +++ b/src/uml/qliteralreal.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QLiteralReal : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralReal) public: - Q_INVOKABLE explicit QLiteralReal(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralReal(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralReal(); // Attributes from QLiteralReal @@ -76,7 +76,7 @@ public: Q_INVOKABLE qreal realValue() const; protected: - explicit QLiteralReal(QLiteralRealPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralspecification.cpp b/src/uml/qliteralspecification.cpp index 61571444..f2528b48 100644 --- a/src/uml/qliteralspecification.cpp +++ b/src/uml/qliteralspecification.cpp @@ -60,12 +60,12 @@ QLiteralSpecificationPrivate::~QLiteralSpecificationPrivate() \brief A literal specification identifies a literal constant being modeled. */ -QLiteralSpecification::QLiteralSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralSpecification::QLiteralSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QLiteralSpecificationPrivate, parent, wrapper) { } -QLiteralSpecification::QLiteralSpecification(QLiteralSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralSpecification::QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralspecification.h b/src/uml/qliteralspecification.h index 7d4c189a..c9055dc0 100644 --- a/src/uml/qliteralspecification.h +++ b/src/uml/qliteralspecification.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QLiteralSpecification : public QValueSpecification Q_DECLARE_PRIVATE(QLiteralSpecification) public: - Q_INVOKABLE explicit QLiteralSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralSpecification(); protected: - explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralstring.cpp b/src/uml/qliteralstring.cpp index 2b65187e..8df5a41b 100644 --- a/src/uml/qliteralstring.cpp +++ b/src/uml/qliteralstring.cpp @@ -60,12 +60,12 @@ QLiteralStringPrivate::~QLiteralStringPrivate() \brief A literal string is a specification of a string value. */ -QLiteralString::QLiteralString(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralString::QLiteralString(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralStringPrivate, parent, wrapper) { } -QLiteralString::QLiteralString(QLiteralStringPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralString::QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralstring.h b/src/uml/qliteralstring.h index 87844ebc..eae91cd2 100644 --- a/src/uml/qliteralstring.h +++ b/src/uml/qliteralstring.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QLiteralString : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralString) public: - Q_INVOKABLE explicit QLiteralString(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralString(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralString(); // Attributes from QLiteralString @@ -79,7 +79,7 @@ public: Q_INVOKABLE QString stringValue() const; protected: - explicit QLiteralString(QLiteralStringPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralunlimitednatural.cpp b/src/uml/qliteralunlimitednatural.cpp index 993300e9..8080a699 100644 --- a/src/uml/qliteralunlimitednatural.cpp +++ b/src/uml/qliteralunlimitednatural.cpp @@ -61,12 +61,12 @@ QLiteralUnlimitedNaturalPrivate::~QLiteralUnlimitedNaturalPrivate() \brief A literal unlimited natural is a specification of an unlimited natural number. */ -QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(*new QLiteralUnlimitedNaturalPrivate, parent, wrapper) { } -QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLiteralUnlimitedNatural::QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLiteralSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qliteralunlimitednatural.h b/src/uml/qliteralunlimitednatural.h index 40ce6c0e..5260ea6b 100644 --- a/src/uml/qliteralunlimitednatural.h +++ b/src/uml/qliteralunlimitednatural.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QLiteralUnlimitedNatural : public QLiteralSpecification Q_DECLARE_PRIVATE(QLiteralUnlimitedNatural) public: - Q_INVOKABLE explicit QLiteralUnlimitedNatural(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLiteralUnlimitedNatural(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralUnlimitedNatural(); // Attributes from QLiteralUnlimitedNatural @@ -76,7 +76,7 @@ public: Q_INVOKABLE qint32 unlimitedValue() const; protected: - explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qloopnode.cpp b/src/uml/qloopnode.cpp index 23babb05..09889f97 100644 --- a/src/uml/qloopnode.cpp +++ b/src/uml/qloopnode.cpp @@ -80,12 +80,12 @@ QLoopNodePrivate::~QLoopNodePrivate() \brief A loop node is a structured activity node that represents a loop with setup, test, and body sections. */ -QLoopNode::QLoopNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLoopNode::QLoopNode(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(*new QLoopNodePrivate, parent, wrapper) { } -QLoopNode::QLoopNode(QLoopNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QLoopNode::QLoopNode(QLoopNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(dd, parent, wrapper) { } @@ -141,7 +141,7 @@ void QLoopNode::addLoopVariableInput(QInputPin *loopVariableInput) Q_D(QLoopNode); if (!d->loopVariableInputs->contains(loopVariableInput)) { d->loopVariableInputs->append(loopVariableInput); - qmof_topLevelWrapper(loopVariableInput)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(loopVariableInput)->setParent(qTopLevelWrapper(this)); } } @@ -152,7 +152,7 @@ void QLoopNode::removeLoopVariableInput(QInputPin *loopVariableInput) Q_D(QLoopNode); if (d->loopVariableInputs->contains(loopVariableInput)) { d->loopVariableInputs->removeAll(loopVariableInput); - qmof_topLevelWrapper(loopVariableInput)->setParent(0); + qTopLevelWrapper(loopVariableInput)->setParent(0); } } @@ -257,7 +257,7 @@ void QLoopNode::addResult(QOutputPin *result) Q_D(QLoopNode); if (!d->results->contains(result)) { d->results->append(result); - qmof_topLevelWrapper(result)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(result)->setParent(qTopLevelWrapper(this)); } } @@ -268,7 +268,7 @@ void QLoopNode::removeResult(QOutputPin *result) Q_D(QLoopNode); if (d->results->contains(result)) { d->results->removeAll(result); - qmof_topLevelWrapper(result)->setParent(0); + qTopLevelWrapper(result)->setParent(0); } } diff --git a/src/uml/qloopnode.h b/src/uml/qloopnode.h index 81dbf203..c95b4011 100644 --- a/src/uml/qloopnode.h +++ b/src/uml/qloopnode.h @@ -81,7 +81,7 @@ class Q_UML_EXPORT QLoopNode : public QStructuredActivityNode Q_DECLARE_PRIVATE(QLoopNode) public: - Q_INVOKABLE explicit QLoopNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QLoopNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLoopNode(); // Attributes from QLoopNode @@ -114,7 +114,7 @@ public: Q_INVOKABLE void removeTest(QExecutableNode *test); protected: - explicit QLoopNode(QLoopNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QLoopNode(QLoopNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmanifestation.cpp b/src/uml/qmanifestation.cpp index a9957c90..d310871e 100644 --- a/src/uml/qmanifestation.cpp +++ b/src/uml/qmanifestation.cpp @@ -63,12 +63,12 @@ QManifestationPrivate::~QManifestationPrivate() \brief A manifestation is the concrete physical rendering of one or more model elements by an artifact. */ -QManifestation::QManifestation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QManifestation::QManifestation(QWrappedObject *parent, QWrappedObject *wrapper) : QAbstraction(*new QManifestationPrivate, parent, wrapper) { } -QManifestation::QManifestation(QManifestationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QManifestation::QManifestation(QManifestationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAbstraction(dd, parent, wrapper) { } @@ -99,25 +99,25 @@ void QManifestation::setUtilizedElement(QPackageableElement *utilizedElement) Q_D(QManifestation); if (d->utilizedElement != utilizedElement) { // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeSupplier(qmofobject_cast<QNamedElement *>(d->utilizedElement)); + (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(d->utilizedElement)); d->utilizedElement = utilizedElement; // Adjust subsetted property(ies) if (utilizedElement) { - (qmofobject_cast<QDependency *>(this))->addSupplier(qmofobject_cast<QNamedElement *>(utilizedElement)); + (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(utilizedElement)); } } } // Overriden methods for subsetted properties -void QManifestation::addSupplier(QtMof::QMofPointer<QPackageableElement> utilizedElement) +void QManifestation::addSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement) { setUtilizedElement(utilizedElement); } -void QManifestation::removeSupplier(QtMof::QMofPointer<QPackageableElement> utilizedElement) +void QManifestation::removeSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement) { Q_UNUSED(utilizedElement); setUtilizedElement(0); diff --git a/src/uml/qmanifestation.h b/src/uml/qmanifestation.h index 2713ec7f..99ac698e 100644 --- a/src/uml/qmanifestation.h +++ b/src/uml/qmanifestation.h @@ -46,7 +46,8 @@ // Base class includes #include <QtUml/QAbstraction> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -69,7 +70,7 @@ class Q_UML_EXPORT QManifestation : public QAbstraction Q_DECLARE_PRIVATE(QManifestation) public: - Q_INVOKABLE explicit QManifestation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QManifestation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QManifestation(); // Association ends from QManifestation @@ -77,11 +78,11 @@ public: Q_INVOKABLE void setUtilizedElement(QPackageableElement *utilizedElement); // Overriden methods for subsetted properties - Q_INVOKABLE void addSupplier(QtMof::QMofPointer<QPackageableElement> utilizedElement); - Q_INVOKABLE void removeSupplier(QtMof::QMofPointer<QPackageableElement> utilizedElement); + Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement); + Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement); protected: - explicit QManifestation(QManifestationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QManifestation(QManifestationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmergenode.cpp b/src/uml/qmergenode.cpp index ad96042d..aa00ba4a 100644 --- a/src/uml/qmergenode.cpp +++ b/src/uml/qmergenode.cpp @@ -60,12 +60,12 @@ QMergeNodePrivate::~QMergeNodePrivate() \brief A merge node is a control node that brings together multiple alternate flows. It is not used to synchronize concurrent flows but to accept one among several alternate flows. */ -QMergeNode::QMergeNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMergeNode::QMergeNode(QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(*new QMergeNodePrivate, parent, wrapper) { } -QMergeNode::QMergeNode(QMergeNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMergeNode::QMergeNode(QMergeNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QControlNode(dd, parent, wrapper) { } diff --git a/src/uml/qmergenode.h b/src/uml/qmergenode.h index e0d96a60..10978efd 100644 --- a/src/uml/qmergenode.h +++ b/src/uml/qmergenode.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QMergeNode : public QControlNode Q_DECLARE_PRIVATE(QMergeNode) public: - Q_INVOKABLE explicit QMergeNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMergeNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMergeNode(); protected: - explicit QMergeNode(QMergeNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMergeNode(QMergeNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessage.cpp b/src/uml/qmessage.cpp index fa6ceedc..fd359ece 100644 --- a/src/uml/qmessage.cpp +++ b/src/uml/qmessage.cpp @@ -73,12 +73,12 @@ QMessagePrivate::~QMessagePrivate() \brief A message defines a particular communication between lifelines of an interaction. */ -QMessage::QMessage(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessage::QMessage(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QMessagePrivate, parent, wrapper) { } -QMessage::QMessage(QMessagePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessage::QMessage(QMessagePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -169,7 +169,7 @@ void QMessage::addArgument(QValueSpecification *argument) d->arguments->append(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(argument)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(argument)); } } @@ -182,7 +182,7 @@ void QMessage::removeArgument(QValueSpecification *argument) d->arguments->removeAll(argument); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(argument)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(argument)); } } @@ -231,7 +231,7 @@ void QMessage::setInteraction(QInteraction *interaction) d->interaction = interaction; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(interaction)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(interaction)); // Adjust opposite property if (interaction) diff --git a/src/uml/qmessage.h b/src/uml/qmessage.h index cbfe1afd..aa64b518 100644 --- a/src/uml/qmessage.h +++ b/src/uml/qmessage.h @@ -84,7 +84,7 @@ class Q_UML_EXPORT QMessage : public QNamedElement Q_DECLARE_PRIVATE(QMessage) public: - Q_INVOKABLE explicit QMessage(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMessage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMessage(); // Attributes from QMessage @@ -108,7 +108,7 @@ public: Q_INVOKABLE void setConnector(QConnector *connector); protected: - explicit QMessage(QMessagePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMessage(QMessagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageend.cpp b/src/uml/qmessageend.cpp index 97d6fa13..dab59248 100644 --- a/src/uml/qmessageend.cpp +++ b/src/uml/qmessageend.cpp @@ -63,12 +63,12 @@ QMessageEndPrivate::~QMessageEndPrivate() \brief MessageEnd is an abstract specialization of NamedElement that represents what can occur at the end of a message. */ -QMessageEnd::QMessageEnd(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessageEnd::QMessageEnd(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QMessageEndPrivate, parent, wrapper) { } -QMessageEnd::QMessageEnd(QMessageEndPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessageEnd::QMessageEnd(QMessageEndPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qmessageend.h b/src/uml/qmessageend.h index e318280e..d1144f57 100644 --- a/src/uml/qmessageend.h +++ b/src/uml/qmessageend.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QMessageEnd : public QNamedElement Q_DECLARE_PRIVATE(QMessageEnd) public: - Q_INVOKABLE explicit QMessageEnd(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMessageEnd(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMessageEnd(); // Association ends from QMessageEnd @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setMessage(QMessage *message); protected: - explicit QMessageEnd(QMessageEndPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMessageEnd(QMessageEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageevent.cpp b/src/uml/qmessageevent.cpp index ace6a3c4..9bee5568 100644 --- a/src/uml/qmessageevent.cpp +++ b/src/uml/qmessageevent.cpp @@ -60,12 +60,12 @@ QMessageEventPrivate::~QMessageEventPrivate() \brief A message event specifies the receipt by an object of either a call or a signal. */ -QMessageEvent::QMessageEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessageEvent::QMessageEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(*new QMessageEventPrivate, parent, wrapper) { } -QMessageEvent::QMessageEvent(QMessageEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMessageEvent::QMessageEvent(QMessageEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(dd, parent, wrapper) { } diff --git a/src/uml/qmessageevent.h b/src/uml/qmessageevent.h index 5d4b00d1..7307032e 100644 --- a/src/uml/qmessageevent.h +++ b/src/uml/qmessageevent.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QMessageEvent : public QEvent Q_DECLARE_PRIVATE(QMessageEvent) public: - Q_INVOKABLE explicit QMessageEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMessageEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMessageEvent(); protected: - explicit QMessageEvent(QMessageEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMessageEvent(QMessageEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageoccurrencespecification.cpp b/src/uml/qmessageoccurrencespecification.cpp index af3ecf55..b21da0ea 100644 --- a/src/uml/qmessageoccurrencespecification.cpp +++ b/src/uml/qmessageoccurrencespecification.cpp @@ -60,15 +60,15 @@ QMessageOccurrenceSpecificationPrivate::~QMessageOccurrenceSpecificationPrivate( \brief A message occurrence specification pecifies the occurrence of message events, such as sending and receiving of signals or invoking or receiving of operation calls. A message occurrence specification is a kind of message end. Messages are generated either by synchronous operation calls or asynchronous signal sends. They are received by the execution of corresponding accept event actions. */ -QMessageOccurrenceSpecification::QMessageOccurrenceSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QMessageOccurrenceSpecificationPrivate, parent, wrapper), +QMessageOccurrenceSpecification::QMessageOccurrenceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QMessageOccurrenceSpecificationPrivate, parent, wrapper), _wrappedOccurrenceSpecification(new QOccurrenceSpecification(this, this)), _wrappedMessageEnd(new QMessageEnd(this, this)) { } -QMessageOccurrenceSpecification::QMessageOccurrenceSpecification(QMessageOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QMessageOccurrenceSpecification::QMessageOccurrenceSpecification(QMessageOccurrenceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedOccurrenceSpecification(new QOccurrenceSpecification(this, this)), _wrappedMessageEnd(new QMessageEnd(this, this)) { @@ -87,7 +87,7 @@ QMessageOccurrenceSpecification::~QMessageOccurrenceSpecification() */ const QSet<QElement *> *QMessageOccurrenceSpecification::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -95,7 +95,7 @@ const QSet<QElement *> *QMessageOccurrenceSpecification::ownedElements() const */ QElement *QMessageOccurrenceSpecification::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -103,17 +103,17 @@ QElement *QMessageOccurrenceSpecification::owner() const */ const QSet<QComment *> *QMessageOccurrenceSpecification::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QMessageOccurrenceSpecification::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QMessageOccurrenceSpecification::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -125,12 +125,12 @@ void QMessageOccurrenceSpecification::removeOwnedComment(QComment *ownedComment) */ QString QMessageOccurrenceSpecification::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QMessageOccurrenceSpecification::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -138,12 +138,12 @@ void QMessageOccurrenceSpecification::setName(QString name) */ QtUml::VisibilityKind QMessageOccurrenceSpecification::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QMessageOccurrenceSpecification::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -151,7 +151,7 @@ void QMessageOccurrenceSpecification::setVisibility(QtUml::VisibilityKind visibi */ QString QMessageOccurrenceSpecification::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -163,12 +163,12 @@ QString QMessageOccurrenceSpecification::qualifiedName() const */ QStringExpression *QMessageOccurrenceSpecification::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QMessageOccurrenceSpecification::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -176,7 +176,7 @@ void QMessageOccurrenceSpecification::setNameExpression(QStringExpression *nameE */ QNamespace *QMessageOccurrenceSpecification::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -184,17 +184,17 @@ QNamespace *QMessageOccurrenceSpecification::namespace_() const */ const QSet<QDependency *> *QMessageOccurrenceSpecification::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QMessageOccurrenceSpecification::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QMessageOccurrenceSpecification::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -206,12 +206,12 @@ void QMessageOccurrenceSpecification::removeClientDependency(QDependency *client */ QMessage *QMessageOccurrenceSpecification::message() const { - return (qmofobject_cast<const QMessageEnd *>(this))->message(); + return (qwrappedobject_cast<const QMessageEnd *>(this))->message(); } void QMessageOccurrenceSpecification::setMessage(QMessage *message) { - (qmofobject_cast<QMessageEnd *>(this))->setMessage(message); + (qwrappedobject_cast<QMessageEnd *>(this))->setMessage(message); } #include "moc_qmessageoccurrencespecification.cpp" diff --git a/src/uml/qmessageoccurrencespecification.h b/src/uml/qmessageoccurrencespecification.h index 8a5a9291..7a284a80 100644 --- a/src/uml/qmessageoccurrencespecification.h +++ b/src/uml/qmessageoccurrencespecification.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QOccurrenceSpecification> #include <QtUml/QMessageEnd> @@ -56,7 +57,7 @@ QT_MODULE(QtUml) class QMessageOccurrenceSpecificationPrivate; -class Q_UML_EXPORT QMessageOccurrenceSpecification : public QtMof::QMofObject +class Q_UML_EXPORT QMessageOccurrenceSpecification : public QWrappedObject { Q_OBJECT @@ -64,7 +65,7 @@ class Q_UML_EXPORT QMessageOccurrenceSpecification : public QtMof::QMofObject Q_DECLARE_PRIVATE(QMessageOccurrenceSpecification) public: - Q_INVOKABLE explicit QMessageOccurrenceSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMessageOccurrenceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMessageOccurrenceSpecification(); // Association ends from aggregated QElement @@ -94,7 +95,7 @@ public: Q_INVOKABLE void setMessage(QMessage *message); protected: - explicit QMessageOccurrenceSpecification(QMessageOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMessageOccurrenceSpecification(QMessageOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QOccurrenceSpecification *_wrappedOccurrenceSpecification; diff --git a/src/uml/qmessageoccurrencespecification_p.h b/src/uml/qmessageoccurrencespecification_p.h index f3a42280..de80bf4d 100644 --- a/src/uml/qmessageoccurrencespecification_p.h +++ b/src/uml/qmessageoccurrencespecification_p.h @@ -42,7 +42,8 @@ #define QTUML_QMESSAGEOCCURRENCESPECIFICATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qoccurrencespecification_p.h" #include "private/qmessageend_p.h" @@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE_QTUML QT_MODULE(QtUml) class QMessageOccurrenceSpecification; -class Q_UML_EXPORT QMessageOccurrenceSpecificationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QMessageOccurrenceSpecificationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QMessageOccurrenceSpecification) diff --git a/src/uml/qmodel.cpp b/src/uml/qmodel.cpp index 2e2b0bdd..1ed851cd 100644 --- a/src/uml/qmodel.cpp +++ b/src/uml/qmodel.cpp @@ -60,12 +60,12 @@ QModelPrivate::~QModelPrivate() \brief A model captures a view of a physical system. It is an abstraction of the physical system, with a certain purpose. This purpose determines what is to be included in the model and what is irrelevant. Thus the model completely describes those aspects of the physical system that are relevant to the purpose of the model, at the appropriate level of detail. */ -QModel::QModel(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QModel::QModel(QWrappedObject *parent, QWrappedObject *wrapper) : QPackage(*new QModelPrivate, parent, wrapper) { } -QModel::QModel(QModelPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QModel::QModel(QModelPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackage(dd, parent, wrapper) { } diff --git a/src/uml/qmodel.h b/src/uml/qmodel.h index 96d6c065..d762ed48 100644 --- a/src/uml/qmodel.h +++ b/src/uml/qmodel.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QModel : public QPackage Q_DECLARE_PRIVATE(QModel) public: - Q_INVOKABLE explicit QModel(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QModel(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QModel(); // Attributes from QModel @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setViewpoint(QString viewpoint); protected: - explicit QModel(QModelPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QModel(QModelPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmultiplicityelement.cpp b/src/uml/qmultiplicityelement.cpp index fdbb2c26..e2c9562b 100644 --- a/src/uml/qmultiplicityelement.cpp +++ b/src/uml/qmultiplicityelement.cpp @@ -66,12 +66,12 @@ QMultiplicityElementPrivate::~QMultiplicityElementPrivate() \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. */ -QMultiplicityElement::QMultiplicityElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMultiplicityElement::QMultiplicityElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QMultiplicityElementPrivate, parent, wrapper) { } -QMultiplicityElement::QMultiplicityElement(QMultiplicityElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QMultiplicityElement::QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -196,13 +196,13 @@ void QMultiplicityElement::setUpperValue(QValueSpecification *upperValue) Q_D(QMultiplicityElement); if (d->upperValue != upperValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->upperValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->upperValue)); d->upperValue = upperValue; // Adjust subsetted property(ies) if (upperValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(upperValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(upperValue)); } } } @@ -225,13 +225,13 @@ void QMultiplicityElement::setLowerValue(QValueSpecification *lowerValue) Q_D(QMultiplicityElement); if (d->lowerValue != lowerValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->lowerValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->lowerValue)); d->lowerValue = lowerValue; // Adjust subsetted property(ies) if (lowerValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(lowerValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(lowerValue)); } } } diff --git a/src/uml/qmultiplicityelement.h b/src/uml/qmultiplicityelement.h index 2301c73d..101c6e04 100644 --- a/src/uml/qmultiplicityelement.h +++ b/src/uml/qmultiplicityelement.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QMultiplicityElement : public QElement Q_DECLARE_PRIVATE(QMultiplicityElement) public: - Q_INVOKABLE explicit QMultiplicityElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QMultiplicityElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMultiplicityElement(); // Attributes from QMultiplicityElement @@ -101,7 +101,7 @@ public: Q_INVOKABLE qint32 upperBound() const; protected: - explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnamedelement.cpp b/src/uml/qnamedelement.cpp index f65b98f7..1662b5bb 100644 --- a/src/uml/qnamedelement.cpp +++ b/src/uml/qnamedelement.cpp @@ -71,16 +71,16 @@ void QNamedElementPrivate::setNamespace_(QNamespace *namespace_) Q_Q(QNamedElement); // Adjust opposite property if (this->namespace_) - (qmofobject_cast<QNamespacePrivate *>(this->namespace_->d_func()))->removeOwnedMember(q); + (qwrappedobject_cast<QNamespacePrivate *>(this->namespace_->d_func()))->removeOwnedMember(q); this->namespace_ = namespace_; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(this))->setOwner(qmofobject_cast<QElement *>(namespace_)); + (qwrappedobject_cast<QElementPrivate *>(this))->setOwner(qwrappedobject_cast<QElement *>(namespace_)); // Adjust opposite property if (namespace_) - (qmofobject_cast<QNamespacePrivate *>(namespace_->d_func()))->addOwnedMember(q); + (qwrappedobject_cast<QNamespacePrivate *>(namespace_->d_func()))->addOwnedMember(q); } } @@ -92,12 +92,12 @@ void QNamedElementPrivate::setNamespace_(QNamespace *namespace_) \brief A named element supports using a string expression to specify its name. This allows names of model elements to involve template parameters. The actual name is evaluated from the string expression only when it is sensible to do so (e.g., when a template is bound).A named element is an element in a model that may have a name. */ -QNamedElement::QNamedElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QNamedElement::QNamedElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QNamedElementPrivate, parent, wrapper) { } -QNamedElement::QNamedElement(QNamedElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QNamedElement::QNamedElement(QNamedElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -128,10 +128,10 @@ void QNamedElement::setName(QString name) Q_D(QNamedElement); if (d->name != name) { d->name = name; - QtMof::QMofObject *mofObject = this; - while (mofObject->wrapper()) - mofObject = mofObject->wrapper(); - mofObject->setObjectName(name); + QWrappedObject *wrappedObject = this; + while (wrappedObject->wrapper()) + wrappedObject = wrappedObject->wrapper(); + wrappedObject->setObjectName(name); } } @@ -198,13 +198,13 @@ void QNamedElement::setNameExpression(QStringExpression *nameExpression) Q_D(QNamedElement); if (d->nameExpression != nameExpression) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->nameExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->nameExpression)); d->nameExpression = nameExpression; // Adjust subsetted property(ies) if (nameExpression) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(nameExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(nameExpression)); } } } diff --git a/src/uml/qnamedelement.h b/src/uml/qnamedelement.h index 8fb7d300..a5d418f8 100644 --- a/src/uml/qnamedelement.h +++ b/src/uml/qnamedelement.h @@ -83,7 +83,7 @@ class Q_UML_EXPORT QNamedElement : public QElement Q_DECLARE_PRIVATE(QNamedElement) public: - Q_INVOKABLE explicit QNamedElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QNamedElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QNamedElement(); // Attributes from QNamedElement @@ -111,7 +111,7 @@ public: friend class QNamespacePrivate; protected: - explicit QNamedElement(QNamedElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QNamedElement(QNamedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnamespace.cpp b/src/uml/qnamespace.cpp index d8f146a3..b66921ce 100644 --- a/src/uml/qnamespace.cpp +++ b/src/uml/qnamespace.cpp @@ -96,12 +96,12 @@ void QNamespacePrivate::addOwnedMember(QNamedElement *ownedMember) this->ownedMembers->insert(ownedMember); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->addMember(qmofobject_cast<QNamedElement *>(ownedMember)); - (qmofobject_cast<QElementPrivate *>(this))->addOwnedElement(qmofobject_cast<QElement *>(ownedMember)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); + (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); // Adjust opposite property Q_Q(QNamespace); - (qmofobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(q); + (qwrappedobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(q); } } @@ -113,11 +113,11 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) this->ownedMembers->remove(ownedMember); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->removeMember(qmofobject_cast<QNamedElement *>(ownedMember)); - (qmofobject_cast<QElementPrivate *>(this))->removeOwnedElement(qmofobject_cast<QElement *>(ownedMember)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); + (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); // Adjust opposite property - (qmofobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(0); + (qwrappedobject_cast<QNamedElementPrivate *>(ownedMember->d_func()))->setNamespace_(0); } } @@ -129,12 +129,12 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) \brief A namespace is an element in a model that contains a set of named elements that can be identified by name. */ -QNamespace::QNamespace(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QNamespace::QNamespace(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QNamespacePrivate, parent, wrapper) { } -QNamespace::QNamespace(QNamespacePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QNamespace::QNamespace(QNamespacePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -167,7 +167,7 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) d->packageImports->insert(packageImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(packageImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); // Adjust opposite property packageImport->setImportingNamespace(this); @@ -175,7 +175,7 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member foreach (QPackageableElement *packageableElement, *packageImport->importedPackage()->packagedElements()) - d->addMember(qmofobject_cast<QNamedElement *>(packageableElement)); + d->addMember(qwrappedobject_cast<QNamedElement *>(packageableElement)); } } @@ -188,7 +188,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) d->packageImports->remove(packageImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(packageImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); // Adjust opposite property packageImport->setImportingNamespace(0); @@ -196,7 +196,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member foreach (QPackageableElement *packageableElement, *packageImport->importedPackage()->packagedElements()) - d->removeMember(qmofobject_cast<QNamedElement *>(packageableElement)); + d->removeMember(qwrappedobject_cast<QNamedElement *>(packageableElement)); } } @@ -249,14 +249,14 @@ void QNamespace::addElementImport(QElementImport *elementImport) d->elementImports->insert(elementImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(elementImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); // Adjust opposite property elementImport->setImportingNamespace(this); // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member - d->addMember(qmofobject_cast<QNamedElement *>(elementImport->importedElement())); + d->addMember(qwrappedobject_cast<QNamedElement *>(elementImport->importedElement())); } } @@ -269,14 +269,14 @@ void QNamespace::removeElementImport(QElementImport *elementImport) d->elementImports->remove(elementImport); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(elementImport)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); // Adjust opposite property elementImport->setImportingNamespace(0); // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member - d->removeMember(qmofobject_cast<QNamedElement *>(elementImport->importedElement())); + d->removeMember(qwrappedobject_cast<QNamedElement *>(elementImport->importedElement())); } } @@ -300,7 +300,7 @@ void QNamespace::addOwnedRule(QConstraint *ownedRule) d->ownedRules->insert(ownedRule); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedRule)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); // Adjust opposite property ownedRule->setContext(this); @@ -316,7 +316,7 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) d->ownedRules->remove(ownedRule); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedRule)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); // Adjust opposite property ownedRule->setContext(0); diff --git a/src/uml/qnamespace.h b/src/uml/qnamespace.h index 9797a973..b001dcca 100644 --- a/src/uml/qnamespace.h +++ b/src/uml/qnamespace.h @@ -79,7 +79,7 @@ class Q_UML_EXPORT QNamespace : public QNamedElement Q_DECLARE_PRIVATE(QNamespace) public: - Q_INVOKABLE explicit QNamespace(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QNamespace(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QNamespace(); // Association ends from QNamespace @@ -106,7 +106,7 @@ public: friend class QNamedElementPrivate; protected: - explicit QNamespace(QNamespacePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QNamespace(QNamespacePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnode.cpp b/src/uml/qnode.cpp index 927c38cd..d10ed8cb 100644 --- a/src/uml/qnode.cpp +++ b/src/uml/qnode.cpp @@ -62,15 +62,15 @@ QNodePrivate::~QNodePrivate() \brief A node is computational resource upon which artifacts may be deployed for execution. Nodes can be interconnected through communication paths to define network structures. */ -QNode::QNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QNodePrivate, parent, wrapper), +QNode::QNode(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QNodePrivate, parent, wrapper), _wrappedClass(new QClass(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) { } -QNode::QNode(QNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QNode::QNode(QNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedClass(new QClass(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) { @@ -89,7 +89,7 @@ QNode::~QNode() */ const QSet<QElement *> *QNode::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -97,7 +97,7 @@ const QSet<QElement *> *QNode::ownedElements() const */ QElement *QNode::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -105,17 +105,17 @@ QElement *QNode::owner() const */ const QSet<QComment *> *QNode::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QNode::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QNode::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -127,12 +127,12 @@ void QNode::removeOwnedComment(QComment *ownedComment) */ QString QNode::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QNode::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -140,12 +140,12 @@ void QNode::setName(QString name) */ QtUml::VisibilityKind QNode::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QNode::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -153,7 +153,7 @@ void QNode::setVisibility(QtUml::VisibilityKind visibility) */ QString QNode::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -165,12 +165,12 @@ QString QNode::qualifiedName() const */ QStringExpression *QNode::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QNode::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -178,7 +178,7 @@ void QNode::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QNode::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -186,17 +186,17 @@ QNamespace *QNode::namespace_() const */ const QSet<QDependency *> *QNode::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QNode::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QNode::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -208,7 +208,7 @@ void QNode::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageableElement *> *QNode::deployedElements() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployedElements(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } /*! @@ -216,17 +216,17 @@ const QSet<QPackageableElement *> *QNode::deployedElements() const */ const QSet<QDeployment *> *QNode::deployments() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployments(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } void QNode::addDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); } void QNode::removeDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); } // --------------------------------------------------------------- @@ -253,7 +253,7 @@ void QNode::addNestedNode(QNode *nestedNode) d->nestedNodes->insert(nestedNode); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(nestedNode)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedNode)); } } @@ -266,7 +266,7 @@ void QNode::removeNestedNode(QNode *nestedNode) d->nestedNodes->remove(nestedNode); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(nestedNode)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedNode)); } } diff --git a/src/uml/qnode.h b/src/uml/qnode.h index 8567aa63..17c1cbc8 100644 --- a/src/uml/qnode.h +++ b/src/uml/qnode.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QClass> #include <QtUml/QDeploymentTarget> @@ -59,7 +60,7 @@ QT_MODULE(QtUml) class QNodePrivate; -class Q_UML_EXPORT QNode : public QtMof::QMofObject +class Q_UML_EXPORT QNode : public QWrappedObject { Q_OBJECT @@ -69,7 +70,7 @@ class Q_UML_EXPORT QNode : public QtMof::QMofObject Q_DECLARE_PRIVATE(QNode) public: - Q_INVOKABLE explicit QNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QNode(); // Association ends from aggregated QElement @@ -106,7 +107,7 @@ public: Q_INVOKABLE void removeNestedNode(QNode *nestedNode); protected: - explicit QNode(QNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QNode(QNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QClass *_wrappedClass; diff --git a/src/uml/qnode_p.h b/src/uml/qnode_p.h index 3525e10f..c1fae920 100644 --- a/src/uml/qnode_p.h +++ b/src/uml/qnode_p.h @@ -42,7 +42,8 @@ #define QTUML_QNODE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qclass_p.h" #include "private/qdeploymenttarget_p.h" @@ -60,7 +61,7 @@ QT_MODULE(QtUml) // Forward decls for function parameters class QNode; -class Q_UML_EXPORT QNodePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QNodePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QNode) diff --git a/src/uml/qobjectflow.cpp b/src/uml/qobjectflow.cpp index b2808c9a..9c517144 100644 --- a/src/uml/qobjectflow.cpp +++ b/src/uml/qobjectflow.cpp @@ -66,12 +66,12 @@ QObjectFlowPrivate::~QObjectFlowPrivate() \brief An object flow is an activity edge that can have objects or data passing along it.Object flows have support for multicast/receive, token selection from object nodes, and transformation of tokens. */ -QObjectFlow::QObjectFlow(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QObjectFlow::QObjectFlow(QWrappedObject *parent, QWrappedObject *wrapper) : QActivityEdge(*new QObjectFlowPrivate, parent, wrapper) { } -QObjectFlow::QObjectFlow(QObjectFlowPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QObjectFlow::QObjectFlow(QObjectFlowPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QActivityEdge(dd, parent, wrapper) { } diff --git a/src/uml/qobjectflow.h b/src/uml/qobjectflow.h index aba66d2f..fce42063 100644 --- a/src/uml/qobjectflow.h +++ b/src/uml/qobjectflow.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QObjectFlow : public QActivityEdge Q_DECLARE_PRIVATE(QObjectFlow) public: - Q_INVOKABLE explicit QObjectFlow(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QObjectFlow(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QObjectFlow(); // Attributes from QObjectFlow @@ -86,7 +86,7 @@ public: Q_INVOKABLE void setTransformation(QBehavior *transformation); protected: - explicit QObjectFlow(QObjectFlowPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QObjectFlow(QObjectFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobjectnode.cpp b/src/uml/qobjectnode.cpp index 5a103797..c92a1291 100644 --- a/src/uml/qobjectnode.cpp +++ b/src/uml/qobjectnode.cpp @@ -70,15 +70,15 @@ QObjectNodePrivate::~QObjectNodePrivate() \brief An object node is an abstract activity node that is part of defining object flow in an activity.Object nodes have support for token selection, limitation on the number of tokens, specifying the state required for tokens, and carrying control values. */ -QObjectNode::QObjectNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QObjectNodePrivate, parent, wrapper), +QObjectNode::QObjectNode(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QObjectNodePrivate, parent, wrapper), _wrappedActivityNode(new QActivityNode(this, this)), _wrappedTypedElement(new QTypedElement(this, this)) { } -QObjectNode::QObjectNode(QObjectNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QObjectNode::QObjectNode(QObjectNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedActivityNode(new QActivityNode(this, this)), _wrappedTypedElement(new QTypedElement(this, this)) { @@ -97,7 +97,7 @@ QObjectNode::~QObjectNode() */ const QSet<QElement *> *QObjectNode::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -105,7 +105,7 @@ const QSet<QElement *> *QObjectNode::ownedElements() const */ QElement *QObjectNode::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -113,17 +113,17 @@ QElement *QObjectNode::owner() const */ const QSet<QComment *> *QObjectNode::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QObjectNode::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QObjectNode::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -135,12 +135,12 @@ void QObjectNode::removeOwnedComment(QComment *ownedComment) */ QString QObjectNode::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QObjectNode::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -148,12 +148,12 @@ void QObjectNode::setName(QString name) */ QtUml::VisibilityKind QObjectNode::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QObjectNode::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -161,7 +161,7 @@ void QObjectNode::setVisibility(QtUml::VisibilityKind visibility) */ QString QObjectNode::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -173,12 +173,12 @@ QString QObjectNode::qualifiedName() const */ QStringExpression *QObjectNode::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QObjectNode::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -186,7 +186,7 @@ void QObjectNode::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QObjectNode::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -194,17 +194,17 @@ QNamespace *QObjectNode::namespace_() const */ const QSet<QDependency *> *QObjectNode::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QObjectNode::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QObjectNode::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -216,12 +216,12 @@ void QObjectNode::removeClientDependency(QDependency *clientDependency) */ bool QObjectNode::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QObjectNode::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -233,7 +233,7 @@ void QObjectNode::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QObjectNode::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -241,7 +241,7 @@ const QSet<QRedefinableElement *> *QObjectNode::redefinedElements() const */ const QSet<QClassifier *> *QObjectNode::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -253,17 +253,17 @@ const QSet<QClassifier *> *QObjectNode::redefinitionContexts() const */ const QSet<QActivityNode *> *QObjectNode::redefinedNodes() const { - return (qmofobject_cast<const QActivityNode *>(this))->redefinedNodes(); + return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } void QObjectNode::addRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); } void QObjectNode::removeRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); } /*! @@ -271,17 +271,17 @@ void QObjectNode::removeRedefinedNode(QActivityNode *redefinedNode) */ const QSet<QActivityEdge *> *QObjectNode::incomings() const { - return (qmofobject_cast<const QActivityNode *>(this))->incomings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } void QObjectNode::addIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->addIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->addIncoming(incoming); } void QObjectNode::removeIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->removeIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->removeIncoming(incoming); } /*! @@ -289,12 +289,12 @@ void QObjectNode::removeIncoming(QActivityEdge *incoming) */ QActivity *QObjectNode::activity() const { - return (qmofobject_cast<const QActivityNode *>(this))->activity(); + return (qwrappedobject_cast<const QActivityNode *>(this))->activity(); } void QObjectNode::setActivity(QActivity *activity) { - (qmofobject_cast<QActivityNode *>(this))->setActivity(activity); + (qwrappedobject_cast<QActivityNode *>(this))->setActivity(activity); } /*! @@ -302,7 +302,7 @@ void QObjectNode::setActivity(QActivity *activity) */ const QSet<QActivityGroup *> *QObjectNode::inGroup() const { - return (qmofobject_cast<const QActivityNode *>(this))->inGroup(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } /*! @@ -310,12 +310,12 @@ const QSet<QActivityGroup *> *QObjectNode::inGroup() const */ QStructuredActivityNode *QObjectNode::inStructuredNode() const { - return (qmofobject_cast<const QActivityNode *>(this))->inStructuredNode(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inStructuredNode(); } void QObjectNode::setInStructuredNode(QStructuredActivityNode *inStructuredNode) { - (qmofobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); + (qwrappedobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); } /*! @@ -323,17 +323,17 @@ void QObjectNode::setInStructuredNode(QStructuredActivityNode *inStructuredNode) */ const QSet<QActivityPartition *> *QObjectNode::inPartition() const { - return (qmofobject_cast<const QActivityNode *>(this))->inPartition(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } void QObjectNode::addInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->addInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->addInPartition(inPartition); } void QObjectNode::removeInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); } /*! @@ -341,17 +341,17 @@ void QObjectNode::removeInPartition(QActivityPartition *inPartition) */ const QSet<QInterruptibleActivityRegion *> *QObjectNode::inInterruptibleRegion() const { - return (qmofobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } void QObjectNode::addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); } void QObjectNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); } /*! @@ -359,17 +359,17 @@ void QObjectNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *inIn */ const QSet<QActivityEdge *> *QObjectNode::outgoings() const { - return (qmofobject_cast<const QActivityNode *>(this))->outgoings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } void QObjectNode::addOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); } void QObjectNode::removeOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); } // --------------------------------------------------------------- @@ -381,12 +381,12 @@ void QObjectNode::removeOutgoing(QActivityEdge *outgoing) */ QType *QObjectNode::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QObjectNode::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -457,13 +457,13 @@ void QObjectNode::setUpperBound(QValueSpecification *upperBound) Q_D(QObjectNode); if (d->upperBound != upperBound) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->upperBound)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->upperBound)); d->upperBound = upperBound; // Adjust subsetted property(ies) if (upperBound) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(upperBound)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(upperBound)); } } } diff --git a/src/uml/qobjectnode.h b/src/uml/qobjectnode.h index ecb9c372..752d6b5f 100644 --- a/src/uml/qobjectnode.h +++ b/src/uml/qobjectnode.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QActivityNode> #include <QtUml/QTypedElement> @@ -67,7 +68,7 @@ class QValueSpecification; class QObjectNodePrivate; -class Q_UML_EXPORT QObjectNode : public QtMof::QMofObject +class Q_UML_EXPORT QObjectNode : public QWrappedObject { Q_OBJECT @@ -81,7 +82,7 @@ class Q_UML_EXPORT QObjectNode : public QtMof::QMofObject Q_DECLARE_PRIVATE(QObjectNode) public: - Q_INVOKABLE explicit QObjectNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QObjectNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QObjectNode(); // Association ends from aggregated QElement @@ -156,7 +157,7 @@ public: Q_INVOKABLE void removeInState(QState *inState); protected: - explicit QObjectNode(QObjectNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QObjectNode(QObjectNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QActivityNode *_wrappedActivityNode; diff --git a/src/uml/qobjectnode_p.h b/src/uml/qobjectnode_p.h index d0355a89..9303eaec 100644 --- a/src/uml/qobjectnode_p.h +++ b/src/uml/qobjectnode_p.h @@ -42,7 +42,8 @@ #define QTUML_QOBJECTNODE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qactivitynode_p.h" #include "private/qtypedelement_p.h" @@ -65,7 +66,7 @@ class QState; class QBehavior; class QValueSpecification; -class Q_UML_EXPORT QObjectNodePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QObjectNodePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QObjectNode) diff --git a/src/uml/qobservation.cpp b/src/uml/qobservation.cpp index ac192ee8..7f34287f 100644 --- a/src/uml/qobservation.cpp +++ b/src/uml/qobservation.cpp @@ -60,12 +60,12 @@ QObservationPrivate::~QObservationPrivate() \brief Observation is a superclass of TimeObservation and DurationObservation in order for TimeExpression and Duration to refer to either in a simple way. */ -QObservation::QObservation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QObservation::QObservation(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QObservationPrivate, parent, wrapper) { } -QObservation::QObservation(QObservationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QObservation::QObservation(QObservationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } diff --git a/src/uml/qobservation.h b/src/uml/qobservation.h index 76f3cdc0..4da8aa6f 100644 --- a/src/uml/qobservation.h +++ b/src/uml/qobservation.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QObservation : public QPackageableElement Q_DECLARE_PRIVATE(QObservation) public: - Q_INVOKABLE explicit QObservation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QObservation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QObservation(); protected: - explicit QObservation(QObservationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QObservation(QObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoccurrencespecification.cpp b/src/uml/qoccurrencespecification.cpp index 84fd6ba6..82ed5aa2 100644 --- a/src/uml/qoccurrencespecification.cpp +++ b/src/uml/qoccurrencespecification.cpp @@ -68,12 +68,12 @@ QOccurrenceSpecificationPrivate::~QOccurrenceSpecificationPrivate() \brief An occurrence specification is the basic semantic unit of interactions. The sequences of occurrences specified by them are the meanings of interactions. */ -QOccurrenceSpecification::QOccurrenceSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOccurrenceSpecification::QOccurrenceSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QOccurrenceSpecificationPrivate, parent, wrapper) { } -QOccurrenceSpecification::QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOccurrenceSpecification::QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } diff --git a/src/uml/qoccurrencespecification.h b/src/uml/qoccurrencespecification.h index cbf63b9e..c874ee29 100644 --- a/src/uml/qoccurrencespecification.h +++ b/src/uml/qoccurrencespecification.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QOccurrenceSpecification : public QInteractionFragment Q_DECLARE_PRIVATE(QOccurrenceSpecification) public: - Q_INVOKABLE explicit QOccurrenceSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOccurrenceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOccurrenceSpecification(); // Association ends from QOccurrenceSpecification @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeToBefore(QGeneralOrdering *toBefore); protected: - explicit QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueaction.cpp b/src/uml/qopaqueaction.cpp index c39204e8..d069dcdc 100644 --- a/src/uml/qopaqueaction.cpp +++ b/src/uml/qopaqueaction.cpp @@ -71,12 +71,12 @@ QOpaqueActionPrivate::~QOpaqueActionPrivate() \brief An action with implementation-specific semantics. */ -QOpaqueAction::QOpaqueAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueAction::QOpaqueAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QOpaqueActionPrivate, parent, wrapper) { } -QOpaqueAction::QOpaqueAction(QOpaqueActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueAction::QOpaqueAction(QOpaqueActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -175,7 +175,7 @@ void QOpaqueAction::addInputValue(QInputPin *inputValue) d->inputValues->insert(inputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(inputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(inputValue)); } } @@ -188,7 +188,7 @@ void QOpaqueAction::removeInputValue(QInputPin *inputValue) d->inputValues->remove(inputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(inputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(inputValue)); } } @@ -212,7 +212,7 @@ void QOpaqueAction::addOutputValue(QOutputPin *outputValue) d->outputValues->insert(outputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(outputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(outputValue)); } } @@ -225,7 +225,7 @@ void QOpaqueAction::removeOutputValue(QOutputPin *outputValue) d->outputValues->remove(outputValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(outputValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(outputValue)); } } diff --git a/src/uml/qopaqueaction.h b/src/uml/qopaqueaction.h index 21eef939..b9c81da8 100644 --- a/src/uml/qopaqueaction.h +++ b/src/uml/qopaqueaction.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QOpaqueAction : public QAction Q_DECLARE_PRIVATE(QOpaqueAction) public: - Q_INVOKABLE explicit QOpaqueAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOpaqueAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOpaqueAction(); // Attributes from QOpaqueAction @@ -96,7 +96,7 @@ public: Q_INVOKABLE void removeOutputValue(QOutputPin *outputValue); protected: - explicit QOpaqueAction(QOpaqueActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOpaqueAction(QOpaqueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaquebehavior.cpp b/src/uml/qopaquebehavior.cpp index 6882e7b0..4966d1eb 100644 --- a/src/uml/qopaquebehavior.cpp +++ b/src/uml/qopaquebehavior.cpp @@ -64,12 +64,12 @@ QOpaqueBehaviorPrivate::~QOpaqueBehaviorPrivate() \brief An behavior with implementation-specific semantics. */ -QOpaqueBehavior::QOpaqueBehavior(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueBehavior::QOpaqueBehavior(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(*new QOpaqueBehaviorPrivate, parent, wrapper) { } -QOpaqueBehavior::QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueBehavior::QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(dd, parent, wrapper) { } diff --git a/src/uml/qopaquebehavior.h b/src/uml/qopaquebehavior.h index b061c224..0e6c4b0b 100644 --- a/src/uml/qopaquebehavior.h +++ b/src/uml/qopaquebehavior.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QOpaqueBehavior : public QBehavior Q_DECLARE_PRIVATE(QOpaqueBehavior) public: - Q_INVOKABLE explicit QOpaqueBehavior(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOpaqueBehavior(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOpaqueBehavior(); // Attributes from QOpaqueBehavior @@ -81,7 +81,7 @@ public: Q_INVOKABLE void removeBody(QString body); protected: - explicit QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueexpression.cpp b/src/uml/qopaqueexpression.cpp index e134f885..fd33e542 100644 --- a/src/uml/qopaqueexpression.cpp +++ b/src/uml/qopaqueexpression.cpp @@ -68,12 +68,12 @@ QOpaqueExpressionPrivate::~QOpaqueExpressionPrivate() \brief An opaque expression is an uninterpreted textual statement that denotes a (possibly empty) set of values when evaluated in a context.Provides a mechanism for precisely defining the behavior of an opaque expression. An opaque expression is defined by a behavior restricted to return one result. */ -QOpaqueExpression::QOpaqueExpression(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueExpression::QOpaqueExpression(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QOpaqueExpressionPrivate, parent, wrapper) { } -QOpaqueExpression::QOpaqueExpression(QOpaqueExpressionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOpaqueExpression::QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } diff --git a/src/uml/qopaqueexpression.h b/src/uml/qopaqueexpression.h index 5d8ffe86..a38a4c1f 100644 --- a/src/uml/qopaqueexpression.h +++ b/src/uml/qopaqueexpression.h @@ -75,7 +75,7 @@ class Q_UML_EXPORT QOpaqueExpression : public QValueSpecification Q_DECLARE_PRIVATE(QOpaqueExpression) public: - Q_INVOKABLE explicit QOpaqueExpression(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOpaqueExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOpaqueExpression(); // Attributes from QOpaqueExpression @@ -98,7 +98,7 @@ public: Q_INVOKABLE qint32 value() const; protected: - explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoperation.cpp b/src/uml/qoperation.cpp index 853a1074..68c10111 100644 --- a/src/uml/qoperation.cpp +++ b/src/uml/qoperation.cpp @@ -85,16 +85,16 @@ QOperationPrivate::~QOperationPrivate() \brief An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior.An operation may invoke both the execution of method behaviors as well as other behavioral responses.Operation specializes TemplateableElement in order to support specification of template operations and bound operations. Operation specializes ParameterableElement to specify that an operation can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template. */ -QOperation::QOperation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QOperationPrivate, parent, wrapper), +QOperation::QOperation(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QOperationPrivate, parent, wrapper), _wrappedTemplateableElement(new QTemplateableElement(this, this)), _wrappedBehavioralFeature(new QBehavioralFeature(this, this)), _wrappedParameterableElement(new QParameterableElement(this, this)) { } -QOperation::QOperation(QOperationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QOperation::QOperation(QOperationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTemplateableElement(new QTemplateableElement(this, this)), _wrappedBehavioralFeature(new QBehavioralFeature(this, this)), _wrappedParameterableElement(new QParameterableElement(this, this)) @@ -114,7 +114,7 @@ QOperation::~QOperation() */ const QSet<QElement *> *QOperation::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -122,7 +122,7 @@ const QSet<QElement *> *QOperation::ownedElements() const */ QElement *QOperation::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -130,17 +130,17 @@ QElement *QOperation::owner() const */ const QSet<QComment *> *QOperation::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QOperation::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QOperation::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -152,12 +152,12 @@ void QOperation::removeOwnedComment(QComment *ownedComment) */ QTemplateSignature *QOperation::ownedTemplateSignature() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); } void QOperation::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -165,17 +165,17 @@ void QOperation::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSign */ const QSet<QTemplateBinding *> *QOperation::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QOperation::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QOperation::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -187,12 +187,12 @@ void QOperation::removeTemplateBinding(QTemplateBinding *templateBinding) */ QString QOperation::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QOperation::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -200,12 +200,12 @@ void QOperation::setName(QString name) */ QtUml::VisibilityKind QOperation::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QOperation::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -213,7 +213,7 @@ void QOperation::setVisibility(QtUml::VisibilityKind visibility) */ QString QOperation::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -225,12 +225,12 @@ QString QOperation::qualifiedName() const */ QStringExpression *QOperation::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QOperation::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -238,7 +238,7 @@ void QOperation::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QOperation::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -246,17 +246,17 @@ QNamespace *QOperation::namespace_() const */ const QSet<QDependency *> *QOperation::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QOperation::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QOperation::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -268,17 +268,17 @@ void QOperation::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QOperation::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QOperation::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QOperation::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -286,7 +286,7 @@ void QOperation::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QOperation::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -294,7 +294,7 @@ const QSet<QNamedElement *> *QOperation::members() const */ const QSet<QPackageableElement *> *QOperation::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -302,17 +302,17 @@ const QSet<QPackageableElement *> *QOperation::importedMembers() const */ const QSet<QElementImport *> *QOperation::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QOperation::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QOperation::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -320,17 +320,17 @@ void QOperation::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QOperation::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QOperation::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QOperation::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -338,7 +338,7 @@ void QOperation::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QOperation::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -350,12 +350,12 @@ const QSet<QNamedElement *> *QOperation::ownedMembers() const */ bool QOperation::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QOperation::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -367,7 +367,7 @@ void QOperation::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QOperation::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -375,7 +375,7 @@ const QSet<QRedefinableElement *> *QOperation::redefinedElements() const */ const QSet<QClassifier *> *QOperation::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -387,12 +387,12 @@ const QSet<QClassifier *> *QOperation::redefinitionContexts() const */ bool QOperation::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QOperation::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -404,7 +404,7 @@ void QOperation::setStatic(bool isStatic) */ const QSet<QClassifier *> *QOperation::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- @@ -416,12 +416,12 @@ const QSet<QClassifier *> *QOperation::featuringClassifiers() const */ QtUml::CallConcurrencyKind QOperation::concurrency() const { - return (qmofobject_cast<const QBehavioralFeature *>(this))->concurrency(); + return (qwrappedobject_cast<const QBehavioralFeature *>(this))->concurrency(); } void QOperation::setConcurrency(QtUml::CallConcurrencyKind concurrency) { - (qmofobject_cast<QBehavioralFeature *>(this))->setConcurrency(concurrency); + (qwrappedobject_cast<QBehavioralFeature *>(this))->setConcurrency(concurrency); } /*! @@ -429,12 +429,12 @@ void QOperation::setConcurrency(QtUml::CallConcurrencyKind concurrency) */ bool QOperation::isAbstract() const { - return (qmofobject_cast<const QBehavioralFeature *>(this))->isAbstract(); + return (qwrappedobject_cast<const QBehavioralFeature *>(this))->isAbstract(); } void QOperation::setAbstract(bool isAbstract) { - (qmofobject_cast<QBehavioralFeature *>(this))->setAbstract(isAbstract); + (qwrappedobject_cast<QBehavioralFeature *>(this))->setAbstract(isAbstract); } // --------------------------------------------------------------- @@ -446,17 +446,17 @@ void QOperation::setAbstract(bool isAbstract) */ const QSet<QParameterSet *> *QOperation::ownedParameterSets() const { - return (qmofobject_cast<const QBehavioralFeature *>(this))->ownedParameterSets(); + return (qwrappedobject_cast<const QBehavioralFeature *>(this))->ownedParameterSets(); } void QOperation::addOwnedParameterSet(QParameterSet *ownedParameterSet) { - (qmofobject_cast<QBehavioralFeature *>(this))->addOwnedParameterSet(ownedParameterSet); + (qwrappedobject_cast<QBehavioralFeature *>(this))->addOwnedParameterSet(ownedParameterSet); } void QOperation::removeOwnedParameterSet(QParameterSet *ownedParameterSet) { - (qmofobject_cast<QBehavioralFeature *>(this))->removeOwnedParameterSet(ownedParameterSet); + (qwrappedobject_cast<QBehavioralFeature *>(this))->removeOwnedParameterSet(ownedParameterSet); } /*! @@ -464,17 +464,17 @@ void QOperation::removeOwnedParameterSet(QParameterSet *ownedParameterSet) */ const QSet<QBehavior *> *QOperation::methods() const { - return (qmofobject_cast<const QBehavioralFeature *>(this))->methods(); + return (qwrappedobject_cast<const QBehavioralFeature *>(this))->methods(); } void QOperation::addMethod(QBehavior *method) { - (qmofobject_cast<QBehavioralFeature *>(this))->addMethod(method); + (qwrappedobject_cast<QBehavioralFeature *>(this))->addMethod(method); } void QOperation::removeMethod(QBehavior *method) { - (qmofobject_cast<QBehavioralFeature *>(this))->removeMethod(method); + (qwrappedobject_cast<QBehavioralFeature *>(this))->removeMethod(method); } // --------------------------------------------------------------- @@ -486,12 +486,12 @@ void QOperation::removeMethod(QBehavior *method) */ QTemplateParameter *QOperation::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QOperation::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -589,7 +589,7 @@ void QOperation::addOwnedParameter(QParameter *ownedParameter) Q_D(QOperation); if (!d->ownedParameters->contains(ownedParameter)) { d->ownedParameters->append(ownedParameter); - qmof_topLevelWrapper(ownedParameter)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(ownedParameter)->setParent(qTopLevelWrapper(this)); // Adjust opposite property ownedParameter->setOperation(this); @@ -603,7 +603,7 @@ void QOperation::removeOwnedParameter(QParameter *ownedParameter) Q_D(QOperation); if (d->ownedParameters->contains(ownedParameter)) { d->ownedParameters->removeAll(ownedParameter); - qmof_topLevelWrapper(ownedParameter)->setParent(0); + qTopLevelWrapper(ownedParameter)->setParent(0); // Adjust opposite property ownedParameter->setOperation(0); @@ -628,13 +628,13 @@ void QOperation::setBodyCondition(QConstraint *bodyCondition) Q_D(QOperation); if (d->bodyCondition != bodyCondition) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(d->bodyCondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(d->bodyCondition)); d->bodyCondition = bodyCondition; // Adjust subsetted property(ies) if (bodyCondition) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(bodyCondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(bodyCondition)); } } } @@ -659,7 +659,7 @@ void QOperation::addRedefinedOperation(QOperation *redefinedOperation) d->redefinedOperations->insert(redefinedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedOperation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); } } @@ -672,7 +672,7 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) d->redefinedOperations->remove(redefinedOperation); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedOperation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); } } @@ -696,7 +696,7 @@ void QOperation::addPostcondition(QConstraint *postcondition) d->postconditions->insert(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -709,7 +709,7 @@ void QOperation::removePostcondition(QConstraint *postcondition) d->postconditions->remove(postcondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(postcondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); } } @@ -735,19 +735,19 @@ void QOperation::setDatatype(QDataType *datatype) d->datatype->removeOwnedOperation(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->datatype)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->datatype)); d->datatype = datatype; // Adjust subsetted property(ies) if (datatype) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(datatype)); } if (datatype) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(datatype)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(datatype)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(datatype)); // Adjust opposite property if (datatype) @@ -803,19 +803,19 @@ void QOperation::setInterface(QInterface *interface) d->interface->removeOwnedOperation(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->interface)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->interface)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->interface)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->interface)); d->interface = interface; // Adjust subsetted property(ies) if (interface) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(interface)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(interface)); } if (interface) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(interface)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(interface)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(interface)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(interface)); // Adjust opposite property if (interface) @@ -855,7 +855,7 @@ void QOperation::addPrecondition(QConstraint *precondition) d->preconditions->insert(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -868,7 +868,7 @@ void QOperation::removePrecondition(QConstraint *precondition) d->preconditions->remove(precondition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(precondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); } } @@ -894,19 +894,19 @@ void QOperation::setClass_(QClass *class_) d->class_->removeOwnedOperation(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->class_)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->class_)); d->class_ = class_; // Adjust subsetted property(ies) if (class_) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(class_)); } if (class_) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(class_)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(class_)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(class_)); // Adjust opposite property if (class_) diff --git a/src/uml/qoperation.h b/src/uml/qoperation.h index 9296fe15..8b19de7f 100644 --- a/src/uml/qoperation.h +++ b/src/uml/qoperation.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QTemplateableElement> #include <QtUml/QBehavioralFeature> #include <QtUml/QParameterableElement> @@ -71,7 +72,7 @@ class QClass; class QOperationPrivate; -class Q_UML_EXPORT QOperation : public QtMof::QMofObject +class Q_UML_EXPORT QOperation : public QWrappedObject { Q_OBJECT @@ -96,7 +97,7 @@ class Q_UML_EXPORT QOperation : public QtMof::QMofObject Q_DECLARE_PRIVATE(QOperation) public: - Q_INVOKABLE explicit QOperation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOperation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOperation(); // Association ends from aggregated QElement @@ -216,7 +217,7 @@ public: Q_INVOKABLE const QSet<QParameter *> *returnResult() const; protected: - explicit QOperation(QOperationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOperation(QOperationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTemplateableElement *_wrappedTemplateableElement; diff --git a/src/uml/qoperation_p.h b/src/uml/qoperation_p.h index d5c981d2..ecadbf7e 100644 --- a/src/uml/qoperation_p.h +++ b/src/uml/qoperation_p.h @@ -42,7 +42,8 @@ #define QTUML_QOPERATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtemplateableelement_p.h" #include "private/qbehavioralfeature_p.h" #include "private/qparameterableelement_p.h" @@ -70,7 +71,7 @@ class QConstraint; class QDataType; class QClass; -class Q_UML_EXPORT QOperationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QOperationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QOperation) diff --git a/src/uml/qoperationtemplateparameter.cpp b/src/uml/qoperationtemplateparameter.cpp index 81dbaef4..b06ca22b 100644 --- a/src/uml/qoperationtemplateparameter.cpp +++ b/src/uml/qoperationtemplateparameter.cpp @@ -63,12 +63,12 @@ QOperationTemplateParameterPrivate::~QOperationTemplateParameterPrivate() \brief An operation template parameter exposes an operation as a formal parameter for a template. */ -QOperationTemplateParameter::QOperationTemplateParameter(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOperationTemplateParameter::QOperationTemplateParameter(QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(*new QOperationTemplateParameterPrivate, parent, wrapper) { } -QOperationTemplateParameter::QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOperationTemplateParameter::QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QTemplateParameter(dd, parent, wrapper) { } diff --git a/src/uml/qoperationtemplateparameter.h b/src/uml/qoperationtemplateparameter.h index 22781935..653aea54 100644 --- a/src/uml/qoperationtemplateparameter.h +++ b/src/uml/qoperationtemplateparameter.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QOperationTemplateParameter : public QTemplateParameter Q_DECLARE_PRIVATE(QOperationTemplateParameter) public: - Q_INVOKABLE explicit QOperationTemplateParameter(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOperationTemplateParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOperationTemplateParameter(); // Association ends from QOperationTemplateParameter @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setParameteredElement(QOperation *parameteredElement); protected: - explicit QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoutputpin.cpp b/src/uml/qoutputpin.cpp index 4ac3c841..e5e31f19 100644 --- a/src/uml/qoutputpin.cpp +++ b/src/uml/qoutputpin.cpp @@ -60,12 +60,12 @@ QOutputPinPrivate::~QOutputPinPrivate() \brief An output pin is a pin that holds output values produced by an action. */ -QOutputPin::QOutputPin(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOutputPin::QOutputPin(QWrappedObject *parent, QWrappedObject *wrapper) : QPin(*new QOutputPinPrivate, parent, wrapper) { } -QOutputPin::QOutputPin(QOutputPinPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QOutputPin::QOutputPin(QOutputPinPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPin(dd, parent, wrapper) { } diff --git a/src/uml/qoutputpin.h b/src/uml/qoutputpin.h index 750f506a..3b76fc9b 100644 --- a/src/uml/qoutputpin.h +++ b/src/uml/qoutputpin.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QOutputPin : public QPin Q_DECLARE_PRIVATE(QOutputPin) public: - Q_INVOKABLE explicit QOutputPin(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QOutputPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOutputPin(); protected: - explicit QOutputPin(QOutputPinPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QOutputPin(QOutputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackage.cpp b/src/uml/qpackage.cpp index d45d9ff4..15357be7 100644 --- a/src/uml/qpackage.cpp +++ b/src/uml/qpackage.cpp @@ -74,16 +74,16 @@ QPackagePrivate::~QPackagePrivate() \brief A package can have one or more profile applications to indicate which profiles have been applied. Because a profile is a package, it is possible to apply a profile not only to packages, but also to profiles.Package specializes TemplateableElement and PackageableElement specializes ParameterableElement to specify that a package can be used as a template and a PackageableElement as a template parameter.A package is used to group elements, and provides a namespace for the grouped elements. */ -QPackage::QPackage(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QPackagePrivate, parent, wrapper), +QPackage::QPackage(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QPackagePrivate, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedTemplateableElement(new QTemplateableElement(this, this)) { } -QPackage::QPackage(QPackagePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QPackage::QPackage(QPackagePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)), _wrappedTemplateableElement(new QTemplateableElement(this, this)) @@ -103,7 +103,7 @@ QPackage::~QPackage() */ const QSet<QElement *> *QPackage::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -111,7 +111,7 @@ const QSet<QElement *> *QPackage::ownedElements() const */ QElement *QPackage::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -119,17 +119,17 @@ QElement *QPackage::owner() const */ const QSet<QComment *> *QPackage::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QPackage::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QPackage::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -141,12 +141,12 @@ void QPackage::removeOwnedComment(QComment *ownedComment) */ QString QPackage::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QPackage::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -154,7 +154,7 @@ void QPackage::setName(QString name) */ QString QPackage::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -166,12 +166,12 @@ QString QPackage::qualifiedName() const */ QStringExpression *QPackage::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QPackage::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -179,7 +179,7 @@ void QPackage::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QPackage::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -187,17 +187,17 @@ QNamespace *QPackage::namespace_() const */ const QSet<QDependency *> *QPackage::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QPackage::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QPackage::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -209,17 +209,17 @@ void QPackage::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QPackage::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QPackage::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QPackage::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -227,7 +227,7 @@ void QPackage::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QPackage::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -235,7 +235,7 @@ const QSet<QNamedElement *> *QPackage::members() const */ const QSet<QPackageableElement *> *QPackage::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -243,17 +243,17 @@ const QSet<QPackageableElement *> *QPackage::importedMembers() const */ const QSet<QElementImport *> *QPackage::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QPackage::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QPackage::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -261,17 +261,17 @@ void QPackage::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QPackage::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QPackage::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QPackage::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -279,7 +279,7 @@ void QPackage::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QPackage::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -291,12 +291,12 @@ const QSet<QNamedElement *> *QPackage::ownedMembers() const */ QTemplateParameter *QPackage::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QPackage::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -304,12 +304,12 @@ void QPackage::setOwningTemplateParameter(QTemplateParameter *owningTemplatePara */ QTemplateParameter *QPackage::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QPackage::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -321,12 +321,12 @@ void QPackage::setTemplateParameter(QTemplateParameter *templateParameter) */ QtUml::VisibilityKind QPackage::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QPackage::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } // --------------------------------------------------------------- @@ -338,12 +338,12 @@ void QPackage::setVisibility(QtUml::VisibilityKind visibility) */ QTemplateSignature *QPackage::ownedTemplateSignature() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); } void QPackage::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -351,17 +351,17 @@ void QPackage::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignat */ const QSet<QTemplateBinding *> *QPackage::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QPackage::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QPackage::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -404,7 +404,7 @@ const QSet<QType *> *QPackage::ownedTypes() const Q_D(const QPackage); QSet<QType *> *ownedTypes_ = new QSet<QType *>; foreach (QPackageableElement *packageableElement, *d->packagedElements) - if (QType *type = qmofobject_cast<QType *>(packageableElement)) + if (QType *type = qwrappedobject_cast<QType *>(packageableElement)) ownedTypes_->insert(type); return ownedTypes_; } @@ -416,7 +416,7 @@ void QPackage::addOwnedType(QType *ownedType) Q_D(QPackage); if (!d->packagedElements->contains(ownedType)) { // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->addPackagedElement(qmofobject_cast<QPackageableElement *>(ownedType)); + (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); // Adjust opposite property ownedType->setPackage(this); @@ -430,7 +430,7 @@ void QPackage::removeOwnedType(QType *ownedType) Q_D(QPackage); if (d->packagedElements->contains(ownedType)) { // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->removePackagedElement(qmofobject_cast<QPackageableElement *>(ownedType)); + (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); // Adjust opposite property ownedType->setPackage(0); @@ -457,7 +457,7 @@ void QPackage::addPackagedElement(QPackageableElement *packagedElement) d->packagedElements->insert(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } @@ -470,7 +470,7 @@ void QPackage::removePackagedElement(QPackageableElement *packagedElement) d->packagedElements->remove(packagedElement); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(packagedElement)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); } } @@ -498,7 +498,7 @@ void QPackage::setNestingPackage(QPackage *nestingPackage) d->nestingPackage = nestingPackage; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(nestingPackage)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(nestingPackage)); // Adjust opposite property if (nestingPackage) @@ -526,7 +526,7 @@ void QPackage::addProfileApplication(QProfileApplication *profileApplication) d->profileApplications->insert(profileApplication); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(profileApplication)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(profileApplication)); // Adjust opposite property profileApplication->setApplyingPackage(this); @@ -542,7 +542,7 @@ void QPackage::removeProfileApplication(QProfileApplication *profileApplication) d->profileApplications->remove(profileApplication); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(profileApplication)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(profileApplication)); // Adjust opposite property profileApplication->setApplyingPackage(0); @@ -560,7 +560,7 @@ const QSet<QStereotype *> *QPackage::ownedStereotypes() const Q_D(const QPackage); QSet<QStereotype *> *ownedStereotypes_ = new QSet<QStereotype *>; foreach (QPackageableElement *packageableElement, *d->packagedElements) - if (QStereotype *stereotype = qmofobject_cast<QStereotype *>(packageableElement)) + if (QStereotype *stereotype = qwrappedobject_cast<QStereotype *>(packageableElement)) ownedStereotypes_->insert(stereotype); return ownedStereotypes_; } @@ -585,7 +585,7 @@ void QPackage::addPackageMerge(QPackageMerge *packageMerge) d->packageMerges->insert(packageMerge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(packageMerge)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); // Adjust opposite property packageMerge->setReceivingPackage(this); @@ -601,7 +601,7 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) d->packageMerges->remove(packageMerge); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(packageMerge)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); // Adjust opposite property packageMerge->setReceivingPackage(0); @@ -619,7 +619,7 @@ const QSet<QPackage *> *QPackage::nestedPackages() const Q_D(const QPackage); QSet<QPackage *> *nestedPackages_ = new QSet<QPackage *>; foreach (QPackageableElement *packageableElement, *d->packagedElements) - if (QPackage *package = qmofobject_cast<QPackage *>(packageableElement)) + if (QPackage *package = qwrappedobject_cast<QPackage *>(packageableElement)) nestedPackages_->insert(package); return nestedPackages_; } @@ -629,9 +629,9 @@ void QPackage::addNestedPackage(QPackage *nestedPackage) // This is a read-write derived association end Q_D(QPackage); - if (!d->packagedElements->contains(qmofobject_cast<QPackageableElement *>(nestedPackage))) { + if (!d->packagedElements->contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->addPackagedElement(qmofobject_cast<QPackageableElement *>(nestedPackage)); + (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); // Adjust opposite property nestedPackage->setNestingPackage(this); @@ -643,9 +643,9 @@ void QPackage::removeNestedPackage(QPackage *nestedPackage) // This is a read-write derived association end Q_D(QPackage); - if (d->packagedElements->contains(qmofobject_cast<QPackageableElement *>(nestedPackage))) { + if (d->packagedElements->contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { // Adjust subsetted property(ies) - (qmofobject_cast<QPackage *>(this))->removePackagedElement(qmofobject_cast<QPackageableElement *>(nestedPackage)); + (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); // Adjust opposite property nestedPackage->setNestingPackage(0); @@ -705,22 +705,22 @@ const QSet<QPackageableElement *> *QPackage::visibleMembers() const // Overriden methods for subsetted properties -void QPackage::addPackagedElement(QtMof::QMofPointer<QType> ownedType) +void QPackage::addPackagedElement(QWrappedObjectPointer<QType> ownedType) { addOwnedType(ownedType); } -void QPackage::removePackagedElement(QtMof::QMofPointer<QType> ownedType) +void QPackage::removePackagedElement(QWrappedObjectPointer<QType> ownedType) { removeOwnedType(ownedType); } -void QPackage::addPackagedElement(QtMof::QMofPointer<QPackage> nestedPackage) +void QPackage::addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage) { addNestedPackage(nestedPackage); } -void QPackage::removePackagedElement(QtMof::QMofPointer<QPackage> nestedPackage) +void QPackage::removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage) { removeNestedPackage(nestedPackage); } diff --git a/src/uml/qpackage.h b/src/uml/qpackage.h index a8e4b0fb..d2fadfd0 100644 --- a/src/uml/qpackage.h +++ b/src/uml/qpackage.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QNamespace> #include <QtUml/QPackageableElement> #include <QtUml/QTemplateableElement> @@ -53,7 +54,8 @@ #include <QtCore/QString> #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -71,7 +73,7 @@ class QType; class QPackagePrivate; -class Q_UML_EXPORT QPackage : public QtMof::QMofObject +class Q_UML_EXPORT QPackage : public QWrappedObject { Q_OBJECT @@ -88,7 +90,7 @@ class Q_UML_EXPORT QPackage : public QtMof::QMofObject Q_DECLARE_PRIVATE(QPackage) public: - Q_INVOKABLE explicit QPackage(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackage(); // Association ends from aggregated QElement @@ -174,13 +176,13 @@ public: Q_INVOKABLE const QSet<QPackageableElement *> *visibleMembers() const; // Overriden methods for subsetted properties - Q_INVOKABLE void addPackagedElement(QtMof::QMofPointer<QType> ownedType); - Q_INVOKABLE void removePackagedElement(QtMof::QMofPointer<QType> ownedType); - Q_INVOKABLE void addPackagedElement(QtMof::QMofPointer<QPackage> nestedPackage); - Q_INVOKABLE void removePackagedElement(QtMof::QMofPointer<QPackage> nestedPackage); + Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QType> ownedType); + Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType); + Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); + Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); protected: - explicit QPackage(QPackagePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPackage(QPackagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QNamespace *_wrappedNamespace; diff --git a/src/uml/qpackage_p.h b/src/uml/qpackage_p.h index 41e027fd..ae4f4f2a 100644 --- a/src/uml/qpackage_p.h +++ b/src/uml/qpackage_p.h @@ -42,7 +42,8 @@ #define QTUML_QPACKAGE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qnamespace_p.h" #include "private/qpackageableelement_p.h" #include "private/qtemplateableelement_p.h" @@ -68,7 +69,7 @@ class QStereotype; class QPackage; class QType; -class Q_UML_EXPORT QPackagePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QPackagePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QPackage) diff --git a/src/uml/qpackageableelement.cpp b/src/uml/qpackageableelement.cpp index 6cf8bace..7ec359bc 100644 --- a/src/uml/qpackageableelement.cpp +++ b/src/uml/qpackageableelement.cpp @@ -61,15 +61,15 @@ QPackageableElementPrivate::~QPackageableElementPrivate() \brief Packageable elements are able to serve as a template parameter.A packageable element indicates a named element that may be owned directly by a package. */ -QPackageableElement::QPackageableElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QPackageableElementPrivate, parent, wrapper), +QPackageableElement::QPackageableElement(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QPackageableElementPrivate, parent, wrapper), _wrappedParameterableElement(new QParameterableElement(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { } -QPackageableElement::QPackageableElement(QPackageableElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QPackageableElement::QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedParameterableElement(new QParameterableElement(this, this)), _wrappedNamedElement(new QNamedElement(this, this)) { @@ -88,7 +88,7 @@ QPackageableElement::~QPackageableElement() */ const QSet<QElement *> *QPackageableElement::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -96,7 +96,7 @@ const QSet<QElement *> *QPackageableElement::ownedElements() const */ QElement *QPackageableElement::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -104,17 +104,17 @@ QElement *QPackageableElement::owner() const */ const QSet<QComment *> *QPackageableElement::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QPackageableElement::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QPackageableElement::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -126,12 +126,12 @@ void QPackageableElement::removeOwnedComment(QComment *ownedComment) */ QTemplateParameter *QPackageableElement::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QPackageableElement::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -139,12 +139,12 @@ void QPackageableElement::setOwningTemplateParameter(QTemplateParameter *owningT */ QTemplateParameter *QPackageableElement::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QPackageableElement::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -156,12 +156,12 @@ void QPackageableElement::setTemplateParameter(QTemplateParameter *templateParam */ QString QPackageableElement::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QPackageableElement::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -169,7 +169,7 @@ void QPackageableElement::setName(QString name) */ QString QPackageableElement::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -181,12 +181,12 @@ QString QPackageableElement::qualifiedName() const */ QStringExpression *QPackageableElement::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QPackageableElement::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -194,7 +194,7 @@ void QPackageableElement::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QPackageableElement::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -202,17 +202,17 @@ QNamespace *QPackageableElement::namespace_() const */ const QSet<QDependency *> *QPackageableElement::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QPackageableElement::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QPackageableElement::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- diff --git a/src/uml/qpackageableelement.h b/src/uml/qpackageableelement.h index aab72cba..ae1d1587 100644 --- a/src/uml/qpackageableelement.h +++ b/src/uml/qpackageableelement.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QParameterableElement> #include <QtUml/QNamedElement> @@ -59,7 +60,7 @@ QT_MODULE(QtUml) class QPackageableElementPrivate; -class Q_UML_EXPORT QPackageableElement : public QtMof::QMofObject +class Q_UML_EXPORT QPackageableElement : public QWrappedObject { Q_OBJECT @@ -69,7 +70,7 @@ class Q_UML_EXPORT QPackageableElement : public QtMof::QMofObject Q_DECLARE_PRIVATE(QPackageableElement) public: - Q_INVOKABLE explicit QPackageableElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageableElement(); // Association ends from aggregated QElement @@ -103,7 +104,7 @@ public: Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); protected: - explicit QPackageableElement(QPackageableElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QParameterableElement *_wrappedParameterableElement; diff --git a/src/uml/qpackageableelement_p.h b/src/uml/qpackageableelement_p.h index 1c779809..7f09d2e4 100644 --- a/src/uml/qpackageableelement_p.h +++ b/src/uml/qpackageableelement_p.h @@ -42,7 +42,8 @@ #define QTUML_QPACKAGEABLEELEMENT_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qparameterableelement_p.h" #include "private/qnamedelement_p.h" @@ -57,7 +58,7 @@ QT_BEGIN_NAMESPACE_QTUML QT_MODULE(QtUml) -class Q_UML_EXPORT QPackageableElementPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QPackageableElementPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QPackageableElement) diff --git a/src/uml/qpackageimport.cpp b/src/uml/qpackageimport.cpp index 2f012b6f..915ccb58 100644 --- a/src/uml/qpackageimport.cpp +++ b/src/uml/qpackageimport.cpp @@ -66,12 +66,12 @@ QPackageImportPrivate::~QPackageImportPrivate() \brief A package import is a relationship that allows the use of unqualified names to refer to package members from other namespaces. */ -QPackageImport::QPackageImport(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPackageImport::QPackageImport(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QPackageImportPrivate, parent, wrapper) { } -QPackageImport::QPackageImport(QPackageImportPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPackageImport::QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -131,14 +131,14 @@ void QPackageImport::setImportingNamespace(QNamespace *importingNamespace) d->importingNamespace->removePackageImport(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->importingNamespace)); d->importingNamespace = importingNamespace; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(importingNamespace)); if (importingNamespace) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(importingNamespace)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(importingNamespace)); } // Adjust opposite property @@ -165,13 +165,13 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) Q_D(QPackageImport); if (d->importedPackage != importedPackage) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->importedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->importedPackage)); d->importedPackage = importedPackage; // Adjust subsetted property(ies) if (importedPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(importedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(importedPackage)); } } } diff --git a/src/uml/qpackageimport.h b/src/uml/qpackageimport.h index 3d5d9aaf..10083e74 100644 --- a/src/uml/qpackageimport.h +++ b/src/uml/qpackageimport.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QPackageImport : public QDirectedRelationship Q_DECLARE_PRIVATE(QPackageImport) public: - Q_INVOKABLE explicit QPackageImport(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageImport(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageImport(); // Attributes from QPackageImport @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setImportedPackage(QPackage *importedPackage); protected: - explicit QPackageImport(QPackageImportPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackagemerge.cpp b/src/uml/qpackagemerge.cpp index 1bc8970c..c9367fa2 100644 --- a/src/uml/qpackagemerge.cpp +++ b/src/uml/qpackagemerge.cpp @@ -64,12 +64,12 @@ QPackageMergePrivate::~QPackageMergePrivate() \brief A package merge defines how the contents of one package are extended by the contents of another package. */ -QPackageMerge::QPackageMerge(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPackageMerge::QPackageMerge(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QPackageMergePrivate, parent, wrapper) { } -QPackageMerge::QPackageMerge(QPackageMergePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPackageMerge::QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -100,13 +100,13 @@ void QPackageMerge::setMergedPackage(QPackage *mergedPackage) Q_D(QPackageMerge); if (d->mergedPackage != mergedPackage) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->mergedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->mergedPackage)); d->mergedPackage = mergedPackage; // Adjust subsetted property(ies) if (mergedPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(mergedPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(mergedPackage)); } } } @@ -133,14 +133,14 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) d->receivingPackage->removePackageMerge(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->receivingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->receivingPackage)); d->receivingPackage = receivingPackage; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(receivingPackage)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(receivingPackage)); if (receivingPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(receivingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(receivingPackage)); } // Adjust opposite property diff --git a/src/uml/qpackagemerge.h b/src/uml/qpackagemerge.h index ebba9366..8372435d 100644 --- a/src/uml/qpackagemerge.h +++ b/src/uml/qpackagemerge.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QPackageMerge : public QDirectedRelationship Q_DECLARE_PRIVATE(QPackageMerge) public: - Q_INVOKABLE explicit QPackageMerge(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPackageMerge(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPackageMerge(); // Association ends from QPackageMerge @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage); protected: - explicit QPackageMerge(QPackageMergePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameter.cpp b/src/uml/qparameter.cpp index d7f3e079..56919379 100644 --- a/src/uml/qparameter.cpp +++ b/src/uml/qparameter.cpp @@ -71,15 +71,15 @@ QParameterPrivate::~QParameterPrivate() \brief Parameters are allowed to be treated as connectable elements.A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature.Parameters have support for streaming, exceptions, and parameter sets. */ -QParameter::QParameter(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QParameterPrivate, parent, wrapper), +QParameter::QParameter(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QParameterPrivate, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)) { } -QParameter::QParameter(QParameterPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QParameter::QParameter(QParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)) { @@ -98,7 +98,7 @@ QParameter::~QParameter() */ const QSet<QElement *> *QParameter::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -106,7 +106,7 @@ const QSet<QElement *> *QParameter::ownedElements() const */ QElement *QParameter::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -114,17 +114,17 @@ QElement *QParameter::owner() const */ const QSet<QComment *> *QParameter::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QParameter::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QParameter::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -136,12 +136,12 @@ void QParameter::removeOwnedComment(QComment *ownedComment) */ qint32 QParameter::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QParameter::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -149,12 +149,12 @@ void QParameter::setUpper(qint32 upper) */ bool QParameter::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QParameter::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -162,12 +162,12 @@ void QParameter::setUnique(bool isUnique) */ bool QParameter::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QParameter::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -175,12 +175,12 @@ void QParameter::setOrdered(bool isOrdered) */ qint32 QParameter::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QParameter::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -192,12 +192,12 @@ void QParameter::setLower(qint32 lower) */ QValueSpecification *QParameter::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QParameter::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -205,12 +205,12 @@ void QParameter::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QParameter::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QParameter::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -222,12 +222,12 @@ void QParameter::setLowerValue(QValueSpecification *lowerValue) */ QString QParameter::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QParameter::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -235,12 +235,12 @@ void QParameter::setName(QString name) */ QtUml::VisibilityKind QParameter::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QParameter::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -248,7 +248,7 @@ void QParameter::setVisibility(QtUml::VisibilityKind visibility) */ QString QParameter::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -260,12 +260,12 @@ QString QParameter::qualifiedName() const */ QStringExpression *QParameter::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QParameter::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -273,7 +273,7 @@ void QParameter::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QParameter::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -281,17 +281,17 @@ QNamespace *QParameter::namespace_() const */ const QSet<QDependency *> *QParameter::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QParameter::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QParameter::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -303,12 +303,12 @@ void QParameter::removeClientDependency(QDependency *clientDependency) */ QType *QParameter::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QParameter::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -320,12 +320,12 @@ void QParameter::setType(QType *type) */ QTemplateParameter *QParameter::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QParameter::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -337,7 +337,7 @@ void QParameter::setOwningTemplateParameter(QTemplateParameter *owningTemplatePa */ const QList<QConnectorEnd *> *QParameter::ends() const { - return (qmofobject_cast<const QConnectableElement *>(this))->ends(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } /*! @@ -345,12 +345,12 @@ const QList<QConnectorEnd *> *QParameter::ends() const */ QConnectableElementTemplateParameter *QParameter::templateParameter() const { - return (qmofobject_cast<const QConnectableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->templateParameter(); } void QParameter::setTemplateParameter(QConnectableElementTemplateParameter *templateParameter) { - (qmofobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -493,7 +493,7 @@ void QParameter::setOperation(QOperation *operation) d->operation = operation; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(operation)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(operation)); // Adjust opposite property if (operation) @@ -519,13 +519,13 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) Q_D(QParameter); if (d->defaultValue != defaultValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->defaultValue)); d->defaultValue = defaultValue; // Adjust subsetted property(ies) if (defaultValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(defaultValue)); } } } diff --git a/src/uml/qparameter.h b/src/uml/qparameter.h index 7ee89f81..f27b2e0c 100644 --- a/src/uml/qparameter.h +++ b/src/uml/qparameter.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QMultiplicityElement> #include <QtUml/QConnectableElement> @@ -69,7 +70,7 @@ class QParameterSet; class QParameterPrivate; -class Q_UML_EXPORT QParameter : public QtMof::QMofObject +class Q_UML_EXPORT QParameter : public QWrappedObject { Q_OBJECT @@ -86,7 +87,7 @@ class Q_UML_EXPORT QParameter : public QtMof::QMofObject Q_DECLARE_PRIVATE(QParameter) public: - Q_INVOKABLE explicit QParameter(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QParameter(); // Association ends from aggregated QElement @@ -162,7 +163,7 @@ public: Q_INVOKABLE void removeParameterSet(QParameterSet *parameterSet); protected: - explicit QParameter(QParameterPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QParameter(QParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QMultiplicityElement *_wrappedMultiplicityElement; diff --git a/src/uml/qparameter_p.h b/src/uml/qparameter_p.h index 7921f3ac..1213fd9a 100644 --- a/src/uml/qparameter_p.h +++ b/src/uml/qparameter_p.h @@ -42,7 +42,8 @@ #define QTUML_QPARAMETER_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qmultiplicityelement_p.h" #include "private/qconnectableelement_p.h" @@ -68,7 +69,7 @@ class QOperation; class QParameterSet; class QParameter; -class Q_UML_EXPORT QParameterPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QParameterPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QParameter) diff --git a/src/uml/qparameterableelement.cpp b/src/uml/qparameterableelement.cpp index 24da6bc9..5e9d2f0d 100644 --- a/src/uml/qparameterableelement.cpp +++ b/src/uml/qparameterableelement.cpp @@ -64,12 +64,12 @@ QParameterableElementPrivate::~QParameterableElementPrivate() \brief A parameterable element is an element that can be exposed as a formal template parameter for a template, or specified as an actual parameter in a binding of a template. */ -QParameterableElement::QParameterableElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QParameterableElement::QParameterableElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QParameterableElementPrivate, parent, wrapper) { } -QParameterableElement::QParameterableElement(QParameterableElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QParameterableElement::QParameterableElement(QParameterableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -104,8 +104,8 @@ void QParameterableElement::setOwningTemplateParameter(QTemplateParameter *ownin d->owningTemplateParameter = owningTemplateParameter; // Adjust subsetted property(ies) - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(qmofobject_cast<QTemplateParameter *>(owningTemplateParameter)); - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(owningTemplateParameter)); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(qwrappedobject_cast<QTemplateParameter *>(owningTemplateParameter)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(owningTemplateParameter)); // Adjust opposite property owningTemplateParameter->setOwnedParameteredElement(this); diff --git a/src/uml/qparameterableelement.h b/src/uml/qparameterableelement.h index 1a2e3963..6f791d97 100644 --- a/src/uml/qparameterableelement.h +++ b/src/uml/qparameterableelement.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QParameterableElement : public QElement Q_DECLARE_PRIVATE(QParameterableElement) public: - Q_INVOKABLE explicit QParameterableElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QParameterableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QParameterableElement(); // Association ends from QParameterableElement @@ -82,7 +82,7 @@ public: Q_INVOKABLE bool isTemplateParameter() const; protected: - explicit QParameterableElement(QParameterableElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QParameterableElement(QParameterableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameterset.cpp b/src/uml/qparameterset.cpp index 75803029..c42d7718 100644 --- a/src/uml/qparameterset.cpp +++ b/src/uml/qparameterset.cpp @@ -67,12 +67,12 @@ QParameterSetPrivate::~QParameterSetPrivate() \brief A parameter set is an element that provides alternative sets of inputs or outputs that a behavior may use. */ -QParameterSet::QParameterSet(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QParameterSet::QParameterSet(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QParameterSetPrivate, parent, wrapper) { } -QParameterSet::QParameterSet(QParameterSetPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QParameterSet::QParameterSet(QParameterSetPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -143,7 +143,7 @@ void QParameterSet::addCondition(QConstraint *condition) d->conditions->insert(condition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(condition)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(condition)); } } @@ -156,7 +156,7 @@ void QParameterSet::removeCondition(QConstraint *condition) d->conditions->remove(condition); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(condition)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(condition)); } } diff --git a/src/uml/qparameterset.h b/src/uml/qparameterset.h index 23d51d82..908fa1fc 100644 --- a/src/uml/qparameterset.h +++ b/src/uml/qparameterset.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QParameterSet : public QNamedElement Q_DECLARE_PRIVATE(QParameterSet) public: - Q_INVOKABLE explicit QParameterSet(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QParameterSet(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QParameterSet(); // Association ends from QParameterSet @@ -84,7 +84,7 @@ public: Q_INVOKABLE void removeCondition(QConstraint *condition); protected: - explicit QParameterSet(QParameterSetPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QParameterSet(QParameterSetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpartdecomposition.cpp b/src/uml/qpartdecomposition.cpp index 25f1efc2..364ce9fd 100644 --- a/src/uml/qpartdecomposition.cpp +++ b/src/uml/qpartdecomposition.cpp @@ -60,12 +60,12 @@ QPartDecompositionPrivate::~QPartDecompositionPrivate() \brief A part decomposition is a description of the internal interactions of one lifeline relative to an interaction. */ -QPartDecomposition::QPartDecomposition(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPartDecomposition::QPartDecomposition(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionUse(*new QPartDecompositionPrivate, parent, wrapper) { } -QPartDecomposition::QPartDecomposition(QPartDecompositionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPartDecomposition::QPartDecomposition(QPartDecompositionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionUse(dd, parent, wrapper) { } diff --git a/src/uml/qpartdecomposition.h b/src/uml/qpartdecomposition.h index d6fccadf..3e542a86 100644 --- a/src/uml/qpartdecomposition.h +++ b/src/uml/qpartdecomposition.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QPartDecomposition : public QInteractionUse Q_DECLARE_PRIVATE(QPartDecomposition) public: - Q_INVOKABLE explicit QPartDecomposition(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPartDecomposition(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPartDecomposition(); protected: - explicit QPartDecomposition(QPartDecompositionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPartDecomposition(QPartDecompositionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpin.cpp b/src/uml/qpin.cpp index c41d2cd7..73de9e40 100644 --- a/src/uml/qpin.cpp +++ b/src/uml/qpin.cpp @@ -61,15 +61,15 @@ QPinPrivate::~QPinPrivate() \brief A pin is a typed element and multiplicity element that provides values to actions and accept result values from them.A pin is an object node for inputs and outputs to actions. */ -QPin::QPin(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QPinPrivate, parent, wrapper), +QPin::QPin(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QPinPrivate, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedObjectNode(new QObjectNode(this, this)) { } -QPin::QPin(QPinPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QPin::QPin(QPinPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedObjectNode(new QObjectNode(this, this)) { @@ -88,7 +88,7 @@ QPin::~QPin() */ const QSet<QElement *> *QPin::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -96,7 +96,7 @@ const QSet<QElement *> *QPin::ownedElements() const */ QElement *QPin::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -104,17 +104,17 @@ QElement *QPin::owner() const */ const QSet<QComment *> *QPin::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QPin::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QPin::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -126,12 +126,12 @@ void QPin::removeOwnedComment(QComment *ownedComment) */ qint32 QPin::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QPin::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -139,12 +139,12 @@ void QPin::setUpper(qint32 upper) */ bool QPin::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QPin::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -152,12 +152,12 @@ void QPin::setUnique(bool isUnique) */ bool QPin::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QPin::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -165,12 +165,12 @@ void QPin::setOrdered(bool isOrdered) */ qint32 QPin::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QPin::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -182,12 +182,12 @@ void QPin::setLower(qint32 lower) */ QValueSpecification *QPin::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QPin::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -195,12 +195,12 @@ void QPin::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QPin::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QPin::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -212,12 +212,12 @@ void QPin::setLowerValue(QValueSpecification *lowerValue) */ QString QPin::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QPin::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -225,12 +225,12 @@ void QPin::setName(QString name) */ QtUml::VisibilityKind QPin::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QPin::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -238,7 +238,7 @@ void QPin::setVisibility(QtUml::VisibilityKind visibility) */ QString QPin::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -250,12 +250,12 @@ QString QPin::qualifiedName() const */ QStringExpression *QPin::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QPin::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -263,7 +263,7 @@ void QPin::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QPin::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -271,17 +271,17 @@ QNamespace *QPin::namespace_() const */ const QSet<QDependency *> *QPin::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QPin::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QPin::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -293,12 +293,12 @@ void QPin::removeClientDependency(QDependency *clientDependency) */ bool QPin::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QPin::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -310,7 +310,7 @@ void QPin::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QPin::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -318,7 +318,7 @@ const QSet<QRedefinableElement *> *QPin::redefinedElements() const */ const QSet<QClassifier *> *QPin::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -330,17 +330,17 @@ const QSet<QClassifier *> *QPin::redefinitionContexts() const */ const QSet<QActivityNode *> *QPin::redefinedNodes() const { - return (qmofobject_cast<const QActivityNode *>(this))->redefinedNodes(); + return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } void QPin::addRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); } void QPin::removeRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); } /*! @@ -348,17 +348,17 @@ void QPin::removeRedefinedNode(QActivityNode *redefinedNode) */ const QSet<QActivityEdge *> *QPin::incomings() const { - return (qmofobject_cast<const QActivityNode *>(this))->incomings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } void QPin::addIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->addIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->addIncoming(incoming); } void QPin::removeIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->removeIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->removeIncoming(incoming); } /*! @@ -366,12 +366,12 @@ void QPin::removeIncoming(QActivityEdge *incoming) */ QActivity *QPin::activity() const { - return (qmofobject_cast<const QActivityNode *>(this))->activity(); + return (qwrappedobject_cast<const QActivityNode *>(this))->activity(); } void QPin::setActivity(QActivity *activity) { - (qmofobject_cast<QActivityNode *>(this))->setActivity(activity); + (qwrappedobject_cast<QActivityNode *>(this))->setActivity(activity); } /*! @@ -379,7 +379,7 @@ void QPin::setActivity(QActivity *activity) */ const QSet<QActivityGroup *> *QPin::inGroup() const { - return (qmofobject_cast<const QActivityNode *>(this))->inGroup(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } /*! @@ -387,12 +387,12 @@ const QSet<QActivityGroup *> *QPin::inGroup() const */ QStructuredActivityNode *QPin::inStructuredNode() const { - return (qmofobject_cast<const QActivityNode *>(this))->inStructuredNode(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inStructuredNode(); } void QPin::setInStructuredNode(QStructuredActivityNode *inStructuredNode) { - (qmofobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); + (qwrappedobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); } /*! @@ -400,17 +400,17 @@ void QPin::setInStructuredNode(QStructuredActivityNode *inStructuredNode) */ const QSet<QActivityPartition *> *QPin::inPartition() const { - return (qmofobject_cast<const QActivityNode *>(this))->inPartition(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } void QPin::addInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->addInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->addInPartition(inPartition); } void QPin::removeInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); } /*! @@ -418,17 +418,17 @@ void QPin::removeInPartition(QActivityPartition *inPartition) */ const QSet<QInterruptibleActivityRegion *> *QPin::inInterruptibleRegion() const { - return (qmofobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } void QPin::addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); } void QPin::removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); } /*! @@ -436,17 +436,17 @@ void QPin::removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterrupt */ const QSet<QActivityEdge *> *QPin::outgoings() const { - return (qmofobject_cast<const QActivityNode *>(this))->outgoings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } void QPin::addOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); } void QPin::removeOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); } // --------------------------------------------------------------- @@ -458,12 +458,12 @@ void QPin::removeOutgoing(QActivityEdge *outgoing) */ QType *QPin::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QPin::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -475,12 +475,12 @@ void QPin::setType(QType *type) */ bool QPin::isControlType() const { - return (qmofobject_cast<const QObjectNode *>(this))->isControlType(); + return (qwrappedobject_cast<const QObjectNode *>(this))->isControlType(); } void QPin::setControlType(bool isControlType) { - (qmofobject_cast<QObjectNode *>(this))->setControlType(isControlType); + (qwrappedobject_cast<QObjectNode *>(this))->setControlType(isControlType); } /*! @@ -488,12 +488,12 @@ void QPin::setControlType(bool isControlType) */ QtUml::ObjectNodeOrderingKind QPin::ordering() const { - return (qmofobject_cast<const QObjectNode *>(this))->ordering(); + return (qwrappedobject_cast<const QObjectNode *>(this))->ordering(); } void QPin::setOrdering(QtUml::ObjectNodeOrderingKind ordering) { - (qmofobject_cast<QObjectNode *>(this))->setOrdering(ordering); + (qwrappedobject_cast<QObjectNode *>(this))->setOrdering(ordering); } // --------------------------------------------------------------- @@ -505,12 +505,12 @@ void QPin::setOrdering(QtUml::ObjectNodeOrderingKind ordering) */ QValueSpecification *QPin::upperBound() const { - return (qmofobject_cast<const QObjectNode *>(this))->upperBound(); + return (qwrappedobject_cast<const QObjectNode *>(this))->upperBound(); } void QPin::setUpperBound(QValueSpecification *upperBound) { - (qmofobject_cast<QObjectNode *>(this))->setUpperBound(upperBound); + (qwrappedobject_cast<QObjectNode *>(this))->setUpperBound(upperBound); } /*! @@ -518,12 +518,12 @@ void QPin::setUpperBound(QValueSpecification *upperBound) */ QBehavior *QPin::selection() const { - return (qmofobject_cast<const QObjectNode *>(this))->selection(); + return (qwrappedobject_cast<const QObjectNode *>(this))->selection(); } void QPin::setSelection(QBehavior *selection) { - (qmofobject_cast<QObjectNode *>(this))->setSelection(selection); + (qwrappedobject_cast<QObjectNode *>(this))->setSelection(selection); } /*! @@ -531,17 +531,17 @@ void QPin::setSelection(QBehavior *selection) */ const QSet<QState *> *QPin::inState() const { - return (qmofobject_cast<const QObjectNode *>(this))->inState(); + return (qwrappedobject_cast<const QObjectNode *>(this))->inState(); } void QPin::addInState(QState *inState) { - (qmofobject_cast<QObjectNode *>(this))->addInState(inState); + (qwrappedobject_cast<QObjectNode *>(this))->addInState(inState); } void QPin::removeInState(QState *inState) { - (qmofobject_cast<QObjectNode *>(this))->removeInState(inState); + (qwrappedobject_cast<QObjectNode *>(this))->removeInState(inState); } // --------------------------------------------------------------- diff --git a/src/uml/qpin.h b/src/uml/qpin.h index 98e82936..0650f22f 100644 --- a/src/uml/qpin.h +++ b/src/uml/qpin.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QMultiplicityElement> #include <QtUml/QObjectNode> @@ -56,7 +57,7 @@ QT_MODULE(QtUml) class QPinPrivate; -class Q_UML_EXPORT QPin : public QtMof::QMofObject +class Q_UML_EXPORT QPin : public QWrappedObject { Q_OBJECT @@ -66,7 +67,7 @@ class Q_UML_EXPORT QPin : public QtMof::QMofObject Q_DECLARE_PRIVATE(QPin) public: - Q_INVOKABLE explicit QPin(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPin(); // Association ends from aggregated QElement @@ -161,7 +162,7 @@ public: Q_INVOKABLE void setControl(bool isControl); protected: - explicit QPin(QPinPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPin(QPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QMultiplicityElement *_wrappedMultiplicityElement; diff --git a/src/uml/qpin_p.h b/src/uml/qpin_p.h index aa89bfcb..8f30d78e 100644 --- a/src/uml/qpin_p.h +++ b/src/uml/qpin_p.h @@ -42,7 +42,8 @@ #define QTUML_QPIN_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qmultiplicityelement_p.h" #include "private/qobjectnode_p.h" @@ -54,7 +55,7 @@ QT_BEGIN_NAMESPACE_QTUML QT_MODULE(QtUml) -class Q_UML_EXPORT QPinPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QPinPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QPin) diff --git a/src/uml/qport.cpp b/src/uml/qport.cpp index 23977717..7d19de4c 100644 --- a/src/uml/qport.cpp +++ b/src/uml/qport.cpp @@ -69,12 +69,12 @@ QPortPrivate::~QPortPrivate() \brief A port has an associated protocol state machine.A port is a property of a classifier that specifies a distinct interaction point between that classifier and its environment or between the (behavior of the) classifier and its internal parts. Ports are connected to properties of the classifier by connectors through which requests can be made to invoke the behavioral features of a classifier. A Port may specify the services a classifier provides (offers) to its environment as well as the services that a classifier expects (requires) of its environment. */ -QPort::QPort(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPort::QPort(QWrappedObject *parent, QWrappedObject *wrapper) : QProperty(*new QPortPrivate, parent, wrapper) { } -QPort::QPort(QPortPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPort::QPort(QPortPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QProperty(dd, parent, wrapper) { } @@ -219,7 +219,7 @@ void QPort::addRedefinedPort(QPort *redefinedPort) d->redefinedPorts->insert(redefinedPort); // Adjust subsetted property(ies) - (qmofobject_cast<QProperty *>(this))->addRedefinedProperty(qmofobject_cast<QProperty *>(redefinedPort)); + (qwrappedobject_cast<QProperty *>(this))->addRedefinedProperty(qwrappedobject_cast<QProperty *>(redefinedPort)); } } @@ -232,18 +232,18 @@ void QPort::removeRedefinedPort(QPort *redefinedPort) d->redefinedPorts->remove(redefinedPort); // Adjust subsetted property(ies) - (qmofobject_cast<QProperty *>(this))->removeRedefinedProperty(qmofobject_cast<QProperty *>(redefinedPort)); + (qwrappedobject_cast<QProperty *>(this))->removeRedefinedProperty(qwrappedobject_cast<QProperty *>(redefinedPort)); } } // Overriden methods for subsetted properties -void QPort::addRedefinedProperty(QtMof::QMofPointer<QPort> redefinedPort) +void QPort::addRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort) { addRedefinedPort(redefinedPort); } -void QPort::removeRedefinedProperty(QtMof::QMofPointer<QPort> redefinedPort) +void QPort::removeRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort) { removeRedefinedPort(redefinedPort); } diff --git a/src/uml/qport.h b/src/uml/qport.h index 634e1bf7..ed113f9c 100644 --- a/src/uml/qport.h +++ b/src/uml/qport.h @@ -49,7 +49,8 @@ // Qt includes #include <QtCore/QSet> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -79,7 +80,7 @@ class Q_UML_EXPORT QPort : public QProperty Q_DECLARE_PRIVATE(QPort) public: - Q_INVOKABLE explicit QPort(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPort(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPort(); // Attributes from QPort @@ -100,11 +101,11 @@ public: Q_INVOKABLE void removeRedefinedPort(QPort *redefinedPort); // Overriden methods for subsetted properties - Q_INVOKABLE void addRedefinedProperty(QtMof::QMofPointer<QPort> redefinedPort); - Q_INVOKABLE void removeRedefinedProperty(QtMof::QMofPointer<QPort> redefinedPort); + Q_INVOKABLE void addRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort); + Q_INVOKABLE void removeRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort); protected: - explicit QPort(QPortPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPort(QPortPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprimitivetype.cpp b/src/uml/qprimitivetype.cpp index 252f6ed9..5ba39b9d 100644 --- a/src/uml/qprimitivetype.cpp +++ b/src/uml/qprimitivetype.cpp @@ -60,12 +60,12 @@ QPrimitiveTypePrivate::~QPrimitiveTypePrivate() \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. */ -QPrimitiveType::QPrimitiveType(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPrimitiveType::QPrimitiveType(QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(*new QPrimitiveTypePrivate, parent, wrapper) { } -QPrimitiveType::QPrimitiveType(QPrimitiveTypePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPrimitiveType::QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDataType(dd, parent, wrapper) { } diff --git a/src/uml/qprimitivetype.h b/src/uml/qprimitivetype.h index 504a7d98..6d1499ac 100644 --- a/src/uml/qprimitivetype.h +++ b/src/uml/qprimitivetype.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QPrimitiveType : public QDataType Q_DECLARE_PRIVATE(QPrimitiveType) public: - Q_INVOKABLE explicit QPrimitiveType(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPrimitiveType(); protected: - explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprofile.cpp b/src/uml/qprofile.cpp index a2005766..6bf693d0 100644 --- a/src/uml/qprofile.cpp +++ b/src/uml/qprofile.cpp @@ -67,12 +67,12 @@ QProfilePrivate::~QProfilePrivate() \brief A profile defines limited extensions to a reference metamodel with the purpose of adapting the metamodel to a specific platform or domain. */ -QProfile::QProfile(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProfile::QProfile(QWrappedObject *parent, QWrappedObject *wrapper) : QPackage(*new QProfilePrivate, parent, wrapper) { } -QProfile::QProfile(QProfilePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProfile::QProfile(QProfilePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackage(dd, parent, wrapper) { } @@ -105,7 +105,7 @@ void QProfile::addMetamodelReference(QPackageImport *metamodelReference) d->metamodelReferences->insert(metamodelReference); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addPackageImport(qmofobject_cast<QPackageImport *>(metamodelReference)); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(qwrappedobject_cast<QPackageImport *>(metamodelReference)); } } @@ -118,7 +118,7 @@ void QProfile::removeMetamodelReference(QPackageImport *metamodelReference) d->metamodelReferences->remove(metamodelReference); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removePackageImport(qmofobject_cast<QPackageImport *>(metamodelReference)); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(qwrappedobject_cast<QPackageImport *>(metamodelReference)); } } @@ -142,7 +142,7 @@ void QProfile::addMetaclassReference(QElementImport *metaclassReference) d->metaclassReferences->insert(metaclassReference); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->addElementImport(qmofobject_cast<QElementImport *>(metaclassReference)); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(qwrappedobject_cast<QElementImport *>(metaclassReference)); } } @@ -155,7 +155,7 @@ void QProfile::removeMetaclassReference(QElementImport *metaclassReference) d->metaclassReferences->remove(metaclassReference); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeElementImport(qmofobject_cast<QElementImport *>(metaclassReference)); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(qwrappedobject_cast<QElementImport *>(metaclassReference)); } } diff --git a/src/uml/qprofile.h b/src/uml/qprofile.h index 2bfd3c47..b8660e99 100644 --- a/src/uml/qprofile.h +++ b/src/uml/qprofile.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QProfile : public QPackage Q_DECLARE_PRIVATE(QProfile) public: - Q_INVOKABLE explicit QProfile(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProfile(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProfile(); // Association ends from QProfile @@ -84,7 +84,7 @@ public: Q_INVOKABLE void removeMetaclassReference(QElementImport *metaclassReference); protected: - explicit QProfile(QProfilePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProfile(QProfilePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprofileapplication.cpp b/src/uml/qprofileapplication.cpp index 13b9acf5..112ac9b5 100644 --- a/src/uml/qprofileapplication.cpp +++ b/src/uml/qprofileapplication.cpp @@ -66,12 +66,12 @@ QProfileApplicationPrivate::~QProfileApplicationPrivate() \brief A profile application is used to show which profiles have been applied to a package. */ -QProfileApplication::QProfileApplication(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProfileApplication::QProfileApplication(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QProfileApplicationPrivate, parent, wrapper) { } -QProfileApplication::QProfileApplication(QProfileApplicationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProfileApplication::QProfileApplication(QProfileApplicationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -131,14 +131,14 @@ void QProfileApplication::setApplyingPackage(QPackage *applyingPackage) d->applyingPackage->removeProfileApplication(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->applyingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->applyingPackage)); d->applyingPackage = applyingPackage; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(applyingPackage)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(applyingPackage)); if (applyingPackage) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(applyingPackage)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(applyingPackage)); } // Adjust opposite property @@ -165,13 +165,13 @@ void QProfileApplication::setAppliedProfile(QProfile *appliedProfile) Q_D(QProfileApplication); if (d->appliedProfile != appliedProfile) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->appliedProfile)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->appliedProfile)); d->appliedProfile = appliedProfile; // Adjust subsetted property(ies) if (appliedProfile) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(appliedProfile)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(appliedProfile)); } } } diff --git a/src/uml/qprofileapplication.h b/src/uml/qprofileapplication.h index f062a1cb..e13e9a46 100644 --- a/src/uml/qprofileapplication.h +++ b/src/uml/qprofileapplication.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QProfileApplication : public QDirectedRelationship Q_DECLARE_PRIVATE(QProfileApplication) public: - Q_INVOKABLE explicit QProfileApplication(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProfileApplication(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProfileApplication(); // Attributes from QProfileApplication @@ -84,7 +84,7 @@ public: Q_INVOKABLE void setAppliedProfile(QProfile *appliedProfile); protected: - explicit QProfileApplication(QProfileApplicationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProfileApplication(QProfileApplicationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qproperty.cpp b/src/uml/qproperty.cpp index eec8eba6..4f0aabb9 100644 --- a/src/uml/qproperty.cpp +++ b/src/uml/qproperty.cpp @@ -87,16 +87,16 @@ QPropertyPrivate::~QPropertyPrivate() \brief Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association. The range of valid values represented by the property can be controlled by setting the property's type.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.A property has the capability of being a deployment target in a deployment relationship. This enables modeling the deployment to hierarchical nodes that have properties functioning as internal parts.Property specializes ParameterableElement to specify that a property can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.A property represents a set of instances that are owned by a containing classifier instance. */ -QProperty::QProperty(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QPropertyPrivate, parent, wrapper), +QProperty::QProperty(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QPropertyPrivate, parent, wrapper), _wrappedStructuralFeature(new QStructuralFeature(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) { } -QProperty::QProperty(QPropertyPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QProperty::QProperty(QPropertyPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedStructuralFeature(new QStructuralFeature(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)), _wrappedDeploymentTarget(new QDeploymentTarget(this, this)) @@ -116,7 +116,7 @@ QProperty::~QProperty() */ const QSet<QElement *> *QProperty::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -124,7 +124,7 @@ const QSet<QElement *> *QProperty::ownedElements() const */ QElement *QProperty::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -132,17 +132,17 @@ QElement *QProperty::owner() const */ const QSet<QComment *> *QProperty::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QProperty::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QProperty::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -154,12 +154,12 @@ void QProperty::removeOwnedComment(QComment *ownedComment) */ QString QProperty::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QProperty::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -167,12 +167,12 @@ void QProperty::setName(QString name) */ QtUml::VisibilityKind QProperty::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QProperty::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -180,7 +180,7 @@ void QProperty::setVisibility(QtUml::VisibilityKind visibility) */ QString QProperty::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -192,12 +192,12 @@ QString QProperty::qualifiedName() const */ QStringExpression *QProperty::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QProperty::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -205,7 +205,7 @@ void QProperty::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QProperty::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -213,17 +213,17 @@ QNamespace *QProperty::namespace_() const */ const QSet<QDependency *> *QProperty::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QProperty::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QProperty::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -235,12 +235,12 @@ void QProperty::removeClientDependency(QDependency *clientDependency) */ QType *QProperty::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QProperty::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -252,12 +252,12 @@ void QProperty::setType(QType *type) */ qint32 QProperty::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QProperty::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -265,12 +265,12 @@ void QProperty::setUpper(qint32 upper) */ bool QProperty::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QProperty::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -278,12 +278,12 @@ void QProperty::setUnique(bool isUnique) */ bool QProperty::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QProperty::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -291,12 +291,12 @@ void QProperty::setOrdered(bool isOrdered) */ qint32 QProperty::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QProperty::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -308,12 +308,12 @@ void QProperty::setLower(qint32 lower) */ QValueSpecification *QProperty::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QProperty::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -321,12 +321,12 @@ void QProperty::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QProperty::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QProperty::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -338,12 +338,12 @@ void QProperty::setLowerValue(QValueSpecification *lowerValue) */ bool QProperty::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QProperty::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -355,7 +355,7 @@ void QProperty::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QProperty::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -363,7 +363,7 @@ const QSet<QRedefinableElement *> *QProperty::redefinedElements() const */ const QSet<QClassifier *> *QProperty::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -375,12 +375,12 @@ const QSet<QClassifier *> *QProperty::redefinitionContexts() const */ bool QProperty::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QProperty::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -392,7 +392,7 @@ void QProperty::setStatic(bool isStatic) */ const QSet<QClassifier *> *QProperty::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- @@ -404,12 +404,12 @@ const QSet<QClassifier *> *QProperty::featuringClassifiers() const */ QTemplateParameter *QProperty::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QProperty::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -421,7 +421,7 @@ void QProperty::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar */ const QList<QConnectorEnd *> *QProperty::ends() const { - return (qmofobject_cast<const QConnectableElement *>(this))->ends(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } /*! @@ -429,12 +429,12 @@ const QList<QConnectorEnd *> *QProperty::ends() const */ QConnectableElementTemplateParameter *QProperty::templateParameter() const { - return (qmofobject_cast<const QConnectableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->templateParameter(); } void QProperty::setTemplateParameter(QConnectableElementTemplateParameter *templateParameter) { - (qmofobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -446,7 +446,7 @@ void QProperty::setTemplateParameter(QConnectableElementTemplateParameter *templ */ const QSet<QPackageableElement *> *QProperty::deployedElements() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployedElements(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } /*! @@ -454,17 +454,17 @@ const QSet<QPackageableElement *> *QProperty::deployedElements() const */ const QSet<QDeployment *> *QProperty::deployments() const { - return (qmofobject_cast<const QDeploymentTarget *>(this))->deployments(); + return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } void QProperty::addDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->addDeployment(deployment); } void QProperty::removeDeployment(QDeployment *deployment) { - (qmofobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); + (qwrappedobject_cast<QDeploymentTarget *>(this))->removeDeployment(deployment); } // --------------------------------------------------------------- @@ -681,20 +681,20 @@ void QProperty::setOwningAssociation(QAssociation *owningAssociation) d->owningAssociation->removeOwnedEnd(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->owningAssociation)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->owningAssociation)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->owningAssociation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->owningAssociation)); d->owningAssociation = owningAssociation; // Adjust subsetted property(ies) if (owningAssociation) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(owningAssociation)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(owningAssociation)); } if (owningAssociation) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(owningAssociation)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(owningAssociation)); } - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(owningAssociation)); - (qmofobject_cast<QProperty *>(this))->setAssociation(qmofobject_cast<QAssociation *>(owningAssociation)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(owningAssociation)); + (qwrappedobject_cast<QProperty *>(this))->setAssociation(qwrappedobject_cast<QAssociation *>(owningAssociation)); // Adjust opposite property if (owningAssociation) @@ -722,7 +722,7 @@ void QProperty::addQualifier(QProperty *qualifier) d->qualifiers->append(qualifier); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(qualifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); // Adjust opposite property qualifier->setAssociationEnd(this); @@ -738,7 +738,7 @@ void QProperty::removeQualifier(QProperty *qualifier) d->qualifiers->removeAll(qualifier); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(qualifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); // Adjust opposite property qualifier->setAssociationEnd(0); @@ -763,13 +763,13 @@ void QProperty::setDefaultValue(QValueSpecification *defaultValue) Q_D(QProperty); if (d->defaultValue != defaultValue) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->defaultValue)); d->defaultValue = defaultValue; // Adjust subsetted property(ies) if (defaultValue) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(defaultValue)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(defaultValue)); } } } @@ -796,18 +796,18 @@ void QProperty::setClass_(QClass *class_) d->class_->removeOwnedAttribute(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->class_)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->class_)); d->class_ = class_; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(class_)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(class_)); if (class_) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(class_)); } if (class_) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(class_)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(class_)); } // Adjust opposite property @@ -864,7 +864,7 @@ void QProperty::setAssociationEnd(QProperty *associationEnd) d->associationEnd = associationEnd; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(associationEnd)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(associationEnd)); // Adjust opposite property if (associationEnd) @@ -894,18 +894,18 @@ void QProperty::setDatatype(QDataType *datatype) d->datatype->removeOwnedAttribute(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->datatype)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->datatype)); d->datatype = datatype; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(datatype)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(datatype)); if (datatype) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(datatype)); } if (datatype) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(datatype)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(datatype)); } // Adjust opposite property @@ -934,7 +934,7 @@ void QProperty::addRedefinedProperty(QProperty *redefinedProperty) d->redefinedProperties->insert(redefinedProperty); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedProperty)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); } } @@ -947,7 +947,7 @@ void QProperty::removeRedefinedProperty(QProperty *redefinedProperty) d->redefinedProperties->remove(redefinedProperty); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedProperty)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); } } @@ -1002,18 +1002,18 @@ void QProperty::setInterface(QInterface *interface) d->interface->removeOwnedAttribute(this); // Adjust subsetted property(ies) - (qmofobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qmofobject_cast<QClassifier *>(d->interface)); - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->interface)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->removeFeaturingClassifier(qwrappedobject_cast<QClassifier *>(d->interface)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->interface)); d->interface = interface; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(interface)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(interface)); if (interface) { - (qmofobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qmofobject_cast<QClassifier *>(interface)); + (qwrappedobject_cast<QFeaturePrivate *>(d))->addFeaturingClassifier(qwrappedobject_cast<QClassifier *>(interface)); } if (interface) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(interface)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(interface)); } // Adjust opposite property diff --git a/src/uml/qproperty.h b/src/uml/qproperty.h index 7fea5ef2..359ea578 100644 --- a/src/uml/qproperty.h +++ b/src/uml/qproperty.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QStructuralFeature> #include <QtUml/QConnectableElement> #include <QtUml/QDeploymentTarget> @@ -75,7 +76,7 @@ class QClass; class QPropertyPrivate; -class Q_UML_EXPORT QProperty : public QtMof::QMofObject +class Q_UML_EXPORT QProperty : public QWrappedObject { Q_OBJECT @@ -102,7 +103,7 @@ class Q_UML_EXPORT QProperty : public QtMof::QMofObject Q_DECLARE_PRIVATE(QProperty) public: - Q_INVOKABLE explicit QProperty(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProperty(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProperty(); // Association ends from aggregated QElement @@ -228,7 +229,7 @@ public: Q_INVOKABLE const QSet<QType *> *subsettingContext() const; protected: - explicit QProperty(QPropertyPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProperty(QPropertyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QStructuralFeature *_wrappedStructuralFeature; diff --git a/src/uml/qproperty_p.h b/src/uml/qproperty_p.h index 2e965b52..99112c12 100644 --- a/src/uml/qproperty_p.h +++ b/src/uml/qproperty_p.h @@ -42,7 +42,8 @@ #define QTUML_QPROPERTY_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qstructuralfeature_p.h" #include "private/qconnectableelement_p.h" #include "private/qdeploymenttarget_p.h" @@ -74,7 +75,7 @@ class QAssociation; class QClass; class QProperty; -class Q_UML_EXPORT QPropertyPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QPropertyPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QProperty) diff --git a/src/uml/qprotocolconformance.cpp b/src/uml/qprotocolconformance.cpp index 9b4bcb2f..1c90b709 100644 --- a/src/uml/qprotocolconformance.cpp +++ b/src/uml/qprotocolconformance.cpp @@ -64,12 +64,12 @@ QProtocolConformancePrivate::~QProtocolConformancePrivate() \brief Protocol state machines can be redefined into more specific protocol state machines, or into behavioral state machines. Protocol conformance declares that the specific protocol state machine specifies a protocol that conforms to the general state machine one, or that the specific behavioral state machine abide by the protocol of the general protocol state machine. */ -QProtocolConformance::QProtocolConformance(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolConformance::QProtocolConformance(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QProtocolConformancePrivate, parent, wrapper) { } -QProtocolConformance::QProtocolConformance(QProtocolConformancePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolConformance::QProtocolConformance(QProtocolConformancePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -104,14 +104,14 @@ void QProtocolConformance::setSpecificMachine(QProtocolStateMachine *specificMac d->specificMachine->removeConformance(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->specificMachine)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->specificMachine)); d->specificMachine = specificMachine; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(specificMachine)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(specificMachine)); if (specificMachine) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(specificMachine)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(specificMachine)); } // Adjust opposite property @@ -138,13 +138,13 @@ void QProtocolConformance::setGeneralMachine(QProtocolStateMachine *generalMachi Q_D(QProtocolConformance); if (d->generalMachine != generalMachine) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->generalMachine)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->generalMachine)); d->generalMachine = generalMachine; // Adjust subsetted property(ies) if (generalMachine) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(generalMachine)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(generalMachine)); } } } diff --git a/src/uml/qprotocolconformance.h b/src/uml/qprotocolconformance.h index 1aa6ea0f..18f59ed6 100644 --- a/src/uml/qprotocolconformance.h +++ b/src/uml/qprotocolconformance.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QProtocolConformance : public QDirectedRelationship Q_DECLARE_PRIVATE(QProtocolConformance) public: - Q_INVOKABLE explicit QProtocolConformance(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProtocolConformance(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProtocolConformance(); // Association ends from QProtocolConformance @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setGeneralMachine(QProtocolStateMachine *generalMachine); protected: - explicit QProtocolConformance(QProtocolConformancePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProtocolConformance(QProtocolConformancePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocolstatemachine.cpp b/src/uml/qprotocolstatemachine.cpp index 2ce677b2..2df5419b 100644 --- a/src/uml/qprotocolstatemachine.cpp +++ b/src/uml/qprotocolstatemachine.cpp @@ -64,12 +64,12 @@ QProtocolStateMachinePrivate::~QProtocolStateMachinePrivate() \brief A protocol state machine is always defined in the context of a classifier. It specifies which operations of the classifier can be called in which state and under which condition, thus specifying the allowed call sequences on the classifier's operations. A protocol state machine presents the possible and permitted transitions on the instances of its context classifier, together with the operations which carry the transitions. In this manner, an instance lifecycle can be created for a classifier, by specifying the order in which the operations can be activated and the states through which an instance progresses during its existence. */ -QProtocolStateMachine::QProtocolStateMachine(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolStateMachine::QProtocolStateMachine(QWrappedObject *parent, QWrappedObject *wrapper) : QStateMachine(*new QProtocolStateMachinePrivate, parent, wrapper) { } -QProtocolStateMachine::QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolStateMachine::QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStateMachine(dd, parent, wrapper) { } @@ -102,7 +102,7 @@ void QProtocolStateMachine::addConformance(QProtocolConformance *conformance) d->conformance->insert(conformance); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(conformance)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(conformance)); // Adjust opposite property conformance->setSpecificMachine(this); @@ -118,7 +118,7 @@ void QProtocolStateMachine::removeConformance(QProtocolConformance *conformance) d->conformance->remove(conformance); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(conformance)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(conformance)); // Adjust opposite property conformance->setSpecificMachine(0); diff --git a/src/uml/qprotocolstatemachine.h b/src/uml/qprotocolstatemachine.h index 3262ea69..c87cb97a 100644 --- a/src/uml/qprotocolstatemachine.h +++ b/src/uml/qprotocolstatemachine.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QProtocolStateMachine : public QStateMachine Q_DECLARE_PRIVATE(QProtocolStateMachine) public: - Q_INVOKABLE explicit QProtocolStateMachine(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProtocolStateMachine(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProtocolStateMachine(); // Association ends from QProtocolStateMachine @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeConformance(QProtocolConformance *conformance); protected: - explicit QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocoltransition.cpp b/src/uml/qprotocoltransition.cpp index 5f8e5a2b..d303297f 100644 --- a/src/uml/qprotocoltransition.cpp +++ b/src/uml/qprotocoltransition.cpp @@ -65,12 +65,12 @@ QProtocolTransitionPrivate::~QProtocolTransitionPrivate() \brief A protocol transition specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. */ -QProtocolTransition::QProtocolTransition(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolTransition::QProtocolTransition(QWrappedObject *parent, QWrappedObject *wrapper) : QTransition(*new QProtocolTransitionPrivate, parent, wrapper) { } -QProtocolTransition::QProtocolTransition(QProtocolTransitionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QProtocolTransition::QProtocolTransition(QProtocolTransitionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QTransition(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QProtocolTransition::setPostCondition(QConstraint *postCondition) Q_D(QProtocolTransition); if (d->postCondition != postCondition) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(d->postCondition)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(d->postCondition)); d->postCondition = postCondition; // Adjust subsetted property(ies) if (postCondition) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(postCondition)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postCondition)); } } } @@ -144,7 +144,7 @@ void QProtocolTransition::setPreCondition(QConstraint *preCondition) d->preCondition = preCondition; // Adjust subsetted property(ies) - (qmofobject_cast<QTransition *>(this))->setGuard(qmofobject_cast<QConstraint *>(preCondition)); + (qwrappedobject_cast<QTransition *>(this))->setGuard(qwrappedobject_cast<QConstraint *>(preCondition)); } } diff --git a/src/uml/qprotocoltransition.h b/src/uml/qprotocoltransition.h index f69a4aed..e83db5df 100644 --- a/src/uml/qprotocoltransition.h +++ b/src/uml/qprotocoltransition.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QProtocolTransition : public QTransition Q_DECLARE_PRIVATE(QProtocolTransition) public: - Q_INVOKABLE explicit QProtocolTransition(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QProtocolTransition(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QProtocolTransition(); // Association ends from QProtocolTransition @@ -84,7 +84,7 @@ public: Q_INVOKABLE void setPreCondition(QConstraint *preCondition); protected: - explicit QProtocolTransition(QProtocolTransitionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QProtocolTransition(QProtocolTransitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpseudostate.cpp b/src/uml/qpseudostate.cpp index 2cdc8336..5fa38b63 100644 --- a/src/uml/qpseudostate.cpp +++ b/src/uml/qpseudostate.cpp @@ -66,12 +66,12 @@ QPseudostatePrivate::~QPseudostatePrivate() \brief A pseudostate is an abstraction that encompasses different types of transient vertices in the state machine graph. */ -QPseudostate::QPseudostate(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPseudostate::QPseudostate(QWrappedObject *parent, QWrappedObject *wrapper) : QVertex(*new QPseudostatePrivate, parent, wrapper) { } -QPseudostate::QPseudostate(QPseudostatePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QPseudostate::QPseudostate(QPseudostatePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QVertex(dd, parent, wrapper) { } @@ -133,7 +133,7 @@ void QPseudostate::setState(QState *state) d->state = state; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(state)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(state)); // Adjust opposite property if (state) @@ -165,7 +165,7 @@ void QPseudostate::setStateMachine(QStateMachine *stateMachine) d->stateMachine = stateMachine; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(stateMachine)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(stateMachine)); // Adjust opposite property if (stateMachine) diff --git a/src/uml/qpseudostate.h b/src/uml/qpseudostate.h index 92e695d7..f7ab950a 100644 --- a/src/uml/qpseudostate.h +++ b/src/uml/qpseudostate.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QPseudostate : public QVertex Q_DECLARE_PRIVATE(QPseudostate) public: - Q_INVOKABLE explicit QPseudostate(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QPseudostate(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPseudostate(); // Attributes from QPseudostate @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setStateMachine(QStateMachine *stateMachine); protected: - explicit QPseudostate(QPseudostatePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QPseudostate(QPseudostatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qqualifiervalue.cpp b/src/uml/qqualifiervalue.cpp index de8af671..d0c7094f 100644 --- a/src/uml/qqualifiervalue.cpp +++ b/src/uml/qqualifiervalue.cpp @@ -65,12 +65,12 @@ QQualifierValuePrivate::~QQualifierValuePrivate() \brief A qualifier value is not an action. It is an element that identifies links. It gives a single qualifier within a link end data specification. */ -QQualifierValue::QQualifierValue(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QQualifierValue::QQualifierValue(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QQualifierValuePrivate, parent, wrapper) { } -QQualifierValue::QQualifierValue(QQualifierValuePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QQualifierValue::QQualifierValue(QQualifierValuePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/uml/qqualifiervalue.h b/src/uml/qqualifiervalue.h index 20029e5a..599acf88 100644 --- a/src/uml/qqualifiervalue.h +++ b/src/uml/qqualifiervalue.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QQualifierValue : public QElement Q_DECLARE_PRIVATE(QQualifierValue) public: - Q_INVOKABLE explicit QQualifierValue(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QQualifierValue(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QQualifierValue(); // Association ends from QQualifierValue @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setQualifier(QProperty *qualifier); protected: - explicit QQualifierValue(QQualifierValuePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QQualifierValue(QQualifierValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qraiseexceptionaction.cpp b/src/uml/qraiseexceptionaction.cpp index fc4049c8..242a91f7 100644 --- a/src/uml/qraiseexceptionaction.cpp +++ b/src/uml/qraiseexceptionaction.cpp @@ -63,12 +63,12 @@ QRaiseExceptionActionPrivate::~QRaiseExceptionActionPrivate() \brief A raise exception action is an action that causes an exception to occur. The input value becomes the exception object. */ -QRaiseExceptionAction::QRaiseExceptionAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRaiseExceptionAction::QRaiseExceptionAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QRaiseExceptionActionPrivate, parent, wrapper) { } -QRaiseExceptionAction::QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRaiseExceptionAction::QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QRaiseExceptionAction::setException(QInputPin *exception) Q_D(QRaiseExceptionAction); if (d->exception != exception) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->exception)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->exception)); d->exception = exception; // Adjust subsetted property(ies) if (exception) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(exception)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(exception)); } } } diff --git a/src/uml/qraiseexceptionaction.h b/src/uml/qraiseexceptionaction.h index 846dc307..00976eb1 100644 --- a/src/uml/qraiseexceptionaction.h +++ b/src/uml/qraiseexceptionaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QRaiseExceptionAction : public QAction Q_DECLARE_PRIVATE(QRaiseExceptionAction) public: - Q_INVOKABLE explicit QRaiseExceptionAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRaiseExceptionAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRaiseExceptionAction(); // Association ends from QRaiseExceptionAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setException(QInputPin *exception); protected: - explicit QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadextentaction.cpp b/src/uml/qreadextentaction.cpp index cd627e74..a6b4936b 100644 --- a/src/uml/qreadextentaction.cpp +++ b/src/uml/qreadextentaction.cpp @@ -65,12 +65,12 @@ QReadExtentActionPrivate::~QReadExtentActionPrivate() \brief A read extent action is an action that retrieves the current instances of a classifier. */ -QReadExtentAction::QReadExtentAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadExtentAction::QReadExtentAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReadExtentActionPrivate, parent, wrapper) { } -QReadExtentAction::QReadExtentAction(QReadExtentActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadExtentAction::QReadExtentAction(QReadExtentActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -122,13 +122,13 @@ void QReadExtentAction::setResult(QOutputPin *result) Q_D(QReadExtentAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadextentaction.h b/src/uml/qreadextentaction.h index 949541d6..8ab52710 100644 --- a/src/uml/qreadextentaction.h +++ b/src/uml/qreadextentaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QReadExtentAction : public QAction Q_DECLARE_PRIVATE(QReadExtentAction) public: - Q_INVOKABLE explicit QReadExtentAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadExtentAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadExtentAction(); // Association ends from QReadExtentAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadExtentAction(QReadExtentActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadExtentAction(QReadExtentActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadisclassifiedobjectaction.cpp b/src/uml/qreadisclassifiedobjectaction.cpp index d5953b96..0e14b1bc 100644 --- a/src/uml/qreadisclassifiedobjectaction.cpp +++ b/src/uml/qreadisclassifiedobjectaction.cpp @@ -68,12 +68,12 @@ QReadIsClassifiedObjectActionPrivate::~QReadIsClassifiedObjectActionPrivate() \brief A read is classified object action is an action that determines whether a runtime object is classified by a given classifier. */ -QReadIsClassifiedObjectAction::QReadIsClassifiedObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadIsClassifiedObjectAction::QReadIsClassifiedObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReadIsClassifiedObjectActionPrivate, parent, wrapper) { } -QReadIsClassifiedObjectAction::QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadIsClassifiedObjectAction::QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -129,13 +129,13 @@ void QReadIsClassifiedObjectAction::setResult(QOutputPin *result) Q_D(QReadIsClassifiedObjectAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } @@ -158,13 +158,13 @@ void QReadIsClassifiedObjectAction::setObject(QInputPin *object) Q_D(QReadIsClassifiedObjectAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qreadisclassifiedobjectaction.h b/src/uml/qreadisclassifiedobjectaction.h index b75fc4b8..8661587e 100644 --- a/src/uml/qreadisclassifiedobjectaction.h +++ b/src/uml/qreadisclassifiedobjectaction.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QReadIsClassifiedObjectAction : public QAction Q_DECLARE_PRIVATE(QReadIsClassifiedObjectAction) public: - Q_INVOKABLE explicit QReadIsClassifiedObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadIsClassifiedObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadIsClassifiedObjectAction(); // Attributes from QReadIsClassifiedObjectAction @@ -88,7 +88,7 @@ public: Q_INVOKABLE void setClassifier(QClassifier *classifier); protected: - explicit QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkaction.cpp b/src/uml/qreadlinkaction.cpp index 2b134df3..88105938 100644 --- a/src/uml/qreadlinkaction.cpp +++ b/src/uml/qreadlinkaction.cpp @@ -63,12 +63,12 @@ QReadLinkActionPrivate::~QReadLinkActionPrivate() \brief A read link action is a link action that navigates across associations to retrieve objects on one end. */ -QReadLinkAction::QReadLinkAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkAction::QReadLinkAction(QWrappedObject *parent, QWrappedObject *wrapper) : QLinkAction(*new QReadLinkActionPrivate, parent, wrapper) { } -QReadLinkAction::QReadLinkAction(QReadLinkActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkAction::QReadLinkAction(QReadLinkActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLinkAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QReadLinkAction::setResult(QOutputPin *result) Q_D(QReadLinkAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadlinkaction.h b/src/uml/qreadlinkaction.h index cefa9750..c8055fe1 100644 --- a/src/uml/qreadlinkaction.h +++ b/src/uml/qreadlinkaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReadLinkAction : public QLinkAction Q_DECLARE_PRIVATE(QReadLinkAction) public: - Q_INVOKABLE explicit QReadLinkAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadLinkAction(); // Association ends from QReadLinkAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadLinkAction(QReadLinkActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadLinkAction(QReadLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkobjectendaction.cpp b/src/uml/qreadlinkobjectendaction.cpp index a322fcf1..d18be56b 100644 --- a/src/uml/qreadlinkobjectendaction.cpp +++ b/src/uml/qreadlinkobjectendaction.cpp @@ -67,12 +67,12 @@ QReadLinkObjectEndActionPrivate::~QReadLinkObjectEndActionPrivate() \brief A read link object end action is an action that retrieves an end object from a link object. */ -QReadLinkObjectEndAction::QReadLinkObjectEndAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkObjectEndAction::QReadLinkObjectEndAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReadLinkObjectEndActionPrivate, parent, wrapper) { } -QReadLinkObjectEndAction::QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkObjectEndAction::QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -124,13 +124,13 @@ void QReadLinkObjectEndAction::setObject(QInputPin *object) Q_D(QReadLinkObjectEndAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } @@ -153,13 +153,13 @@ void QReadLinkObjectEndAction::setResult(QOutputPin *result) Q_D(QReadLinkObjectEndAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadlinkobjectendaction.h b/src/uml/qreadlinkobjectendaction.h index 203d26c3..f7053d60 100644 --- a/src/uml/qreadlinkobjectendaction.h +++ b/src/uml/qreadlinkobjectendaction.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QReadLinkObjectEndAction : public QAction Q_DECLARE_PRIVATE(QReadLinkObjectEndAction) public: - Q_INVOKABLE explicit QReadLinkObjectEndAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadLinkObjectEndAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadLinkObjectEndAction(); // Association ends from QReadLinkObjectEndAction @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkobjectendqualifieraction.cpp b/src/uml/qreadlinkobjectendqualifieraction.cpp index e946a69c..b2936668 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qreadlinkobjectendqualifieraction.cpp @@ -67,12 +67,12 @@ QReadLinkObjectEndQualifierActionPrivate::~QReadLinkObjectEndQualifierActionPriv \brief A read link object end qualifier action is an action that retrieves a qualifier end value from a link object. */ -QReadLinkObjectEndQualifierAction::QReadLinkObjectEndQualifierAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkObjectEndQualifierAction::QReadLinkObjectEndQualifierAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReadLinkObjectEndQualifierActionPrivate, parent, wrapper) { } -QReadLinkObjectEndQualifierAction::QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadLinkObjectEndQualifierAction::QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -103,13 +103,13 @@ void QReadLinkObjectEndQualifierAction::setResult(QOutputPin *result) Q_D(QReadLinkObjectEndQualifierAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } @@ -132,13 +132,13 @@ void QReadLinkObjectEndQualifierAction::setObject(QInputPin *object) Q_D(QReadLinkObjectEndQualifierAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qreadlinkobjectendqualifieraction.h b/src/uml/qreadlinkobjectendqualifieraction.h index d75f4d9b..c4cc3b98 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.h +++ b/src/uml/qreadlinkobjectendqualifieraction.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QReadLinkObjectEndQualifierAction : public QAction Q_DECLARE_PRIVATE(QReadLinkObjectEndQualifierAction) public: - Q_INVOKABLE explicit QReadLinkObjectEndQualifierAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadLinkObjectEndQualifierAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadLinkObjectEndQualifierAction(); // Association ends from QReadLinkObjectEndQualifierAction @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setQualifier(QProperty *qualifier); protected: - explicit QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadselfaction.cpp b/src/uml/qreadselfaction.cpp index 055fe341..bb39d650 100644 --- a/src/uml/qreadselfaction.cpp +++ b/src/uml/qreadselfaction.cpp @@ -63,12 +63,12 @@ QReadSelfActionPrivate::~QReadSelfActionPrivate() \brief A read self action is an action that retrieves the host object of an action. */ -QReadSelfAction::QReadSelfAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadSelfAction::QReadSelfAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReadSelfActionPrivate, parent, wrapper) { } -QReadSelfAction::QReadSelfAction(QReadSelfActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadSelfAction::QReadSelfAction(QReadSelfActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QReadSelfAction::setResult(QOutputPin *result) Q_D(QReadSelfAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadselfaction.h b/src/uml/qreadselfaction.h index 3a384993..15e001af 100644 --- a/src/uml/qreadselfaction.h +++ b/src/uml/qreadselfaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReadSelfAction : public QAction Q_DECLARE_PRIVATE(QReadSelfAction) public: - Q_INVOKABLE explicit QReadSelfAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadSelfAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadSelfAction(); // Association ends from QReadSelfAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadSelfAction(QReadSelfActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadSelfAction(QReadSelfActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadstructuralfeatureaction.cpp b/src/uml/qreadstructuralfeatureaction.cpp index faffec22..27f1171f 100644 --- a/src/uml/qreadstructuralfeatureaction.cpp +++ b/src/uml/qreadstructuralfeatureaction.cpp @@ -63,12 +63,12 @@ QReadStructuralFeatureActionPrivate::~QReadStructuralFeatureActionPrivate() \brief A read structural feature action is a structural feature action that retrieves the values of a structural feature. */ -QReadStructuralFeatureAction::QReadStructuralFeatureAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadStructuralFeatureAction::QReadStructuralFeatureAction(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(*new QReadStructuralFeatureActionPrivate, parent, wrapper) { } -QReadStructuralFeatureAction::QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadStructuralFeatureAction::QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QReadStructuralFeatureAction::setResult(QOutputPin *result) Q_D(QReadStructuralFeatureAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadstructuralfeatureaction.h b/src/uml/qreadstructuralfeatureaction.h index a69f77c7..d8109b1d 100644 --- a/src/uml/qreadstructuralfeatureaction.h +++ b/src/uml/qreadstructuralfeatureaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReadStructuralFeatureAction : public QStructuralFeatureActio Q_DECLARE_PRIVATE(QReadStructuralFeatureAction) public: - Q_INVOKABLE explicit QReadStructuralFeatureAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadStructuralFeatureAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadStructuralFeatureAction(); // Association ends from QReadStructuralFeatureAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadvariableaction.cpp b/src/uml/qreadvariableaction.cpp index 0aa9ea4c..9c959059 100644 --- a/src/uml/qreadvariableaction.cpp +++ b/src/uml/qreadvariableaction.cpp @@ -63,12 +63,12 @@ QReadVariableActionPrivate::~QReadVariableActionPrivate() \brief A read variable action is a variable action that retrieves the values of a variable. */ -QReadVariableAction::QReadVariableAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadVariableAction::QReadVariableAction(QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(*new QReadVariableActionPrivate, parent, wrapper) { } -QReadVariableAction::QReadVariableAction(QReadVariableActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReadVariableAction::QReadVariableAction(QReadVariableActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QReadVariableAction::setResult(QOutputPin *result) Q_D(QReadVariableAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qreadvariableaction.h b/src/uml/qreadvariableaction.h index 4ed94e2f..617dbbfd 100644 --- a/src/uml/qreadvariableaction.h +++ b/src/uml/qreadvariableaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReadVariableAction : public QVariableAction Q_DECLARE_PRIVATE(QReadVariableAction) public: - Q_INVOKABLE explicit QReadVariableAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReadVariableAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReadVariableAction(); // Association ends from QReadVariableAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QReadVariableAction(QReadVariableActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReadVariableAction(QReadVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qrealization.cpp b/src/uml/qrealization.cpp index 10aaed46..4921b454 100644 --- a/src/uml/qrealization.cpp +++ b/src/uml/qrealization.cpp @@ -60,12 +60,12 @@ QRealizationPrivate::~QRealizationPrivate() \brief Realization is a specialized abstraction relationship between two sets of model elements, one representing a specification (the supplier) and the other represents an implementation of the latter (the client). Realization can be used to model stepwise refinement, optimizations, transformations, templates, model synthesis, framework composition, etc. */ -QRealization::QRealization(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRealization::QRealization(QWrappedObject *parent, QWrappedObject *wrapper) : QAbstraction(*new QRealizationPrivate, parent, wrapper) { } -QRealization::QRealization(QRealizationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRealization::QRealization(QRealizationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAbstraction(dd, parent, wrapper) { } diff --git a/src/uml/qrealization.h b/src/uml/qrealization.h index 92ddb344..8e53af22 100644 --- a/src/uml/qrealization.h +++ b/src/uml/qrealization.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QRealization : public QAbstraction Q_DECLARE_PRIVATE(QRealization) public: - Q_INVOKABLE explicit QRealization(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRealization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRealization(); protected: - explicit QRealization(QRealizationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRealization(QRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreception.cpp b/src/uml/qreception.cpp index de826415..4519e3b5 100644 --- a/src/uml/qreception.cpp +++ b/src/uml/qreception.cpp @@ -63,12 +63,12 @@ QReceptionPrivate::~QReceptionPrivate() \brief A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. */ -QReception::QReception(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReception::QReception(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioralFeature(*new QReceptionPrivate, parent, wrapper) { } -QReception::QReception(QReceptionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReception::QReception(QReceptionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioralFeature(dd, parent, wrapper) { } diff --git a/src/uml/qreception.h b/src/uml/qreception.h index fa8ec975..8ee59463 100644 --- a/src/uml/qreception.h +++ b/src/uml/qreception.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReception : public QBehavioralFeature Q_DECLARE_PRIVATE(QReception) public: - Q_INVOKABLE explicit QReception(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReception(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReception(); // Association ends from QReception @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setSignal(QSignal *signal); protected: - explicit QReception(QReceptionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReception(QReceptionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreclassifyobjectaction.cpp b/src/uml/qreclassifyobjectaction.cpp index ace1d128..46786be2 100644 --- a/src/uml/qreclassifyobjectaction.cpp +++ b/src/uml/qreclassifyobjectaction.cpp @@ -69,12 +69,12 @@ QReclassifyObjectActionPrivate::~QReclassifyObjectActionPrivate() \brief A reclassify object action is an action that changes which classifiers classify an object. */ -QReclassifyObjectAction::QReclassifyObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReclassifyObjectAction::QReclassifyObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReclassifyObjectActionPrivate, parent, wrapper) { } -QReclassifyObjectAction::QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReclassifyObjectAction::QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -161,13 +161,13 @@ void QReclassifyObjectAction::setObject(QInputPin *object) Q_D(QReclassifyObjectAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qreclassifyobjectaction.h b/src/uml/qreclassifyobjectaction.h index c33cccd1..7ab93b22 100644 --- a/src/uml/qreclassifyobjectaction.h +++ b/src/uml/qreclassifyobjectaction.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QReclassifyObjectAction : public QAction Q_DECLARE_PRIVATE(QReclassifyObjectAction) public: - Q_INVOKABLE explicit QReclassifyObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReclassifyObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReclassifyObjectAction(); // Attributes from QReclassifyObjectAction @@ -92,7 +92,7 @@ public: Q_INVOKABLE void removeNewClassifier(QClassifier *newClassifier); protected: - explicit QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qredefinableelement.cpp b/src/uml/qredefinableelement.cpp index fe9e8642..4d8c47fb 100644 --- a/src/uml/qredefinableelement.cpp +++ b/src/uml/qredefinableelement.cpp @@ -103,12 +103,12 @@ void QRedefinableElementPrivate::removeRedefinitionContext(QClassifier *redefini \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. */ -QRedefinableElement::QRedefinableElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRedefinableElement::QRedefinableElement(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QRedefinableElementPrivate, parent, wrapper) { } -QRedefinableElement::QRedefinableElement(QRedefinableElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRedefinableElement::QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qredefinableelement.h b/src/uml/qredefinableelement.h index 8f635d89..9df8f780 100644 --- a/src/uml/qredefinableelement.h +++ b/src/uml/qredefinableelement.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QRedefinableElement : public QNamedElement Q_DECLARE_PRIVATE(QRedefinableElement) public: - Q_INVOKABLE explicit QRedefinableElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRedefinableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRedefinableElement(); // Attributes from QRedefinableElement @@ -88,7 +88,7 @@ public: Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const; protected: - explicit QRedefinableElement(QRedefinableElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qredefinabletemplatesignature.cpp b/src/uml/qredefinabletemplatesignature.cpp index 58389571..35f0dd4d 100644 --- a/src/uml/qredefinabletemplatesignature.cpp +++ b/src/uml/qredefinabletemplatesignature.cpp @@ -66,15 +66,15 @@ QRedefinableTemplateSignaturePrivate::~QRedefinableTemplateSignaturePrivate() \brief A redefinable template signature supports the addition of formal template parameters in a specialization of a template classifier. */ -QRedefinableTemplateSignature::QRedefinableTemplateSignature(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QRedefinableTemplateSignaturePrivate, parent, wrapper), +QRedefinableTemplateSignature::QRedefinableTemplateSignature(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QRedefinableTemplateSignaturePrivate, parent, wrapper), _wrappedTemplateSignature(new QTemplateSignature(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)) { } -QRedefinableTemplateSignature::QRedefinableTemplateSignature(QRedefinableTemplateSignaturePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QRedefinableTemplateSignature::QRedefinableTemplateSignature(QRedefinableTemplateSignaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTemplateSignature(new QTemplateSignature(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)) { @@ -93,7 +93,7 @@ QRedefinableTemplateSignature::~QRedefinableTemplateSignature() */ const QSet<QElement *> *QRedefinableTemplateSignature::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -101,7 +101,7 @@ const QSet<QElement *> *QRedefinableTemplateSignature::ownedElements() const */ QElement *QRedefinableTemplateSignature::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -109,17 +109,17 @@ QElement *QRedefinableTemplateSignature::owner() const */ const QSet<QComment *> *QRedefinableTemplateSignature::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QRedefinableTemplateSignature::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QRedefinableTemplateSignature::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -131,12 +131,12 @@ void QRedefinableTemplateSignature::removeOwnedComment(QComment *ownedComment) */ QString QRedefinableTemplateSignature::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QRedefinableTemplateSignature::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -144,12 +144,12 @@ void QRedefinableTemplateSignature::setName(QString name) */ QtUml::VisibilityKind QRedefinableTemplateSignature::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QRedefinableTemplateSignature::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -157,7 +157,7 @@ void QRedefinableTemplateSignature::setVisibility(QtUml::VisibilityKind visibili */ QString QRedefinableTemplateSignature::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -169,12 +169,12 @@ QString QRedefinableTemplateSignature::qualifiedName() const */ QStringExpression *QRedefinableTemplateSignature::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QRedefinableTemplateSignature::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -182,7 +182,7 @@ void QRedefinableTemplateSignature::setNameExpression(QStringExpression *nameExp */ QNamespace *QRedefinableTemplateSignature::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -190,17 +190,17 @@ QNamespace *QRedefinableTemplateSignature::namespace_() const */ const QSet<QDependency *> *QRedefinableTemplateSignature::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QRedefinableTemplateSignature::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QRedefinableTemplateSignature::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -212,12 +212,12 @@ void QRedefinableTemplateSignature::removeClientDependency(QDependency *clientDe */ bool QRedefinableTemplateSignature::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QRedefinableTemplateSignature::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -229,7 +229,7 @@ void QRedefinableTemplateSignature::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QRedefinableTemplateSignature::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -237,7 +237,7 @@ const QSet<QRedefinableElement *> *QRedefinableTemplateSignature::redefinedEleme */ const QSet<QClassifier *> *QRedefinableTemplateSignature::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -276,13 +276,13 @@ void QRedefinableTemplateSignature::setClassifier(QClassifier *classifier) // Adjust opposite property // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qmofobject_cast<QClassifier *>(d->classifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinitionContext(qwrappedobject_cast<QClassifier *>(d->classifier)); d->classifier = classifier; // Adjust subsetted property(ies) if (classifier) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qmofobject_cast<QClassifier *>(classifier)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinitionContext(qwrappedobject_cast<QClassifier *>(classifier)); } // Adjust opposite property @@ -310,7 +310,7 @@ void QRedefinableTemplateSignature::addExtendedSignature(QRedefinableTemplateSig d->extendedSignatures->insert(extendedSignature); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(extendedSignature)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(extendedSignature)); } } @@ -323,7 +323,7 @@ void QRedefinableTemplateSignature::removeExtendedSignature(QRedefinableTemplate d->extendedSignatures->remove(extendedSignature); // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(extendedSignature)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(extendedSignature)); } } diff --git a/src/uml/qredefinabletemplatesignature.h b/src/uml/qredefinabletemplatesignature.h index 786d0712..43acef06 100644 --- a/src/uml/qredefinabletemplatesignature.h +++ b/src/uml/qredefinabletemplatesignature.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QTemplateSignature> #include <QtUml/QRedefinableElement> @@ -63,7 +64,7 @@ class QTemplateParameter; class QRedefinableTemplateSignaturePrivate; -class Q_UML_EXPORT QRedefinableTemplateSignature : public QtMof::QMofObject +class Q_UML_EXPORT QRedefinableTemplateSignature : public QWrappedObject { Q_OBJECT @@ -75,7 +76,7 @@ class Q_UML_EXPORT QRedefinableTemplateSignature : public QtMof::QMofObject Q_DECLARE_PRIVATE(QRedefinableTemplateSignature) public: - Q_INVOKABLE explicit QRedefinableTemplateSignature(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRedefinableTemplateSignature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRedefinableTemplateSignature(); // Association ends from aggregated QElement @@ -120,7 +121,7 @@ public: Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; protected: - explicit QRedefinableTemplateSignature(QRedefinableTemplateSignaturePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRedefinableTemplateSignature(QRedefinableTemplateSignaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTemplateSignature *_wrappedTemplateSignature; diff --git a/src/uml/qredefinabletemplatesignature_p.h b/src/uml/qredefinabletemplatesignature_p.h index 03408305..17083cb2 100644 --- a/src/uml/qredefinabletemplatesignature_p.h +++ b/src/uml/qredefinabletemplatesignature_p.h @@ -42,7 +42,8 @@ #define QTUML_QREDEFINABLETEMPLATESIGNATURE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtemplatesignature_p.h" #include "private/qredefinableelement_p.h" @@ -62,7 +63,7 @@ class QClassifier; class QRedefinableTemplateSignature; class QTemplateParameter; -class Q_UML_EXPORT QRedefinableTemplateSignaturePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QRedefinableTemplateSignaturePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QRedefinableTemplateSignature) diff --git a/src/uml/qreduceaction.cpp b/src/uml/qreduceaction.cpp index 683bae27..4b301508 100644 --- a/src/uml/qreduceaction.cpp +++ b/src/uml/qreduceaction.cpp @@ -68,12 +68,12 @@ QReduceActionPrivate::~QReduceActionPrivate() \brief A reduce action is an action that reduces a collection to a single value by combining the elements of the collection. */ -QReduceAction::QReduceAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReduceAction::QReduceAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReduceActionPrivate, parent, wrapper) { } -QReduceAction::QReduceAction(QReduceActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReduceAction::QReduceAction(QReduceActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -129,13 +129,13 @@ void QReduceAction::setResult(QOutputPin *result) Q_D(QReduceAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } @@ -158,13 +158,13 @@ void QReduceAction::setCollection(QInputPin *collection) Q_D(QReduceAction); if (d->collection != collection) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->collection)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->collection)); d->collection = collection; // Adjust subsetted property(ies) if (collection) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(collection)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(collection)); } } } diff --git a/src/uml/qreduceaction.h b/src/uml/qreduceaction.h index 74a4600b..91bc0f33 100644 --- a/src/uml/qreduceaction.h +++ b/src/uml/qreduceaction.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QReduceAction : public QAction Q_DECLARE_PRIVATE(QReduceAction) public: - Q_INVOKABLE explicit QReduceAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReduceAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReduceAction(); // Attributes from QReduceAction @@ -88,7 +88,7 @@ public: Q_INVOKABLE void setReducer(QBehavior *reducer); protected: - explicit QReduceAction(QReduceActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReduceAction(QReduceActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qregion.cpp b/src/uml/qregion.cpp index 5f75273a..848b0ba7 100644 --- a/src/uml/qregion.cpp +++ b/src/uml/qregion.cpp @@ -73,15 +73,15 @@ QRegionPrivate::~QRegionPrivate() \brief A region is an orthogonal part of either a composite state or a state machine. It contains states and transitions. */ -QRegion::QRegion(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QRegionPrivate, parent, wrapper), +QRegion::QRegion(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QRegionPrivate, parent, wrapper), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) { } -QRegion::QRegion(QRegionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QRegion::QRegion(QRegionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) { @@ -100,7 +100,7 @@ QRegion::~QRegion() */ const QSet<QElement *> *QRegion::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -108,7 +108,7 @@ const QSet<QElement *> *QRegion::ownedElements() const */ QElement *QRegion::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -116,17 +116,17 @@ QElement *QRegion::owner() const */ const QSet<QComment *> *QRegion::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QRegion::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QRegion::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -138,12 +138,12 @@ void QRegion::removeOwnedComment(QComment *ownedComment) */ QString QRegion::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QRegion::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -151,12 +151,12 @@ void QRegion::setName(QString name) */ QtUml::VisibilityKind QRegion::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QRegion::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -164,7 +164,7 @@ void QRegion::setVisibility(QtUml::VisibilityKind visibility) */ QString QRegion::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -176,12 +176,12 @@ QString QRegion::qualifiedName() const */ QStringExpression *QRegion::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QRegion::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -189,7 +189,7 @@ void QRegion::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QRegion::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -197,17 +197,17 @@ QNamespace *QRegion::namespace_() const */ const QSet<QDependency *> *QRegion::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QRegion::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QRegion::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -219,12 +219,12 @@ void QRegion::removeClientDependency(QDependency *clientDependency) */ bool QRegion::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QRegion::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -236,7 +236,7 @@ void QRegion::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QRegion::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } // --------------------------------------------------------------- @@ -248,17 +248,17 @@ const QSet<QRedefinableElement *> *QRegion::redefinedElements() const */ const QSet<QPackageImport *> *QRegion::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QRegion::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QRegion::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -266,7 +266,7 @@ void QRegion::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QRegion::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -274,7 +274,7 @@ const QSet<QNamedElement *> *QRegion::members() const */ const QSet<QPackageableElement *> *QRegion::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -282,17 +282,17 @@ const QSet<QPackageableElement *> *QRegion::importedMembers() const */ const QSet<QElementImport *> *QRegion::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QRegion::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QRegion::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -300,17 +300,17 @@ void QRegion::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QRegion::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QRegion::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QRegion::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -318,7 +318,7 @@ void QRegion::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QRegion::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -343,13 +343,13 @@ void QRegion::setExtendedRegion(QRegion *extendedRegion) Q_D(QRegion); if (d->extendedRegion != extendedRegion) { // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(d->extendedRegion)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(d->extendedRegion)); d->extendedRegion = extendedRegion; // Adjust subsetted property(ies) if (extendedRegion) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(extendedRegion)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(extendedRegion)); } } } @@ -374,7 +374,7 @@ void QRegion::addTransition(QTransition *transition) d->transitions->insert(transition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(transition)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(transition)); // Adjust opposite property transition->setContainer(this); @@ -390,7 +390,7 @@ void QRegion::removeTransition(QTransition *transition) d->transitions->remove(transition); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(transition)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(transition)); // Adjust opposite property transition->setContainer(0); @@ -421,7 +421,7 @@ void QRegion::setStateMachine(QStateMachine *stateMachine) d->stateMachine = stateMachine; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(stateMachine)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(stateMachine)); // Adjust opposite property if (stateMachine) @@ -453,7 +453,7 @@ void QRegion::setState(QState *state) d->state = state; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(state)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(state)); // Adjust opposite property if (state) @@ -493,7 +493,7 @@ void QRegion::addSubvertex(QVertex *subvertex) d->subvertices->insert(subvertex); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(subvertex)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(subvertex)); // Adjust opposite property subvertex->setContainer(this); @@ -509,7 +509,7 @@ void QRegion::removeSubvertex(QVertex *subvertex) d->subvertices->remove(subvertex); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(subvertex)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(subvertex)); // Adjust opposite property subvertex->setContainer(0); diff --git a/src/uml/qregion.h b/src/uml/qregion.h index f8272c8b..8d624ff3 100644 --- a/src/uml/qregion.h +++ b/src/uml/qregion.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QRedefinableElement> #include <QtUml/QNamespace> @@ -66,7 +67,7 @@ class QState; class QRegionPrivate; -class Q_UML_EXPORT QRegion : public QtMof::QMofObject +class Q_UML_EXPORT QRegion : public QWrappedObject { Q_OBJECT @@ -81,7 +82,7 @@ class Q_UML_EXPORT QRegion : public QtMof::QMofObject Q_DECLARE_PRIVATE(QRegion) public: - Q_INVOKABLE explicit QRegion(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRegion(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRegion(); // Association ends from aggregated QElement @@ -149,7 +150,7 @@ public: Q_INVOKABLE bool isRedefinitionContextValid(const QRegion *redefined) const; protected: - explicit QRegion(QRegionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRegion(QRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QRedefinableElement *_wrappedRedefinableElement; diff --git a/src/uml/qregion_p.h b/src/uml/qregion_p.h index c7022740..b7318a08 100644 --- a/src/uml/qregion_p.h +++ b/src/uml/qregion_p.h @@ -42,7 +42,8 @@ #define QTUML_QREGION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qredefinableelement_p.h" #include "private/qnamespace_p.h" @@ -65,7 +66,7 @@ class QClassifier; class QRegion; class QState; -class Q_UML_EXPORT QRegionPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QRegionPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QRegion) diff --git a/src/uml/qrelationship.cpp b/src/uml/qrelationship.cpp index f5ac4118..10506200 100644 --- a/src/uml/qrelationship.cpp +++ b/src/uml/qrelationship.cpp @@ -80,12 +80,12 @@ void QRelationshipPrivate::removeRelatedElement(QElement *relatedElement) \brief Relationship is an abstract concept that specifies some kind of relationship between elements. */ -QRelationship::QRelationship(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRelationship::QRelationship(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QRelationshipPrivate, parent, wrapper) { } -QRelationship::QRelationship(QRelationshipPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRelationship::QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } diff --git a/src/uml/qrelationship.h b/src/uml/qrelationship.h index 6cca0526..3d1b1754 100644 --- a/src/uml/qrelationship.h +++ b/src/uml/qrelationship.h @@ -67,14 +67,14 @@ class Q_UML_EXPORT QRelationship : public QElement Q_DECLARE_PRIVATE(QRelationship) public: - Q_INVOKABLE explicit QRelationship(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRelationship(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRelationship(); // Association ends from QRelationship Q_INVOKABLE const QSet<QElement *> *relatedElements() const; protected: - explicit QRelationship(QRelationshipPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qremovestructuralfeaturevalueaction.cpp b/src/uml/qremovestructuralfeaturevalueaction.cpp index df6343e6..ca76630a 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qremovestructuralfeaturevalueaction.cpp @@ -64,12 +64,12 @@ QRemoveStructuralFeatureValueActionPrivate::~QRemoveStructuralFeatureValueAction \brief A remove structural feature value action is a write structural feature action that removes values from structural features. */ -QRemoveStructuralFeatureValueAction::QRemoveStructuralFeatureValueAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRemoveStructuralFeatureValueAction::QRemoveStructuralFeatureValueAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteStructuralFeatureAction(*new QRemoveStructuralFeatureValueActionPrivate, parent, wrapper) { } -QRemoveStructuralFeatureValueAction::QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRemoveStructuralFeatureValueAction::QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteStructuralFeatureAction(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QRemoveStructuralFeatureValueAction::setRemoveAt(QInputPin *removeAt) Q_D(QRemoveStructuralFeatureValueAction); if (d->removeAt != removeAt) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->removeAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->removeAt)); d->removeAt = removeAt; // Adjust subsetted property(ies) if (removeAt) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(removeAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(removeAt)); } } } diff --git a/src/uml/qremovestructuralfeaturevalueaction.h b/src/uml/qremovestructuralfeaturevalueaction.h index f2a7aa7f..ca77cef4 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.h +++ b/src/uml/qremovestructuralfeaturevalueaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QRemoveStructuralFeatureValueAction : public QWriteStructural Q_DECLARE_PRIVATE(QRemoveStructuralFeatureValueAction) public: - Q_INVOKABLE explicit QRemoveStructuralFeatureValueAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRemoveStructuralFeatureValueAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRemoveStructuralFeatureValueAction(); // Attributes from QRemoveStructuralFeatureValueAction @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setRemoveAt(QInputPin *removeAt); protected: - explicit QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qremovevariablevalueaction.cpp b/src/uml/qremovevariablevalueaction.cpp index 6e1808d8..dc3e256f 100644 --- a/src/uml/qremovevariablevalueaction.cpp +++ b/src/uml/qremovevariablevalueaction.cpp @@ -64,12 +64,12 @@ QRemoveVariableValueActionPrivate::~QRemoveVariableValueActionPrivate() \brief A remove variable value action is a write variable action that removes values from variables. */ -QRemoveVariableValueAction::QRemoveVariableValueAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRemoveVariableValueAction::QRemoveVariableValueAction(QWrappedObject *parent, QWrappedObject *wrapper) : QWriteVariableAction(*new QRemoveVariableValueActionPrivate, parent, wrapper) { } -QRemoveVariableValueAction::QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QRemoveVariableValueAction::QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QWriteVariableAction(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QRemoveVariableValueAction::setRemoveAt(QInputPin *removeAt) Q_D(QRemoveVariableValueAction); if (d->removeAt != removeAt) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->removeAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->removeAt)); d->removeAt = removeAt; // Adjust subsetted property(ies) if (removeAt) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(removeAt)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(removeAt)); } } } diff --git a/src/uml/qremovevariablevalueaction.h b/src/uml/qremovevariablevalueaction.h index 81917149..d9250f02 100644 --- a/src/uml/qremovevariablevalueaction.h +++ b/src/uml/qremovevariablevalueaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QRemoveVariableValueAction : public QWriteVariableAction Q_DECLARE_PRIVATE(QRemoveVariableValueAction) public: - Q_INVOKABLE explicit QRemoveVariableValueAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QRemoveVariableValueAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRemoveVariableValueAction(); // Attributes from QRemoveVariableValueAction @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setRemoveAt(QInputPin *removeAt); protected: - explicit QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreplyaction.cpp b/src/uml/qreplyaction.cpp index b552b49f..f6d55e46 100644 --- a/src/uml/qreplyaction.cpp +++ b/src/uml/qreplyaction.cpp @@ -67,12 +67,12 @@ QReplyActionPrivate::~QReplyActionPrivate() \brief A reply action is an action that accepts a set of return values and a value containing return information produced by a previous accept call action. The reply action returns the values to the caller of the previous call, completing execution of the call. */ -QReplyAction::QReplyAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReplyAction::QReplyAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QReplyActionPrivate, parent, wrapper) { } -QReplyAction::QReplyAction(QReplyActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QReplyAction::QReplyAction(QReplyActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -124,13 +124,13 @@ void QReplyAction::setReturnInformation(QInputPin *returnInformation) Q_D(QReplyAction); if (d->returnInformation != returnInformation) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->returnInformation)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->returnInformation)); d->returnInformation = returnInformation; // Adjust subsetted property(ies) if (returnInformation) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(returnInformation)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(returnInformation)); } } } @@ -155,7 +155,7 @@ void QReplyAction::addReplyValue(QInputPin *replyValue) d->replyValues->insert(replyValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(replyValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(replyValue)); } } @@ -168,7 +168,7 @@ void QReplyAction::removeReplyValue(QInputPin *replyValue) d->replyValues->remove(replyValue); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(replyValue)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(replyValue)); } } diff --git a/src/uml/qreplyaction.h b/src/uml/qreplyaction.h index 35983380..d13b408f 100644 --- a/src/uml/qreplyaction.h +++ b/src/uml/qreplyaction.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QReplyAction : public QAction Q_DECLARE_PRIVATE(QReplyAction) public: - Q_INVOKABLE explicit QReplyAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QReplyAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QReplyAction(); // Association ends from QReplyAction @@ -86,7 +86,7 @@ public: Q_INVOKABLE void removeReplyValue(QInputPin *replyValue); protected: - explicit QReplyAction(QReplyActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QReplyAction(QReplyActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsendobjectaction.cpp b/src/uml/qsendobjectaction.cpp index 39c23943..ad03fa95 100644 --- a/src/uml/qsendobjectaction.cpp +++ b/src/uml/qsendobjectaction.cpp @@ -65,12 +65,12 @@ QSendObjectActionPrivate::~QSendObjectActionPrivate() \brief A send object action is an action that transmits an object to the target object, where it may invoke behavior such as the firing of state machine transitions or the execution of an activity. The value of the object is available to the execution of invoked behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor. */ -QSendObjectAction::QSendObjectAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSendObjectAction::QSendObjectAction(QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(*new QSendObjectActionPrivate, parent, wrapper) { } -QSendObjectAction::QSendObjectAction(QSendObjectActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSendObjectAction::QSendObjectAction(QSendObjectActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(dd, parent, wrapper) { } @@ -122,13 +122,13 @@ void QSendObjectAction::setTarget(QInputPin *target) Q_D(QSendObjectAction); if (d->target != target) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->target)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->target)); d->target = target; // Adjust subsetted property(ies) if (target) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(target)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(target)); } } } diff --git a/src/uml/qsendobjectaction.h b/src/uml/qsendobjectaction.h index f7f16167..c0c69e5f 100644 --- a/src/uml/qsendobjectaction.h +++ b/src/uml/qsendobjectaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QSendObjectAction : public QInvocationAction Q_DECLARE_PRIVATE(QSendObjectAction) public: - Q_INVOKABLE explicit QSendObjectAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSendObjectAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSendObjectAction(); // Association ends from QSendObjectAction @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setTarget(QInputPin *target); protected: - explicit QSendObjectAction(QSendObjectActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSendObjectAction(QSendObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsendsignalaction.cpp b/src/uml/qsendsignalaction.cpp index c7c2a523..dcbc287e 100644 --- a/src/uml/qsendsignalaction.cpp +++ b/src/uml/qsendsignalaction.cpp @@ -65,12 +65,12 @@ QSendSignalActionPrivate::~QSendSignalActionPrivate() \brief A send signal action is an action that creates a signal instance from its inputs, and transmits it to the target object, where it may cause the firing of a state machine transition or the execution of an activity. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor. If the input is already a signal instance, use a send object action. */ -QSendSignalAction::QSendSignalAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSendSignalAction::QSendSignalAction(QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(*new QSendSignalActionPrivate, parent, wrapper) { } -QSendSignalAction::QSendSignalAction(QSendSignalActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSendSignalAction::QSendSignalAction(QSendSignalActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInvocationAction(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QSendSignalAction::setTarget(QInputPin *target) Q_D(QSendSignalAction); if (d->target != target) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->target)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->target)); d->target = target; // Adjust subsetted property(ies) if (target) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(target)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(target)); } } } diff --git a/src/uml/qsendsignalaction.h b/src/uml/qsendsignalaction.h index 3e637da3..9e8a5ca7 100644 --- a/src/uml/qsendsignalaction.h +++ b/src/uml/qsendsignalaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QSendSignalAction : public QInvocationAction Q_DECLARE_PRIVATE(QSendSignalAction) public: - Q_INVOKABLE explicit QSendSignalAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSendSignalAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSendSignalAction(); // Association ends from QSendSignalAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setSignal(QSignal *signal); protected: - explicit QSendSignalAction(QSendSignalActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSendSignalAction(QSendSignalActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsequencenode.cpp b/src/uml/qsequencenode.cpp index e223f297..461bd748 100644 --- a/src/uml/qsequencenode.cpp +++ b/src/uml/qsequencenode.cpp @@ -64,12 +64,12 @@ QSequenceNodePrivate::~QSequenceNodePrivate() \brief A sequence node is a structured activity node that executes its actions in order. */ -QSequenceNode::QSequenceNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSequenceNode::QSequenceNode(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(*new QSequenceNodePrivate, parent, wrapper) { } -QSequenceNode::QSequenceNode(QSequenceNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSequenceNode::QSequenceNode(QSequenceNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuredActivityNode(dd, parent, wrapper) { } @@ -100,7 +100,7 @@ void QSequenceNode::addExecutableNode(QExecutableNode *executableNode) Q_D(QSequenceNode); if (!d->executableNodes->contains(executableNode)) { d->executableNodes->append(executableNode); - qmof_topLevelWrapper(executableNode)->setParent(qmof_topLevelWrapper(this)); + qTopLevelWrapper(executableNode)->setParent(qTopLevelWrapper(this)); } } @@ -111,7 +111,7 @@ void QSequenceNode::removeExecutableNode(QExecutableNode *executableNode) Q_D(QSequenceNode); if (d->executableNodes->contains(executableNode)) { d->executableNodes->removeAll(executableNode); - qmof_topLevelWrapper(executableNode)->setParent(0); + qTopLevelWrapper(executableNode)->setParent(0); } } diff --git a/src/uml/qsequencenode.h b/src/uml/qsequencenode.h index d9d646af..ec1dc3fe 100644 --- a/src/uml/qsequencenode.h +++ b/src/uml/qsequencenode.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QSequenceNode : public QStructuredActivityNode Q_DECLARE_PRIVATE(QSequenceNode) public: - Q_INVOKABLE explicit QSequenceNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSequenceNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSequenceNode(); // Association ends from QSequenceNode @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeExecutableNode(QExecutableNode *executableNode); protected: - explicit QSequenceNode(QSequenceNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSequenceNode(QSequenceNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignal.cpp b/src/uml/qsignal.cpp index d05edeae..9b115a24 100644 --- a/src/uml/qsignal.cpp +++ b/src/uml/qsignal.cpp @@ -64,12 +64,12 @@ QSignalPrivate::~QSignalPrivate() \brief A signal is a specification of send request instances communicated between objects. The receiving object handles the received request instances as specified by its receptions. The data carried by a send request (which was passed to it by the send invocation occurrence that caused that request) are represented as attributes of the signal. A signal is defined independently of the classifiers handling the signal occurrence. */ -QSignal::QSignal(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSignal::QSignal(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QSignalPrivate, parent, wrapper) { } -QSignal::QSignal(QSignalPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSignal::QSignal(QSignalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -102,8 +102,8 @@ void QSignal::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); } } @@ -116,8 +116,8 @@ void QSignal::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); } } diff --git a/src/uml/qsignal.h b/src/uml/qsignal.h index a575c5c7..27afd91d 100644 --- a/src/uml/qsignal.h +++ b/src/uml/qsignal.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QSignal : public QClassifier Q_DECLARE_PRIVATE(QSignal) public: - Q_INVOKABLE explicit QSignal(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSignal(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSignal(); // Association ends from QSignal @@ -79,7 +79,7 @@ public: Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); protected: - explicit QSignal(QSignalPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSignal(QSignalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignalevent.cpp b/src/uml/qsignalevent.cpp index 28044c3f..f989da26 100644 --- a/src/uml/qsignalevent.cpp +++ b/src/uml/qsignalevent.cpp @@ -63,12 +63,12 @@ QSignalEventPrivate::~QSignalEventPrivate() \brief A signal event represents the receipt of an asynchronous signal instance. A signal event may, for example, cause a state machine to trigger a transition. */ -QSignalEvent::QSignalEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSignalEvent::QSignalEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(*new QSignalEventPrivate, parent, wrapper) { } -QSignalEvent::QSignalEvent(QSignalEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSignalEvent::QSignalEvent(QSignalEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QMessageEvent(dd, parent, wrapper) { } diff --git a/src/uml/qsignalevent.h b/src/uml/qsignalevent.h index c0ac6cb4..22e1a293 100644 --- a/src/uml/qsignalevent.h +++ b/src/uml/qsignalevent.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QSignalEvent : public QMessageEvent Q_DECLARE_PRIVATE(QSignalEvent) public: - Q_INVOKABLE explicit QSignalEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSignalEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSignalEvent(); // Association ends from QSignalEvent @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setSignal(QSignal *signal); protected: - explicit QSignalEvent(QSignalEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSignalEvent(QSignalEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qslot.cpp b/src/uml/qslot.cpp index f7f0c5db..371fe56d 100644 --- a/src/uml/qslot.cpp +++ b/src/uml/qslot.cpp @@ -68,12 +68,12 @@ QSlotPrivate::~QSlotPrivate() \brief A slot specifies that an entity modeled by an instance specification has a value or values for a specific structural feature. */ -QSlot::QSlot(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSlot::QSlot(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QSlotPrivate, parent, wrapper) { } -QSlot::QSlot(QSlotPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSlot::QSlot(QSlotPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -106,7 +106,7 @@ void QSlot::addValue(QValueSpecification *value) d->values->append(value); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); } } @@ -119,7 +119,7 @@ void QSlot::removeValue(QValueSpecification *value) d->values->removeAll(value); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(value)); } } @@ -168,7 +168,7 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) d->owningInstance = owningInstance; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(owningInstance)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(owningInstance)); // Adjust opposite property if (owningInstance) diff --git a/src/uml/qslot.h b/src/uml/qslot.h index 352232f2..a1c66cd1 100644 --- a/src/uml/qslot.h +++ b/src/uml/qslot.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QSlot : public QElement Q_DECLARE_PRIVATE(QSlot) public: - Q_INVOKABLE explicit QSlot(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSlot(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSlot(); // Association ends from QSlot @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance); protected: - explicit QSlot(QSlotPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSlot(QSlotPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstartclassifierbehavioraction.cpp b/src/uml/qstartclassifierbehavioraction.cpp index 95494a6e..8dd103d9 100644 --- a/src/uml/qstartclassifierbehavioraction.cpp +++ b/src/uml/qstartclassifierbehavioraction.cpp @@ -63,12 +63,12 @@ QStartClassifierBehaviorActionPrivate::~QStartClassifierBehaviorActionPrivate() \brief A start classifier behavior action is an action that starts the classifier behavior of the input. */ -QStartClassifierBehaviorAction::QStartClassifierBehaviorAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStartClassifierBehaviorAction::QStartClassifierBehaviorAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QStartClassifierBehaviorActionPrivate, parent, wrapper) { } -QStartClassifierBehaviorAction::QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStartClassifierBehaviorAction::QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QStartClassifierBehaviorAction::setObject(QInputPin *object) Q_D(QStartClassifierBehaviorAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qstartclassifierbehavioraction.h b/src/uml/qstartclassifierbehavioraction.h index ba7be521..6c322c93 100644 --- a/src/uml/qstartclassifierbehavioraction.h +++ b/src/uml/qstartclassifierbehavioraction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QStartClassifierBehaviorAction : public QAction Q_DECLARE_PRIVATE(QStartClassifierBehaviorAction) public: - Q_INVOKABLE explicit QStartClassifierBehaviorAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStartClassifierBehaviorAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStartClassifierBehaviorAction(); // Association ends from QStartClassifierBehaviorAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setObject(QInputPin *object); protected: - explicit QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstartobjectbehavioraction.cpp b/src/uml/qstartobjectbehavioraction.cpp index 14a6f750..497453af 100644 --- a/src/uml/qstartobjectbehavioraction.cpp +++ b/src/uml/qstartobjectbehavioraction.cpp @@ -63,12 +63,12 @@ QStartObjectBehaviorActionPrivate::~QStartObjectBehaviorActionPrivate() \brief StartObjectBehaviorAction is an action that starts the execution either of a directly instantiated behavior or of the classifier behavior of an object. Argument values may be supplied for the input parameters of the behavior. If the behavior is invoked synchronously, then output values may be obtained for output parameters. */ -QStartObjectBehaviorAction::QStartObjectBehaviorAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStartObjectBehaviorAction::QStartObjectBehaviorAction(QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(*new QStartObjectBehaviorActionPrivate, parent, wrapper) { } -QStartObjectBehaviorAction::QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStartObjectBehaviorAction::QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QCallAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QStartObjectBehaviorAction::setObject(QInputPin *object) Q_D(QStartObjectBehaviorAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qstartobjectbehavioraction.h b/src/uml/qstartobjectbehavioraction.h index 12ecb849..df182e58 100644 --- a/src/uml/qstartobjectbehavioraction.h +++ b/src/uml/qstartobjectbehavioraction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QStartObjectBehaviorAction : public QCallAction Q_DECLARE_PRIVATE(QStartObjectBehaviorAction) public: - Q_INVOKABLE explicit QStartObjectBehaviorAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStartObjectBehaviorAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStartObjectBehaviorAction(); // Association ends from QStartObjectBehaviorAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setObject(QInputPin *object); protected: - explicit QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstate.cpp b/src/uml/qstate.cpp index 5854fec8..b8934493 100644 --- a/src/uml/qstate.cpp +++ b/src/uml/qstate.cpp @@ -83,16 +83,16 @@ QStatePrivate::~QStatePrivate() \brief A state models a situation during which some (usually implicit) invariant condition holds.The states of protocol state machines are exposed to the users of their context classifiers. A protocol state represents an exposed stable situation of its context classifier: when an instance of the classifier is not processing any operation, users of this instance can always know its state configuration. */ -QState::QState(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QStatePrivate, parent, wrapper), +QState::QState(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QStatePrivate, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedVertex(new QVertex(this, this)) { } -QState::QState(QStatePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QState::QState(QStatePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedNamespace(new QNamespace(this, this)), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedVertex(new QVertex(this, this)) @@ -112,7 +112,7 @@ QState::~QState() */ const QSet<QElement *> *QState::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -120,7 +120,7 @@ const QSet<QElement *> *QState::ownedElements() const */ QElement *QState::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -128,17 +128,17 @@ QElement *QState::owner() const */ const QSet<QComment *> *QState::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QState::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QState::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -150,12 +150,12 @@ void QState::removeOwnedComment(QComment *ownedComment) */ QString QState::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QState::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -163,12 +163,12 @@ void QState::setName(QString name) */ QtUml::VisibilityKind QState::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QState::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -176,7 +176,7 @@ void QState::setVisibility(QtUml::VisibilityKind visibility) */ QString QState::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -188,12 +188,12 @@ QString QState::qualifiedName() const */ QStringExpression *QState::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QState::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -201,7 +201,7 @@ void QState::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QState::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -209,17 +209,17 @@ QNamespace *QState::namespace_() const */ const QSet<QDependency *> *QState::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QState::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QState::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -231,17 +231,17 @@ void QState::removeClientDependency(QDependency *clientDependency) */ const QSet<QPackageImport *> *QState::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QState::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QState::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -249,7 +249,7 @@ void QState::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QState::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -257,7 +257,7 @@ const QSet<QNamedElement *> *QState::members() const */ const QSet<QPackageableElement *> *QState::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -265,17 +265,17 @@ const QSet<QPackageableElement *> *QState::importedMembers() const */ const QSet<QElementImport *> *QState::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QState::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QState::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -283,17 +283,17 @@ void QState::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QState::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QState::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QState::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -301,7 +301,7 @@ void QState::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QState::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -313,12 +313,12 @@ const QSet<QNamedElement *> *QState::ownedMembers() const */ bool QState::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QState::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -330,7 +330,7 @@ void QState::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QState::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } // --------------------------------------------------------------- @@ -342,7 +342,7 @@ const QSet<QRedefinableElement *> *QState::redefinedElements() const */ const QSet<QTransition *> *QState::incomings() const { - return (qmofobject_cast<const QVertex *>(this))->incomings(); + return (qwrappedobject_cast<const QVertex *>(this))->incomings(); } /*! @@ -350,12 +350,12 @@ const QSet<QTransition *> *QState::incomings() const */ QRegion *QState::container() const { - return (qmofobject_cast<const QVertex *>(this))->container(); + return (qwrappedobject_cast<const QVertex *>(this))->container(); } void QState::setContainer(QRegion *container) { - (qmofobject_cast<QVertex *>(this))->setContainer(container); + (qwrappedobject_cast<QVertex *>(this))->setContainer(container); } /*! @@ -363,7 +363,7 @@ void QState::setContainer(QRegion *container) */ const QSet<QTransition *> *QState::outgoings() const { - return (qmofobject_cast<const QVertex *>(this))->outgoings(); + return (qwrappedobject_cast<const QVertex *>(this))->outgoings(); } // --------------------------------------------------------------- @@ -442,7 +442,7 @@ void QState::addRegion(QRegion *region) d->regions->insert(region); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(region)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); // Adjust opposite property region->setState(this); @@ -458,7 +458,7 @@ void QState::removeRegion(QRegion *region) d->regions->remove(region); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(region)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); // Adjust opposite property region->setState(0); @@ -483,13 +483,13 @@ void QState::setExit(QBehavior *exit) Q_D(QState); if (d->exit != exit) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->exit)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->exit)); d->exit = exit; // Adjust subsetted property(ies) if (exit) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(exit)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(exit)); } } } @@ -514,7 +514,7 @@ void QState::addConnection(QConnectionPointReference *connection) d->connections->insert(connection); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(connection)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connection)); // Adjust opposite property connection->setState(this); @@ -530,7 +530,7 @@ void QState::removeConnection(QConnectionPointReference *connection) d->connections->remove(connection); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(connection)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connection)); // Adjust opposite property connection->setState(0); @@ -567,13 +567,13 @@ void QState::setRedefinedState(QState *redefinedState) Q_D(QState); if (d->redefinedState != redefinedState) { // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(d->redefinedState)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(d->redefinedState)); d->redefinedState = redefinedState; // Adjust subsetted property(ies) if (redefinedState) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedState)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedState)); } } } @@ -598,7 +598,7 @@ void QState::addDeferrableTrigger(QTrigger *deferrableTrigger) d->deferrableTriggers->insert(deferrableTrigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(deferrableTrigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(deferrableTrigger)); } } @@ -611,7 +611,7 @@ void QState::removeDeferrableTrigger(QTrigger *deferrableTrigger) d->deferrableTriggers->remove(deferrableTrigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(deferrableTrigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(deferrableTrigger)); } } @@ -635,7 +635,7 @@ void QState::addConnectionPoint(QPseudostate *connectionPoint) d->connectionPoints->insert(connectionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(connectionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); // Adjust opposite property connectionPoint->setState(this); @@ -651,7 +651,7 @@ void QState::removeConnectionPoint(QPseudostate *connectionPoint) d->connectionPoints->remove(connectionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(connectionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); // Adjust opposite property connectionPoint->setState(0); @@ -676,13 +676,13 @@ void QState::setEntry(QBehavior *entry) Q_D(QState); if (d->entry != entry) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->entry)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->entry)); d->entry = entry; // Adjust subsetted property(ies) if (entry) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(entry)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(entry)); } } } @@ -705,13 +705,13 @@ void QState::setDoActivity(QBehavior *doActivity) Q_D(QState); if (d->doActivity != doActivity) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->doActivity)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->doActivity)); d->doActivity = doActivity; // Adjust subsetted property(ies) if (doActivity) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(doActivity)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(doActivity)); } } } @@ -763,13 +763,13 @@ void QState::setStateInvariant(QConstraint *stateInvariant) Q_D(QState); if (d->stateInvariant != stateInvariant) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(d->stateInvariant)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(d->stateInvariant)); d->stateInvariant = stateInvariant; // Adjust subsetted property(ies) if (stateInvariant) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(stateInvariant)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(stateInvariant)); } } } diff --git a/src/uml/qstate.h b/src/uml/qstate.h index 4d6a20c9..a4abb29d 100644 --- a/src/uml/qstate.h +++ b/src/uml/qstate.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QNamespace> #include <QtUml/QRedefinableElement> #include <QtUml/QVertex> @@ -70,7 +71,7 @@ class QPseudostate; class QStatePrivate; -class Q_UML_EXPORT QState : public QtMof::QMofObject +class Q_UML_EXPORT QState : public QWrappedObject { Q_OBJECT @@ -94,7 +95,7 @@ class Q_UML_EXPORT QState : public QtMof::QMofObject Q_DECLARE_PRIVATE(QState) public: - Q_INVOKABLE explicit QState(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QState(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QState(); // Association ends from aggregated QElement @@ -185,7 +186,7 @@ public: Q_INVOKABLE bool isRedefinitionContextValid(const QState *redefined) const; protected: - explicit QState(QStatePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QState(QStatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QNamespace *_wrappedNamespace; diff --git a/src/uml/qstate_p.h b/src/uml/qstate_p.h index 0601af25..4c9f6e15 100644 --- a/src/uml/qstate_p.h +++ b/src/uml/qstate_p.h @@ -42,7 +42,8 @@ #define QTUML_QSTATE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qnamespace_p.h" #include "private/qredefinableelement_p.h" #include "private/qvertex_p.h" @@ -69,7 +70,7 @@ class QConnectionPointReference; class QTrigger; class QPseudostate; -class Q_UML_EXPORT QStatePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QStatePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QState) diff --git a/src/uml/qstateinvariant.cpp b/src/uml/qstateinvariant.cpp index b84aeb1e..3e299baa 100644 --- a/src/uml/qstateinvariant.cpp +++ b/src/uml/qstateinvariant.cpp @@ -65,12 +65,12 @@ QStateInvariantPrivate::~QStateInvariantPrivate() \brief A state invariant is a runtime constraint on the participants of the interaction. It may be used to specify a variety of different kinds of constraints, such as values of attributes or variables, internal or external states, and so on. A state invariant is an interaction fragment and it is placed on a lifeline. */ -QStateInvariant::QStateInvariant(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStateInvariant::QStateInvariant(QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(*new QStateInvariantPrivate, parent, wrapper) { } -QStateInvariant::QStateInvariant(QStateInvariantPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStateInvariant::QStateInvariant(QStateInvariantPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInteractionFragment(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QStateInvariant::setInvariant(QConstraint *invariant) Q_D(QStateInvariant); if (d->invariant != invariant) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->invariant)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->invariant)); d->invariant = invariant; // Adjust subsetted property(ies) if (invariant) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(invariant)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(invariant)); } } } diff --git a/src/uml/qstateinvariant.h b/src/uml/qstateinvariant.h index a98ae977..184fcc2f 100644 --- a/src/uml/qstateinvariant.h +++ b/src/uml/qstateinvariant.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QStateInvariant : public QInteractionFragment Q_DECLARE_PRIVATE(QStateInvariant) public: - Q_INVOKABLE explicit QStateInvariant(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStateInvariant(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStateInvariant(); // Association ends from QStateInvariant @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setCovered(QLifeline *covered); protected: - explicit QStateInvariant(QStateInvariantPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStateInvariant(QStateInvariantPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstatemachine.cpp b/src/uml/qstatemachine.cpp index 3f7adec2..4c5c6e84 100644 --- a/src/uml/qstatemachine.cpp +++ b/src/uml/qstatemachine.cpp @@ -74,12 +74,12 @@ QStateMachinePrivate::~QStateMachinePrivate() \brief State machines can be used to express the behavior of part of a system. Behavior is modeled as a traversal of a graph of state nodes interconnected by one or more joined transition arcs that are triggered by the dispatching of series of (event) occurrences. During this traversal, the state machine executes a series of activities associated with various elements of the state machine. */ -QStateMachine::QStateMachine(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStateMachine::QStateMachine(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(*new QStateMachinePrivate, parent, wrapper) { } -QStateMachine::QStateMachine(QStateMachinePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStateMachine::QStateMachine(QStateMachinePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavior(dd, parent, wrapper) { } @@ -143,7 +143,7 @@ void QStateMachine::addConnectionPoint(QPseudostate *connectionPoint) d->connectionPoints->insert(connectionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(connectionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); // Adjust opposite property connectionPoint->setStateMachine(this); @@ -159,7 +159,7 @@ void QStateMachine::removeConnectionPoint(QPseudostate *connectionPoint) d->connectionPoints->remove(connectionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(connectionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); // Adjust opposite property connectionPoint->setStateMachine(0); @@ -223,7 +223,7 @@ void QStateMachine::addRegion(QRegion *region) d->regions->insert(region); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(region)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); // Adjust opposite property region->setStateMachine(this); @@ -239,7 +239,7 @@ void QStateMachine::removeRegion(QRegion *region) d->regions->remove(region); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(region)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); // Adjust opposite property region->setStateMachine(0); diff --git a/src/uml/qstatemachine.h b/src/uml/qstatemachine.h index 6cf28805..2310766e 100644 --- a/src/uml/qstatemachine.h +++ b/src/uml/qstatemachine.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QStateMachine : public QBehavior Q_DECLARE_PRIVATE(QStateMachine) public: - Q_INVOKABLE explicit QStateMachine(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStateMachine(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStateMachine(); // Association ends from QStateMachine @@ -101,7 +101,7 @@ public: Q_INVOKABLE bool isRedefinitionContextValid(const QStateMachine *redefined) const; protected: - explicit QStateMachine(QStateMachinePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStateMachine(QStateMachinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstereotype.cpp b/src/uml/qstereotype.cpp index 79694764..4d09b783 100644 --- a/src/uml/qstereotype.cpp +++ b/src/uml/qstereotype.cpp @@ -65,12 +65,12 @@ QStereotypePrivate::~QStereotypePrivate() \brief A stereotype defines how an existing metaclass may be extended, and enables the use of platform or domain specific terminology or notation in place of, or in addition to, the ones used for the extended metaclass. */ -QStereotype::QStereotype(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStereotype::QStereotype(QWrappedObject *parent, QWrappedObject *wrapper) : QClass(*new QStereotypePrivate, parent, wrapper) { } -QStereotype::QStereotype(QStereotypePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStereotype::QStereotype(QStereotypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClass(dd, parent, wrapper) { } @@ -103,7 +103,7 @@ void QStereotype::addIcon(QImage *icon) d->icons->insert(icon); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(icon)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(icon)); } } @@ -116,7 +116,7 @@ void QStereotype::removeIcon(QImage *icon) d->icons->remove(icon); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(icon)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(icon)); } } diff --git a/src/uml/qstereotype.h b/src/uml/qstereotype.h index 7d3ec133..0e73a790 100644 --- a/src/uml/qstereotype.h +++ b/src/uml/qstereotype.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QStereotype : public QClass Q_DECLARE_PRIVATE(QStereotype) public: - Q_INVOKABLE explicit QStereotype(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStereotype(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStereotype(); // Association ends from QStereotype @@ -85,7 +85,7 @@ public: Q_INVOKABLE QProfile *containingProfile() const; protected: - explicit QStereotype(QStereotypePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStereotype(QStereotypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstringexpression.cpp b/src/uml/qstringexpression.cpp index 62545e27..c82c43ab 100644 --- a/src/uml/qstringexpression.cpp +++ b/src/uml/qstringexpression.cpp @@ -63,15 +63,15 @@ QStringExpressionPrivate::~QStringExpressionPrivate() \brief An expression that specifies a string value that is derived by concatenating a set of sub string expressions, some of which might be template parameters. */ -QStringExpression::QStringExpression(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QStringExpressionPrivate, parent, wrapper), +QStringExpression::QStringExpression(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QStringExpressionPrivate, parent, wrapper), _wrappedExpression(new QExpression(this, this)), _wrappedTemplateableElement(new QTemplateableElement(this, this)) { } -QStringExpression::QStringExpression(QStringExpressionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QStringExpression::QStringExpression(QStringExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedExpression(new QExpression(this, this)), _wrappedTemplateableElement(new QTemplateableElement(this, this)) { @@ -90,7 +90,7 @@ QStringExpression::~QStringExpression() */ const QSet<QElement *> *QStringExpression::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -98,7 +98,7 @@ const QSet<QElement *> *QStringExpression::ownedElements() const */ QElement *QStringExpression::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -106,17 +106,17 @@ QElement *QStringExpression::owner() const */ const QSet<QComment *> *QStringExpression::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QStringExpression::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QStringExpression::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -128,12 +128,12 @@ void QStringExpression::removeOwnedComment(QComment *ownedComment) */ QTemplateSignature *QStringExpression::ownedTemplateSignature() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->ownedTemplateSignature(); } void QStringExpression::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature) { - (qmofobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); + (qwrappedobject_cast<QTemplateableElement *>(this))->setOwnedTemplateSignature(ownedTemplateSignature); } /*! @@ -141,17 +141,17 @@ void QStringExpression::setOwnedTemplateSignature(QTemplateSignature *ownedTempl */ const QSet<QTemplateBinding *> *QStringExpression::templateBindings() const { - return (qmofobject_cast<const QTemplateableElement *>(this))->templateBindings(); + return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } void QStringExpression::addTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->addTemplateBinding(templateBinding); } void QStringExpression::removeTemplateBinding(QTemplateBinding *templateBinding) { - (qmofobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); + (qwrappedobject_cast<QTemplateableElement *>(this))->removeTemplateBinding(templateBinding); } // --------------------------------------------------------------- @@ -182,7 +182,7 @@ void QStringExpression::setOwningExpression(QStringExpression *owningExpression) d->owningExpression = owningExpression; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(owningExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(owningExpression)); // Adjust opposite property if (owningExpression) @@ -210,7 +210,7 @@ void QStringExpression::addSubExpression(QStringExpression *subExpression) d->subExpressions->insert(subExpression); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(subExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(subExpression)); // Adjust opposite property subExpression->setOwningExpression(this); @@ -226,7 +226,7 @@ void QStringExpression::removeSubExpression(QStringExpression *subExpression) d->subExpressions->remove(subExpression); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(subExpression)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(subExpression)); // Adjust opposite property subExpression->setOwningExpression(0); diff --git a/src/uml/qstringexpression.h b/src/uml/qstringexpression.h index 5846b4bb..f230dcee 100644 --- a/src/uml/qstringexpression.h +++ b/src/uml/qstringexpression.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QExpression> #include <QtUml/QTemplateableElement> @@ -60,7 +61,7 @@ QT_MODULE(QtUml) class QStringExpressionPrivate; -class Q_UML_EXPORT QStringExpression : public QtMof::QMofObject +class Q_UML_EXPORT QStringExpression : public QWrappedObject { Q_OBJECT @@ -71,7 +72,7 @@ class Q_UML_EXPORT QStringExpression : public QtMof::QMofObject Q_DECLARE_PRIVATE(QStringExpression) public: - Q_INVOKABLE explicit QStringExpression(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStringExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStringExpression(); // Association ends from aggregated QElement @@ -99,7 +100,7 @@ public: Q_INVOKABLE QString stringValue() const; protected: - explicit QStringExpression(QStringExpressionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStringExpression(QStringExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QExpression *_wrappedExpression; diff --git a/src/uml/qstringexpression_p.h b/src/uml/qstringexpression_p.h index 99541f6a..2f0dfb4c 100644 --- a/src/uml/qstringexpression_p.h +++ b/src/uml/qstringexpression_p.h @@ -42,7 +42,8 @@ #define QTUML_QSTRINGEXPRESSION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qexpression_p.h" #include "private/qtemplateableelement_p.h" @@ -61,7 +62,7 @@ QT_MODULE(QtUml) // Forward decls for function parameters class QStringExpression; -class Q_UML_EXPORT QStringExpressionPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QStringExpressionPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QStringExpression) diff --git a/src/uml/qstructuralfeature.cpp b/src/uml/qstructuralfeature.cpp index aebc8172..f8516164 100644 --- a/src/uml/qstructuralfeature.cpp +++ b/src/uml/qstructuralfeature.cpp @@ -61,16 +61,16 @@ QStructuralFeaturePrivate::~QStructuralFeaturePrivate() \brief A structural feature is a typed feature of a classifier that specifies the structure of instances of the classifier.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. */ -QStructuralFeature::QStructuralFeature(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QStructuralFeaturePrivate, parent, wrapper), +QStructuralFeature::QStructuralFeature(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QStructuralFeaturePrivate, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedFeature(new QFeature(this, this)) { } -QStructuralFeature::QStructuralFeature(QStructuralFeaturePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QStructuralFeature::QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedFeature(new QFeature(this, this)) @@ -90,7 +90,7 @@ QStructuralFeature::~QStructuralFeature() */ const QSet<QElement *> *QStructuralFeature::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -98,7 +98,7 @@ const QSet<QElement *> *QStructuralFeature::ownedElements() const */ QElement *QStructuralFeature::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -106,17 +106,17 @@ QElement *QStructuralFeature::owner() const */ const QSet<QComment *> *QStructuralFeature::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QStructuralFeature::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QStructuralFeature::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -128,12 +128,12 @@ void QStructuralFeature::removeOwnedComment(QComment *ownedComment) */ QString QStructuralFeature::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QStructuralFeature::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -141,12 +141,12 @@ void QStructuralFeature::setName(QString name) */ QtUml::VisibilityKind QStructuralFeature::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QStructuralFeature::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -154,7 +154,7 @@ void QStructuralFeature::setVisibility(QtUml::VisibilityKind visibility) */ QString QStructuralFeature::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -166,12 +166,12 @@ QString QStructuralFeature::qualifiedName() const */ QStringExpression *QStructuralFeature::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QStructuralFeature::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -179,7 +179,7 @@ void QStructuralFeature::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QStructuralFeature::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -187,17 +187,17 @@ QNamespace *QStructuralFeature::namespace_() const */ const QSet<QDependency *> *QStructuralFeature::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QStructuralFeature::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QStructuralFeature::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -209,12 +209,12 @@ void QStructuralFeature::removeClientDependency(QDependency *clientDependency) */ QType *QStructuralFeature::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QStructuralFeature::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -226,12 +226,12 @@ void QStructuralFeature::setType(QType *type) */ qint32 QStructuralFeature::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QStructuralFeature::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -239,12 +239,12 @@ void QStructuralFeature::setUpper(qint32 upper) */ bool QStructuralFeature::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QStructuralFeature::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -252,12 +252,12 @@ void QStructuralFeature::setUnique(bool isUnique) */ bool QStructuralFeature::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QStructuralFeature::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -265,12 +265,12 @@ void QStructuralFeature::setOrdered(bool isOrdered) */ qint32 QStructuralFeature::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QStructuralFeature::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -282,12 +282,12 @@ void QStructuralFeature::setLower(qint32 lower) */ QValueSpecification *QStructuralFeature::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QStructuralFeature::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -295,12 +295,12 @@ void QStructuralFeature::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QStructuralFeature::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QStructuralFeature::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -312,12 +312,12 @@ void QStructuralFeature::setLowerValue(QValueSpecification *lowerValue) */ bool QStructuralFeature::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QStructuralFeature::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -329,7 +329,7 @@ void QStructuralFeature::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -337,7 +337,7 @@ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const */ const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -349,12 +349,12 @@ const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const */ bool QStructuralFeature::isStatic() const { - return (qmofobject_cast<const QFeature *>(this))->isStatic(); + return (qwrappedobject_cast<const QFeature *>(this))->isStatic(); } void QStructuralFeature::setStatic(bool isStatic) { - (qmofobject_cast<QFeature *>(this))->setStatic(isStatic); + (qwrappedobject_cast<QFeature *>(this))->setStatic(isStatic); } // --------------------------------------------------------------- @@ -366,7 +366,7 @@ void QStructuralFeature::setStatic(bool isStatic) */ const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const { - return (qmofobject_cast<const QFeature *>(this))->featuringClassifiers(); + return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } // --------------------------------------------------------------- diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h index c5d37f4e..e852c78f 100644 --- a/src/uml/qstructuralfeature.h +++ b/src/uml/qstructuralfeature.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QTypedElement> #include <QtUml/QMultiplicityElement> #include <QtUml/QFeature> @@ -57,7 +58,7 @@ QT_MODULE(QtUml) class QStructuralFeaturePrivate; -class Q_UML_EXPORT QStructuralFeature : public QtMof::QMofObject +class Q_UML_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT @@ -67,7 +68,7 @@ class Q_UML_EXPORT QStructuralFeature : public QtMof::QMofObject Q_DECLARE_PRIVATE(QStructuralFeature) public: - Q_INVOKABLE explicit QStructuralFeature(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStructuralFeature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStructuralFeature(); // Association ends from aggregated QElement @@ -132,7 +133,7 @@ public: Q_INVOKABLE void setReadOnly(bool isReadOnly); protected: - explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTypedElement *_wrappedTypedElement; diff --git a/src/uml/qstructuralfeature_p.h b/src/uml/qstructuralfeature_p.h index a2c4de74..77bcc416 100644 --- a/src/uml/qstructuralfeature_p.h +++ b/src/uml/qstructuralfeature_p.h @@ -42,7 +42,8 @@ #define QTUML_QSTRUCTURALFEATURE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtypedelement_p.h" #include "private/qmultiplicityelement_p.h" #include "private/qfeature_p.h" @@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE_QTUML QT_MODULE(QtUml) -class Q_UML_EXPORT QStructuralFeaturePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QStructuralFeaturePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QStructuralFeature) diff --git a/src/uml/qstructuralfeatureaction.cpp b/src/uml/qstructuralfeatureaction.cpp index d44a7bf5..df215183 100644 --- a/src/uml/qstructuralfeatureaction.cpp +++ b/src/uml/qstructuralfeatureaction.cpp @@ -65,12 +65,12 @@ QStructuralFeatureActionPrivate::~QStructuralFeatureActionPrivate() \brief StructuralFeatureAction is an abstract class for all structural feature actions. */ -QStructuralFeatureAction::QStructuralFeatureAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStructuralFeatureAction::QStructuralFeatureAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QStructuralFeatureActionPrivate, parent, wrapper) { } -QStructuralFeatureAction::QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStructuralFeatureAction::QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QStructuralFeatureAction::setObject(QInputPin *object) Q_D(QStructuralFeatureAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } diff --git a/src/uml/qstructuralfeatureaction.h b/src/uml/qstructuralfeatureaction.h index 76ba1b4a..7b299ec1 100644 --- a/src/uml/qstructuralfeatureaction.h +++ b/src/uml/qstructuralfeatureaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QStructuralFeatureAction : public QAction Q_DECLARE_PRIVATE(QStructuralFeatureAction) public: - Q_INVOKABLE explicit QStructuralFeatureAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStructuralFeatureAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStructuralFeatureAction(); // Association ends from QStructuralFeatureAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setStructuralFeature(QStructuralFeature *structuralFeature); protected: - explicit QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuredactivitynode.cpp b/src/uml/qstructuredactivitynode.cpp index f9fac404..aa5a61f3 100644 --- a/src/uml/qstructuredactivitynode.cpp +++ b/src/uml/qstructuredactivitynode.cpp @@ -79,16 +79,16 @@ QStructuredActivityNodePrivate::~QStructuredActivityNodePrivate() \brief A structured activity node is an executable activity node that may have an expansion into subordinate nodes as an activity group. The subordinate nodes must belong to only one structured activity node, although they may be nested.Because of the concurrent nature of the execution of actions within and across activities, it can be difficult to guarantee the consistent access and modification of object memory. In order to avoid race conditions or other concurrency-related problems, it is sometimes necessary to isolate the effects of a group of actions from the effects of actions outside the group. This may be indicated by setting the mustIsolate attribute to true on a structured activity node. If a structured activity node is "isolated," then any object used by an action within the node cannot be accessed by any action outside the node until the structured activity node as a whole completes. Any concurrent actions that would result in accessing such objects are required to have their execution deferred until the completion of the node. */ -QStructuredActivityNode::QStructuredActivityNode(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QStructuredActivityNodePrivate, parent, wrapper), +QStructuredActivityNode::QStructuredActivityNode(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QStructuredActivityNodePrivate, parent, wrapper), _wrappedAction(new QAction(this, this)), _wrappedNamespace(new QNamespace(this, this)), _wrappedActivityGroup(new QActivityGroup(this, this)) { } -QStructuredActivityNode::QStructuredActivityNode(QStructuredActivityNodePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QStructuredActivityNode::QStructuredActivityNode(QStructuredActivityNodePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedAction(new QAction(this, this)), _wrappedNamespace(new QNamespace(this, this)), _wrappedActivityGroup(new QActivityGroup(this, this)) @@ -108,7 +108,7 @@ QStructuredActivityNode::~QStructuredActivityNode() */ const QSet<QElement *> *QStructuredActivityNode::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -116,7 +116,7 @@ const QSet<QElement *> *QStructuredActivityNode::ownedElements() const */ QElement *QStructuredActivityNode::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -124,17 +124,17 @@ QElement *QStructuredActivityNode::owner() const */ const QSet<QComment *> *QStructuredActivityNode::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QStructuredActivityNode::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QStructuredActivityNode::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -146,12 +146,12 @@ void QStructuredActivityNode::removeOwnedComment(QComment *ownedComment) */ QString QStructuredActivityNode::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QStructuredActivityNode::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -159,12 +159,12 @@ void QStructuredActivityNode::setName(QString name) */ QtUml::VisibilityKind QStructuredActivityNode::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QStructuredActivityNode::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -172,7 +172,7 @@ void QStructuredActivityNode::setVisibility(QtUml::VisibilityKind visibility) */ QString QStructuredActivityNode::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -184,12 +184,12 @@ QString QStructuredActivityNode::qualifiedName() const */ QStringExpression *QStructuredActivityNode::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QStructuredActivityNode::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -197,7 +197,7 @@ void QStructuredActivityNode::setNameExpression(QStringExpression *nameExpressio */ QNamespace *QStructuredActivityNode::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -205,17 +205,17 @@ QNamespace *QStructuredActivityNode::namespace_() const */ const QSet<QDependency *> *QStructuredActivityNode::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QStructuredActivityNode::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QStructuredActivityNode::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -227,12 +227,12 @@ void QStructuredActivityNode::removeClientDependency(QDependency *clientDependen */ bool QStructuredActivityNode::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QStructuredActivityNode::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -244,7 +244,7 @@ void QStructuredActivityNode::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QStructuredActivityNode::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } /*! @@ -252,7 +252,7 @@ const QSet<QRedefinableElement *> *QStructuredActivityNode::redefinedElements() */ const QSet<QClassifier *> *QStructuredActivityNode::redefinitionContexts() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } // --------------------------------------------------------------- @@ -264,17 +264,17 @@ const QSet<QClassifier *> *QStructuredActivityNode::redefinitionContexts() const */ const QSet<QActivityNode *> *QStructuredActivityNode::redefinedNodes() const { - return (qmofobject_cast<const QActivityNode *>(this))->redefinedNodes(); + return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } void QStructuredActivityNode::addRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->addRedefinedNode(redefinedNode); } void QStructuredActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) { - (qmofobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); + (qwrappedobject_cast<QActivityNode *>(this))->removeRedefinedNode(redefinedNode); } /*! @@ -282,17 +282,17 @@ void QStructuredActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) */ const QSet<QActivityEdge *> *QStructuredActivityNode::incomings() const { - return (qmofobject_cast<const QActivityNode *>(this))->incomings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } void QStructuredActivityNode::addIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->addIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->addIncoming(incoming); } void QStructuredActivityNode::removeIncoming(QActivityEdge *incoming) { - (qmofobject_cast<QActivityNode *>(this))->removeIncoming(incoming); + (qwrappedobject_cast<QActivityNode *>(this))->removeIncoming(incoming); } /*! @@ -300,7 +300,7 @@ void QStructuredActivityNode::removeIncoming(QActivityEdge *incoming) */ const QSet<QActivityGroup *> *QStructuredActivityNode::inGroup() const { - return (qmofobject_cast<const QActivityNode *>(this))->inGroup(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } /*! @@ -308,12 +308,12 @@ const QSet<QActivityGroup *> *QStructuredActivityNode::inGroup() const */ QStructuredActivityNode *QStructuredActivityNode::inStructuredNode() const { - return (qmofobject_cast<const QActivityNode *>(this))->inStructuredNode(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inStructuredNode(); } void QStructuredActivityNode::setInStructuredNode(QStructuredActivityNode *inStructuredNode) { - (qmofobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); + (qwrappedobject_cast<QActivityNode *>(this))->setInStructuredNode(inStructuredNode); } /*! @@ -321,17 +321,17 @@ void QStructuredActivityNode::setInStructuredNode(QStructuredActivityNode *inStr */ const QSet<QActivityPartition *> *QStructuredActivityNode::inPartition() const { - return (qmofobject_cast<const QActivityNode *>(this))->inPartition(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } void QStructuredActivityNode::addInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->addInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->addInPartition(inPartition); } void QStructuredActivityNode::removeInPartition(QActivityPartition *inPartition) { - (qmofobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); + (qwrappedobject_cast<QActivityNode *>(this))->removeInPartition(inPartition); } /*! @@ -339,17 +339,17 @@ void QStructuredActivityNode::removeInPartition(QActivityPartition *inPartition) */ const QSet<QInterruptibleActivityRegion *> *QStructuredActivityNode::inInterruptibleRegion() const { - return (qmofobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); + return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } void QStructuredActivityNode::addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->addInInterruptibleRegion(inInterruptibleRegion); } void QStructuredActivityNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion) { - (qmofobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); + (qwrappedobject_cast<QActivityNode *>(this))->removeInInterruptibleRegion(inInterruptibleRegion); } /*! @@ -357,17 +357,17 @@ void QStructuredActivityNode::removeInInterruptibleRegion(QInterruptibleActivity */ const QSet<QActivityEdge *> *QStructuredActivityNode::outgoings() const { - return (qmofobject_cast<const QActivityNode *>(this))->outgoings(); + return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } void QStructuredActivityNode::addOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->addOutgoing(outgoing); } void QStructuredActivityNode::removeOutgoing(QActivityEdge *outgoing) { - (qmofobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); + (qwrappedobject_cast<QActivityNode *>(this))->removeOutgoing(outgoing); } // --------------------------------------------------------------- @@ -379,17 +379,17 @@ void QStructuredActivityNode::removeOutgoing(QActivityEdge *outgoing) */ const QSet<QExceptionHandler *> *QStructuredActivityNode::handlers() const { - return (qmofobject_cast<const QExecutableNode *>(this))->handlers(); + return (qwrappedobject_cast<const QExecutableNode *>(this))->handlers(); } void QStructuredActivityNode::addHandler(QExceptionHandler *handler) { - (qmofobject_cast<QExecutableNode *>(this))->addHandler(handler); + (qwrappedobject_cast<QExecutableNode *>(this))->addHandler(handler); } void QStructuredActivityNode::removeHandler(QExceptionHandler *handler) { - (qmofobject_cast<QExecutableNode *>(this))->removeHandler(handler); + (qwrappedobject_cast<QExecutableNode *>(this))->removeHandler(handler); } // --------------------------------------------------------------- @@ -401,12 +401,12 @@ void QStructuredActivityNode::removeHandler(QExceptionHandler *handler) */ bool QStructuredActivityNode::isLocallyReentrant() const { - return (qmofobject_cast<const QAction *>(this))->isLocallyReentrant(); + return (qwrappedobject_cast<const QAction *>(this))->isLocallyReentrant(); } void QStructuredActivityNode::setLocallyReentrant(bool isLocallyReentrant) { - (qmofobject_cast<QAction *>(this))->setLocallyReentrant(isLocallyReentrant); + (qwrappedobject_cast<QAction *>(this))->setLocallyReentrant(isLocallyReentrant); } // --------------------------------------------------------------- @@ -418,7 +418,7 @@ void QStructuredActivityNode::setLocallyReentrant(bool isLocallyReentrant) */ QClassifier *QStructuredActivityNode::context() const { - return (qmofobject_cast<const QAction *>(this))->context(); + return (qwrappedobject_cast<const QAction *>(this))->context(); } /*! @@ -426,17 +426,17 @@ QClassifier *QStructuredActivityNode::context() const */ const QSet<QConstraint *> *QStructuredActivityNode::localPostconditions() const { - return (qmofobject_cast<const QAction *>(this))->localPostconditions(); + return (qwrappedobject_cast<const QAction *>(this))->localPostconditions(); } void QStructuredActivityNode::addLocalPostcondition(QConstraint *localPostcondition) { - (qmofobject_cast<QAction *>(this))->addLocalPostcondition(localPostcondition); + (qwrappedobject_cast<QAction *>(this))->addLocalPostcondition(localPostcondition); } void QStructuredActivityNode::removeLocalPostcondition(QConstraint *localPostcondition) { - (qmofobject_cast<QAction *>(this))->removeLocalPostcondition(localPostcondition); + (qwrappedobject_cast<QAction *>(this))->removeLocalPostcondition(localPostcondition); } /*! @@ -444,17 +444,17 @@ void QStructuredActivityNode::removeLocalPostcondition(QConstraint *localPostcon */ const QSet<QConstraint *> *QStructuredActivityNode::localPreconditions() const { - return (qmofobject_cast<const QAction *>(this))->localPreconditions(); + return (qwrappedobject_cast<const QAction *>(this))->localPreconditions(); } void QStructuredActivityNode::addLocalPrecondition(QConstraint *localPrecondition) { - (qmofobject_cast<QAction *>(this))->addLocalPrecondition(localPrecondition); + (qwrappedobject_cast<QAction *>(this))->addLocalPrecondition(localPrecondition); } void QStructuredActivityNode::removeLocalPrecondition(QConstraint *localPrecondition) { - (qmofobject_cast<QAction *>(this))->removeLocalPrecondition(localPrecondition); + (qwrappedobject_cast<QAction *>(this))->removeLocalPrecondition(localPrecondition); } /*! @@ -462,7 +462,7 @@ void QStructuredActivityNode::removeLocalPrecondition(QConstraint *localPrecondi */ const QList<QInputPin *> *QStructuredActivityNode::inputs() const { - return (qmofobject_cast<const QAction *>(this))->inputs(); + return (qwrappedobject_cast<const QAction *>(this))->inputs(); } /*! @@ -470,7 +470,7 @@ const QList<QInputPin *> *QStructuredActivityNode::inputs() const */ const QList<QOutputPin *> *QStructuredActivityNode::outputs() const { - return (qmofobject_cast<const QAction *>(this))->outputs(); + return (qwrappedobject_cast<const QAction *>(this))->outputs(); } // --------------------------------------------------------------- @@ -482,17 +482,17 @@ const QList<QOutputPin *> *QStructuredActivityNode::outputs() const */ const QSet<QPackageImport *> *QStructuredActivityNode::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QStructuredActivityNode::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QStructuredActivityNode::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -500,7 +500,7 @@ void QStructuredActivityNode::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QStructuredActivityNode::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -508,7 +508,7 @@ const QSet<QNamedElement *> *QStructuredActivityNode::members() const */ const QSet<QPackageableElement *> *QStructuredActivityNode::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -516,17 +516,17 @@ const QSet<QPackageableElement *> *QStructuredActivityNode::importedMembers() co */ const QSet<QElementImport *> *QStructuredActivityNode::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QStructuredActivityNode::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QStructuredActivityNode::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -534,17 +534,17 @@ void QStructuredActivityNode::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QStructuredActivityNode::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QStructuredActivityNode::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QStructuredActivityNode::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -552,7 +552,7 @@ void QStructuredActivityNode::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QStructuredActivityNode::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -564,7 +564,7 @@ const QSet<QNamedElement *> *QStructuredActivityNode::ownedMembers() const */ const QSet<QActivityNode *> *QStructuredActivityNode::containedNodes() const { - return (qmofobject_cast<const QActivityGroup *>(this))->containedNodes(); + return (qwrappedobject_cast<const QActivityGroup *>(this))->containedNodes(); } /*! @@ -572,7 +572,7 @@ const QSet<QActivityNode *> *QStructuredActivityNode::containedNodes() const */ const QSet<QActivityGroup *> *QStructuredActivityNode::subgroups() const { - return (qmofobject_cast<const QActivityGroup *>(this))->subgroups(); + return (qwrappedobject_cast<const QActivityGroup *>(this))->subgroups(); } /*! @@ -580,7 +580,7 @@ const QSet<QActivityGroup *> *QStructuredActivityNode::subgroups() const */ const QSet<QActivityEdge *> *QStructuredActivityNode::containedEdges() const { - return (qmofobject_cast<const QActivityGroup *>(this))->containedEdges(); + return (qwrappedobject_cast<const QActivityGroup *>(this))->containedEdges(); } /*! @@ -588,7 +588,7 @@ const QSet<QActivityEdge *> *QStructuredActivityNode::containedEdges() const */ QActivityGroup *QStructuredActivityNode::superGroup() const { - return (qmofobject_cast<const QActivityGroup *>(this))->superGroup(); + return (qwrappedobject_cast<const QActivityGroup *>(this))->superGroup(); } // --------------------------------------------------------------- @@ -637,7 +637,7 @@ void QStructuredActivityNode::addStructuredNodeInput(QInputPin *structuredNodeIn d->structuredNodeInputs->insert(structuredNodeInput); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(structuredNodeInput)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(structuredNodeInput)); } } @@ -650,7 +650,7 @@ void QStructuredActivityNode::removeStructuredNodeInput(QInputPin *structuredNod d->structuredNodeInputs->remove(structuredNodeInput); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(structuredNodeInput)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(structuredNodeInput)); } } @@ -674,8 +674,8 @@ void QStructuredActivityNode::addNode(QActivityNode *node) d->nodes->insert(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qmofobject_cast<QActivityNode *>(node)); - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(node)); // Adjust opposite property node->setInStructuredNode(this); @@ -691,8 +691,8 @@ void QStructuredActivityNode::removeNode(QActivityNode *node) d->nodes->remove(node); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qmofobject_cast<QActivityNode *>(node)); - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(node)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(node)); // Adjust opposite property node->setInStructuredNode(0); @@ -716,7 +716,7 @@ void QStructuredActivityNode::addStructuredNodeOutput(QOutputPin *structuredNode d->structuredNodeOutputs->insert(structuredNodeOutput); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(structuredNodeOutput)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(structuredNodeOutput)); } } @@ -729,7 +729,7 @@ void QStructuredActivityNode::removeStructuredNodeOutput(QOutputPin *structuredN d->structuredNodeOutputs->remove(structuredNodeOutput); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(structuredNodeOutput)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(structuredNodeOutput)); } } @@ -753,8 +753,8 @@ void QStructuredActivityNode::addEdge(QActivityEdge *edge) d->edges->insert(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qmofobject_cast<QActivityEdge *>(edge)); - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(edge)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(edge)); // Adjust opposite property edge->setInStructuredNode(this); @@ -770,8 +770,8 @@ void QStructuredActivityNode::removeEdge(QActivityEdge *edge) d->edges->remove(edge); // Adjust subsetted property(ies) - (qmofobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qmofobject_cast<QActivityEdge *>(edge)); - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(edge)); + (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(edge)); // Adjust opposite property edge->setInStructuredNode(0); @@ -798,7 +798,7 @@ void QStructuredActivityNode::addVariable(QVariable *variable) d->variables->insert(variable); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(variable)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); // Adjust opposite property variable->setScope(this); @@ -814,7 +814,7 @@ void QStructuredActivityNode::removeVariable(QVariable *variable) d->variables->remove(variable); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(variable)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); // Adjust opposite property variable->setScope(0); diff --git a/src/uml/qstructuredactivitynode.h b/src/uml/qstructuredactivitynode.h index 6a431eeb..b5c6dd8d 100644 --- a/src/uml/qstructuredactivitynode.h +++ b/src/uml/qstructuredactivitynode.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QAction> #include <QtUml/QNamespace> #include <QtUml/QActivityGroup> @@ -68,7 +69,7 @@ class QActivityNode; class QStructuredActivityNodePrivate; -class Q_UML_EXPORT QStructuredActivityNode : public QtMof::QMofObject +class Q_UML_EXPORT QStructuredActivityNode : public QWrappedObject { Q_OBJECT @@ -84,7 +85,7 @@ class Q_UML_EXPORT QStructuredActivityNode : public QtMof::QMofObject Q_DECLARE_PRIVATE(QStructuredActivityNode) public: - Q_INVOKABLE explicit QStructuredActivityNode(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStructuredActivityNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStructuredActivityNode(); // Association ends from aggregated QElement @@ -201,7 +202,7 @@ public: Q_INVOKABLE void setActivity(QActivity *activity); protected: - explicit QStructuredActivityNode(QStructuredActivityNodePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStructuredActivityNode(QStructuredActivityNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QAction *_wrappedAction; diff --git a/src/uml/qstructuredactivitynode_p.h b/src/uml/qstructuredactivitynode_p.h index 5d443cbf..9e46fe05 100644 --- a/src/uml/qstructuredactivitynode_p.h +++ b/src/uml/qstructuredactivitynode_p.h @@ -42,7 +42,8 @@ #define QTUML_QSTRUCTUREDACTIVITYNODE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qaction_p.h" #include "private/qnamespace_p.h" #include "private/qactivitygroup_p.h" @@ -67,7 +68,7 @@ class QActivity; class QActivityNode; class QStructuredActivityNode; -class Q_UML_EXPORT QStructuredActivityNodePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QStructuredActivityNodePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QStructuredActivityNode) diff --git a/src/uml/qstructuredclassifier.cpp b/src/uml/qstructuredclassifier.cpp index eff456f5..86dc66dc 100644 --- a/src/uml/qstructuredclassifier.cpp +++ b/src/uml/qstructuredclassifier.cpp @@ -70,7 +70,7 @@ void QStructuredClassifierPrivate::addRole(QConnectableElement *role) this->roles->insert(role); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->addMember(qmofobject_cast<QNamedElement *>(role)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(role)); } } @@ -82,7 +82,7 @@ void QStructuredClassifierPrivate::removeRole(QConnectableElement *role) this->roles->remove(role); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(this))->removeMember(qmofobject_cast<QNamedElement *>(role)); + (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(role)); } } @@ -94,12 +94,12 @@ void QStructuredClassifierPrivate::removeRole(QConnectableElement *role) \brief A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. */ -QStructuredClassifier::QStructuredClassifier(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStructuredClassifier::QStructuredClassifier(QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(*new QStructuredClassifierPrivate, parent, wrapper) { } -QStructuredClassifier::QStructuredClassifier(QStructuredClassifierPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QStructuredClassifier::QStructuredClassifier(QStructuredClassifierPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QClassifier(dd, parent, wrapper) { } @@ -143,9 +143,9 @@ void QStructuredClassifier::addOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->append(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QStructuredClassifierPrivate *>(d))->addRole(qmofobject_cast<QConnectableElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->addRole(qwrappedobject_cast<QConnectableElement *>(ownedAttribute)); } } @@ -158,9 +158,9 @@ void QStructuredClassifier::removeOwnedAttribute(QProperty *ownedAttribute) d->ownedAttributes->removeAll(ownedAttribute); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeAttribute(qmofobject_cast<QProperty *>(ownedAttribute)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedAttribute)); - (qmofobject_cast<QStructuredClassifierPrivate *>(d))->removeRole(qmofobject_cast<QConnectableElement *>(ownedAttribute)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); + (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->removeRole(qwrappedobject_cast<QConnectableElement *>(ownedAttribute)); } } @@ -196,8 +196,8 @@ void QStructuredClassifier::addOwnedConnector(QConnector *ownedConnector) d->ownedConnectors->insert(ownedConnector); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->addFeature(qmofobject_cast<QFeature *>(ownedConnector)); - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(ownedConnector)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedConnector)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedConnector)); } } @@ -210,8 +210,8 @@ void QStructuredClassifier::removeOwnedConnector(QConnector *ownedConnector) d->ownedConnectors->remove(ownedConnector); // Adjust subsetted property(ies) - (qmofobject_cast<QClassifierPrivate *>(d))->removeFeature(qmofobject_cast<QFeature *>(ownedConnector)); - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(ownedConnector)); + (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedConnector)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedConnector)); } } diff --git a/src/uml/qstructuredclassifier.h b/src/uml/qstructuredclassifier.h index f5894a9b..58285d90 100644 --- a/src/uml/qstructuredclassifier.h +++ b/src/uml/qstructuredclassifier.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QStructuredClassifier : public QClassifier Q_DECLARE_PRIVATE(QStructuredClassifier) public: - Q_INVOKABLE explicit QStructuredClassifier(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QStructuredClassifier(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QStructuredClassifier(); // Association ends from QStructuredClassifier @@ -90,7 +90,7 @@ public: Q_INVOKABLE void removeOwnedConnector(QConnector *ownedConnector); protected: - explicit QStructuredClassifier(QStructuredClassifierPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QStructuredClassifier(QStructuredClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsubstitution.cpp b/src/uml/qsubstitution.cpp index 7d144448..b4bd7fc1 100644 --- a/src/uml/qsubstitution.cpp +++ b/src/uml/qsubstitution.cpp @@ -64,12 +64,12 @@ QSubstitutionPrivate::~QSubstitutionPrivate() \brief A substitution is a relationship between two classifiers signifies that the substituting classifier complies with the contract specified by the contract classifier. This implies that instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected. */ -QSubstitution::QSubstitution(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSubstitution::QSubstitution(QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(*new QSubstitutionPrivate, parent, wrapper) { } -QSubstitution::QSubstitution(QSubstitutionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QSubstitution::QSubstitution(QSubstitutionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QRealization(dd, parent, wrapper) { } @@ -100,13 +100,13 @@ void QSubstitution::setContract(QClassifier *contract) Q_D(QSubstitution); if (d->contract != contract) { // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeSupplier(qmofobject_cast<QNamedElement *>(d->contract)); + (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(d->contract)); d->contract = contract; // Adjust subsetted property(ies) if (contract) { - (qmofobject_cast<QDependency *>(this))->addSupplier(qmofobject_cast<QNamedElement *>(contract)); + (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(contract)); } } } @@ -133,14 +133,14 @@ void QSubstitution::setSubstitutingClassifier(QClassifier *substitutingClassifie d->substitutingClassifier->removeSubstitution(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDependency *>(this))->removeClient(qmofobject_cast<QNamedElement *>(d->substitutingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->removeClient(qwrappedobject_cast<QNamedElement *>(d->substitutingClassifier)); d->substitutingClassifier = substitutingClassifier; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(substitutingClassifier)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(substitutingClassifier)); if (substitutingClassifier) { - (qmofobject_cast<QDependency *>(this))->addClient(qmofobject_cast<QNamedElement *>(substitutingClassifier)); + (qwrappedobject_cast<QDependency *>(this))->addClient(qwrappedobject_cast<QNamedElement *>(substitutingClassifier)); } // Adjust opposite property @@ -151,23 +151,23 @@ void QSubstitution::setSubstitutingClassifier(QClassifier *substitutingClassifie // Overriden methods for subsetted properties -void QSubstitution::addSupplier(QtMof::QMofPointer<QClassifier> contract) +void QSubstitution::addSupplier(QWrappedObjectPointer<QClassifier> contract) { setContract(contract); } -void QSubstitution::removeSupplier(QtMof::QMofPointer<QClassifier> contract) +void QSubstitution::removeSupplier(QWrappedObjectPointer<QClassifier> contract) { Q_UNUSED(contract); setContract(0); } -void QSubstitution::addClient(QtMof::QMofPointer<QClassifier> substitutingClassifier) +void QSubstitution::addClient(QWrappedObjectPointer<QClassifier> substitutingClassifier) { setSubstitutingClassifier(substitutingClassifier); } -void QSubstitution::removeClient(QtMof::QMofPointer<QClassifier> substitutingClassifier) +void QSubstitution::removeClient(QWrappedObjectPointer<QClassifier> substitutingClassifier) { Q_UNUSED(substitutingClassifier); setSubstitutingClassifier(0); diff --git a/src/uml/qsubstitution.h b/src/uml/qsubstitution.h index 614cc2d1..ba7be624 100644 --- a/src/uml/qsubstitution.h +++ b/src/uml/qsubstitution.h @@ -46,7 +46,8 @@ // Base class includes #include <QtUml/QRealization> -#include <QtMof/QMofPointer> +#include <QtWrappedObjects/QWrappedObjectPointer> +using QtWrappedObjects::QWrappedObjectPointer; QT_BEGIN_HEADER @@ -70,7 +71,7 @@ class Q_UML_EXPORT QSubstitution : public QRealization Q_DECLARE_PRIVATE(QSubstitution) public: - Q_INVOKABLE explicit QSubstitution(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QSubstitution(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QSubstitution(); // Association ends from QSubstitution @@ -80,13 +81,13 @@ public: Q_INVOKABLE void setSubstitutingClassifier(QClassifier *substitutingClassifier); // Overriden methods for subsetted properties - Q_INVOKABLE void addSupplier(QtMof::QMofPointer<QClassifier> contract); - Q_INVOKABLE void removeSupplier(QtMof::QMofPointer<QClassifier> contract); - Q_INVOKABLE void addClient(QtMof::QMofPointer<QClassifier> substitutingClassifier); - Q_INVOKABLE void removeClient(QtMof::QMofPointer<QClassifier> substitutingClassifier); + Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QClassifier> contract); + Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QClassifier> contract); + Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> substitutingClassifier); + Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> substitutingClassifier); protected: - explicit QSubstitution(QSubstitutionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QSubstitution(QSubstitutionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateableelement.cpp b/src/uml/qtemplateableelement.cpp index cdee3964..54f4d711 100644 --- a/src/uml/qtemplateableelement.cpp +++ b/src/uml/qtemplateableelement.cpp @@ -67,12 +67,12 @@ QTemplateableElementPrivate::~QTemplateableElementPrivate() \brief A templateable element is an element that can optionally be defined as a template and bound to other templates. */ -QTemplateableElement::QTemplateableElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateableElement::QTemplateableElement(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QTemplateableElementPrivate, parent, wrapper) { } -QTemplateableElement::QTemplateableElement(QTemplateableElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateableElement::QTemplateableElement(QTemplateableElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -105,13 +105,13 @@ void QTemplateableElement::setOwnedTemplateSignature(QTemplateSignature *ownedTe // Adjust opposite property // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->ownedTemplateSignature)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->ownedTemplateSignature)); d->ownedTemplateSignature = ownedTemplateSignature; // Adjust subsetted property(ies) if (ownedTemplateSignature) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedTemplateSignature)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedTemplateSignature)); } // Adjust opposite property @@ -139,7 +139,7 @@ void QTemplateableElement::addTemplateBinding(QTemplateBinding *templateBinding) d->templateBindings->insert(templateBinding); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(templateBinding)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(templateBinding)); // Adjust opposite property templateBinding->setBoundElement(this); @@ -155,7 +155,7 @@ void QTemplateableElement::removeTemplateBinding(QTemplateBinding *templateBindi d->templateBindings->remove(templateBinding); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(templateBinding)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(templateBinding)); // Adjust opposite property templateBinding->setBoundElement(0); diff --git a/src/uml/qtemplateableelement.h b/src/uml/qtemplateableelement.h index bf8397ee..d0de35cd 100644 --- a/src/uml/qtemplateableelement.h +++ b/src/uml/qtemplateableelement.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QTemplateableElement : public QElement Q_DECLARE_PRIVATE(QTemplateableElement) public: - Q_INVOKABLE explicit QTemplateableElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTemplateableElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTemplateableElement(); // Association ends from QTemplateableElement @@ -88,7 +88,7 @@ public: Q_INVOKABLE const QSet<QParameterableElement *> *parameterableElements() const; protected: - explicit QTemplateableElement(QTemplateableElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTemplateableElement(QTemplateableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplatebinding.cpp b/src/uml/qtemplatebinding.cpp index 9122db18..57203318 100644 --- a/src/uml/qtemplatebinding.cpp +++ b/src/uml/qtemplatebinding.cpp @@ -68,12 +68,12 @@ QTemplateBindingPrivate::~QTemplateBindingPrivate() \brief A template binding represents a relationship between a templateable element and a template. A template binding specifies the substitutions of actual parameters for the formal parameters of the template. */ -QTemplateBinding::QTemplateBinding(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateBinding::QTemplateBinding(QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(*new QTemplateBindingPrivate, parent, wrapper) { } -QTemplateBinding::QTemplateBinding(QTemplateBindingPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateBinding::QTemplateBinding(QTemplateBindingPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDirectedRelationship(dd, parent, wrapper) { } @@ -104,13 +104,13 @@ void QTemplateBinding::setSignature(QTemplateSignature *signature) Q_D(QTemplateBinding); if (d->signature != signature) { // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qmofobject_cast<QElement *>(d->signature)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(d->signature)); d->signature = signature; // Adjust subsetted property(ies) if (signature) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qmofobject_cast<QElement *>(signature)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(signature)); } } } @@ -137,14 +137,14 @@ void QTemplateBinding::setBoundElement(QTemplateableElement *boundElement) d->boundElement->removeTemplateBinding(this); // Adjust subsetted property(ies) - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qmofobject_cast<QElement *>(d->boundElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(d->boundElement)); d->boundElement = boundElement; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(boundElement)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(boundElement)); if (boundElement) { - (qmofobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qmofobject_cast<QElement *>(boundElement)); + (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(boundElement)); } // Adjust opposite property @@ -173,7 +173,7 @@ void QTemplateBinding::addParameterSubstitution(QTemplateParameterSubstitution * d->parameterSubstitutions->insert(parameterSubstitution); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(parameterSubstitution)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(parameterSubstitution)); // Adjust opposite property parameterSubstitution->setTemplateBinding(this); @@ -189,7 +189,7 @@ void QTemplateBinding::removeParameterSubstitution(QTemplateParameterSubstitutio d->parameterSubstitutions->remove(parameterSubstitution); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(parameterSubstitution)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(parameterSubstitution)); // Adjust opposite property parameterSubstitution->setTemplateBinding(0); diff --git a/src/uml/qtemplatebinding.h b/src/uml/qtemplatebinding.h index 59879188..cfbf8968 100644 --- a/src/uml/qtemplatebinding.h +++ b/src/uml/qtemplatebinding.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QTemplateBinding : public QDirectedRelationship Q_DECLARE_PRIVATE(QTemplateBinding) public: - Q_INVOKABLE explicit QTemplateBinding(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTemplateBinding(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTemplateBinding(); // Association ends from QTemplateBinding @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeParameterSubstitution(QTemplateParameterSubstitution *parameterSubstitution); protected: - explicit QTemplateBinding(QTemplateBindingPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTemplateBinding(QTemplateBindingPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateparameter.cpp b/src/uml/qtemplateparameter.cpp index 12696764..a175cdda 100644 --- a/src/uml/qtemplateparameter.cpp +++ b/src/uml/qtemplateparameter.cpp @@ -68,12 +68,12 @@ QTemplateParameterPrivate::~QTemplateParameterPrivate() \brief A template parameter exposes a parameterable element as a formal template parameter of a template. */ -QTemplateParameter::QTemplateParameter(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateParameter::QTemplateParameter(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QTemplateParameterPrivate, parent, wrapper) { } -QTemplateParameter::QTemplateParameter(QTemplateParameterPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateParameter::QTemplateParameter(QTemplateParameterPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -153,14 +153,14 @@ void QTemplateParameter::setOwnedParameteredElement(QParameterableElement *owned // Adjust opposite property // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->ownedParameteredElement)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->ownedParameteredElement)); d->ownedParameteredElement = ownedParameteredElement; // Adjust subsetted property(ies) - (qmofobject_cast<QTemplateParameter *>(this))->setParameteredElement(qmofobject_cast<QParameterableElement *>(ownedParameteredElement)); + (qwrappedobject_cast<QTemplateParameter *>(this))->setParameteredElement(qwrappedobject_cast<QParameterableElement *>(ownedParameteredElement)); if (ownedParameteredElement) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedParameteredElement)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedParameteredElement)); } // Adjust opposite property @@ -186,15 +186,15 @@ void QTemplateParameter::setOwnedDefault(QParameterableElement *ownedDefault) Q_D(QTemplateParameter); if (d->ownedDefault != ownedDefault) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->ownedDefault)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->ownedDefault)); d->ownedDefault = ownedDefault; // Adjust subsetted property(ies) if (ownedDefault) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedDefault)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedDefault)); } - (qmofobject_cast<QTemplateParameter *>(this))->setDefault_(qmofobject_cast<QParameterableElement *>(ownedDefault)); + (qwrappedobject_cast<QTemplateParameter *>(this))->setDefault_(qwrappedobject_cast<QParameterableElement *>(ownedDefault)); } } @@ -222,7 +222,7 @@ void QTemplateParameter::setSignature(QTemplateSignature *signature) d->signature = signature; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(signature)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(signature)); // Adjust opposite property if (signature) diff --git a/src/uml/qtemplateparameter.h b/src/uml/qtemplateparameter.h index 11dd545c..d3ff38e2 100644 --- a/src/uml/qtemplateparameter.h +++ b/src/uml/qtemplateparameter.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QTemplateParameter : public QElement Q_DECLARE_PRIVATE(QTemplateParameter) public: - Q_INVOKABLE explicit QTemplateParameter(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTemplateParameter(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTemplateParameter(); // Association ends from QTemplateParameter @@ -88,7 +88,7 @@ public: Q_INVOKABLE void setSignature(QTemplateSignature *signature); protected: - explicit QTemplateParameter(QTemplateParameterPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTemplateParameter(QTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateparametersubstitution.cpp b/src/uml/qtemplateparametersubstitution.cpp index e28183e5..eb93df7a 100644 --- a/src/uml/qtemplateparametersubstitution.cpp +++ b/src/uml/qtemplateparametersubstitution.cpp @@ -68,12 +68,12 @@ QTemplateParameterSubstitutionPrivate::~QTemplateParameterSubstitutionPrivate() \brief A template parameter substitution relates the actual parameter to a formal template parameter as part of a template binding. */ -QTemplateParameterSubstitution::QTemplateParameterSubstitution(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateParameterSubstitution::QTemplateParameterSubstitution(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QTemplateParameterSubstitutionPrivate, parent, wrapper) { } -QTemplateParameterSubstitution::QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateParameterSubstitution::QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -104,15 +104,15 @@ void QTemplateParameterSubstitution::setOwnedActual(QParameterableElement *owned Q_D(QTemplateParameterSubstitution); if (d->ownedActual != ownedActual) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->ownedActual)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->ownedActual)); d->ownedActual = ownedActual; // Adjust subsetted property(ies) if (ownedActual) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedActual)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedActual)); } - (qmofobject_cast<QTemplateParameterSubstitution *>(this))->setActual(qmofobject_cast<QParameterableElement *>(ownedActual)); + (qwrappedobject_cast<QTemplateParameterSubstitution *>(this))->setActual(qwrappedobject_cast<QParameterableElement *>(ownedActual)); } } @@ -182,7 +182,7 @@ void QTemplateParameterSubstitution::setTemplateBinding(QTemplateBinding *templa d->templateBinding = templateBinding; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(templateBinding)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(templateBinding)); // Adjust opposite property if (templateBinding) diff --git a/src/uml/qtemplateparametersubstitution.h b/src/uml/qtemplateparametersubstitution.h index 5b180f74..61cc73da 100644 --- a/src/uml/qtemplateparametersubstitution.h +++ b/src/uml/qtemplateparametersubstitution.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QTemplateParameterSubstitution : public QElement Q_DECLARE_PRIVATE(QTemplateParameterSubstitution) public: - Q_INVOKABLE explicit QTemplateParameterSubstitution(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTemplateParameterSubstitution(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTemplateParameterSubstitution(); // Association ends from QTemplateParameterSubstitution @@ -86,7 +86,7 @@ public: Q_INVOKABLE void setTemplateBinding(QTemplateBinding *templateBinding); protected: - explicit QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplatesignature.cpp b/src/uml/qtemplatesignature.cpp index a6049c1c..e8d04421 100644 --- a/src/uml/qtemplatesignature.cpp +++ b/src/uml/qtemplatesignature.cpp @@ -68,12 +68,12 @@ QTemplateSignaturePrivate::~QTemplateSignaturePrivate() \brief A template signature bundles the set of formal template parameters for a templated element. */ -QTemplateSignature::QTemplateSignature(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateSignature::QTemplateSignature(QWrappedObject *parent, QWrappedObject *wrapper) : QElement(*new QTemplateSignaturePrivate, parent, wrapper) { } -QTemplateSignature::QTemplateSignature(QTemplateSignaturePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTemplateSignature::QTemplateSignature(QTemplateSignaturePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QElement(dd, parent, wrapper) { } @@ -139,7 +139,7 @@ void QTemplateSignature::setTemplate_(QTemplateableElement *template_) d->template_ = template_; // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->setOwner(qmofobject_cast<QElement *>(template_)); + (qwrappedobject_cast<QElementPrivate *>(d))->setOwner(qwrappedobject_cast<QElement *>(template_)); // Adjust opposite property template_->setOwnedTemplateSignature(this); @@ -166,8 +166,8 @@ void QTemplateSignature::addOwnedParameter(QTemplateParameter *ownedParameter) d->ownedParameters->append(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QTemplateSignature *>(this))->addParameter(qmofobject_cast<QTemplateParameter *>(ownedParameter)); - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(ownedParameter)); + (qwrappedobject_cast<QTemplateSignature *>(this))->addParameter(qwrappedobject_cast<QTemplateParameter *>(ownedParameter)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedParameter)); // Adjust opposite property ownedParameter->setSignature(this); @@ -183,8 +183,8 @@ void QTemplateSignature::removeOwnedParameter(QTemplateParameter *ownedParameter d->ownedParameters->removeAll(ownedParameter); // Adjust subsetted property(ies) - (qmofobject_cast<QTemplateSignature *>(this))->removeParameter(qmofobject_cast<QTemplateParameter *>(ownedParameter)); - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(ownedParameter)); + (qwrappedobject_cast<QTemplateSignature *>(this))->removeParameter(qwrappedobject_cast<QTemplateParameter *>(ownedParameter)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedParameter)); // Adjust opposite property ownedParameter->setSignature(0); diff --git a/src/uml/qtemplatesignature.h b/src/uml/qtemplatesignature.h index 67aac191..7f8378e6 100644 --- a/src/uml/qtemplatesignature.h +++ b/src/uml/qtemplatesignature.h @@ -73,7 +73,7 @@ class Q_UML_EXPORT QTemplateSignature : public QElement Q_DECLARE_PRIVATE(QTemplateSignature) public: - Q_INVOKABLE explicit QTemplateSignature(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTemplateSignature(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTemplateSignature(); // Association ends from QTemplateSignature @@ -87,7 +87,7 @@ public: Q_INVOKABLE void removeOwnedParameter(QTemplateParameter *ownedParameter); protected: - explicit QTemplateSignature(QTemplateSignaturePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTemplateSignature(QTemplateSignaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtestidentityaction.cpp b/src/uml/qtestidentityaction.cpp index c13e07e6..1c4336c8 100644 --- a/src/uml/qtestidentityaction.cpp +++ b/src/uml/qtestidentityaction.cpp @@ -66,12 +66,12 @@ QTestIdentityActionPrivate::~QTestIdentityActionPrivate() \brief A test identity action is an action that tests if two values are identical objects. */ -QTestIdentityAction::QTestIdentityAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTestIdentityAction::QTestIdentityAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QTestIdentityActionPrivate, parent, wrapper) { } -QTestIdentityAction::QTestIdentityAction(QTestIdentityActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTestIdentityAction::QTestIdentityAction(QTestIdentityActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -102,13 +102,13 @@ void QTestIdentityAction::setSecond(QInputPin *second) Q_D(QTestIdentityAction); if (d->second != second) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->second)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->second)); d->second = second; // Adjust subsetted property(ies) if (second) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(second)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(second)); } } } @@ -131,13 +131,13 @@ void QTestIdentityAction::setResult(QOutputPin *result) Q_D(QTestIdentityAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } @@ -160,13 +160,13 @@ void QTestIdentityAction::setFirst(QInputPin *first) Q_D(QTestIdentityAction); if (d->first != first) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->first)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->first)); d->first = first; // Adjust subsetted property(ies) if (first) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(first)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(first)); } } } diff --git a/src/uml/qtestidentityaction.h b/src/uml/qtestidentityaction.h index f9d8e305..67f9ebe7 100644 --- a/src/uml/qtestidentityaction.h +++ b/src/uml/qtestidentityaction.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QTestIdentityAction : public QAction Q_DECLARE_PRIVATE(QTestIdentityAction) public: - Q_INVOKABLE explicit QTestIdentityAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTestIdentityAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTestIdentityAction(); // Association ends from QTestIdentityAction @@ -82,7 +82,7 @@ public: Q_INVOKABLE void setFirst(QInputPin *first); protected: - explicit QTestIdentityAction(QTestIdentityActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTestIdentityAction(QTestIdentityActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeconstraint.cpp b/src/uml/qtimeconstraint.cpp index 63c76f14..e6e66e44 100644 --- a/src/uml/qtimeconstraint.cpp +++ b/src/uml/qtimeconstraint.cpp @@ -65,12 +65,12 @@ QTimeConstraintPrivate::~QTimeConstraintPrivate() \brief A time constraint is a constraint that refers to a time interval. */ -QTimeConstraint::QTimeConstraint(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeConstraint::QTimeConstraint(QWrappedObject *parent, QWrappedObject *wrapper) : QIntervalConstraint(*new QTimeConstraintPrivate, parent, wrapper) { } -QTimeConstraint::QTimeConstraint(QTimeConstraintPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeConstraint::QTimeConstraint(QTimeConstraintPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QIntervalConstraint(dd, parent, wrapper) { } diff --git a/src/uml/qtimeconstraint.h b/src/uml/qtimeconstraint.h index 943dae04..d3d59da5 100644 --- a/src/uml/qtimeconstraint.h +++ b/src/uml/qtimeconstraint.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QTimeConstraint : public QIntervalConstraint Q_DECLARE_PRIVATE(QTimeConstraint) public: - Q_INVOKABLE explicit QTimeConstraint(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTimeConstraint(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTimeConstraint(); // Attributes from QTimeConstraint @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setSpecification(QTimeInterval *specification); protected: - explicit QTimeConstraint(QTimeConstraintPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTimeConstraint(QTimeConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeevent.cpp b/src/uml/qtimeevent.cpp index 7c8a24f6..9b25279a 100644 --- a/src/uml/qtimeevent.cpp +++ b/src/uml/qtimeevent.cpp @@ -64,12 +64,12 @@ QTimeEventPrivate::~QTimeEventPrivate() \brief A time event can be defined relative to entering the current state of the executing state machine.A time event specifies a point in time. At the specified time, the event occurs. */ -QTimeEvent::QTimeEvent(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeEvent::QTimeEvent(QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(*new QTimeEventPrivate, parent, wrapper) { } -QTimeEvent::QTimeEvent(QTimeEventPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeEvent::QTimeEvent(QTimeEventPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QEvent(dd, parent, wrapper) { } @@ -125,13 +125,13 @@ void QTimeEvent::setWhen(QTimeExpression *when) Q_D(QTimeEvent); if (d->when != when) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->when)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->when)); d->when = when; // Adjust subsetted property(ies) if (when) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(when)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(when)); } } } diff --git a/src/uml/qtimeevent.h b/src/uml/qtimeevent.h index 4a4d531c..ccc5ebc6 100644 --- a/src/uml/qtimeevent.h +++ b/src/uml/qtimeevent.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QTimeEvent : public QEvent Q_DECLARE_PRIVATE(QTimeEvent) public: - Q_INVOKABLE explicit QTimeEvent(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTimeEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTimeEvent(); // Attributes from QTimeEvent @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setWhen(QTimeExpression *when); protected: - explicit QTimeEvent(QTimeEventPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTimeEvent(QTimeEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeexpression.cpp b/src/uml/qtimeexpression.cpp index 1affaece..7466e590 100644 --- a/src/uml/qtimeexpression.cpp +++ b/src/uml/qtimeexpression.cpp @@ -65,12 +65,12 @@ QTimeExpressionPrivate::~QTimeExpressionPrivate() \brief A time expression defines a value specification that represents a time value. */ -QTimeExpression::QTimeExpression(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeExpression::QTimeExpression(QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(*new QTimeExpressionPrivate, parent, wrapper) { } -QTimeExpression::QTimeExpression(QTimeExpressionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeExpression::QTimeExpression(QTimeExpressionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QValueSpecification(dd, parent, wrapper) { } @@ -132,13 +132,13 @@ void QTimeExpression::setExpr(QValueSpecification *expr) Q_D(QTimeExpression); if (d->expr != expr) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->expr)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->expr)); d->expr = expr; // Adjust subsetted property(ies) if (expr) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(expr)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(expr)); } } } diff --git a/src/uml/qtimeexpression.h b/src/uml/qtimeexpression.h index 6b252b0c..d2b43a6f 100644 --- a/src/uml/qtimeexpression.h +++ b/src/uml/qtimeexpression.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QTimeExpression : public QValueSpecification Q_DECLARE_PRIVATE(QTimeExpression) public: - Q_INVOKABLE explicit QTimeExpression(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTimeExpression(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTimeExpression(); // Association ends from QTimeExpression @@ -82,7 +82,7 @@ public: Q_INVOKABLE void setExpr(QValueSpecification *expr); protected: - explicit QTimeExpression(QTimeExpressionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTimeExpression(QTimeExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeinterval.cpp b/src/uml/qtimeinterval.cpp index cfb3b3c0..dcf95c11 100644 --- a/src/uml/qtimeinterval.cpp +++ b/src/uml/qtimeinterval.cpp @@ -64,12 +64,12 @@ QTimeIntervalPrivate::~QTimeIntervalPrivate() \brief A time interval defines the range between two time expressions. */ -QTimeInterval::QTimeInterval(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeInterval::QTimeInterval(QWrappedObject *parent, QWrappedObject *wrapper) : QInterval(*new QTimeIntervalPrivate, parent, wrapper) { } -QTimeInterval::QTimeInterval(QTimeIntervalPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeInterval::QTimeInterval(QTimeIntervalPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInterval(dd, parent, wrapper) { } diff --git a/src/uml/qtimeinterval.h b/src/uml/qtimeinterval.h index 9f2cd12f..abf01097 100644 --- a/src/uml/qtimeinterval.h +++ b/src/uml/qtimeinterval.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QTimeInterval : public QInterval Q_DECLARE_PRIVATE(QTimeInterval) public: - Q_INVOKABLE explicit QTimeInterval(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTimeInterval(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTimeInterval(); // Association ends from QTimeInterval @@ -78,7 +78,7 @@ public: Q_INVOKABLE void setMin(QTimeExpression *min); protected: - explicit QTimeInterval(QTimeIntervalPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTimeInterval(QTimeIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeobservation.cpp b/src/uml/qtimeobservation.cpp index 5468894a..0bbf020c 100644 --- a/src/uml/qtimeobservation.cpp +++ b/src/uml/qtimeobservation.cpp @@ -64,12 +64,12 @@ QTimeObservationPrivate::~QTimeObservationPrivate() \brief A time observation is a reference to a time instant during an execution. It points out the element in the model to observe and whether the observation is when this model element is entered or when it is exited. */ -QTimeObservation::QTimeObservation(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeObservation::QTimeObservation(QWrappedObject *parent, QWrappedObject *wrapper) : QObservation(*new QTimeObservationPrivate, parent, wrapper) { } -QTimeObservation::QTimeObservation(QTimeObservationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTimeObservation::QTimeObservation(QTimeObservationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QObservation(dd, parent, wrapper) { } diff --git a/src/uml/qtimeobservation.h b/src/uml/qtimeobservation.h index 8199faec..5df66d71 100644 --- a/src/uml/qtimeobservation.h +++ b/src/uml/qtimeobservation.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QTimeObservation : public QObservation Q_DECLARE_PRIVATE(QTimeObservation) public: - Q_INVOKABLE explicit QTimeObservation(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTimeObservation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTimeObservation(); // Attributes from QTimeObservation @@ -80,7 +80,7 @@ public: Q_INVOKABLE void setEvent(QNamedElement *event); protected: - explicit QTimeObservation(QTimeObservationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTimeObservation(QTimeObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtransition.cpp b/src/uml/qtransition.cpp index 84748324..730d4816 100644 --- a/src/uml/qtransition.cpp +++ b/src/uml/qtransition.cpp @@ -79,15 +79,15 @@ QTransitionPrivate::~QTransitionPrivate() \brief A transition is a directed relationship between a source vertex and a target vertex. It may be part of a compound transition, which takes the state machine from one state configuration to another, representing the complete response of the state machine to an occurrence of an event of a particular type. */ -QTransition::QTransition(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QTransitionPrivate, parent, wrapper), +QTransition::QTransition(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QTransitionPrivate, parent, wrapper), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) { } -QTransition::QTransition(QTransitionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QTransition::QTransition(QTransitionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedRedefinableElement(new QRedefinableElement(this, this)), _wrappedNamespace(new QNamespace(this, this)) { @@ -106,7 +106,7 @@ QTransition::~QTransition() */ const QSet<QElement *> *QTransition::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -114,7 +114,7 @@ const QSet<QElement *> *QTransition::ownedElements() const */ QElement *QTransition::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -122,17 +122,17 @@ QElement *QTransition::owner() const */ const QSet<QComment *> *QTransition::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QTransition::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QTransition::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -144,12 +144,12 @@ void QTransition::removeOwnedComment(QComment *ownedComment) */ QString QTransition::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QTransition::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -157,12 +157,12 @@ void QTransition::setName(QString name) */ QtUml::VisibilityKind QTransition::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QTransition::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -170,7 +170,7 @@ void QTransition::setVisibility(QtUml::VisibilityKind visibility) */ QString QTransition::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -182,12 +182,12 @@ QString QTransition::qualifiedName() const */ QStringExpression *QTransition::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QTransition::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -195,7 +195,7 @@ void QTransition::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QTransition::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -203,17 +203,17 @@ QNamespace *QTransition::namespace_() const */ const QSet<QDependency *> *QTransition::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QTransition::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QTransition::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -225,12 +225,12 @@ void QTransition::removeClientDependency(QDependency *clientDependency) */ bool QTransition::isLeaf() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->isLeaf(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->isLeaf(); } void QTransition::setLeaf(bool isLeaf) { - (qmofobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); + (qwrappedobject_cast<QRedefinableElement *>(this))->setLeaf(isLeaf); } // --------------------------------------------------------------- @@ -242,7 +242,7 @@ void QTransition::setLeaf(bool isLeaf) */ const QSet<QRedefinableElement *> *QTransition::redefinedElements() const { - return (qmofobject_cast<const QRedefinableElement *>(this))->redefinedElements(); + return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } // --------------------------------------------------------------- @@ -254,17 +254,17 @@ const QSet<QRedefinableElement *> *QTransition::redefinedElements() const */ const QSet<QPackageImport *> *QTransition::packageImports() const { - return (qmofobject_cast<const QNamespace *>(this))->packageImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } void QTransition::addPackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->addPackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(packageImport); } void QTransition::removePackageImport(QPackageImport *packageImport) { - (qmofobject_cast<QNamespace *>(this))->removePackageImport(packageImport); + (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(packageImport); } /*! @@ -272,7 +272,7 @@ void QTransition::removePackageImport(QPackageImport *packageImport) */ const QSet<QNamedElement *> *QTransition::members() const { - return (qmofobject_cast<const QNamespace *>(this))->members(); + return (qwrappedobject_cast<const QNamespace *>(this))->members(); } /*! @@ -280,7 +280,7 @@ const QSet<QNamedElement *> *QTransition::members() const */ const QSet<QPackageableElement *> *QTransition::importedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->importedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } /*! @@ -288,17 +288,17 @@ const QSet<QPackageableElement *> *QTransition::importedMembers() const */ const QSet<QElementImport *> *QTransition::elementImports() const { - return (qmofobject_cast<const QNamespace *>(this))->elementImports(); + return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } void QTransition::addElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->addElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->addElementImport(elementImport); } void QTransition::removeElementImport(QElementImport *elementImport) { - (qmofobject_cast<QNamespace *>(this))->removeElementImport(elementImport); + (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(elementImport); } /*! @@ -306,17 +306,17 @@ void QTransition::removeElementImport(QElementImport *elementImport) */ const QSet<QConstraint *> *QTransition::ownedRules() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedRules(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } void QTransition::addOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(ownedRule); } void QTransition::removeOwnedRule(QConstraint *ownedRule) { - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(ownedRule); } /*! @@ -324,7 +324,7 @@ void QTransition::removeOwnedRule(QConstraint *ownedRule) */ const QSet<QNamedElement *> *QTransition::ownedMembers() const { - return (qmofobject_cast<const QNamespace *>(this))->ownedMembers(); + return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } // --------------------------------------------------------------- @@ -374,13 +374,13 @@ void QTransition::setGuard(QConstraint *guard) Q_D(QTransition); if (d->guard != guard) { // Adjust subsetted property(ies) - (qmofobject_cast<QNamespace *>(this))->removeOwnedRule(qmofobject_cast<QConstraint *>(d->guard)); + (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(d->guard)); d->guard = guard; // Adjust subsetted property(ies) if (guard) { - (qmofobject_cast<QNamespace *>(this))->addOwnedRule(qmofobject_cast<QConstraint *>(guard)); + (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(guard)); } } } @@ -404,13 +404,13 @@ void QTransition::setTarget(QVertex *target) if (d->target != target) { // Adjust opposite property if (d->target) - (qmofobject_cast<QVertexPrivate *>(d->target->d_func()))->removeIncoming(this); + (qwrappedobject_cast<QVertexPrivate *>(d->target->d_func()))->removeIncoming(this); d->target = target; // Adjust opposite property if (target) - (qmofobject_cast<QVertexPrivate *>(target->d_func()))->addIncoming(this); + (qwrappedobject_cast<QVertexPrivate *>(target->d_func()))->addIncoming(this); } } @@ -432,13 +432,13 @@ void QTransition::setEffect(QBehavior *effect) Q_D(QTransition); if (d->effect != effect) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->effect)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->effect)); d->effect = effect; // Adjust subsetted property(ies) if (effect) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(effect)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(effect)); } } } @@ -467,7 +467,7 @@ void QTransition::setContainer(QRegion *container) d->container = container; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(container)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(container)); // Adjust opposite property if (container) @@ -505,13 +505,13 @@ void QTransition::setRedefinedTransition(QTransition *redefinedTransition) Q_D(QTransition); if (d->redefinedTransition != redefinedTransition) { // Adjust subsetted property(ies) - (qmofobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qmofobject_cast<QRedefinableElement *>(d->redefinedTransition)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(d->redefinedTransition)); d->redefinedTransition = redefinedTransition; // Adjust subsetted property(ies) if (redefinedTransition) { - (qmofobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qmofobject_cast<QRedefinableElement *>(redefinedTransition)); + (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedTransition)); } } } @@ -535,13 +535,13 @@ void QTransition::setSource(QVertex *source) if (d->source != source) { // Adjust opposite property if (d->source) - (qmofobject_cast<QVertexPrivate *>(d->source->d_func()))->removeOutgoing(this); + (qwrappedobject_cast<QVertexPrivate *>(d->source->d_func()))->removeOutgoing(this); d->source = source; // Adjust opposite property if (source) - (qmofobject_cast<QVertexPrivate *>(source->d_func()))->addOutgoing(this); + (qwrappedobject_cast<QVertexPrivate *>(source->d_func()))->addOutgoing(this); } } @@ -565,7 +565,7 @@ void QTransition::addTrigger(QTrigger *trigger) d->triggers->insert(trigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(trigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(trigger)); } } @@ -578,7 +578,7 @@ void QTransition::removeTrigger(QTrigger *trigger) d->triggers->remove(trigger); // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(trigger)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(trigger)); } } diff --git a/src/uml/qtransition.h b/src/uml/qtransition.h index 2f15f723..c1a75349 100644 --- a/src/uml/qtransition.h +++ b/src/uml/qtransition.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QRedefinableElement> #include <QtUml/QNamespace> @@ -71,7 +72,7 @@ class QBehavior; class QTransitionPrivate; -class Q_UML_EXPORT QTransition : public QtMof::QMofObject +class Q_UML_EXPORT QTransition : public QWrappedObject { Q_OBJECT @@ -89,7 +90,7 @@ class Q_UML_EXPORT QTransition : public QtMof::QMofObject Q_DECLARE_PRIVATE(QTransition) public: - Q_INVOKABLE explicit QTransition(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTransition(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTransition(); // Association ends from aggregated QElement @@ -162,7 +163,7 @@ public: Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; protected: - explicit QTransition(QTransitionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTransition(QTransitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QRedefinableElement *_wrappedRedefinableElement; diff --git a/src/uml/qtransition_p.h b/src/uml/qtransition_p.h index 45c4b0e4..96befeb9 100644 --- a/src/uml/qtransition_p.h +++ b/src/uml/qtransition_p.h @@ -42,7 +42,8 @@ #define QTUML_QTRANSITION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qredefinableelement_p.h" #include "private/qnamespace_p.h" @@ -70,7 +71,7 @@ class QRegion; class QConstraint; class QBehavior; -class Q_UML_EXPORT QTransitionPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QTransitionPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QTransition) diff --git a/src/uml/qtrigger.cpp b/src/uml/qtrigger.cpp index e64d86dc..eed9ae1c 100644 --- a/src/uml/qtrigger.cpp +++ b/src/uml/qtrigger.cpp @@ -66,12 +66,12 @@ QTriggerPrivate::~QTriggerPrivate() \brief A trigger specification may be qualified by the port on which the event occurred.A trigger relates an event to a behavior that may affect an instance of the classifier. */ -QTrigger::QTrigger(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTrigger::QTrigger(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QTriggerPrivate, parent, wrapper) { } -QTrigger::QTrigger(QTriggerPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTrigger::QTrigger(QTriggerPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qtrigger.h b/src/uml/qtrigger.h index 17466127..dcdacd9c 100644 --- a/src/uml/qtrigger.h +++ b/src/uml/qtrigger.h @@ -72,7 +72,7 @@ class Q_UML_EXPORT QTrigger : public QNamedElement Q_DECLARE_PRIVATE(QTrigger) public: - Q_INVOKABLE explicit QTrigger(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTrigger(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTrigger(); // Association ends from QTrigger @@ -83,7 +83,7 @@ public: Q_INVOKABLE void setEvent(QEvent *event); protected: - explicit QTrigger(QTriggerPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTrigger(QTriggerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtype.cpp b/src/uml/qtype.cpp index 60600094..4f593b51 100644 --- a/src/uml/qtype.cpp +++ b/src/uml/qtype.cpp @@ -63,12 +63,12 @@ QTypePrivate::~QTypePrivate() \brief A type is a named element that is used as the type for a typed element. A type can be contained in a package.A type constrains the values represented by a typed element. */ -QType::QType(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QType::QType(QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(*new QTypePrivate, parent, wrapper) { } -QType::QType(QTypePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QType::QType(QTypePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QPackageableElement(dd, parent, wrapper) { } @@ -105,7 +105,7 @@ void QType::setPackage(QPackage *package) d->package = package; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(package)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(package)); // Adjust opposite property if (package) diff --git a/src/uml/qtype.h b/src/uml/qtype.h index af7f340a..c95cd37b 100644 --- a/src/uml/qtype.h +++ b/src/uml/qtype.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QType : public QPackageableElement Q_DECLARE_PRIVATE(QType) public: - Q_INVOKABLE explicit QType(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QType(); // Association ends from QType @@ -78,7 +78,7 @@ public: Q_INVOKABLE bool conformsTo(const QType *other) const; protected: - explicit QType(QTypePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QType(QTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtypedelement.cpp b/src/uml/qtypedelement.cpp index e00da88c..a344aa15 100644 --- a/src/uml/qtypedelement.cpp +++ b/src/uml/qtypedelement.cpp @@ -63,12 +63,12 @@ QTypedElementPrivate::~QTypedElementPrivate() \brief A typed element is a kind of named element that represents an element with a type.A typed element has a type. */ -QTypedElement::QTypedElement(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTypedElement::QTypedElement(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QTypedElementPrivate, parent, wrapper) { } -QTypedElement::QTypedElement(QTypedElementPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QTypedElement::QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } diff --git a/src/uml/qtypedelement.h b/src/uml/qtypedelement.h index a0870d30..63d996ee 100644 --- a/src/uml/qtypedelement.h +++ b/src/uml/qtypedelement.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QTypedElement : public QNamedElement Q_DECLARE_PRIVATE(QTypedElement) public: - Q_INVOKABLE explicit QTypedElement(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QTypedElement(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QTypedElement(); // Association ends from QTypedElement @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setType(QType *type); protected: - explicit QTypedElement(QTypedElementPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qunmarshallaction.cpp b/src/uml/qunmarshallaction.cpp index cc562698..6b694253 100644 --- a/src/uml/qunmarshallaction.cpp +++ b/src/uml/qunmarshallaction.cpp @@ -68,12 +68,12 @@ QUnmarshallActionPrivate::~QUnmarshallActionPrivate() \brief An unmarshall action is an action that breaks an object of a known type into outputs each of which is equal to a value from a structural feature of the object. */ -QUnmarshallAction::QUnmarshallAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUnmarshallAction::QUnmarshallAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QUnmarshallActionPrivate, parent, wrapper) { } -QUnmarshallAction::QUnmarshallAction(QUnmarshallActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUnmarshallAction::QUnmarshallAction(QUnmarshallActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -104,13 +104,13 @@ void QUnmarshallAction::setObject(QInputPin *object) Q_D(QUnmarshallAction); if (d->object != object) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->object)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->object)); d->object = object; // Adjust subsetted property(ies) if (object) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(object)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(object)); } } } @@ -135,7 +135,7 @@ void QUnmarshallAction::addResult(QOutputPin *result) d->results->insert(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } @@ -148,7 +148,7 @@ void QUnmarshallAction::removeResult(QOutputPin *result) d->results->remove(result); // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); } } diff --git a/src/uml/qunmarshallaction.h b/src/uml/qunmarshallaction.h index eb58c2de..9db98d69 100644 --- a/src/uml/qunmarshallaction.h +++ b/src/uml/qunmarshallaction.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QUnmarshallAction : public QAction Q_DECLARE_PRIVATE(QUnmarshallAction) public: - Q_INVOKABLE explicit QUnmarshallAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QUnmarshallAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QUnmarshallAction(); // Association ends from QUnmarshallAction @@ -87,7 +87,7 @@ public: Q_INVOKABLE void setUnmarshallType(QClassifier *unmarshallType); protected: - explicit QUnmarshallAction(QUnmarshallActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QUnmarshallAction(QUnmarshallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qusage.cpp b/src/uml/qusage.cpp index 7e96ffc9..b3e2c25d 100644 --- a/src/uml/qusage.cpp +++ b/src/uml/qusage.cpp @@ -60,12 +60,12 @@ QUsagePrivate::~QUsagePrivate() \brief A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. A usage is a dependency in which the client requires the presence of the supplier. */ -QUsage::QUsage(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUsage::QUsage(QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(*new QUsagePrivate, parent, wrapper) { } -QUsage::QUsage(QUsagePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUsage::QUsage(QUsagePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QDependency(dd, parent, wrapper) { } diff --git a/src/uml/qusage.h b/src/uml/qusage.h index eff87fd9..e9dcee65 100644 --- a/src/uml/qusage.h +++ b/src/uml/qusage.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QUsage : public QDependency Q_DECLARE_PRIVATE(QUsage) public: - Q_INVOKABLE explicit QUsage(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QUsage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QUsage(); protected: - explicit QUsage(QUsagePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QUsage(QUsagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qusecase.cpp b/src/uml/qusecase.cpp index 591800cb..5d0d9263 100644 --- a/src/uml/qusecase.cpp +++ b/src/uml/qusecase.cpp @@ -73,12 +73,12 @@ QUseCasePrivate::~QUseCasePrivate() \brief A use case is the specification of a set of actions performed by a system, which yields an observable result that is, typically, of value for one or more actors or other stakeholders of the system. */ -QUseCase::QUseCase(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUseCase::QUseCase(QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioredClassifier(*new QUseCasePrivate, parent, wrapper) { } -QUseCase::QUseCase(QUseCasePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QUseCase::QUseCase(QUseCasePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QBehavioredClassifier(dd, parent, wrapper) { } @@ -111,7 +111,7 @@ void QUseCase::addExtensionPoint(QExtensionPoint *extensionPoint) d->extensionPoints->insert(extensionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(extensionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(extensionPoint)); // Adjust opposite property extensionPoint->setUseCase(this); @@ -127,7 +127,7 @@ void QUseCase::removeExtensionPoint(QExtensionPoint *extensionPoint) d->extensionPoints->remove(extensionPoint); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(extensionPoint)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(extensionPoint)); // Adjust opposite property extensionPoint->setUseCase(0); @@ -154,7 +154,7 @@ void QUseCase::addInclude(QInclude *include) d->includes->insert(include); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(include)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(include)); // Adjust opposite property include->setIncludingCase(this); @@ -170,7 +170,7 @@ void QUseCase::removeInclude(QInclude *include) d->includes->remove(include); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(include)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(include)); // Adjust opposite property include->setIncludingCase(0); @@ -235,7 +235,7 @@ void QUseCase::addExtend(QExtend *extend) d->extends->insert(extend); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qmofobject_cast<QNamedElement *>(extend)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(extend)); // Adjust opposite property extend->setExtension(this); @@ -251,7 +251,7 @@ void QUseCase::removeExtend(QExtend *extend) d->extends->remove(extend); // Adjust subsetted property(ies) - (qmofobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qmofobject_cast<QNamedElement *>(extend)); + (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(extend)); // Adjust opposite property extend->setExtension(0); diff --git a/src/uml/qusecase.h b/src/uml/qusecase.h index 35ab49d2..e1dc1110 100644 --- a/src/uml/qusecase.h +++ b/src/uml/qusecase.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QUseCase : public QBehavioredClassifier Q_DECLARE_PRIVATE(QUseCase) public: - Q_INVOKABLE explicit QUseCase(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QUseCase(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QUseCase(); // Association ends from QUseCase @@ -97,7 +97,7 @@ public: Q_INVOKABLE const QSet<QUseCase *> *allIncludedUseCases() const; protected: - explicit QUseCase(QUseCasePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QUseCase(QUseCasePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluepin.cpp b/src/uml/qvaluepin.cpp index 1d17eb94..5eed6d8a 100644 --- a/src/uml/qvaluepin.cpp +++ b/src/uml/qvaluepin.cpp @@ -63,12 +63,12 @@ QValuePinPrivate::~QValuePinPrivate() \brief A value pin is an input pin that provides a value by evaluating a value specification. */ -QValuePin::QValuePin(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QValuePin::QValuePin(QWrappedObject *parent, QWrappedObject *wrapper) : QInputPin(*new QValuePinPrivate, parent, wrapper) { } -QValuePin::QValuePin(QValuePinPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QValuePin::QValuePin(QValuePinPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QInputPin(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QValuePin::setValue(QValueSpecification *value) Q_D(QValuePin); if (d->value != value) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->value)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->value)); d->value = value; // Adjust subsetted property(ies) if (value) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); } } } diff --git a/src/uml/qvaluepin.h b/src/uml/qvaluepin.h index 3a11eaa1..e3fb73b5 100644 --- a/src/uml/qvaluepin.h +++ b/src/uml/qvaluepin.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QValuePin : public QInputPin Q_DECLARE_PRIVATE(QValuePin) public: - Q_INVOKABLE explicit QValuePin(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QValuePin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QValuePin(); // Association ends from QValuePin @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setValue(QValueSpecification *value); protected: - explicit QValuePin(QValuePinPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QValuePin(QValuePinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluespecification.cpp b/src/uml/qvaluespecification.cpp index bd11940d..a37d5371 100644 --- a/src/uml/qvaluespecification.cpp +++ b/src/uml/qvaluespecification.cpp @@ -62,15 +62,15 @@ QValueSpecificationPrivate::~QValueSpecificationPrivate() \brief ValueSpecification specializes ParameterableElement to specify that a value specification can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.A value specification is the specification of a (possibly empty) set of instances, including both objects and data values. */ -QValueSpecification::QValueSpecification(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QValueSpecificationPrivate, parent, wrapper), +QValueSpecification::QValueSpecification(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QValueSpecificationPrivate, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { } -QValueSpecification::QValueSpecification(QValueSpecificationPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QValueSpecification::QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedTypedElement(new QTypedElement(this, this)), _wrappedPackageableElement(new QPackageableElement(this, this)) { @@ -89,7 +89,7 @@ QValueSpecification::~QValueSpecification() */ const QSet<QElement *> *QValueSpecification::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -97,7 +97,7 @@ const QSet<QElement *> *QValueSpecification::ownedElements() const */ QElement *QValueSpecification::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -105,17 +105,17 @@ QElement *QValueSpecification::owner() const */ const QSet<QComment *> *QValueSpecification::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QValueSpecification::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QValueSpecification::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -127,12 +127,12 @@ void QValueSpecification::removeOwnedComment(QComment *ownedComment) */ QString QValueSpecification::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QValueSpecification::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -140,7 +140,7 @@ void QValueSpecification::setName(QString name) */ QString QValueSpecification::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -152,12 +152,12 @@ QString QValueSpecification::qualifiedName() const */ QStringExpression *QValueSpecification::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QValueSpecification::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -165,7 +165,7 @@ void QValueSpecification::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QValueSpecification::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -173,17 +173,17 @@ QNamespace *QValueSpecification::namespace_() const */ const QSet<QDependency *> *QValueSpecification::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QValueSpecification::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QValueSpecification::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -195,12 +195,12 @@ void QValueSpecification::removeClientDependency(QDependency *clientDependency) */ QType *QValueSpecification::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QValueSpecification::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -212,12 +212,12 @@ void QValueSpecification::setType(QType *type) */ QTemplateParameter *QValueSpecification::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QValueSpecification::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } /*! @@ -225,12 +225,12 @@ void QValueSpecification::setOwningTemplateParameter(QTemplateParameter *owningT */ QTemplateParameter *QValueSpecification::templateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->templateParameter(); } void QValueSpecification::setTemplateParameter(QTemplateParameter *templateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -242,12 +242,12 @@ void QValueSpecification::setTemplateParameter(QTemplateParameter *templateParam */ QtUml::VisibilityKind QValueSpecification::visibility() const { - return (qmofobject_cast<const QPackageableElement *>(this))->visibility(); + return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } void QValueSpecification::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QPackageableElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } /*! diff --git a/src/uml/qvaluespecification.h b/src/uml/qvaluespecification.h index 14fb47ba..2734a1ac 100644 --- a/src/uml/qvaluespecification.h +++ b/src/uml/qvaluespecification.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QTypedElement> #include <QtUml/QPackageableElement> @@ -62,7 +63,7 @@ class QParameterableElement; class QValueSpecificationPrivate; -class Q_UML_EXPORT QValueSpecification : public QtMof::QMofObject +class Q_UML_EXPORT QValueSpecification : public QWrappedObject { Q_OBJECT @@ -70,7 +71,7 @@ class Q_UML_EXPORT QValueSpecification : public QtMof::QMofObject Q_DECLARE_PRIVATE(QValueSpecification) public: - Q_INVOKABLE explicit QValueSpecification(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QValueSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QValueSpecification(); // Association ends from aggregated QElement @@ -118,7 +119,7 @@ public: Q_INVOKABLE qint32 unlimitedValue() const; protected: - explicit QValueSpecification(QValueSpecificationPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QTypedElement *_wrappedTypedElement; diff --git a/src/uml/qvaluespecification_p.h b/src/uml/qvaluespecification_p.h index afcbe723..977395c2 100644 --- a/src/uml/qvaluespecification_p.h +++ b/src/uml/qvaluespecification_p.h @@ -42,7 +42,8 @@ #define QTUML_QVALUESPECIFICATION_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qtypedelement_p.h" #include "private/qpackageableelement_p.h" @@ -60,7 +61,7 @@ QT_MODULE(QtUml) // Forward decls for function parameters class QParameterableElement; -class Q_UML_EXPORT QValueSpecificationPrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QValueSpecificationPrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QValueSpecification) diff --git a/src/uml/qvaluespecificationaction.cpp b/src/uml/qvaluespecificationaction.cpp index bfdeaa39..bfffd36a 100644 --- a/src/uml/qvaluespecificationaction.cpp +++ b/src/uml/qvaluespecificationaction.cpp @@ -65,12 +65,12 @@ QValueSpecificationActionPrivate::~QValueSpecificationActionPrivate() \brief A value specification action is an action that evaluates a value specification. */ -QValueSpecificationAction::QValueSpecificationAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QValueSpecificationAction::QValueSpecificationAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QValueSpecificationActionPrivate, parent, wrapper) { } -QValueSpecificationAction::QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QValueSpecificationAction::QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QValueSpecificationAction::setValue(QValueSpecification *value) Q_D(QValueSpecificationAction); if (d->value != value) { // Adjust subsetted property(ies) - (qmofobject_cast<QElementPrivate *>(d))->removeOwnedElement(qmofobject_cast<QElement *>(d->value)); + (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(d->value)); d->value = value; // Adjust subsetted property(ies) if (value) { - (qmofobject_cast<QElementPrivate *>(d))->addOwnedElement(qmofobject_cast<QElement *>(value)); + (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); } } } @@ -130,13 +130,13 @@ void QValueSpecificationAction::setResult(QOutputPin *result) Q_D(QValueSpecificationAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } diff --git a/src/uml/qvaluespecificationaction.h b/src/uml/qvaluespecificationaction.h index 57e8656c..c82893a6 100644 --- a/src/uml/qvaluespecificationaction.h +++ b/src/uml/qvaluespecificationaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QValueSpecificationAction : public QAction Q_DECLARE_PRIVATE(QValueSpecificationAction) public: - Q_INVOKABLE explicit QValueSpecificationAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QValueSpecificationAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QValueSpecificationAction(); // Association ends from QValueSpecificationAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); protected: - explicit QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvariable.cpp b/src/uml/qvariable.cpp index 71c39782..be107b25 100644 --- a/src/uml/qvariable.cpp +++ b/src/uml/qvariable.cpp @@ -66,15 +66,15 @@ QVariablePrivate::~QVariablePrivate() \brief A variable is considered a connectable element.Variables are elements for passing data between actions indirectly. A local variable stores values shared by the actions within a structured activity group but not accessible outside it. The output of an action may be written to a variable and read for the input to a subsequent action, which is effectively an indirect data flow path. Because there is no predefined relationship between actions that read and write variables, these actions must be sequenced by control flows to prevent race conditions that may occur between actions that read or write the same variable. */ -QVariable::QVariable(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(*new QVariablePrivate, parent, wrapper), +QVariable::QVariable(QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(*new QVariablePrivate, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)) { } -QVariable::QVariable(QVariablePrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : - QtMof::QMofObject(dd, parent, wrapper), +QVariable::QVariable(QVariablePrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QWrappedObject(dd, parent, wrapper), _wrappedMultiplicityElement(new QMultiplicityElement(this, this)), _wrappedConnectableElement(new QConnectableElement(this, this)) { @@ -93,7 +93,7 @@ QVariable::~QVariable() */ const QSet<QElement *> *QVariable::ownedElements() const { - return (qmofobject_cast<const QElement *>(this))->ownedElements(); + return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } /*! @@ -101,7 +101,7 @@ const QSet<QElement *> *QVariable::ownedElements() const */ QElement *QVariable::owner() const { - return (qmofobject_cast<const QElement *>(this))->owner(); + return (qwrappedobject_cast<const QElement *>(this))->owner(); } /*! @@ -109,17 +109,17 @@ QElement *QVariable::owner() const */ const QSet<QComment *> *QVariable::ownedComments() const { - return (qmofobject_cast<const QElement *>(this))->ownedComments(); + return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } void QVariable::addOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->addOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->addOwnedComment(ownedComment); } void QVariable::removeOwnedComment(QComment *ownedComment) { - (qmofobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); + (qwrappedobject_cast<QElement *>(this))->removeOwnedComment(ownedComment); } // --------------------------------------------------------------- @@ -131,12 +131,12 @@ void QVariable::removeOwnedComment(QComment *ownedComment) */ qint32 QVariable::upper() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upper(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upper(); } void QVariable::setUpper(qint32 upper) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpper(upper); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpper(upper); } /*! @@ -144,12 +144,12 @@ void QVariable::setUpper(qint32 upper) */ bool QVariable::isUnique() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isUnique(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isUnique(); } void QVariable::setUnique(bool isUnique) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUnique(isUnique); } /*! @@ -157,12 +157,12 @@ void QVariable::setUnique(bool isUnique) */ bool QVariable::isOrdered() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->isOrdered(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->isOrdered(); } void QVariable::setOrdered(bool isOrdered) { - (qmofobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setOrdered(isOrdered); } /*! @@ -170,12 +170,12 @@ void QVariable::setOrdered(bool isOrdered) */ qint32 QVariable::lower() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lower(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lower(); } void QVariable::setLower(qint32 lower) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLower(lower); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLower(lower); } // --------------------------------------------------------------- @@ -187,12 +187,12 @@ void QVariable::setLower(qint32 lower) */ QValueSpecification *QVariable::upperValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->upperValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->upperValue(); } void QVariable::setUpperValue(QValueSpecification *upperValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setUpperValue(upperValue); } /*! @@ -200,12 +200,12 @@ void QVariable::setUpperValue(QValueSpecification *upperValue) */ QValueSpecification *QVariable::lowerValue() const { - return (qmofobject_cast<const QMultiplicityElement *>(this))->lowerValue(); + return (qwrappedobject_cast<const QMultiplicityElement *>(this))->lowerValue(); } void QVariable::setLowerValue(QValueSpecification *lowerValue) { - (qmofobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); + (qwrappedobject_cast<QMultiplicityElement *>(this))->setLowerValue(lowerValue); } // --------------------------------------------------------------- @@ -217,12 +217,12 @@ void QVariable::setLowerValue(QValueSpecification *lowerValue) */ QString QVariable::name() const { - return (qmofobject_cast<const QNamedElement *>(this))->name(); + return (qwrappedobject_cast<const QNamedElement *>(this))->name(); } void QVariable::setName(QString name) { - (qmofobject_cast<QNamedElement *>(this))->setName(name); + (qwrappedobject_cast<QNamedElement *>(this))->setName(name); } /*! @@ -230,12 +230,12 @@ void QVariable::setName(QString name) */ QtUml::VisibilityKind QVariable::visibility() const { - return (qmofobject_cast<const QNamedElement *>(this))->visibility(); + return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } void QVariable::setVisibility(QtUml::VisibilityKind visibility) { - (qmofobject_cast<QNamedElement *>(this))->setVisibility(visibility); + (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } /*! @@ -243,7 +243,7 @@ void QVariable::setVisibility(QtUml::VisibilityKind visibility) */ QString QVariable::qualifiedName() const { - return (qmofobject_cast<const QNamedElement *>(this))->qualifiedName(); + return (qwrappedobject_cast<const QNamedElement *>(this))->qualifiedName(); } // --------------------------------------------------------------- @@ -255,12 +255,12 @@ QString QVariable::qualifiedName() const */ QStringExpression *QVariable::nameExpression() const { - return (qmofobject_cast<const QNamedElement *>(this))->nameExpression(); + return (qwrappedobject_cast<const QNamedElement *>(this))->nameExpression(); } void QVariable::setNameExpression(QStringExpression *nameExpression) { - (qmofobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); + (qwrappedobject_cast<QNamedElement *>(this))->setNameExpression(nameExpression); } /*! @@ -268,7 +268,7 @@ void QVariable::setNameExpression(QStringExpression *nameExpression) */ QNamespace *QVariable::namespace_() const { - return (qmofobject_cast<const QNamedElement *>(this))->namespace_(); + return (qwrappedobject_cast<const QNamedElement *>(this))->namespace_(); } /*! @@ -276,17 +276,17 @@ QNamespace *QVariable::namespace_() const */ const QSet<QDependency *> *QVariable::clientDependencies() const { - return (qmofobject_cast<const QNamedElement *>(this))->clientDependencies(); + return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } void QVariable::addClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->addClientDependency(clientDependency); } void QVariable::removeClientDependency(QDependency *clientDependency) { - (qmofobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); + (qwrappedobject_cast<QNamedElement *>(this))->removeClientDependency(clientDependency); } // --------------------------------------------------------------- @@ -298,12 +298,12 @@ void QVariable::removeClientDependency(QDependency *clientDependency) */ QType *QVariable::type() const { - return (qmofobject_cast<const QTypedElement *>(this))->type(); + return (qwrappedobject_cast<const QTypedElement *>(this))->type(); } void QVariable::setType(QType *type) { - (qmofobject_cast<QTypedElement *>(this))->setType(type); + (qwrappedobject_cast<QTypedElement *>(this))->setType(type); } // --------------------------------------------------------------- @@ -315,12 +315,12 @@ void QVariable::setType(QType *type) */ QTemplateParameter *QVariable::owningTemplateParameter() const { - return (qmofobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); + return (qwrappedobject_cast<const QParameterableElement *>(this))->owningTemplateParameter(); } void QVariable::setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter) { - (qmofobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); + (qwrappedobject_cast<QParameterableElement *>(this))->setOwningTemplateParameter(owningTemplateParameter); } // --------------------------------------------------------------- @@ -332,7 +332,7 @@ void QVariable::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar */ const QList<QConnectorEnd *> *QVariable::ends() const { - return (qmofobject_cast<const QConnectableElement *>(this))->ends(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } /*! @@ -340,12 +340,12 @@ const QList<QConnectorEnd *> *QVariable::ends() const */ QConnectableElementTemplateParameter *QVariable::templateParameter() const { - return (qmofobject_cast<const QConnectableElement *>(this))->templateParameter(); + return (qwrappedobject_cast<const QConnectableElement *>(this))->templateParameter(); } void QVariable::setTemplateParameter(QConnectableElementTemplateParameter *templateParameter) { - (qmofobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); + (qwrappedobject_cast<QConnectableElement *>(this))->setTemplateParameter(templateParameter); } // --------------------------------------------------------------- @@ -376,7 +376,7 @@ void QVariable::setScope(QStructuredActivityNode *scope) d->scope = scope; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(scope)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(scope)); // Adjust opposite property if (scope) @@ -408,7 +408,7 @@ void QVariable::setActivityScope(QActivity *activityScope) d->activityScope = activityScope; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(activityScope)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(activityScope)); // Adjust opposite property if (activityScope) diff --git a/src/uml/qvariable.h b/src/uml/qvariable.h index 6c64bc8c..eff58f36 100644 --- a/src/uml/qvariable.h +++ b/src/uml/qvariable.h @@ -44,7 +44,8 @@ #include <QtUml/QtUmlGlobal> // Base class includes -#include <QtMof/QMofObject> +#include <QtWrappedObjects/QWrappedObject> +using QtWrappedObjects::QWrappedObject; #include <QtUml/QMultiplicityElement> #include <QtUml/QConnectableElement> @@ -61,7 +62,7 @@ class QAction; class QVariablePrivate; -class Q_UML_EXPORT QVariable : public QtMof::QMofObject +class Q_UML_EXPORT QVariable : public QWrappedObject { Q_OBJECT @@ -72,7 +73,7 @@ class Q_UML_EXPORT QVariable : public QtMof::QMofObject Q_DECLARE_PRIVATE(QVariable) public: - Q_INVOKABLE explicit QVariable(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QVariable(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QVariable(); // Association ends from aggregated QElement @@ -136,7 +137,7 @@ public: Q_INVOKABLE bool isAccessibleBy(const QAction *a) const; protected: - explicit QVariable(QVariablePrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QVariable(QVariablePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); private: QMultiplicityElement *_wrappedMultiplicityElement; diff --git a/src/uml/qvariable_p.h b/src/uml/qvariable_p.h index 4f04d474..7ae4015d 100644 --- a/src/uml/qvariable_p.h +++ b/src/uml/qvariable_p.h @@ -42,7 +42,8 @@ #define QTUML_QVARIABLE_P_H // Base class includes -#include "private/qmofobject_p.h" +#include "private/qwrappedobject_p.h" +using QtWrappedObjects::QWrappedObjectPrivate; #include "private/qmultiplicityelement_p.h" #include "private/qconnectableelement_p.h" @@ -60,7 +61,7 @@ class QStructuredActivityNode; class QAction; class QVariable; -class Q_UML_EXPORT QVariablePrivate : public QtMof::QMofObjectPrivate +class Q_UML_EXPORT QVariablePrivate : public QWrappedObjectPrivate { Q_DECLARE_PUBLIC(QVariable) diff --git a/src/uml/qvariableaction.cpp b/src/uml/qvariableaction.cpp index 3d7ad777..4a3b6bb9 100644 --- a/src/uml/qvariableaction.cpp +++ b/src/uml/qvariableaction.cpp @@ -63,12 +63,12 @@ QVariableActionPrivate::~QVariableActionPrivate() \brief VariableAction is an abstract class for actions that operate on a statically specified variable. */ -QVariableAction::QVariableAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QVariableAction::QVariableAction(QWrappedObject *parent, QWrappedObject *wrapper) : QAction(*new QVariableActionPrivate, parent, wrapper) { } -QVariableAction::QVariableAction(QVariableActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QVariableAction::QVariableAction(QVariableActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QAction(dd, parent, wrapper) { } diff --git a/src/uml/qvariableaction.h b/src/uml/qvariableaction.h index ce49bfe3..e0618b6c 100644 --- a/src/uml/qvariableaction.h +++ b/src/uml/qvariableaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QVariableAction : public QAction Q_DECLARE_PRIVATE(QVariableAction) public: - Q_INVOKABLE explicit QVariableAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QVariableAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QVariableAction(); // Association ends from QVariableAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setVariable(QVariable *variable); protected: - explicit QVariableAction(QVariableActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QVariableAction(QVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvertex.cpp b/src/uml/qvertex.cpp index 6e0de4cc..4683df9f 100644 --- a/src/uml/qvertex.cpp +++ b/src/uml/qvertex.cpp @@ -127,12 +127,12 @@ void QVertexPrivate::removeOutgoing(QTransition *outgoing) \brief A vertex is an abstraction of a node in a state machine graph. In general, it can be the source or destination of any number of transitions. */ -QVertex::QVertex(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QVertex::QVertex(QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(*new QVertexPrivate, parent, wrapper) { } -QVertex::QVertex(QVertexPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QVertex::QVertex(QVertexPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QNamedElement(dd, parent, wrapper) { } @@ -181,7 +181,7 @@ void QVertex::setContainer(QRegion *container) d->container = container; // Adjust subsetted property(ies) - (qmofobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qmofobject_cast<QNamespace *>(container)); + (qwrappedobject_cast<QNamedElementPrivate *>(d))->setNamespace_(qwrappedobject_cast<QNamespace *>(container)); // Adjust opposite property if (container) diff --git a/src/uml/qvertex.h b/src/uml/qvertex.h index 2cc54948..22beea01 100644 --- a/src/uml/qvertex.h +++ b/src/uml/qvertex.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QVertex : public QNamedElement Q_DECLARE_PRIVATE(QVertex) public: - Q_INVOKABLE explicit QVertex(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QVertex(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QVertex(); // Association ends from QVertex @@ -90,7 +90,7 @@ public: friend class QTransition; protected: - explicit QVertex(QVertexPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QVertex(QVertexPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritelinkaction.cpp b/src/uml/qwritelinkaction.cpp index bf18fdaa..b00e0c66 100644 --- a/src/uml/qwritelinkaction.cpp +++ b/src/uml/qwritelinkaction.cpp @@ -60,12 +60,12 @@ QWriteLinkActionPrivate::~QWriteLinkActionPrivate() \brief WriteLinkAction is an abstract class for link actions that create and destroy links. */ -QWriteLinkAction::QWriteLinkAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteLinkAction::QWriteLinkAction(QWrappedObject *parent, QWrappedObject *wrapper) : QLinkAction(*new QWriteLinkActionPrivate, parent, wrapper) { } -QWriteLinkAction::QWriteLinkAction(QWriteLinkActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteLinkAction::QWriteLinkAction(QWriteLinkActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QLinkAction(dd, parent, wrapper) { } diff --git a/src/uml/qwritelinkaction.h b/src/uml/qwritelinkaction.h index ea30ab97..7dc157d8 100644 --- a/src/uml/qwritelinkaction.h +++ b/src/uml/qwritelinkaction.h @@ -62,11 +62,11 @@ class Q_UML_EXPORT QWriteLinkAction : public QLinkAction Q_DECLARE_PRIVATE(QWriteLinkAction) public: - Q_INVOKABLE explicit QWriteLinkAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QWriteLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QWriteLinkAction(); protected: - explicit QWriteLinkAction(QWriteLinkActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QWriteLinkAction(QWriteLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritestructuralfeatureaction.cpp b/src/uml/qwritestructuralfeatureaction.cpp index 31ffdbe8..2d197d87 100644 --- a/src/uml/qwritestructuralfeatureaction.cpp +++ b/src/uml/qwritestructuralfeatureaction.cpp @@ -65,12 +65,12 @@ QWriteStructuralFeatureActionPrivate::~QWriteStructuralFeatureActionPrivate() \brief WriteStructuralFeatureAction is an abstract class for structural feature actions that change structural feature values. */ -QWriteStructuralFeatureAction::QWriteStructuralFeatureAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteStructuralFeatureAction::QWriteStructuralFeatureAction(QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(*new QWriteStructuralFeatureActionPrivate, parent, wrapper) { } -QWriteStructuralFeatureAction::QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteStructuralFeatureAction::QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QStructuralFeatureAction(dd, parent, wrapper) { } @@ -101,13 +101,13 @@ void QWriteStructuralFeatureAction::setResult(QOutputPin *result) Q_D(QWriteStructuralFeatureAction); if (d->result != result) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeOutput(qmofobject_cast<QOutputPin *>(d->result)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(d->result)); d->result = result; // Adjust subsetted property(ies) if (result) { - (qmofobject_cast<QActionPrivate *>(d))->addOutput(qmofobject_cast<QOutputPin *>(result)); + (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); } } } @@ -130,13 +130,13 @@ void QWriteStructuralFeatureAction::setValue(QInputPin *value) Q_D(QWriteStructuralFeatureAction); if (d->value != value) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->value)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->value)); d->value = value; // Adjust subsetted property(ies) if (value) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(value)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(value)); } } } diff --git a/src/uml/qwritestructuralfeatureaction.h b/src/uml/qwritestructuralfeatureaction.h index bca02bd7..87d88fc5 100644 --- a/src/uml/qwritestructuralfeatureaction.h +++ b/src/uml/qwritestructuralfeatureaction.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QWriteStructuralFeatureAction : public QStructuralFeatureActi Q_DECLARE_PRIVATE(QWriteStructuralFeatureAction) public: - Q_INVOKABLE explicit QWriteStructuralFeatureAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QWriteStructuralFeatureAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QWriteStructuralFeatureAction(); // Association ends from QWriteStructuralFeatureAction @@ -79,7 +79,7 @@ public: Q_INVOKABLE void setValue(QInputPin *value); protected: - explicit QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritevariableaction.cpp b/src/uml/qwritevariableaction.cpp index efc5b3fd..2850b27f 100644 --- a/src/uml/qwritevariableaction.cpp +++ b/src/uml/qwritevariableaction.cpp @@ -63,12 +63,12 @@ QWriteVariableActionPrivate::~QWriteVariableActionPrivate() \brief WriteVariableAction is an abstract class for variable actions that change variable values. */ -QWriteVariableAction::QWriteVariableAction(QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteVariableAction::QWriteVariableAction(QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(*new QWriteVariableActionPrivate, parent, wrapper) { } -QWriteVariableAction::QWriteVariableAction(QWriteVariableActionPrivate &dd, QtMof::QMofObject *parent, QtMof::QMofObject *wrapper) : +QWriteVariableAction::QWriteVariableAction(QWriteVariableActionPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : QVariableAction(dd, parent, wrapper) { } @@ -99,13 +99,13 @@ void QWriteVariableAction::setValue(QInputPin *value) Q_D(QWriteVariableAction); if (d->value != value) { // Adjust subsetted property(ies) - (qmofobject_cast<QActionPrivate *>(d))->removeInput(qmofobject_cast<QInputPin *>(d->value)); + (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(d->value)); d->value = value; // Adjust subsetted property(ies) if (value) { - (qmofobject_cast<QActionPrivate *>(d))->addInput(qmofobject_cast<QInputPin *>(value)); + (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(value)); } } } diff --git a/src/uml/qwritevariableaction.h b/src/uml/qwritevariableaction.h index 52bc63b3..73d355d3 100644 --- a/src/uml/qwritevariableaction.h +++ b/src/uml/qwritevariableaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QWriteVariableAction : public QVariableAction Q_DECLARE_PRIVATE(QWriteVariableAction) public: - Q_INVOKABLE explicit QWriteVariableAction(QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + Q_INVOKABLE explicit QWriteVariableAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QWriteVariableAction(); // Association ends from QWriteVariableAction @@ -75,7 +75,7 @@ public: Q_INVOKABLE void setValue(QInputPin *value); protected: - explicit QWriteVariableAction(QWriteVariableActionPrivate &dd, QtMof::QMofObject *parent = 0, QtMof::QMofObject *wrapper = 0); + explicit QWriteVariableAction(QWriteVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/uml.pro b/src/uml/uml.pro index 5de39aeb..93cabebf 100644 --- a/src/uml/uml.pro +++ b/src/uml/uml.pro @@ -1,7 +1,7 @@ load(qt_build_config) TARGET = QtUml -QT = core-private mof-private +QT = wrappedobjects-private core-private load(qt_module) diff --git a/src/wrappedobjects/qtwrappedobjectsglobal.h b/src/wrappedobjects/qtwrappedobjectsglobal.h new file mode 100644 index 00000000..b33e6a0c --- /dev/null +++ b/src/wrappedobjects/qtwrappedobjectsglobal.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtWrappedObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QTWRAPPEDOBJECTSGLOBAL_H +#define QTWRAPPEDOBJECTSGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_HEADER + +#ifndef QT_STATIC +# if defined(QT_BUILD_WRAPPEDOBJECTS_LIB) +# define Q_WRAPPEDOBJECTS_EXPORT Q_DECL_EXPORT +# else +# define Q_WRAPPEDOBJECTS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_WRAPPEDOBJECTS_EXPORT +#endif + +// QtWrappedObjects macros + +#if defined(Q_MOC_RUN) + +#define QT_NAMESPACE_QTWRAPPEDOBJECTS +#define QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS +#define QT_END_NAMESPACE_QTWRAPPEDOBJECTS +#define QT_USE_NAMESPACE_QTWRAPPEDOBJECTS +#define QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(name) ::name + +#else + +#if defined(QT_NAMESPACE) +# define QT_NAMESPACE_QTWRAPPEDOBJECTS QT_NAMESPACE::QtWrappedObjects +#else +# define QT_NAMESPACE_QTWRAPPEDOBJECTS QtWrappedObjects +#endif + +#define QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS QT_BEGIN_NAMESPACE namespace QtWrappedObjects { +#define QT_END_NAMESPACE_QTWRAPPEDOBJECTS QT_END_NAMESPACE } +#define QT_USE_NAMESPACE_QTWRAPPEDOBJECTS using namespace ::QT_NAMESPACE_QTWRAPPEDOBJECTS; +#define QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(name) ::QT_NAMESPACE_QTWRAPPEDOBJECTS::name + +#endif /* defined(Q_MOC_RUN) */ + +QT_END_HEADER + +#endif // QTWRAPPEDOBJECTSGLOBAL_H + diff --git a/src/wrappedobjects/qwrappedobject.cpp b/src/wrappedobjects/qwrappedobject.cpp new file mode 100644 index 00000000..d0563809 --- /dev/null +++ b/src/wrappedobjects/qwrappedobject.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtWrappedObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qwrappedobject.h" +#include "qwrappedobject_p.h" + +QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS + +QWrappedObjectPrivate::QWrappedObjectPrivate(int version) + : QObjectPrivate(version), wrapper(0) +{ +} + +QWrappedObjectPrivate::~QWrappedObjectPrivate() +{ +} + +QWrappedObject::QWrappedObject(QWrappedObject *parent, QWrappedObject *wrapper) : + QObject(*new QWrappedObjectPrivate, parent) +{ + setWrapper(wrapper); +} + +QWrappedObject::QWrappedObject(QWrappedObjectPrivate &dd, QWrappedObject *parent, QWrappedObject *wrapper) : + QObject(dd, parent) +{ + setWrapper(wrapper); +} + +QWrappedObject::~QWrappedObject() +{ +} + +const QList<QWrappedObject *> &QWrappedObject::wrappedObjects() const +{ + Q_D(const QWrappedObject); + return d->wrappedObjects; +} + +void QWrappedObject::setWrapper(QWrappedObject *wrapper) +{ + Q_D(QWrappedObject); + if (wrapper == d->wrapper) + return; + + if (d->wrapper) + d->wrapper->d_func()->wrappedObjects.removeAll(this); + + d->wrapper = wrapper; + + if (wrapper) + wrapper->d_func()->wrappedObjects.append(this); +} + +QWrappedObject *QWrappedObject::wrapper() const +{ + Q_D(const QWrappedObject); + return d->wrapper; +} + +#include "moc_qwrappedobject.cpp" + +QT_END_NAMESPACE_QTWRAPPEDOBJECTS + diff --git a/src/wrappedobjects/qwrappedobject.h b/src/wrappedobjects/qwrappedobject.h new file mode 100644 index 00000000..c0a27949 --- /dev/null +++ b/src/wrappedobjects/qwrappedobject.h @@ -0,0 +1,120 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtWrappedObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QTWRAPPEDOBJECTS_QWRAPPEDOBJECTSOBJECT_H +#define QTWRAPPEDOBJECTS_QWRAPPEDOBJECTSOBJECT_H + +#include <QtWrappedObjects/QtWrappedObjectsGlobal> + +// Base class includes +#include <QtCore/QObject> + +// Qt includes +#include <QtCore/QSet> +#include <QtCore/QList> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS + +QT_MODULE(QtWrappedObjects) + +class QWrappedObjectPrivate; + +class Q_WRAPPEDOBJECTS_EXPORT QWrappedObject : public QObject +{ + Q_OBJECT + + Q_DISABLE_COPY(QWrappedObject) + Q_DECLARE_PRIVATE(QWrappedObject) + +public: + Q_INVOKABLE explicit QWrappedObject(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); + virtual ~QWrappedObject(); + + const QList<QWrappedObject *> &wrappedObjects() const; + + void setWrapper(QWrappedObject *wrapper); + QWrappedObject *wrapper() const; + +protected: + explicit QWrappedObject(QWrappedObjectPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); +}; + +QT_END_NAMESPACE_QTWRAPPEDOBJECTS + +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *) +Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *> *) +Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *> *) + +template <class T> +inline T qwrappedobject_cast(QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *base, bool restoreToWrapper = true) +{ + if (!base) + return T(); + while (restoreToWrapper && base->wrapper()) + base = base->wrapper(); + if (dynamic_cast<T>(base)) + return dynamic_cast<T>(base); + foreach (QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *wrappedObject, base->wrappedObjects()) { + T returnValue = qwrappedobject_cast<T>(wrappedObject, false); + if (returnValue != T()) + return returnValue; + } + return T(); // not found +} + +template <class T> +inline T qwrappedobject_cast(const QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *base, bool restoreToWrapper = true) +{ + return qwrappedobject_cast<T>(const_cast<QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *>(base), restoreToWrapper); +} + +inline QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *qTopLevelWrapper(QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *wrapped) +{ + while (wrapped->wrapper()) + wrapped = wrapped->wrapper(); + return wrapped; +} + +QT_END_HEADER + +#endif // QTWRAPPEDOBJECTS_QWRAPPEDOBJECTSOBJECT_H + diff --git a/src/wrappedobjects/qwrappedobject_p.h b/src/wrappedobjects/qwrappedobject_p.h new file mode 100644 index 00000000..dc9e428f --- /dev/null +++ b/src/wrappedobjects/qwrappedobject_p.h @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtWrappedObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QTWRAPPEDOBJECTS_QWRAPPEDOBJECT_P_H +#define QTWRAPPEDOBJECTS_QWRAPPEDOBJECT_P_H + +// Base class includes +#include "private/qobject_p.h" + +#include "QtWrappedObjects/QWrappedObject" + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS + +QT_MODULE(QtWrappedObjects) + +class Q_WRAPPEDOBJECTS_EXPORT QWrappedObjectPrivate : public QObjectPrivate +{ + Q_DECLARE_PUBLIC(QWrappedObject) + +public: + explicit QWrappedObjectPrivate(int version = QObjectPrivateVersion); + virtual ~QWrappedObjectPrivate(); + + static QWrappedObjectPrivate *get(QWrappedObject *o) + { + return dynamic_cast<QWrappedObjectPrivate *>(o->d_func()); + } + + QList<QWrappedObject *> wrappedObjects; + QWrappedObject *wrapper; +}; + +QT_END_NAMESPACE_QTWRAPPEDOBJECTS + +template <class T> +inline T qwrappedobject_cast(QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObjectPrivate) *base, bool restoreToWrapper = true) +{ + while (restoreToWrapper && base->wrapper) + base = base->get(base->wrapper); + if (dynamic_cast<T>(base)) + return dynamic_cast<T>(base); + foreach (QT_PREPEND_NAMESPACE_QTWRAPPEDOBJECTS(QWrappedObject) *wrappedObject, base->wrappedObjects) { + T returnValue = qwrappedobject_cast<T>(base->get(wrappedObject), false); + if (returnValue != T()) + return returnValue; + } + return T(); // not found +} + +QT_END_HEADER + +#endif // QTWRAPPEDOBJECTS_QWRAPPEDOBJECT_P_H + diff --git a/src/wrappedobjects/qwrappedobjectpointer.h b/src/wrappedobjects/qwrappedobjectpointer.h new file mode 100644 index 00000000..3a187ca5 --- /dev/null +++ b/src/wrappedobjects/qwrappedobjectpointer.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org> +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtWrappedObjects module of the Qt Toolkit. +** +** :LGPL +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** +** +****************************************************************************/ +#ifndef QTWRAPPEDOBJECTS_QWRAPPEDOBJECTPOINTER_H +#define QTWRAPPEDOBJECTS_QWRAPPEDOBJECTPOINTER_H + +#include <QtWrappedObjects/QtWrappedObjectsGlobal> + +// Base class includes +#include <QtCore/QPointer> + +#include <QtWrappedObjects/QWrappedObject> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE_QTWRAPPEDOBJECTS + +template <class T> +class Q_WRAPPEDOBJECTS_EXPORT QWrappedObjectPointer : public QPointer<T> +{ +public: + QWrappedObjectPointer(T *p = 0) : QPointer<T>(p) { } + virtual ~QWrappedObjectPointer() { } + + template <class U> inline operator U *() + { + return qwrappedobject_cast<U *>(QPointer<T>::data()); + } +}; + +QT_END_NAMESPACE_QTWRAPPEDOBJECTS + +QT_END_HEADER + +#endif // QTWRAPPEDOBJECTS_QWRAPPEDOBJECTPOINTER_H + diff --git a/src/wrappedobjects/wrappedobjects.pro b/src/wrappedobjects/wrappedobjects.pro new file mode 100644 index 00000000..dc7aa25c --- /dev/null +++ b/src/wrappedobjects/wrappedobjects.pro @@ -0,0 +1,19 @@ +load(qt_build_config) + +TARGET = QtWrappedObjects +QT = core-private + +load(qt_module) + +PUBLIC_HEADERS += \ + qtwrappedobjectsglobal.h \ + qwrappedobject.h \ + qwrappedobjectpointer.h + +PRIVATE_HEADERS += \ + qwrappedobject_p.h + +SOURCES += \ + qwrappedobject.cpp + +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/sync.profile b/sync.profile index 5db64850..06c8a399 100644 --- a/sync.profile +++ b/sync.profile @@ -1,4 +1,5 @@ %modules = ( # path to module name map + "QtWrappedObjects" => "$basedir/src/wrappedobjects", "QtMof" => "$basedir/src/mof", "QtUml" => "$basedir/src/uml", ); @@ -7,6 +8,8 @@ ); %classnames = ( + "qtwrappedobjectsversion.h" => "QtWrappedObjectsVersion", + "qtwrappedobjectsglobal.h" => "QtWrappedObjectsGlobal", "qtmofversion.h" => "QtMofVersion", "qtmofglobal.h" => "QtMofGlobal", "qtumlversion.h" => "QtUmlVersion", @@ -16,6 +19,7 @@ ); %modulepris = ( + "QtWrappedObjects" => "$basedir/modules/qtwrappedobjects.pri", "QtMof" => "$basedir/modules/qtmof.pri", "QtUml" => "$basedir/modules/qtuml.pri", ); |