diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-08-26 20:37:03 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-08-27 01:43:50 +0200 |
| commit | bc5342512ed3605bbd1953eaf395fe137ca239f0 (patch) | |
| tree | fd88531fde61ba7c0e0695ba860589b28ce57ebe /src | |
| parent | ec14050b84782321d2a3a6254aa488e7c716cad9 (diff) | |
Add initial support for QObject export of QModelingObjects
Still needs initialization from XMI-defined default values
Change-Id: Iac8d90155f4f7bb8d092d81bc3a610efb7c58979
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
Diffstat (limited to 'src')
491 files changed, 2024 insertions, 147 deletions
diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp index 2ead4b37..231edf32 100644 --- a/src/modeling/qmodelingobject.cpp +++ b/src/modeling/qmodelingobject.cpp @@ -5,11 +5,9 @@ QModelingObjectPrivate::~QModelingObjectPrivate() { } -QModelingObject::QModelingObject(bool create_d_ptr) : - d_ptr(0) +QModelingObject::QModelingObject() : + d_ptr(new QModelingObjectPrivate) { - if (create_d_ptr) - set_d_ptr(new QModelingObjectPrivate); } QModelingObject::~QModelingObject() @@ -17,9 +15,12 @@ QModelingObject::~QModelingObject() delete d_ptr; } -void QModelingObject::set_d_ptr(QModelingObjectPrivate *d_ptr) +QObject *QModelingObject::asQObject() const +{ + return &d_ptr->object; +} + +QModelingObject::QModelingObject(QModelingObjectPrivate *dd) : + d_ptr(dd) { - Q_ASSERT_X(!this->d_ptr, "QModelingObject::set_d_ptr", "d_ptr already set !"); - this->d_ptr = d_ptr; - d_ptr->q_ptr = this; } diff --git a/src/modeling/qmodelingobject.h b/src/modeling/qmodelingobject.h index 70ee46e0..fca7d302 100644 --- a/src/modeling/qmodelingobject.h +++ b/src/modeling/qmodelingobject.h @@ -43,6 +43,8 @@ #include <QtModeling/QtModelingGlobal> +#include <QtCore/QVariant> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -52,15 +54,19 @@ QT_MODULE(QtModeling) #define QM_D(Class) Class##Private *d = dynamic_cast<Class##Private *>(d_ptr); #define QM_Q(Class) Class *q = dynamic_cast<Class *>(q_ptr); +class QObject; + class QModelingObjectPrivate; class Q_MODELING_EXPORT QModelingObject { public: - QModelingObject(bool create_d_ptr = true); + QModelingObject(); virtual ~QModelingObject(); + QObject *asQObject() const; + protected: - void set_d_ptr(QModelingObjectPrivate *d_ptr); + QModelingObject(QModelingObjectPrivate *dd); QModelingObjectPrivate *d_ptr; }; diff --git a/src/modeling/qmodelingobject_p.h b/src/modeling/qmodelingobject_p.h index a569d9f4..37b6ba18 100644 --- a/src/modeling/qmodelingobject_p.h +++ b/src/modeling/qmodelingobject_p.h @@ -43,6 +43,8 @@ #include "QtModeling/QModelingObject" +#include <QtCore/QObject> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -55,6 +57,7 @@ public: virtual ~QModelingObjectPrivate(); QModelingObject *q_ptr; + QObject object; }; QT_END_NAMESPACE diff --git a/src/uml/qtumlglobal.h b/src/uml/qtumlglobal.h index 75eb7b57..9ad1004e 100644 --- a/src/uml/qtumlglobal.h +++ b/src/uml/qtumlglobal.h @@ -43,10 +43,13 @@ #include <QtCore/QtGlobal> +#include <QtCore/QMetaType> #include <QtCore/QList> #include <QtCore/QSet> #include <QtCore/QString> +Q_DECLARE_METATYPE(QList<QString> *) + QT_BEGIN_NAMESPACE #ifndef QT_STATIC diff --git a/src/uml/qtumlnamespace.cpp b/src/uml/qtumlnamespace.cpp index a3228cc2..73a05489 100644 --- a/src/uml/qtumlnamespace.cpp +++ b/src/uml/qtumlnamespace.cpp @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE AggregationKind is an enumeration type that specifies the literals for defining the kind of aggregation of a property. - \value AggregationNone Indicates that the property has no aggregation. + \value AggregationKindNone Indicates that the property has no aggregation. - \value AggregationShared Indicates that the property has a shared aggregation. + \value AggregationKindShared Indicates that the property has a shared aggregation. - \value AggregationComposite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). + \value AggregationKindComposite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). */ /*! @@ -59,11 +59,11 @@ QT_BEGIN_NAMESPACE CallConcurrencyKind is an enumeration type. - \value CallConcurrencySequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. + \value CallConcurrencyKindSequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. - \value CallConcurrencyGuarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the currently executing behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. + \value CallConcurrencyKindGuarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the currently executing behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. - \value CallConcurrencyConcurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. + \value CallConcurrencyKindConcurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. */ /*! @@ -71,9 +71,9 @@ QT_BEGIN_NAMESPACE ConnectorKind is an enumeration type. - \value ConnectorAssembly Indicates that the connector is an assembly connector. + \value ConnectorKindAssembly Indicates that the connector is an assembly connector. - \value ConnectorDelegation Indicates that the connector is a delegation connector. + \value ConnectorKindDelegation Indicates that the connector is a delegation connector. */ /*! @@ -81,11 +81,11 @@ QT_BEGIN_NAMESPACE ExpansionKind is an enumeration type used to specify how multiple executions of an expansion region interact. - \value ExpansionParallel The executions are independent. They may be executed concurrently. + \value ExpansionKindParallel The executions are independent. They may be executed concurrently. - \value ExpansionIterative The executions are dependent and must be executed one at a time, in order of the collection elements. + \value ExpansionKindIterative The executions are dependent and must be executed one at a time, in order of the collection elements. - \value ExpansionStream A stream of collection elements flows into a single execution, in order of the collection elements. + \value ExpansionKindStream A stream of collection elements flows into a single execution, in order of the collection elements. */ /*! @@ -93,29 +93,29 @@ QT_BEGIN_NAMESPACE InteractionOperatorKind is an enumeration designating the different kinds of operators of combined fragments. The interaction operand defines the type of operator of a combined fragment. - \value InteractionOperatorSeq The interactionOperator seq designates that the CombinedFragment represents a weak sequencing between the behaviors of the operands. + \value InteractionOperatorKindSeq The interactionOperator seq designates that the CombinedFragment represents a weak sequencing between the behaviors of the operands. - \value InteractionOperatorAlt The interactionOperator alt designates that the CombinedFragment represents a choice of behavior. At most one of the operands will be chosen. The chosen operand must have an explicit or implicit guard expression that evaluates to true at this point in the interaction. An implicit true guard is implied if the operand has no guard. + \value InteractionOperatorKindAlt The interactionOperator alt designates that the CombinedFragment represents a choice of behavior. At most one of the operands will be chosen. The chosen operand must have an explicit or implicit guard expression that evaluates to true at this point in the interaction. An implicit true guard is implied if the operand has no guard. - \value InteractionOperatorOpt The interactionOperator opt designates that the CombinedFragment represents a choice of behavior where either the (sole) operand happens or nothing happens. An option is semantically equivalent to an alternative CombinedFragment where there is one operand with non-empty content and the second operand is empty. + \value InteractionOperatorKindOpt The interactionOperator opt designates that the CombinedFragment represents a choice of behavior where either the (sole) operand happens or nothing happens. An option is semantically equivalent to an alternative CombinedFragment where there is one operand with non-empty content and the second operand is empty. - \value InteractionOperatorBreak The interactionOperator break designates that the CombinedFragment represents a breaking scenario in the sense that the operand is a scenario that is performed instead of the remainder of the enclosing InteractionFragment. A break operator with a guard is chosen when the guard is true and the rest of the enclosing Interaction Fragment is ignored. When the guard of the break operand is false, the break operand is ignored and the rest of the enclosing InteractionFragment is chosen. The choice between a break operand without a guard and the rest of the enclosing InteractionFragment is done non-deterministically. + \value InteractionOperatorKindBreak The interactionOperator break designates that the CombinedFragment represents a breaking scenario in the sense that the operand is a scenario that is performed instead of the remainder of the enclosing InteractionFragment. A break operator with a guard is chosen when the guard is true and the rest of the enclosing Interaction Fragment is ignored. When the guard of the break operand is false, the break operand is ignored and the rest of the enclosing InteractionFragment is chosen. The choice between a break operand without a guard and the rest of the enclosing InteractionFragment is done non-deterministically. - \value InteractionOperatorPar The interactionOperator par designates that the CombinedFragment represents a parallel merge between the behaviors of the operands. The OccurrenceSpecifications of the different operands can be interleaved in any way as long as the ordering imposed by each operand as such is preserved. + \value InteractionOperatorKindPar The interactionOperator par designates that the CombinedFragment represents a parallel merge between the behaviors of the operands. The OccurrenceSpecifications of the different operands can be interleaved in any way as long as the ordering imposed by each operand as such is preserved. - \value InteractionOperatorStrict The interactionOperator strict designates that the CombinedFragment represents a strict sequencing between the behaviors of the operands. The semantics of strict sequencing defines a strict ordering of the operands on the first level within the CombinedFragment with interactionOperator strict. Therefore OccurrenceSpecifications within contained CombinedFragment will not directly be compared with other OccurrenceSpecifications of the enclosing CombinedFragment. + \value InteractionOperatorKindStrict The interactionOperator strict designates that the CombinedFragment represents a strict sequencing between the behaviors of the operands. The semantics of strict sequencing defines a strict ordering of the operands on the first level within the CombinedFragment with interactionOperator strict. Therefore OccurrenceSpecifications within contained CombinedFragment will not directly be compared with other OccurrenceSpecifications of the enclosing CombinedFragment. - \value InteractionOperatorLoop The interactionOperator loop designates that the CombinedFragment represents a loop. The loop operand will be repeated a number of times. + \value InteractionOperatorKindLoop The interactionOperator loop designates that the CombinedFragment represents a loop. The loop operand will be repeated a number of times. - \value InteractionOperatorCritical The interactionOperator critical designates that the CombinedFragment represents a critical region. A critical region means that the traces of the region cannot be interleaved by other OccurrenceSpecifications (on those Lifelines covered by the region). This means that the region is treated atomically by the enclosing fragment when determining the set of valid traces. Even though enclosing CombinedFragments may imply that some OccurrenceSpecifications may interleave into the region, such as e.g. with par-operator, this is prevented by defining a region. + \value InteractionOperatorKindCritical The interactionOperator critical designates that the CombinedFragment represents a critical region. A critical region means that the traces of the region cannot be interleaved by other OccurrenceSpecifications (on those Lifelines covered by the region). This means that the region is treated atomically by the enclosing fragment when determining the set of valid traces. Even though enclosing CombinedFragments may imply that some OccurrenceSpecifications may interleave into the region, such as e.g. with par-operator, this is prevented by defining a region. - \value InteractionOperatorNeg The interactionOperator neg designates that the CombinedFragment represents traces that are defined to be invalid. + \value InteractionOperatorKindNeg The interactionOperator neg designates that the CombinedFragment represents traces that are defined to be invalid. - \value InteractionOperatorAssert The interactionOperator assert designates that the CombinedFragment represents an assertion. The sequences of the operand of the assertion are the only valid continuations. All other continuations result in an invalid trace. + \value InteractionOperatorKindAssert The interactionOperator assert designates that the CombinedFragment represents an assertion. The sequences of the operand of the assertion are the only valid continuations. All other continuations result in an invalid trace. - \value InteractionOperatorIgnore The interacionOperator ignore designates that there are some message types that are not shown within this combined fragment. These message types can be considered insignificant and are implicitly ignored if they appear in a corresponding execution. Alternatively, one can understand ignore to mean that the message types that are ignored can appear anywhere in the traces. + \value InteractionOperatorKindIgnore The interacionOperator ignore designates that there are some message types that are not shown within this combined fragment. These message types can be considered insignificant and are implicitly ignored if they appear in a corresponding execution. Alternatively, one can understand ignore to mean that the message types that are ignored can appear anywhere in the traces. - \value InteractionOperatorConsider The interactionOperator consider designates which messages should be considered within this combined fragment. This is equivalent to defining every other message to be ignored. + \value InteractionOperatorKindConsider The interactionOperator consider designates which messages should be considered within this combined fragment. This is equivalent to defining every other message to be ignored. */ /*! @@ -123,13 +123,13 @@ QT_BEGIN_NAMESPACE This is an enumerated type that identifies the type of message. - \value MessageComplete sendEvent and receiveEvent are present + \value MessageKindComplete sendEvent and receiveEvent are present - \value MessageLost sendEvent present and receiveEvent absent + \value MessageKindLost sendEvent present and receiveEvent absent - \value MessageFound sendEvent absent and receiveEvent present + \value MessageKindFound sendEvent absent and receiveEvent present - \value MessageUnknown sendEvent and receiveEvent absent (should not appear) + \value MessageKindUnknown sendEvent and receiveEvent absent (should not appear) */ /*! @@ -137,17 +137,17 @@ QT_BEGIN_NAMESPACE This is an enumerated type that identifies the type of communication action that was used to generate the message. - \value MessageSynchCall The message was generated by a synchronous call to an operation. + \value MessageSortSynchCall The message was generated by a synchronous call to an operation. - \value MessageAsynchCall The message was generated by an asynchronous call to an operation; i.e., a CallAction with isSynchronous = false. + \value MessageSortAsynchCall The message was generated by an asynchronous call to an operation; i.e., a CallAction with isSynchronous = false. - \value MessageAsynchSignal The message was generated by an asynchronous send action. + \value MessageSortAsynchSignal The message was generated by an asynchronous send action. - \value MessageCreateMessage The message designating the creation of another lifeline object. + \value MessageSortCreateMessage The message designating the creation of another lifeline object. - \value MessageDeleteMessage The message designating the termination of another lifeline. + \value MessageSortDeleteMessage The message designating the termination of another lifeline. - \value MessageReply The message is a reply message to an operation call. + \value MessageSortReply The message is a reply message to an operation call. */ /*! @@ -155,13 +155,13 @@ QT_BEGIN_NAMESPACE ObjectNodeOrderingKind is an enumeration indicating queuing order within a node. - \value ObjectNodeOrderingUnordered Indicates that object node tokens are unordered. + \value ObjectNodeOrderingKindUnordered Indicates that object node tokens are unordered. - \value ObjectNodeOrderingOrdered Indicates that object node tokens are ordered. + \value ObjectNodeOrderingKindOrdered Indicates that object node tokens are ordered. - \value ObjectNodeOrderingLIFO Indicates that object node tokens are queued in a last in, first out manner. + \value ObjectNodeOrderingKindLIFO Indicates that object node tokens are queued in a last in, first out manner. - \value ObjectNodeOrderingFIFO Indicates that object node tokens are queued in a first in, first out manner. + \value ObjectNodeOrderingKindFIFO Indicates that object node tokens are queued in a first in, first out manner. */ /*! @@ -169,13 +169,13 @@ QT_BEGIN_NAMESPACE Parameter direction kind is an enumeration type that defines literals used to specify direction of parameters. - \value ParameterDirectionIn Indicates that parameter values are passed into the behavioral element by the caller. + \value ParameterDirectionKindIn Indicates that parameter values are passed into the behavioral element by the caller. - \value ParameterDirectionInout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. + \value ParameterDirectionKindInout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. - \value ParameterDirectionOut Indicates that parameter values are passed from a behavioral element out to the caller. + \value ParameterDirectionKindOut Indicates that parameter values are passed from a behavioral element out to the caller. - \value ParameterDirectionReturn Indicates that parameter values are passed as return values from a behavioral element back to the caller. + \value ParameterDirectionKindReturn Indicates that parameter values are passed as return values from a behavioral element back to the caller. */ /*! @@ -183,13 +183,13 @@ QT_BEGIN_NAMESPACE The datatype ParameterEffectKind is an enumeration that indicates the effect of a behavior on values passed in or out of its parameters. - \value ParameterEffectCreate Indicates that the behavior creates values. + \value ParameterEffectKindCreate Indicates that the behavior creates values. - \value ParameterEffectRead Indicates that the behavior reads values. + \value ParameterEffectKindRead Indicates that the behavior reads values. - \value ParameterEffectUpdate Indicates that the behavior updates values. + \value ParameterEffectKindUpdate Indicates that the behavior updates values. - \value ParameterEffectDelete Indicates that the behavior deletes values. + \value ParameterEffectKindDelete Indicates that the behavior deletes values. */ /*! @@ -197,25 +197,25 @@ QT_BEGIN_NAMESPACE PseudostateKind is an enumeration type. - \value PseudostateInitial An initial pseudostate represents a default vertex that is the source for a single transition to the default state of a composite state. There can be at most one initial vertex in a region. The outgoing transition from the initial vertex may have a behavior, but not a trigger or guard. + \value PseudostateKindInitial An initial pseudostate represents a default vertex that is the source for a single transition to the default state of a composite state. There can be at most one initial vertex in a region. The outgoing transition from the initial vertex may have a behavior, but not a trigger or guard. - \value PseudostateDeepHistory DeepHistory represents the most recent active configuration of the composite state that directly contains this pseudostate; e.g. the state configuration that was active when the composite state was last exited. A composite state can have at most one deep history vertex. At most one transition may originate from the history connector to the default deep history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a deep history are performed. + \value PseudostateKindDeepHistory DeepHistory represents the most recent active configuration of the composite state that directly contains this pseudostate; e.g. the state configuration that was active when the composite state was last exited. A composite state can have at most one deep history vertex. At most one transition may originate from the history connector to the default deep history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a deep history are performed. - \value PseudostateShallowHistory ShallowHistory represents the most recent active substate of its containing state (but not the substates of that substate). A composite state can have at most one shallow history vertex. A transition coming into the shallow history vertex is equivalent to a transition coming into the most recent active substate of a state. At most one transition may originate from the history connector to the default shallow history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a shallow history are performed. + \value PseudostateKindShallowHistory ShallowHistory represents the most recent active substate of its containing state (but not the substates of that substate). A composite state can have at most one shallow history vertex. A transition coming into the shallow history vertex is equivalent to a transition coming into the most recent active substate of a state. At most one transition may originate from the history connector to the default shallow history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a shallow history are performed. - \value PseudostateJoin Join vertices serve to merge several transitions emanating from source vertices in different orthogonal regions. The transitions entering a join vertex cannot have guards or triggers. + \value PseudostateKindJoin Join vertices serve to merge several transitions emanating from source vertices in different orthogonal regions. The transitions entering a join vertex cannot have guards or triggers. - \value PseudostateFork Fork vertices serve to split an incoming transition into two or more transitions terminating on orthogonal target vertices (i.e. vertices in different regions of a composite state). The segments outgoing from a fork vertex must not have guards or triggers. + \value PseudostateKindFork Fork vertices serve to split an incoming transition into two or more transitions terminating on orthogonal target vertices (i.e. vertices in different regions of a composite state). The segments outgoing from a fork vertex must not have guards or triggers. - \value PseudostateJunction Junction vertices are semantic-free vertices that are used to chain together multiple transitions. They are used to construct compound transition paths between states. For example, a junction can be used to converge multiple incoming transitions into a single outgoing transition representing a shared transition path (this is known as an merge). Conversely, they can be used to split an incoming transition into multiple outgoing transition segments with different guard conditions. This realizes a static conditional branch. (In the latter case, outgoing transitions whose guard conditions evaluate to false are disabled. A predefined guard denoted 'else' may be defined for at most one outgoing transition. This transition is enabled if all the guards labeling the other transitions are false.) Static conditional branches are distinct from dynamic conditional branches that are realized by choice vertices (described below). + \value PseudostateKindJunction Junction vertices are semantic-free vertices that are used to chain together multiple transitions. They are used to construct compound transition paths between states. For example, a junction can be used to converge multiple incoming transitions into a single outgoing transition representing a shared transition path (this is known as an merge). Conversely, they can be used to split an incoming transition into multiple outgoing transition segments with different guard conditions. This realizes a static conditional branch. (In the latter case, outgoing transitions whose guard conditions evaluate to false are disabled. A predefined guard denoted 'else' may be defined for at most one outgoing transition. This transition is enabled if all the guards labeling the other transitions are false.) Static conditional branches are distinct from dynamic conditional branches that are realized by choice vertices (described below). - \value PseudostateChoice Choice vertices which, when reached, result in the dynamic evaluation of the guards of the triggers of its outgoing transitions. This realizes a dynamic conditional branch. It allows splitting of transitions into multiple outgoing paths such that the decision on which path to take may be a function of the results of prior actions performed in the same run-tocompletion step. If more than one of the guards evaluates to true, an arbitrary one is selected. If none of the guards evaluates to true, then the model is considered ill-formed. (To avoid this, it is recommended to define one outgoing transition with the predefined else guard for every choice vertex.) Choice vertices should be distinguished from static branch points that are based on junction points (described above). + \value PseudostateKindChoice Choice vertices which, when reached, result in the dynamic evaluation of the guards of the triggers of its outgoing transitions. This realizes a dynamic conditional branch. It allows splitting of transitions into multiple outgoing paths such that the decision on which path to take may be a function of the results of prior actions performed in the same run-tocompletion step. If more than one of the guards evaluates to true, an arbitrary one is selected. If none of the guards evaluates to true, then the model is considered ill-formed. (To avoid this, it is recommended to define one outgoing transition with the predefined else guard for every choice vertex.) Choice vertices should be distinguished from static branch points that are based on junction points (described above). - \value PseudostateEntryPoint An entry point pseudostate is an entry point of a state machine or composite state. In each region of the state machine or composite state it has a single transition to a vertex within the same region. + \value PseudostateKindEntryPoint An entry point pseudostate is an entry point of a state machine or composite state. In each region of the state machine or composite state it has a single transition to a vertex within the same region. - \value PseudostateExitPoint An exit point pseudostate is an exit point of a state machine or composite state. Entering an exit point within any region of the composite state or state machine referenced by a submachine state implies the exit of this composite state or submachine state and the triggering of the transition that has this exit point as source in the state machine enclosing the submachine or composite state. + \value PseudostateKindExitPoint An exit point pseudostate is an exit point of a state machine or composite state. Entering an exit point within any region of the composite state or state machine referenced by a submachine state implies the exit of this composite state or submachine state and the triggering of the transition that has this exit point as source in the state machine enclosing the submachine or composite state. - \value PseudostateTerminate Entering a terminate pseudostate implies that the execution of this state machine by means of its context object is terminated. The state machine does not exit any states nor does it perform any exit actions other than those associated with the transition leading to the terminate pseudostate. Entering a terminate pseudostate is equivalent to invoking a DestroyObjectAction. + \value PseudostateKindTerminate Entering a terminate pseudostate implies that the execution of this state machine by means of its context object is terminated. The state machine does not exit any states nor does it perform any exit actions other than those associated with the transition leading to the terminate pseudostate. Entering a terminate pseudostate is equivalent to invoking a DestroyObjectAction. */ /*! @@ -223,11 +223,11 @@ QT_BEGIN_NAMESPACE TransitionKind is an enumeration type. - \value TransitionInternal Implies that the transition, if triggered, occurs without exiting or entering the source state. Thus, it does not cause a state change. This means that the entry or exit condition of the source state will not be invoked. An internal transition can be taken even if the state machine is in one or more regions nested within this state. + \value TransitionKindInternal Implies that the transition, if triggered, occurs without exiting or entering the source state. Thus, it does not cause a state change. This means that the entry or exit condition of the source state will not be invoked. An internal transition can be taken even if the state machine is in one or more regions nested within this state. - \value TransitionLocal Implies that the transition, if triggered, will not exit the composite (source) state, but it will apply to any state within the composite state, and these will be exited and entered. + \value TransitionKindLocal Implies that the transition, if triggered, will not exit the composite (source) state, but it will apply to any state within the composite state, and these will be exited and entered. - \value TransitionExternal Implies that the transition, if triggered, will exit the composite (source) state. + \value TransitionKindExternal Implies that the transition, if triggered, will exit the composite (source) state. */ /*! @@ -235,13 +235,13 @@ QT_BEGIN_NAMESPACE VisibilityKind is an enumeration type that defines literals to determine the visibility of elements in a model. - \value VisibilityPublic A public element is visible to all elements that can access the contents of the namespace that owns it. + \value VisibilityKindPublic A public element is visible to all elements that can access the contents of the namespace that owns it. - \value VisibilityPrivate A private element is only visible inside the namespace that owns it. + \value VisibilityKindPrivate A private element is only visible inside the namespace that owns it. - \value VisibilityProtected A protected element is visible to elements that have a generalization relationship to the namespace that owns it. + \value VisibilityKindProtected A protected element is visible to elements that have a generalization relationship to the namespace that owns it. - \value VisibilityPackage A package element is owned by a namespace that is not a package, and is visible to elements that are in the same package as its owning namespace. Only named elements that are not owned by packages can be marked as having package visibility. Any element marked as having package visibility is visible to all elements within the nearest enclosing package (given that other owning elements have proper visibility). Outside the nearest enclosing package, an element marked as having package visibility is not visible. + \value VisibilityKindPackage A package element is owned by a namespace that is not a package, and is visible to elements that are in the same package as its owning namespace. Only named elements that are not owned by packages can be marked as having package visibility. Any element marked as having package visibility is visible to all elements within the nearest enclosing package (given that other owning elements have proper visibility). Outside the nearest enclosing package, an element marked as having package visibility is not visible. */ QT_END_NAMESPACE diff --git a/src/uml/qtumlnamespace.h b/src/uml/qtumlnamespace.h index 068cf7e6..d20b03c1 100644 --- a/src/uml/qtumlnamespace.h +++ b/src/uml/qtumlnamespace.h @@ -71,109 +71,135 @@ class Q_UML_EXPORT QtUml : public QObject public: enum AggregationKind { - AggregationNone = 0, - AggregationShared, - AggregationComposite + AggregationKindNone = 0, + AggregationKindShared, + AggregationKindComposite }; enum CallConcurrencyKind { - CallConcurrencySequential = 0, - CallConcurrencyGuarded, - CallConcurrencyConcurrent + CallConcurrencyKindNone = 0, + CallConcurrencyKindSequential, + CallConcurrencyKindGuarded, + CallConcurrencyKindConcurrent }; enum ConnectorKind { - ConnectorAssembly = 0, - ConnectorDelegation + ConnectorKindNone = 0, + ConnectorKindAssembly, + ConnectorKindDelegation }; enum ExpansionKind { - ExpansionParallel = 0, - ExpansionIterative, - ExpansionStream + ExpansionKindNone = 0, + ExpansionKindParallel, + ExpansionKindIterative, + ExpansionKindStream }; enum InteractionOperatorKind { - InteractionOperatorSeq = 0, - InteractionOperatorAlt, - InteractionOperatorOpt, - InteractionOperatorBreak, - InteractionOperatorPar, - InteractionOperatorStrict, - InteractionOperatorLoop, - InteractionOperatorCritical, - InteractionOperatorNeg, - InteractionOperatorAssert, - InteractionOperatorIgnore, - InteractionOperatorConsider + InteractionOperatorKindNone = 0, + InteractionOperatorKindSeq, + InteractionOperatorKindAlt, + InteractionOperatorKindOpt, + InteractionOperatorKindBreak, + InteractionOperatorKindPar, + InteractionOperatorKindStrict, + InteractionOperatorKindLoop, + InteractionOperatorKindCritical, + InteractionOperatorKindNeg, + InteractionOperatorKindAssert, + InteractionOperatorKindIgnore, + InteractionOperatorKindConsider }; enum MessageKind { - MessageComplete = 0, - MessageLost, - MessageFound, - MessageUnknown + MessageKindNone = 0, + MessageKindComplete, + MessageKindLost, + MessageKindFound, + MessageKindUnknown }; enum MessageSort { - MessageSynchCall = 0, - MessageAsynchCall, - MessageAsynchSignal, - MessageCreateMessage, - MessageDeleteMessage, - MessageReply + MessageSortNone = 0, + MessageSortSynchCall, + MessageSortAsynchCall, + MessageSortAsynchSignal, + MessageSortCreateMessage, + MessageSortDeleteMessage, + MessageSortReply }; enum ObjectNodeOrderingKind { - ObjectNodeOrderingUnordered = 0, - ObjectNodeOrderingOrdered, - ObjectNodeOrderingLIFO, - ObjectNodeOrderingFIFO + ObjectNodeOrderingKindNone = 0, + ObjectNodeOrderingKindUnordered, + ObjectNodeOrderingKindOrdered, + ObjectNodeOrderingKindLIFO, + ObjectNodeOrderingKindFIFO }; enum ParameterDirectionKind { - ParameterDirectionIn = 0, - ParameterDirectionInout, - ParameterDirectionOut, - ParameterDirectionReturn + ParameterDirectionKindNone = 0, + ParameterDirectionKindIn, + ParameterDirectionKindInout, + ParameterDirectionKindOut, + ParameterDirectionKindReturn }; enum ParameterEffectKind { - ParameterEffectCreate = 0, - ParameterEffectRead, - ParameterEffectUpdate, - ParameterEffectDelete + ParameterEffectKindNone = 0, + ParameterEffectKindCreate, + ParameterEffectKindRead, + ParameterEffectKindUpdate, + ParameterEffectKindDelete }; enum PseudostateKind { - PseudostateInitial = 0, - PseudostateDeepHistory, - PseudostateShallowHistory, - PseudostateJoin, - PseudostateFork, - PseudostateJunction, - PseudostateChoice, - PseudostateEntryPoint, - PseudostateExitPoint, - PseudostateTerminate + PseudostateKindNone = 0, + PseudostateKindInitial, + PseudostateKindDeepHistory, + PseudostateKindShallowHistory, + PseudostateKindJoin, + PseudostateKindFork, + PseudostateKindJunction, + PseudostateKindChoice, + PseudostateKindEntryPoint, + PseudostateKindExitPoint, + PseudostateKindTerminate }; enum TransitionKind { - TransitionInternal = 0, - TransitionLocal, - TransitionExternal + TransitionKindNone = 0, + TransitionKindInternal, + TransitionKindLocal, + TransitionKindExternal }; enum VisibilityKind { - VisibilityPublic = 0, - VisibilityPrivate, - VisibilityProtected, - VisibilityPackage + VisibilityKindNone = 0, + VisibilityKindPublic, + VisibilityKindPrivate, + VisibilityKindProtected, + VisibilityKindPackage }; }; QT_END_NAMESPACE +Q_DECLARE_METATYPE(QtUml::AggregationKind) +Q_DECLARE_METATYPE(QtUml::CallConcurrencyKind) +Q_DECLARE_METATYPE(QtUml::ConnectorKind) +Q_DECLARE_METATYPE(QtUml::ExpansionKind) +Q_DECLARE_METATYPE(QtUml::InteractionOperatorKind) +Q_DECLARE_METATYPE(QtUml::MessageKind) +Q_DECLARE_METATYPE(QtUml::MessageSort) +Q_DECLARE_METATYPE(QtUml::ObjectNodeOrderingKind) +Q_DECLARE_METATYPE(QtUml::ParameterDirectionKind) +Q_DECLARE_METATYPE(QtUml::ParameterEffectKind) +Q_DECLARE_METATYPE(QtUml::PseudostateKind) +Q_DECLARE_METATYPE(QtUml::TransitionKind) +Q_DECLARE_METATYPE(QtUml::VisibilityKind) + QT_END_HEADER #endif // QTUMLNAMESPACE_H diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp index 44c0854b..e6023f01 100644 --- a/src/uml/qumlabstraction.cpp +++ b/src/uml/qumlabstraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlabstraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOpaqueExpression> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlAbstraction::QUmlAbstraction() : _mapping(0) { + d_ptr->object.setProperty("mapping", QVariant::fromValue((QUmlOpaqueExpression *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlabstraction.h b/src/uml/qumlabstraction.h index ec7fcc95..3483ffa0 100644 --- a/src/uml/qumlabstraction.h +++ b/src/uml/qumlabstraction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAbstraction *) +Q_DECLARE_METATYPE(QList<QUmlAbstraction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAbstraction *> *) + QT_END_HEADER #endif // QUMLABSTRACTION_H diff --git a/src/uml/qumlacceptcallaction.cpp b/src/uml/qumlacceptcallaction.cpp index b3d74d1c..9330d054 100644 --- a/src/uml/qumlacceptcallaction.cpp +++ b/src/uml/qumlacceptcallaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlacceptcallaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlAcceptCallAction::QUmlAcceptCallAction() : _returnInformation(0) { + d_ptr->object.setProperty("returnInformation", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlacceptcallaction.h b/src/uml/qumlacceptcallaction.h index 229a3cfc..09f0865c 100644 --- a/src/uml/qumlacceptcallaction.h +++ b/src/uml/qumlacceptcallaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAcceptCallAction *) +Q_DECLARE_METATYPE(QList<QUmlAcceptCallAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAcceptCallAction *> *) + QT_END_HEADER #endif // QUMLACCEPTCALLACTION_H diff --git a/src/uml/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp index 41bad8d7..b890be85 100644 --- a/src/uml/qumlaccepteventaction.cpp +++ b/src/uml/qumlaccepteventaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlaccepteventaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> #include <QtUml/QUmlTrigger> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlAcceptEventAction::QUmlAcceptEventAction() : _isUnmarshall(false) { + d_ptr->object.setProperty("isUnmarshall", QVariant::fromValue(false)); + d_ptr->object.setProperty("result", QVariant::fromValue(&_result)); + d_ptr->object.setProperty("trigger", QVariant::fromValue(&_trigger)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlaccepteventaction.h b/src/uml/qumlaccepteventaction.h index 65aa3c3d..c503c804 100644 --- a/src/uml/qumlaccepteventaction.h +++ b/src/uml/qumlaccepteventaction.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAcceptEventAction *) +Q_DECLARE_METATYPE(QList<QUmlAcceptEventAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAcceptEventAction *> *) + QT_END_HEADER #endif // QUMLACCEPTEVENTACTION_H diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp index efd7e5ce..d5cabd3d 100644 --- a/src/uml/qumlaction.cpp +++ b/src/uml/qumlaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlConstraint> @@ -58,6 +59,12 @@ QT_BEGIN_NAMESPACE QUmlAction::QUmlAction() : _isLocallyReentrant(false) { + d_ptr->object.setProperty("context", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("input", QVariant::fromValue(&_input)); + d_ptr->object.setProperty("isLocallyReentrant", QVariant::fromValue(false)); + d_ptr->object.setProperty("localPostcondition", QVariant::fromValue(&_localPostcondition)); + d_ptr->object.setProperty("localPrecondition", QVariant::fromValue(&_localPrecondition)); + d_ptr->object.setProperty("output", QVariant::fromValue(&_output)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h index fcc6cd82..b3c4e8dd 100644 --- a/src/uml/qumlaction.h +++ b/src/uml/qumlaction.h @@ -89,6 +89,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAction *) +Q_DECLARE_METATYPE(QList<QUmlAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAction *> *) + QT_END_HEADER #endif // QUMLACTION_H diff --git a/src/uml/qumlactionexecutionspecification.cpp b/src/uml/qumlactionexecutionspecification.cpp index 2da1d63f..b9beb0ea 100644 --- a/src/uml/qumlactionexecutionspecification.cpp +++ b/src/uml/qumlactionexecutionspecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactionexecutionspecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAction> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlActionExecutionSpecification::QUmlActionExecutionSpecification() : _action(0) { + d_ptr->object.setProperty("action", QVariant::fromValue((QUmlAction *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactionexecutionspecification.h b/src/uml/qumlactionexecutionspecification.h index b1ee2f60..a60c365a 100644 --- a/src/uml/qumlactionexecutionspecification.h +++ b/src/uml/qumlactionexecutionspecification.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActionExecutionSpecification *) +Q_DECLARE_METATYPE(QList<QUmlActionExecutionSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlActionExecutionSpecification *> *) + QT_END_HEADER #endif // QUMLACTIONEXECUTIONSPECIFICATION_H diff --git a/src/uml/qumlactioninputpin.cpp b/src/uml/qumlactioninputpin.cpp index aef6df71..755f04c6 100644 --- a/src/uml/qumlactioninputpin.cpp +++ b/src/uml/qumlactioninputpin.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactioninputpin.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAction> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlActionInputPin::QUmlActionInputPin() : _fromAction(0) { + d_ptr->object.setProperty("fromAction", QVariant::fromValue((QUmlAction *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactioninputpin.h b/src/uml/qumlactioninputpin.h index 51b65a0d..3ed333f3 100644 --- a/src/uml/qumlactioninputpin.h +++ b/src/uml/qumlactioninputpin.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActionInputPin *) +Q_DECLARE_METATYPE(QList<QUmlActionInputPin *> *) +Q_DECLARE_METATYPE(QSet<QUmlActionInputPin *> *) + QT_END_HEADER #endif // QUMLACTIONINPUTPIN_H diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp index 1779cb12..7dfefebc 100644 --- a/src/uml/qumlactivity.cpp +++ b/src/uml/qumlactivity.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivity.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> @@ -61,6 +62,14 @@ QUmlActivity::QUmlActivity() : _isReadOnly(false), _isSingleExecution(false) { + d_ptr->object.setProperty("edge", QVariant::fromValue(&_edge)); + d_ptr->object.setProperty("group", QVariant::fromValue(&_group)); + d_ptr->object.setProperty("isReadOnly", QVariant::fromValue(false)); + d_ptr->object.setProperty("isSingleExecution", QVariant::fromValue(false)); + d_ptr->object.setProperty("node", QVariant::fromValue(&_node)); + d_ptr->object.setProperty("partition", QVariant::fromValue(&_partition)); + d_ptr->object.setProperty("structuredNode", QVariant::fromValue(&_structuredNode)); + d_ptr->object.setProperty("variable", QVariant::fromValue(&_variable)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivity.h b/src/uml/qumlactivity.h index 268180e6..23cbcdda 100644 --- a/src/uml/qumlactivity.h +++ b/src/uml/qumlactivity.h @@ -100,6 +100,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivity *) +Q_DECLARE_METATYPE(QList<QUmlActivity *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivity *> *) + QT_END_HEADER #endif // QUMLACTIVITY_H diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp index a48349ef..6b7c96ac 100644 --- a/src/uml/qumlactivityedge.cpp +++ b/src/uml/qumlactivityedge.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivityedge.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityGroup> @@ -67,6 +68,16 @@ QUmlActivityEdge::QUmlActivityEdge() : _target(0), _weight(0) { + d_ptr->object.setProperty("activity", QVariant::fromValue((QUmlActivity *)(0))); + d_ptr->object.setProperty("guard", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("inGroup", QVariant::fromValue(&_inGroup)); + d_ptr->object.setProperty("inPartition", QVariant::fromValue(&_inPartition)); + d_ptr->object.setProperty("inStructuredNode", QVariant::fromValue((QUmlStructuredActivityNode *)(0))); + d_ptr->object.setProperty("interrupts", QVariant::fromValue((QUmlInterruptibleActivityRegion *)(0))); + d_ptr->object.setProperty("redefinedEdge", QVariant::fromValue(&_redefinedEdge)); + d_ptr->object.setProperty("source", QVariant::fromValue((QUmlActivityNode *)(0))); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlActivityNode *)(0))); + d_ptr->object.setProperty("weight", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h index 0a99a1ab..ec7fccd2 100644 --- a/src/uml/qumlactivityedge.h +++ b/src/uml/qumlactivityedge.h @@ -104,6 +104,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityEdge *) +Q_DECLARE_METATYPE(QList<QUmlActivityEdge *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityEdge *> *) + QT_END_HEADER #endif // QUMLACTIVITYEDGE_H diff --git a/src/uml/qumlactivityfinalnode.cpp b/src/uml/qumlactivityfinalnode.cpp index 86c06cd5..c07609f6 100644 --- a/src/uml/qumlactivityfinalnode.cpp +++ b/src/uml/qumlactivityfinalnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivityfinalnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlactivityfinalnode.h b/src/uml/qumlactivityfinalnode.h index 5f406f53..a52a4a4a 100644 --- a/src/uml/qumlactivityfinalnode.h +++ b/src/uml/qumlactivityfinalnode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityFinalNode *) +Q_DECLARE_METATYPE(QList<QUmlActivityFinalNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityFinalNode *> *) + QT_END_HEADER #endif // QUMLACTIVITYFINALNODE_H diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp index 5c77255d..2b56444b 100644 --- a/src/uml/qumlactivitygroup.cpp +++ b/src/uml/qumlactivitygroup.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivitygroup.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> @@ -58,6 +59,11 @@ QUmlActivityGroup::QUmlActivityGroup() : _inActivity(0), _superGroup(0) { + d_ptr->object.setProperty("containedEdge", QVariant::fromValue(&_containedEdge)); + d_ptr->object.setProperty("containedNode", QVariant::fromValue(&_containedNode)); + d_ptr->object.setProperty("inActivity", QVariant::fromValue((QUmlActivity *)(0))); + d_ptr->object.setProperty("subgroup", QVariant::fromValue(&_subgroup)); + d_ptr->object.setProperty("superGroup", QVariant::fromValue((QUmlActivityGroup *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h index db6e5586..f87da36d 100644 --- a/src/uml/qumlactivitygroup.h +++ b/src/uml/qumlactivitygroup.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityGroup *) +Q_DECLARE_METATYPE(QList<QUmlActivityGroup *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityGroup *> *) + QT_END_HEADER #endif // QUMLACTIVITYGROUP_H diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp index 8089490a..6fc4e13f 100644 --- a/src/uml/qumlactivitynode.cpp +++ b/src/uml/qumlactivitynode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivitynode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> @@ -61,6 +62,14 @@ QUmlActivityNode::QUmlActivityNode() : _activity(0), _inStructuredNode(0) { + d_ptr->object.setProperty("activity", QVariant::fromValue((QUmlActivity *)(0))); + d_ptr->object.setProperty("inGroup", QVariant::fromValue(&_inGroup)); + d_ptr->object.setProperty("inInterruptibleRegion", QVariant::fromValue(&_inInterruptibleRegion)); + d_ptr->object.setProperty("inPartition", QVariant::fromValue(&_inPartition)); + d_ptr->object.setProperty("inStructuredNode", QVariant::fromValue((QUmlStructuredActivityNode *)(0))); + d_ptr->object.setProperty("incoming", QVariant::fromValue(&_incoming)); + d_ptr->object.setProperty("outgoing", QVariant::fromValue(&_outgoing)); + d_ptr->object.setProperty("redefinedNode", QVariant::fromValue(&_redefinedNode)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h index 048e0abd..4d711dfa 100644 --- a/src/uml/qumlactivitynode.h +++ b/src/uml/qumlactivitynode.h @@ -100,6 +100,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityNode *) +Q_DECLARE_METATYPE(QList<QUmlActivityNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityNode *> *) + QT_END_HEADER #endif // QUMLACTIVITYNODE_H diff --git a/src/uml/qumlactivityparameternode.cpp b/src/uml/qumlactivityparameternode.cpp index 5b96cd60..dfef06ca 100644 --- a/src/uml/qumlactivityparameternode.cpp +++ b/src/uml/qumlactivityparameternode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivityparameternode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlParameter> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlActivityParameterNode::QUmlActivityParameterNode() : _parameter(0) { + d_ptr->object.setProperty("parameter", QVariant::fromValue((QUmlParameter *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivityparameternode.h b/src/uml/qumlactivityparameternode.h index a760bbb3..7d43d247 100644 --- a/src/uml/qumlactivityparameternode.h +++ b/src/uml/qumlactivityparameternode.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityParameterNode *) +Q_DECLARE_METATYPE(QList<QUmlActivityParameterNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityParameterNode *> *) + QT_END_HEADER #endif // QUMLACTIVITYPARAMETERNODE_H diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp index 9664191a..20e23e8c 100644 --- a/src/uml/qumlactivitypartition.cpp +++ b/src/uml/qumlactivitypartition.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactivitypartition.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityNode> @@ -60,6 +61,13 @@ QUmlActivityPartition::QUmlActivityPartition() : _represents(0), _superPartition(0) { + d_ptr->object.setProperty("edge", QVariant::fromValue(&_edge)); + d_ptr->object.setProperty("isDimension", QVariant::fromValue(false)); + d_ptr->object.setProperty("isExternal", QVariant::fromValue(false)); + d_ptr->object.setProperty("node", QVariant::fromValue(&_node)); + d_ptr->object.setProperty("represents", QVariant::fromValue((QUmlElement *)(0))); + d_ptr->object.setProperty("subpartition", QVariant::fromValue(&_subpartition)); + d_ptr->object.setProperty("superPartition", QVariant::fromValue((QUmlActivityPartition *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlactivitypartition.h b/src/uml/qumlactivitypartition.h index 2381ac1e..8c058dc0 100644 --- a/src/uml/qumlactivitypartition.h +++ b/src/uml/qumlactivitypartition.h @@ -91,6 +91,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActivityPartition *) +Q_DECLARE_METATYPE(QList<QUmlActivityPartition *> *) +Q_DECLARE_METATYPE(QSet<QUmlActivityPartition *> *) + QT_END_HEADER #endif // QUMLACTIVITYPARTITION_H diff --git a/src/uml/qumlactor.cpp b/src/uml/qumlactor.cpp index 02982a93..f18a10e3 100644 --- a/src/uml/qumlactor.cpp +++ b/src/uml/qumlactor.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlactor.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlactor.h b/src/uml/qumlactor.h index 7bbd17c2..456efd97 100644 --- a/src/uml/qumlactor.h +++ b/src/uml/qumlactor.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlActor *) +Q_DECLARE_METATYPE(QList<QUmlActor *> *) +Q_DECLARE_METATYPE(QSet<QUmlActor *> *) + QT_END_HEADER #endif // QUMLACTOR_H diff --git a/src/uml/qumladdstructuralfeaturevalueaction.cpp b/src/uml/qumladdstructuralfeaturevalueaction.cpp index fd65af66..9953fdd4 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.cpp +++ b/src/uml/qumladdstructuralfeaturevalueaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumladdstructuralfeaturevalueaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction() : _insertAt(0), _isReplaceAll(false) { + d_ptr->object.setProperty("insertAt", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("isReplaceAll", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumladdstructuralfeaturevalueaction.h b/src/uml/qumladdstructuralfeaturevalueaction.h index 0d4d380b..5549f1ee 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.h +++ b/src/uml/qumladdstructuralfeaturevalueaction.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAddStructuralFeatureValueAction *) +Q_DECLARE_METATYPE(QList<QUmlAddStructuralFeatureValueAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAddStructuralFeatureValueAction *> *) + QT_END_HEADER #endif // QUMLADDSTRUCTURALFEATUREVALUEACTION_H diff --git a/src/uml/qumladdvariablevalueaction.cpp b/src/uml/qumladdvariablevalueaction.cpp index f760d435..4d60fde0 100644 --- a/src/uml/qumladdvariablevalueaction.cpp +++ b/src/uml/qumladdvariablevalueaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumladdvariablevalueaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlAddVariableValueAction::QUmlAddVariableValueAction() : _insertAt(0), _isReplaceAll(false) { + d_ptr->object.setProperty("insertAt", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("isReplaceAll", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumladdvariablevalueaction.h b/src/uml/qumladdvariablevalueaction.h index b091df09..bd02dd0b 100644 --- a/src/uml/qumladdvariablevalueaction.h +++ b/src/uml/qumladdvariablevalueaction.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAddVariableValueAction *) +Q_DECLARE_METATYPE(QList<QUmlAddVariableValueAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlAddVariableValueAction *> *) + QT_END_HEADER #endif // QUMLADDVARIABLEVALUEACTION_H diff --git a/src/uml/qumlanyreceiveevent.cpp b/src/uml/qumlanyreceiveevent.cpp index 506a252d..55112ccf 100644 --- a/src/uml/qumlanyreceiveevent.cpp +++ b/src/uml/qumlanyreceiveevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlanyreceiveevent.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlanyreceiveevent.h b/src/uml/qumlanyreceiveevent.h index c7c649ec..c7c8bf3e 100644 --- a/src/uml/qumlanyreceiveevent.h +++ b/src/uml/qumlanyreceiveevent.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAnyReceiveEvent *) +Q_DECLARE_METATYPE(QList<QUmlAnyReceiveEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlAnyReceiveEvent *> *) + QT_END_HEADER #endif // QUMLANYRECEIVEEVENT_H diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp index 7e2e8384..8376cf40 100644 --- a/src/uml/qumlartifact.cpp +++ b/src/uml/qumlartifact.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlartifact.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlManifestation> #include <QtUml/QUmlOperation> @@ -56,6 +57,11 @@ QT_BEGIN_NAMESPACE QUmlArtifact::QUmlArtifact() { + d_ptr->object.setProperty("fileName", QVariant::fromValue(QString())); + d_ptr->object.setProperty("manifestation", QVariant::fromValue(&_manifestation)); + d_ptr->object.setProperty("nestedArtifact", QVariant::fromValue(&_nestedArtifact)); + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); + d_ptr->object.setProperty("ownedOperation", QVariant::fromValue(&_ownedOperation)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlartifact.h b/src/uml/qumlartifact.h index effab1bd..4f1d9387 100644 --- a/src/uml/qumlartifact.h +++ b/src/uml/qumlartifact.h @@ -87,6 +87,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlArtifact *) +Q_DECLARE_METATYPE(QList<QUmlArtifact *> *) +Q_DECLARE_METATYPE(QSet<QUmlArtifact *> *) + QT_END_HEADER #endif // QUMLARTIFACT_H diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp index 0695888d..d5ccc091 100644 --- a/src/uml/qumlassociation.cpp +++ b/src/uml/qumlassociation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlassociation.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlProperty> #include <QtUml/QUmlType> @@ -56,6 +57,11 @@ QT_BEGIN_NAMESPACE QUmlAssociation::QUmlAssociation() : _isDerived(false) { + d_ptr->object.setProperty("endType", QVariant::fromValue(QList<QUmlType *>())); + d_ptr->object.setProperty("isDerived", QVariant::fromValue(false)); + d_ptr->object.setProperty("memberEnd", QVariant::fromValue(&_memberEnd)); + d_ptr->object.setProperty("navigableOwnedEnd", QVariant::fromValue(&_navigableOwnedEnd)); + d_ptr->object.setProperty("ownedEnd", QVariant::fromValue(&_ownedEnd)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlassociation.h b/src/uml/qumlassociation.h index 66220518..88e79041 100644 --- a/src/uml/qumlassociation.h +++ b/src/uml/qumlassociation.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAssociation *) +Q_DECLARE_METATYPE(QList<QUmlAssociation *> *) +Q_DECLARE_METATYPE(QSet<QUmlAssociation *> *) + QT_END_HEADER #endif // QUMLASSOCIATION_H diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp index ae334917..efeaa811 100644 --- a/src/uml/qumlassociationclass.cpp +++ b/src/uml/qumlassociationclass.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlassociationclass.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlassociationclass.h b/src/uml/qumlassociationclass.h index 215a76a6..63720058 100644 --- a/src/uml/qumlassociationclass.h +++ b/src/uml/qumlassociationclass.h @@ -62,6 +62,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlAssociationClass *) +Q_DECLARE_METATYPE(QList<QUmlAssociationClass *> *) +Q_DECLARE_METATYPE(QSet<QUmlAssociationClass *> *) + QT_END_HEADER #endif // QUMLASSOCIATIONCLASS_H diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp index 1350f3f3..2be6633c 100644 --- a/src/uml/qumlbehavior.cpp +++ b/src/uml/qumlbehavior.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlbehavior.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> @@ -60,6 +61,14 @@ QUmlBehavior::QUmlBehavior() : _isReentrant(true), _specification(0) { + d_ptr->object.setProperty("context", QVariant::fromValue((QUmlBehavioredClassifier *)(0))); + d_ptr->object.setProperty("isReentrant", QVariant::fromValue(false)); + d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter)); + d_ptr->object.setProperty("ownedParameterSet", QVariant::fromValue(&_ownedParameterSet)); + d_ptr->object.setProperty("postcondition", QVariant::fromValue(&_postcondition)); + d_ptr->object.setProperty("precondition", QVariant::fromValue(&_precondition)); + d_ptr->object.setProperty("redefinedBehavior", QVariant::fromValue(&_redefinedBehavior)); + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlBehavioralFeature *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h index 763de2c9..c849f8e7 100644 --- a/src/uml/qumlbehavior.h +++ b/src/uml/qumlbehavior.h @@ -97,6 +97,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlBehavior *) +Q_DECLARE_METATYPE(QList<QUmlBehavior *> *) +Q_DECLARE_METATYPE(QSet<QUmlBehavior *> *) + QT_END_HEADER #endif // QUMLBEHAVIOR_H diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp index 9e18e583..72d6828b 100644 --- a/src/uml/qumlbehavioralfeature.cpp +++ b/src/uml/qumlbehavioralfeature.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlbehavioralfeature.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlNamedElement> @@ -57,9 +58,15 @@ QT_BEGIN_NAMESPACE */ QUmlBehavioralFeature::QUmlBehavioralFeature() : - _concurrency(QtUml::CallConcurrencySequential), + _concurrency(QtUml::CallConcurrencyKindSequential), _isAbstract(false) { + d_ptr->object.setProperty("concurrency", QVariant::fromValue(QtUml::CallConcurrencyKindNone)); + d_ptr->object.setProperty("isAbstract", QVariant::fromValue(false)); + d_ptr->object.setProperty("method", QVariant::fromValue(&_method)); + d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter)); + d_ptr->object.setProperty("ownedParameterSet", QVariant::fromValue(&_ownedParameterSet)); + d_ptr->object.setProperty("raisedException", QVariant::fromValue(&_raisedException)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h index 4fb9b970..20f7e71c 100644 --- a/src/uml/qumlbehavioralfeature.h +++ b/src/uml/qumlbehavioralfeature.h @@ -96,6 +96,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlBehavioralFeature *) +Q_DECLARE_METATYPE(QList<QUmlBehavioralFeature *> *) +Q_DECLARE_METATYPE(QSet<QUmlBehavioralFeature *> *) + QT_END_HEADER #endif // QUMLBEHAVIORALFEATURE_H diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp index 9f44444d..b2d79545 100644 --- a/src/uml/qumlbehavioredclassifier.cpp +++ b/src/uml/qumlbehavioredclassifier.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlbehavioredclassifier.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlInterfaceRealization> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlBehavioredClassifier::QUmlBehavioredClassifier() : _classifierBehavior(0) { + d_ptr->object.setProperty("classifierBehavior", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("interfaceRealization", QVariant::fromValue(&_interfaceRealization)); + d_ptr->object.setProperty("ownedBehavior", QVariant::fromValue(&_ownedBehavior)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h index 4ebfa7d8..d864466d 100644 --- a/src/uml/qumlbehavioredclassifier.h +++ b/src/uml/qumlbehavioredclassifier.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlBehavioredClassifier *) +Q_DECLARE_METATYPE(QList<QUmlBehavioredClassifier *> *) +Q_DECLARE_METATYPE(QSet<QUmlBehavioredClassifier *> *) + QT_END_HEADER #endif // QUMLBEHAVIOREDCLASSIFIER_H diff --git a/src/uml/qumlbehaviorexecutionspecification.cpp b/src/uml/qumlbehaviorexecutionspecification.cpp index 94f86b84..fac08928 100644 --- a/src/uml/qumlbehaviorexecutionspecification.cpp +++ b/src/uml/qumlbehaviorexecutionspecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlbehaviorexecutionspecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification() : _behavior(0) { + d_ptr->object.setProperty("behavior", QVariant::fromValue((QUmlBehavior *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlbehaviorexecutionspecification.h b/src/uml/qumlbehaviorexecutionspecification.h index f1d8f9b6..6512bf86 100644 --- a/src/uml/qumlbehaviorexecutionspecification.h +++ b/src/uml/qumlbehaviorexecutionspecification.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlBehaviorExecutionSpecification *) +Q_DECLARE_METATYPE(QList<QUmlBehaviorExecutionSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlBehaviorExecutionSpecification *> *) + QT_END_HEADER #endif // QUMLBEHAVIOREXECUTIONSPECIFICATION_H diff --git a/src/uml/qumlbroadcastsignalaction.cpp b/src/uml/qumlbroadcastsignalaction.cpp index 56409fd4..e96396cd 100644 --- a/src/uml/qumlbroadcastsignalaction.cpp +++ b/src/uml/qumlbroadcastsignalaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlbroadcastsignalaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlSignal> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlBroadcastSignalAction::QUmlBroadcastSignalAction() : _signal(0) { + d_ptr->object.setProperty("signal", QVariant::fromValue((QUmlSignal *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlbroadcastsignalaction.h b/src/uml/qumlbroadcastsignalaction.h index 7443733a..bbb07ccf 100644 --- a/src/uml/qumlbroadcastsignalaction.h +++ b/src/uml/qumlbroadcastsignalaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlBroadcastSignalAction *) +Q_DECLARE_METATYPE(QList<QUmlBroadcastSignalAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlBroadcastSignalAction *> *) + QT_END_HEADER #endif // QUMLBROADCASTSIGNALACTION_H diff --git a/src/uml/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp index e92d0df9..cff52b5f 100644 --- a/src/uml/qumlcallaction.cpp +++ b/src/uml/qumlcallaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcallaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlCallAction::QUmlCallAction() : _isSynchronous(true) { + d_ptr->object.setProperty("isSynchronous", QVariant::fromValue(false)); + d_ptr->object.setProperty("result", QVariant::fromValue(&_result)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h index b9ed4445..4d90e3d5 100644 --- a/src/uml/qumlcallaction.h +++ b/src/uml/qumlcallaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCallAction *) +Q_DECLARE_METATYPE(QList<QUmlCallAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCallAction *> *) + QT_END_HEADER #endif // QUMLCALLACTION_H diff --git a/src/uml/qumlcallbehavioraction.cpp b/src/uml/qumlcallbehavioraction.cpp index 99cdcddd..1cdffa12 100644 --- a/src/uml/qumlcallbehavioraction.cpp +++ b/src/uml/qumlcallbehavioraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcallbehavioraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlCallBehaviorAction::QUmlCallBehaviorAction() : _behavior(0) { + d_ptr->object.setProperty("behavior", QVariant::fromValue((QUmlBehavior *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcallbehavioraction.h b/src/uml/qumlcallbehavioraction.h index a43c6743..8370390c 100644 --- a/src/uml/qumlcallbehavioraction.h +++ b/src/uml/qumlcallbehavioraction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCallBehaviorAction *) +Q_DECLARE_METATYPE(QList<QUmlCallBehaviorAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCallBehaviorAction *> *) + QT_END_HEADER #endif // QUMLCALLBEHAVIORACTION_H diff --git a/src/uml/qumlcallevent.cpp b/src/uml/qumlcallevent.cpp index 9caeed69..e8625583 100644 --- a/src/uml/qumlcallevent.cpp +++ b/src/uml/qumlcallevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcallevent.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOperation> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlCallEvent::QUmlCallEvent() : _operation(0) { + d_ptr->object.setProperty("operation", QVariant::fromValue((QUmlOperation *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcallevent.h b/src/uml/qumlcallevent.h index b0f6a4bc..2443ec83 100644 --- a/src/uml/qumlcallevent.h +++ b/src/uml/qumlcallevent.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCallEvent *) +Q_DECLARE_METATYPE(QList<QUmlCallEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlCallEvent *> *) + QT_END_HEADER #endif // QUMLCALLEVENT_H diff --git a/src/uml/qumlcalloperationaction.cpp b/src/uml/qumlcalloperationaction.cpp index 0b3483bc..90df4797 100644 --- a/src/uml/qumlcalloperationaction.cpp +++ b/src/uml/qumlcalloperationaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcalloperationaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOperation> @@ -57,6 +58,8 @@ QUmlCallOperationAction::QUmlCallOperationAction() : _operation(0), _target(0) { + d_ptr->object.setProperty("operation", QVariant::fromValue((QUmlOperation *)(0))); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcalloperationaction.h b/src/uml/qumlcalloperationaction.h index dcfc662e..ec0ac727 100644 --- a/src/uml/qumlcalloperationaction.h +++ b/src/uml/qumlcalloperationaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCallOperationAction *) +Q_DECLARE_METATYPE(QList<QUmlCallOperationAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCallOperationAction *> *) + QT_END_HEADER #endif // QUMLCALLOPERATIONACTION_H diff --git a/src/uml/qumlcentralbuffernode.cpp b/src/uml/qumlcentralbuffernode.cpp index bf7e97bc..49a606ba 100644 --- a/src/uml/qumlcentralbuffernode.cpp +++ b/src/uml/qumlcentralbuffernode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcentralbuffernode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlcentralbuffernode.h b/src/uml/qumlcentralbuffernode.h index aac72963..a0e47e68 100644 --- a/src/uml/qumlcentralbuffernode.h +++ b/src/uml/qumlcentralbuffernode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCentralBufferNode *) +Q_DECLARE_METATYPE(QList<QUmlCentralBufferNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlCentralBufferNode *> *) + QT_END_HEADER #endif // QUMLCENTRALBUFFERNODE_H diff --git a/src/uml/qumlchangeevent.cpp b/src/uml/qumlchangeevent.cpp index 8b6eacfa..11ca1137 100644 --- a/src/uml/qumlchangeevent.cpp +++ b/src/uml/qumlchangeevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlchangeevent.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlValueSpecification> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlChangeEvent::QUmlChangeEvent() : _changeExpression(0) { + d_ptr->object.setProperty("changeExpression", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlchangeevent.h b/src/uml/qumlchangeevent.h index 7612cf41..af72842a 100644 --- a/src/uml/qumlchangeevent.h +++ b/src/uml/qumlchangeevent.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlChangeEvent *) +Q_DECLARE_METATYPE(QList<QUmlChangeEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlChangeEvent *> *) + QT_END_HEADER #endif // QUMLCHANGEEVENT_H diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp index c8ba5121..861d78bd 100644 --- a/src/uml/qumlclass.cpp +++ b/src/uml/qumlclass.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclass.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExtension> @@ -61,6 +62,14 @@ QUmlClass::QUmlClass() : _isAbstract(false), _isActive(false) { + d_ptr->object.setProperty("extension", QVariant::fromValue(QSet<QUmlExtension *>())); + d_ptr->object.setProperty("isAbstract", QVariant::fromValue(false)); + d_ptr->object.setProperty("isActive", QVariant::fromValue(false)); + d_ptr->object.setProperty("nestedClassifier", QVariant::fromValue(&_nestedClassifier)); + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); + d_ptr->object.setProperty("ownedOperation", QVariant::fromValue(&_ownedOperation)); + d_ptr->object.setProperty("ownedReception", QVariant::fromValue(&_ownedReception)); + d_ptr->object.setProperty("superClass", QVariant::fromValue(QSet<QUmlClass *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclass.h b/src/uml/qumlclass.h index 745510f6..34d6d378 100644 --- a/src/uml/qumlclass.h +++ b/src/uml/qumlclass.h @@ -102,6 +102,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClass *) +Q_DECLARE_METATYPE(QList<QUmlClass *> *) +Q_DECLARE_METATYPE(QSet<QUmlClass *> *) + QT_END_HEADER #endif // QUMLCLASS_H diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp index a12d5298..0ba69130 100644 --- a/src/uml/qumlclassifier.cpp +++ b/src/uml/qumlclassifier.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclassifier.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> @@ -68,6 +69,22 @@ QUmlClassifier::QUmlClassifier() : _representation(0), _templateParameter(0) { + d_ptr->object.setProperty("attribute", QVariant::fromValue(&_attribute)); + d_ptr->object.setProperty("collaborationUse", QVariant::fromValue(&_collaborationUse)); + d_ptr->object.setProperty("feature", QVariant::fromValue(&_feature)); + d_ptr->object.setProperty("general", QVariant::fromValue(QSet<QUmlClassifier *>())); + d_ptr->object.setProperty("generalization", QVariant::fromValue(&_generalization)); + d_ptr->object.setProperty("inheritedMember", QVariant::fromValue(QSet<QUmlNamedElement *>())); + d_ptr->object.setProperty("isAbstract", QVariant::fromValue(false)); + d_ptr->object.setProperty("isFinalSpecialization", QVariant::fromValue(false)); + d_ptr->object.setProperty("ownedTemplateSignature", QVariant::fromValue((QUmlRedefinableTemplateSignature *)(0))); + d_ptr->object.setProperty("ownedUseCase", QVariant::fromValue(&_ownedUseCase)); + d_ptr->object.setProperty("powertypeExtent", QVariant::fromValue(&_powertypeExtent)); + d_ptr->object.setProperty("redefinedClassifier", QVariant::fromValue(&_redefinedClassifier)); + d_ptr->object.setProperty("representation", QVariant::fromValue((QUmlCollaborationUse *)(0))); + d_ptr->object.setProperty("substitution", QVariant::fromValue(&_substitution)); + d_ptr->object.setProperty("templateParameter", QVariant::fromValue((QUmlClassifierTemplateParameter *)(0))); + d_ptr->object.setProperty("useCase", QVariant::fromValue(&_useCase)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h index 188f037e..6a7b5544 100644 --- a/src/uml/qumlclassifier.h +++ b/src/uml/qumlclassifier.h @@ -145,6 +145,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClassifier *) +Q_DECLARE_METATYPE(QList<QUmlClassifier *> *) +Q_DECLARE_METATYPE(QSet<QUmlClassifier *> *) + QT_END_HEADER #endif // QUMLCLASSIFIER_H diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp index c4d66314..e569a863 100644 --- a/src/uml/qumlclassifiertemplateparameter.cpp +++ b/src/uml/qumlclassifiertemplateparameter.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclassifiertemplateparameter.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> @@ -56,6 +57,9 @@ QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter() : _allowSubstitutable(true), _parameteredElement(0) { + d_ptr->object.setProperty("allowSubstitutable", QVariant::fromValue(false)); + d_ptr->object.setProperty("constrainingClassifier", QVariant::fromValue(&_constrainingClassifier)); + d_ptr->object.setProperty("parameteredElement", QVariant::fromValue((QUmlClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclassifiertemplateparameter.h b/src/uml/qumlclassifiertemplateparameter.h index 84ca8295..13ea959d 100644 --- a/src/uml/qumlclassifiertemplateparameter.h +++ b/src/uml/qumlclassifiertemplateparameter.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClassifierTemplateParameter *) +Q_DECLARE_METATYPE(QList<QUmlClassifierTemplateParameter *> *) +Q_DECLARE_METATYPE(QSet<QUmlClassifierTemplateParameter *> *) + QT_END_HEADER #endif // QUMLCLASSIFIERTEMPLATEPARAMETER_H diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp index 503fc684..eb0faa0d 100644 --- a/src/uml/qumlclause.cpp +++ b/src/uml/qumlclause.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclause.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlOutputPin> @@ -56,6 +57,12 @@ QT_BEGIN_NAMESPACE QUmlClause::QUmlClause() : _decider(0) { + d_ptr->object.setProperty("body", QVariant::fromValue(&_body)); + d_ptr->object.setProperty("bodyOutput", QVariant::fromValue(&_bodyOutput)); + d_ptr->object.setProperty("decider", QVariant::fromValue((QUmlOutputPin *)(0))); + d_ptr->object.setProperty("predecessorClause", QVariant::fromValue(&_predecessorClause)); + d_ptr->object.setProperty("successorClause", QVariant::fromValue(&_successorClause)); + d_ptr->object.setProperty("test", QVariant::fromValue(&_test)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclause.h b/src/uml/qumlclause.h index fda4503b..372ec61e 100644 --- a/src/uml/qumlclause.h +++ b/src/uml/qumlclause.h @@ -89,6 +89,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClause *) +Q_DECLARE_METATYPE(QList<QUmlClause *> *) +Q_DECLARE_METATYPE(QSet<QUmlClause *> *) + QT_END_HEADER #endif // QUMLCLAUSE_H diff --git a/src/uml/qumlclearassociationaction.cpp b/src/uml/qumlclearassociationaction.cpp index 18a654b4..abba3e9b 100644 --- a/src/uml/qumlclearassociationaction.cpp +++ b/src/uml/qumlclearassociationaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclearassociationaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlInputPin> @@ -57,6 +58,8 @@ QUmlClearAssociationAction::QUmlClearAssociationAction() : _association(0), _object(0) { + d_ptr->object.setProperty("association", QVariant::fromValue((QUmlAssociation *)(0))); + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclearassociationaction.h b/src/uml/qumlclearassociationaction.h index 9f9706a3..1fa08a6a 100644 --- a/src/uml/qumlclearassociationaction.h +++ b/src/uml/qumlclearassociationaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClearAssociationAction *) +Q_DECLARE_METATYPE(QList<QUmlClearAssociationAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlClearAssociationAction *> *) + QT_END_HEADER #endif // QUMLCLEARASSOCIATIONACTION_H diff --git a/src/uml/qumlclearstructuralfeatureaction.cpp b/src/uml/qumlclearstructuralfeatureaction.cpp index 2bb893cc..394cfcd1 100644 --- a/src/uml/qumlclearstructuralfeatureaction.cpp +++ b/src/uml/qumlclearstructuralfeatureaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclearstructuralfeatureaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlclearstructuralfeatureaction.h b/src/uml/qumlclearstructuralfeatureaction.h index ba038f16..af0f37fb 100644 --- a/src/uml/qumlclearstructuralfeatureaction.h +++ b/src/uml/qumlclearstructuralfeatureaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClearStructuralFeatureAction *) +Q_DECLARE_METATYPE(QList<QUmlClearStructuralFeatureAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlClearStructuralFeatureAction *> *) + QT_END_HEADER #endif // QUMLCLEARSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qumlclearvariableaction.cpp b/src/uml/qumlclearvariableaction.cpp index 37ac8c58..c52ef0ee 100644 --- a/src/uml/qumlclearvariableaction.cpp +++ b/src/uml/qumlclearvariableaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlclearvariableaction.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlclearvariableaction.h b/src/uml/qumlclearvariableaction.h index b9fedb1d..7f3fd444 100644 --- a/src/uml/qumlclearvariableaction.h +++ b/src/uml/qumlclearvariableaction.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlClearVariableAction *) +Q_DECLARE_METATYPE(QList<QUmlClearVariableAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlClearVariableAction *> *) + QT_END_HEADER #endif // QUMLCLEARVARIABLEACTION_H diff --git a/src/uml/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp index 70f9594b..7c6258fb 100644 --- a/src/uml/qumlcollaboration.cpp +++ b/src/uml/qumlcollaboration.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcollaboration.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElement> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlCollaboration::QUmlCollaboration() { + d_ptr->object.setProperty("collaborationRole", QVariant::fromValue(&_collaborationRole)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcollaboration.h b/src/uml/qumlcollaboration.h index eae9b32e..aeeb40d0 100644 --- a/src/uml/qumlcollaboration.h +++ b/src/uml/qumlcollaboration.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCollaboration *) +Q_DECLARE_METATYPE(QList<QUmlCollaboration *> *) +Q_DECLARE_METATYPE(QSet<QUmlCollaboration *> *) + QT_END_HEADER #endif // QUMLCOLLABORATION_H diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp index 08bdf4e5..b406acd8 100644 --- a/src/uml/qumlcollaborationuse.cpp +++ b/src/uml/qumlcollaborationuse.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcollaborationuse.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlCollaboration> #include <QtUml/QUmlDependency> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlCollaborationUse::QUmlCollaborationUse() : _type(0) { + d_ptr->object.setProperty("roleBinding", QVariant::fromValue(&_roleBinding)); + d_ptr->object.setProperty("type", QVariant::fromValue((QUmlCollaboration *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcollaborationuse.h b/src/uml/qumlcollaborationuse.h index 27ba187c..828660fe 100644 --- a/src/uml/qumlcollaborationuse.h +++ b/src/uml/qumlcollaborationuse.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCollaborationUse *) +Q_DECLARE_METATYPE(QList<QUmlCollaborationUse *> *) +Q_DECLARE_METATYPE(QSet<QUmlCollaborationUse *> *) + QT_END_HEADER #endif // QUMLCOLLABORATIONUSE_H diff --git a/src/uml/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp index ae6e0fdc..b066496f 100644 --- a/src/uml/qumlcombinedfragment.cpp +++ b/src/uml/qumlcombinedfragment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcombinedfragment.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlGate> #include <QtUml/QUmlInteractionOperand> @@ -54,8 +55,11 @@ QT_BEGIN_NAMESPACE */ QUmlCombinedFragment::QUmlCombinedFragment() : - _interactionOperator(QtUml::InteractionOperatorSeq) + _interactionOperator(QtUml::InteractionOperatorKindSeq) { + d_ptr->object.setProperty("cfragmentGate", QVariant::fromValue(&_cfragmentGate)); + d_ptr->object.setProperty("interactionOperator", QVariant::fromValue(QtUml::InteractionOperatorKindNone)); + d_ptr->object.setProperty("operand", QVariant::fromValue(&_operand)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h index 02eb6b62..e18c1ae5 100644 --- a/src/uml/qumlcombinedfragment.h +++ b/src/uml/qumlcombinedfragment.h @@ -78,6 +78,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCombinedFragment *) +Q_DECLARE_METATYPE(QList<QUmlCombinedFragment *> *) +Q_DECLARE_METATYPE(QSet<QUmlCombinedFragment *> *) + QT_END_HEADER #endif // QUMLCOMBINEDFRAGMENT_H diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp index 132b8665..fb16e1e5 100644 --- a/src/uml/qumlcomment.cpp +++ b/src/uml/qumlcomment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcomment.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ QT_BEGIN_NAMESPACE QUmlComment::QUmlComment() { + d_ptr->object.setProperty("annotatedElement", QVariant::fromValue(&_annotatedElement)); + d_ptr->object.setProperty("body", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcomment.h b/src/uml/qumlcomment.h index 48918d58..f0adc3ca 100644 --- a/src/uml/qumlcomment.h +++ b/src/uml/qumlcomment.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlComment *) +Q_DECLARE_METATYPE(QList<QUmlComment *> *) +Q_DECLARE_METATYPE(QSet<QUmlComment *> *) + QT_END_HEADER #endif // QUMLCOMMENT_H diff --git a/src/uml/qumlcommunicationpath.cpp b/src/uml/qumlcommunicationpath.cpp index 94230223..c99ef9f3 100644 --- a/src/uml/qumlcommunicationpath.cpp +++ b/src/uml/qumlcommunicationpath.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcommunicationpath.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlcommunicationpath.h b/src/uml/qumlcommunicationpath.h index cd823580..8168f537 100644 --- a/src/uml/qumlcommunicationpath.h +++ b/src/uml/qumlcommunicationpath.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCommunicationPath *) +Q_DECLARE_METATYPE(QList<QUmlCommunicationPath *> *) +Q_DECLARE_METATYPE(QSet<QUmlCommunicationPath *> *) + QT_END_HEADER #endif // QUMLCOMMUNICATIONPATH_H diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp index 4c64adec..d74a1818 100644 --- a/src/uml/qumlcomponent.cpp +++ b/src/uml/qumlcomponent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcomponent.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComponentRealization> @@ -58,6 +59,11 @@ QT_BEGIN_NAMESPACE QUmlComponent::QUmlComponent() : _isIndirectlyInstantiated(true) { + d_ptr->object.setProperty("isIndirectlyInstantiated", QVariant::fromValue(false)); + d_ptr->object.setProperty("packagedElement", QVariant::fromValue(&_packagedElement)); + d_ptr->object.setProperty("provided", QVariant::fromValue(QSet<QUmlInterface *>())); + d_ptr->object.setProperty("realization", QVariant::fromValue(&_realization)); + d_ptr->object.setProperty("required", QVariant::fromValue(QSet<QUmlInterface *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcomponent.h b/src/uml/qumlcomponent.h index 39b9fd17..08fc65f3 100644 --- a/src/uml/qumlcomponent.h +++ b/src/uml/qumlcomponent.h @@ -89,6 +89,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlComponent *) +Q_DECLARE_METATYPE(QList<QUmlComponent *> *) +Q_DECLARE_METATYPE(QSet<QUmlComponent *> *) + QT_END_HEADER #endif // QUMLCOMPONENT_H diff --git a/src/uml/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp index d957fd4c..0963e6cc 100644 --- a/src/uml/qumlcomponentrealization.cpp +++ b/src/uml/qumlcomponentrealization.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcomponentrealization.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComponent> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlComponentRealization::QUmlComponentRealization() : _abstraction(0) { + d_ptr->object.setProperty("abstraction", QVariant::fromValue((QUmlComponent *)(0))); + d_ptr->object.setProperty("realizingClassifier", QVariant::fromValue(&_realizingClassifier)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcomponentrealization.h b/src/uml/qumlcomponentrealization.h index 1b670770..824ac4f2 100644 --- a/src/uml/qumlcomponentrealization.h +++ b/src/uml/qumlcomponentrealization.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlComponentRealization *) +Q_DECLARE_METATYPE(QList<QUmlComponentRealization *> *) +Q_DECLARE_METATYPE(QSet<QUmlComponentRealization *> *) + QT_END_HEADER #endif // QUMLCOMPONENTREALIZATION_H diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp index b3fe2881..bf94d75a 100644 --- a/src/uml/qumlconditionalnode.cpp +++ b/src/uml/qumlconditionalnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconditionalnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClause> #include <QtUml/QUmlOutputPin> @@ -57,6 +58,10 @@ QUmlConditionalNode::QUmlConditionalNode() : _isAssured(false), _isDeterminate(false) { + d_ptr->object.setProperty("clause", QVariant::fromValue(&_clause)); + d_ptr->object.setProperty("isAssured", QVariant::fromValue(false)); + d_ptr->object.setProperty("isDeterminate", QVariant::fromValue(false)); + d_ptr->object.setProperty("result", QVariant::fromValue(&_result)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconditionalnode.h b/src/uml/qumlconditionalnode.h index 934aa7da..cb6d1b83 100644 --- a/src/uml/qumlconditionalnode.h +++ b/src/uml/qumlconditionalnode.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConditionalNode *) +Q_DECLARE_METATYPE(QList<QUmlConditionalNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlConditionalNode *> *) + QT_END_HEADER #endif // QUMLCONDITIONALNODE_H diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp index 266349b6..d15900e9 100644 --- a/src/uml/qumlconnectableelement.cpp +++ b/src/uml/qumlconnectableelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconnectableelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElementTemplateParameter> #include <QtUml/QUmlConnectorEnd> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlConnectableElement::QUmlConnectableElement() : _templateParameter(0) { + d_ptr->object.setProperty("end", QVariant::fromValue(QList<QUmlConnectorEnd *>())); + d_ptr->object.setProperty("templateParameter", QVariant::fromValue((QUmlConnectableElementTemplateParameter *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h index ccc7f4e9..3395a3b7 100644 --- a/src/uml/qumlconnectableelement.h +++ b/src/uml/qumlconnectableelement.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConnectableElement *) +Q_DECLARE_METATYPE(QList<QUmlConnectableElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlConnectableElement *> *) + QT_END_HEADER #endif // QUMLCONNECTABLEELEMENT_H diff --git a/src/uml/qumlconnectableelementtemplateparameter.cpp b/src/uml/qumlconnectableelementtemplateparameter.cpp index 8a65f867..ac29f29f 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.cpp +++ b/src/uml/qumlconnectableelementtemplateparameter.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconnectableelementtemplateparameter.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElement> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter() : _parameteredElement(0) { + d_ptr->object.setProperty("parameteredElement", QVariant::fromValue((QUmlConnectableElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconnectableelementtemplateparameter.h b/src/uml/qumlconnectableelementtemplateparameter.h index e2054d31..3483fad8 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.h +++ b/src/uml/qumlconnectableelementtemplateparameter.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConnectableElementTemplateParameter *) +Q_DECLARE_METATYPE(QList<QUmlConnectableElementTemplateParameter *> *) +Q_DECLARE_METATYPE(QSet<QUmlConnectableElementTemplateParameter *> *) + QT_END_HEADER #endif // QUMLCONNECTABLEELEMENTTEMPLATEPARAMETER_H diff --git a/src/uml/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp index 764b99a8..db8663f9 100644 --- a/src/uml/qumlconnectionpointreference.cpp +++ b/src/uml/qumlconnectionpointreference.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconnectionpointreference.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPseudostate> #include <QtUml/QUmlState> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlConnectionPointReference::QUmlConnectionPointReference() : _state(0) { + d_ptr->object.setProperty("entry", QVariant::fromValue(&_entry)); + d_ptr->object.setProperty("exit", QVariant::fromValue(&_exit)); + d_ptr->object.setProperty("state", QVariant::fromValue((QUmlState *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h index 38a79d20..05656f2d 100644 --- a/src/uml/qumlconnectionpointreference.h +++ b/src/uml/qumlconnectionpointreference.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConnectionPointReference *) +Q_DECLARE_METATYPE(QList<QUmlConnectionPointReference *> *) +Q_DECLARE_METATYPE(QSet<QUmlConnectionPointReference *> *) + QT_END_HEADER #endif // QUMLCONNECTIONPOINTREFERENCE_H diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp index 36d2b65f..68ea8972 100644 --- a/src/uml/qumlconnector.cpp +++ b/src/uml/qumlconnector.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconnector.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlBehavior> @@ -57,6 +58,11 @@ QT_BEGIN_NAMESPACE QUmlConnector::QUmlConnector() : _type(0) { + d_ptr->object.setProperty("contract", QVariant::fromValue(&_contract)); + d_ptr->object.setProperty("end", QVariant::fromValue(&_end)); + d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::ConnectorKindNone)); + d_ptr->object.setProperty("redefinedConnector", QVariant::fromValue(&_redefinedConnector)); + d_ptr->object.setProperty("type", QVariant::fromValue((QUmlAssociation *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h index 56076920..a4419feb 100644 --- a/src/uml/qumlconnector.h +++ b/src/uml/qumlconnector.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConnector *) +Q_DECLARE_METATYPE(QList<QUmlConnector *> *) +Q_DECLARE_METATYPE(QSet<QUmlConnector *> *) + QT_END_HEADER #endif // QUMLCONNECTOR_H diff --git a/src/uml/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp index 83f41c2b..89716a37 100644 --- a/src/uml/qumlconnectorend.cpp +++ b/src/uml/qumlconnectorend.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconnectorend.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlProperty> @@ -57,6 +58,9 @@ QUmlConnectorEnd::QUmlConnectorEnd() : _partWithPort(0), _role(0) { + d_ptr->object.setProperty("definingEnd", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("partWithPort", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("role", QVariant::fromValue((QUmlConnectableElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconnectorend.h b/src/uml/qumlconnectorend.h index 455f4cf5..db73eb13 100644 --- a/src/uml/qumlconnectorend.h +++ b/src/uml/qumlconnectorend.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConnectorEnd *) +Q_DECLARE_METATYPE(QList<QUmlConnectorEnd *> *) +Q_DECLARE_METATYPE(QSet<QUmlConnectorEnd *> *) + QT_END_HEADER #endif // QUMLCONNECTOREND_H diff --git a/src/uml/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp index 94ce5807..8ae13266 100644 --- a/src/uml/qumlconsiderignorefragment.cpp +++ b/src/uml/qumlconsiderignorefragment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconsiderignorefragment.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment() { + d_ptr->object.setProperty("message", QVariant::fromValue(&_message)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconsiderignorefragment.h b/src/uml/qumlconsiderignorefragment.h index 63847e5b..d7ec7706 100644 --- a/src/uml/qumlconsiderignorefragment.h +++ b/src/uml/qumlconsiderignorefragment.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConsiderIgnoreFragment *) +Q_DECLARE_METATYPE(QList<QUmlConsiderIgnoreFragment *> *) +Q_DECLARE_METATYPE(QSet<QUmlConsiderIgnoreFragment *> *) + QT_END_HEADER #endif // QUMLCONSIDERIGNOREFRAGMENT_H diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp index 7a22ed42..173be4bc 100644 --- a/src/uml/qumlconstraint.cpp +++ b/src/uml/qumlconstraint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlconstraint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlElement> #include <QtUml/QUmlNamespace> @@ -58,6 +59,9 @@ QUmlConstraint::QUmlConstraint() : _context(0), _specification(0) { + d_ptr->object.setProperty("constrainedElement", QVariant::fromValue(&_constrainedElement)); + d_ptr->object.setProperty("context", QVariant::fromValue((QUmlNamespace *)(0))); + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlconstraint.h b/src/uml/qumlconstraint.h index 60a054a0..dde91867 100644 --- a/src/uml/qumlconstraint.h +++ b/src/uml/qumlconstraint.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlConstraint *) +Q_DECLARE_METATYPE(QList<QUmlConstraint *> *) +Q_DECLARE_METATYPE(QSet<QUmlConstraint *> *) + QT_END_HEADER #endif // QUMLCONSTRAINT_H diff --git a/src/uml/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp index 64a2788e..dbe12ff3 100644 --- a/src/uml/qumlcontinuation.cpp +++ b/src/uml/qumlcontinuation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcontinuation.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlContinuation::QUmlContinuation() : _setting(true) { + d_ptr->object.setProperty("setting", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcontinuation.h b/src/uml/qumlcontinuation.h index 88d009bc..db9168bf 100644 --- a/src/uml/qumlcontinuation.h +++ b/src/uml/qumlcontinuation.h @@ -66,6 +66,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlContinuation *) +Q_DECLARE_METATYPE(QList<QUmlContinuation *> *) +Q_DECLARE_METATYPE(QSet<QUmlContinuation *> *) + QT_END_HEADER #endif // QUMLCONTINUATION_H diff --git a/src/uml/qumlcontrolflow.cpp b/src/uml/qumlcontrolflow.cpp index ab815574..32799d7f 100644 --- a/src/uml/qumlcontrolflow.cpp +++ b/src/uml/qumlcontrolflow.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcontrolflow.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlcontrolflow.h b/src/uml/qumlcontrolflow.h index 4949ca8d..647ee62f 100644 --- a/src/uml/qumlcontrolflow.h +++ b/src/uml/qumlcontrolflow.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlControlFlow *) +Q_DECLARE_METATYPE(QList<QUmlControlFlow *> *) +Q_DECLARE_METATYPE(QSet<QUmlControlFlow *> *) + QT_END_HEADER #endif // QUMLCONTROLFLOW_H diff --git a/src/uml/qumlcontrolnode.cpp b/src/uml/qumlcontrolnode.cpp index bde61bae..bacfb2cd 100644 --- a/src/uml/qumlcontrolnode.cpp +++ b/src/uml/qumlcontrolnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcontrolnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlcontrolnode.h b/src/uml/qumlcontrolnode.h index 287fc332..6de6d494 100644 --- a/src/uml/qumlcontrolnode.h +++ b/src/uml/qumlcontrolnode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlControlNode *) +Q_DECLARE_METATYPE(QList<QUmlControlNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlControlNode *> *) + QT_END_HEADER #endif // QUMLCONTROLNODE_H diff --git a/src/uml/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp index 35d063dd..c89968da 100644 --- a/src/uml/qumlcreatelinkaction.cpp +++ b/src/uml/qumlcreatelinkaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcreatelinkaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlLinkEndCreationData> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlCreateLinkAction::QUmlCreateLinkAction() { + d_ptr->object.setProperty("endData", QVariant::fromValue(&_endData)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcreatelinkaction.h b/src/uml/qumlcreatelinkaction.h index 5c89125d..754c07a0 100644 --- a/src/uml/qumlcreatelinkaction.h +++ b/src/uml/qumlcreatelinkaction.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCreateLinkAction *) +Q_DECLARE_METATYPE(QList<QUmlCreateLinkAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCreateLinkAction *> *) + QT_END_HEADER #endif // QUMLCREATELINKACTION_H diff --git a/src/uml/qumlcreatelinkobjectaction.cpp b/src/uml/qumlcreatelinkobjectaction.cpp index 9248a411..6548fd18 100644 --- a/src/uml/qumlcreatelinkobjectaction.cpp +++ b/src/uml/qumlcreatelinkobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcreatelinkobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcreatelinkobjectaction.h b/src/uml/qumlcreatelinkobjectaction.h index 0c28d621..a0dd9612 100644 --- a/src/uml/qumlcreatelinkobjectaction.h +++ b/src/uml/qumlcreatelinkobjectaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCreateLinkObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlCreateLinkObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCreateLinkObjectAction *> *) + QT_END_HEADER #endif // QUMLCREATELINKOBJECTACTION_H diff --git a/src/uml/qumlcreateobjectaction.cpp b/src/uml/qumlcreateobjectaction.cpp index 1a6afcbe..3e52d1e6 100644 --- a/src/uml/qumlcreateobjectaction.cpp +++ b/src/uml/qumlcreateobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlcreateobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlOutputPin> @@ -57,6 +58,8 @@ QUmlCreateObjectAction::QUmlCreateObjectAction() : _classifier(0), _result(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlcreateobjectaction.h b/src/uml/qumlcreateobjectaction.h index 7ef1fd4d..2d6b275c 100644 --- a/src/uml/qumlcreateobjectaction.h +++ b/src/uml/qumlcreateobjectaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlCreateObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlCreateObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlCreateObjectAction *> *) + QT_END_HEADER #endif // QUMLCREATEOBJECTACTION_H diff --git a/src/uml/qumldatastorenode.cpp b/src/uml/qumldatastorenode.cpp index 7ac9c023..4e032f2c 100644 --- a/src/uml/qumldatastorenode.cpp +++ b/src/uml/qumldatastorenode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldatastorenode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumldatastorenode.h b/src/uml/qumldatastorenode.h index 7fab854d..be707d74 100644 --- a/src/uml/qumldatastorenode.h +++ b/src/uml/qumldatastorenode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDataStoreNode *) +Q_DECLARE_METATYPE(QList<QUmlDataStoreNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlDataStoreNode *> *) + QT_END_HEADER #endif // QUMLDATASTORENODE_H diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp index a996df44..a30fd6df 100644 --- a/src/uml/qumldatatype.cpp +++ b/src/uml/qumldatatype.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldatatype.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlOperation> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlDataType::QUmlDataType() { + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); + d_ptr->object.setProperty("ownedOperation", QVariant::fromValue(&_ownedOperation)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldatatype.h b/src/uml/qumldatatype.h index 153a0d52..88d76b15 100644 --- a/src/uml/qumldatatype.h +++ b/src/uml/qumldatatype.h @@ -78,6 +78,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDataType *) +Q_DECLARE_METATYPE(QList<QUmlDataType *> *) +Q_DECLARE_METATYPE(QSet<QUmlDataType *> *) + QT_END_HEADER #endif // QUMLDATATYPE_H diff --git a/src/uml/qumldecisionnode.cpp b/src/uml/qumldecisionnode.cpp index 767f1372..be8e859d 100644 --- a/src/uml/qumldecisionnode.cpp +++ b/src/uml/qumldecisionnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldecisionnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlObjectFlow> @@ -57,6 +58,8 @@ QUmlDecisionNode::QUmlDecisionNode() : _decisionInput(0), _decisionInputFlow(0) { + d_ptr->object.setProperty("decisionInput", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("decisionInputFlow", QVariant::fromValue((QUmlObjectFlow *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldecisionnode.h b/src/uml/qumldecisionnode.h index 48150648..485a4b27 100644 --- a/src/uml/qumldecisionnode.h +++ b/src/uml/qumldecisionnode.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDecisionNode *) +Q_DECLARE_METATYPE(QList<QUmlDecisionNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlDecisionNode *> *) + QT_END_HEADER #endif // QUMLDECISIONNODE_H diff --git a/src/uml/qumldependency.cpp b/src/uml/qumldependency.cpp index 57bc3043..8049495c 100644 --- a/src/uml/qumldependency.cpp +++ b/src/uml/qumldependency.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldependency.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> @@ -54,6 +55,8 @@ QT_BEGIN_NAMESPACE QUmlDependency::QUmlDependency() { + d_ptr->object.setProperty("client", QVariant::fromValue(&_client)); + d_ptr->object.setProperty("supplier", QVariant::fromValue(&_supplier)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldependency.h b/src/uml/qumldependency.h index 21cca26f..5491733f 100644 --- a/src/uml/qumldependency.h +++ b/src/uml/qumldependency.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDependency *) +Q_DECLARE_METATYPE(QList<QUmlDependency *> *) +Q_DECLARE_METATYPE(QSet<QUmlDependency *> *) + QT_END_HEADER #endif // QUMLDEPENDENCY_H diff --git a/src/uml/qumldeployedartifact.cpp b/src/uml/qumldeployedartifact.cpp index 38088f94..969d5b4f 100644 --- a/src/uml/qumldeployedartifact.cpp +++ b/src/uml/qumldeployedartifact.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldeployedartifact.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumldeployedartifact.h b/src/uml/qumldeployedartifact.h index 58a2f52d..a0881e63 100644 --- a/src/uml/qumldeployedartifact.h +++ b/src/uml/qumldeployedartifact.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDeployedArtifact *) +Q_DECLARE_METATYPE(QList<QUmlDeployedArtifact *> *) +Q_DECLARE_METATYPE(QSet<QUmlDeployedArtifact *> *) + QT_END_HEADER #endif // QUMLDEPLOYEDARTIFACT_H diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp index b480895a..9260be13 100644 --- a/src/uml/qumldeployment.cpp +++ b/src/uml/qumldeployment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldeployment.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDeployedArtifact> #include <QtUml/QUmlDeploymentSpecification> @@ -57,6 +58,9 @@ QT_BEGIN_NAMESPACE QUmlDeployment::QUmlDeployment() : _location(0) { + d_ptr->object.setProperty("configuration", QVariant::fromValue(&_configuration)); + d_ptr->object.setProperty("deployedArtifact", QVariant::fromValue(&_deployedArtifact)); + d_ptr->object.setProperty("location", QVariant::fromValue((QUmlDeploymentTarget *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldeployment.h b/src/uml/qumldeployment.h index 659b793c..94968d66 100644 --- a/src/uml/qumldeployment.h +++ b/src/uml/qumldeployment.h @@ -78,6 +78,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDeployment *) +Q_DECLARE_METATYPE(QList<QUmlDeployment *> *) +Q_DECLARE_METATYPE(QSet<QUmlDeployment *> *) + QT_END_HEADER #endif // QUMLDEPLOYMENT_H diff --git a/src/uml/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp index 2ee37aa3..7b93bf8f 100644 --- a/src/uml/qumldeploymentspecification.cpp +++ b/src/uml/qumldeploymentspecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldeploymentspecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDeployment> @@ -55,6 +56,9 @@ QT_BEGIN_NAMESPACE QUmlDeploymentSpecification::QUmlDeploymentSpecification() : _deployment(0) { + d_ptr->object.setProperty("deployment", QVariant::fromValue((QUmlDeployment *)(0))); + d_ptr->object.setProperty("deploymentLocation", QVariant::fromValue(QString())); + d_ptr->object.setProperty("executionLocation", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldeploymentspecification.h b/src/uml/qumldeploymentspecification.h index 22f98800..120fb217 100644 --- a/src/uml/qumldeploymentspecification.h +++ b/src/uml/qumldeploymentspecification.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDeploymentSpecification *) +Q_DECLARE_METATYPE(QList<QUmlDeploymentSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlDeploymentSpecification *> *) + QT_END_HEADER #endif // QUMLDEPLOYMENTSPECIFICATION_H diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp index e1a4ee51..d7d4cb11 100644 --- a/src/uml/qumldeploymenttarget.cpp +++ b/src/uml/qumldeploymenttarget.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldeploymenttarget.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDeployment> #include <QtUml/QUmlPackageableElement> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlDeploymentTarget::QUmlDeploymentTarget() { + d_ptr->object.setProperty("deployedElement", QVariant::fromValue(QSet<QUmlPackageableElement *>())); + d_ptr->object.setProperty("deployment", QVariant::fromValue(&_deployment)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h index 9a35d3ca..9ce2d0a7 100644 --- a/src/uml/qumldeploymenttarget.h +++ b/src/uml/qumldeploymenttarget.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDeploymentTarget *) +Q_DECLARE_METATYPE(QList<QUmlDeploymentTarget *> *) +Q_DECLARE_METATYPE(QSet<QUmlDeploymentTarget *> *) + QT_END_HEADER #endif // QUMLDEPLOYMENTTARGET_H diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp index e161e88e..68ce0f16 100644 --- a/src/uml/qumldestroylinkaction.cpp +++ b/src/uml/qumldestroylinkaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldestroylinkaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlLinkEndDestructionData> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlDestroyLinkAction::QUmlDestroyLinkAction() { + d_ptr->object.setProperty("endData", QVariant::fromValue(&_endData)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldestroylinkaction.h b/src/uml/qumldestroylinkaction.h index 05c75d67..d7659cc3 100644 --- a/src/uml/qumldestroylinkaction.h +++ b/src/uml/qumldestroylinkaction.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDestroyLinkAction *) +Q_DECLARE_METATYPE(QList<QUmlDestroyLinkAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlDestroyLinkAction *> *) + QT_END_HEADER #endif // QUMLDESTROYLINKACTION_H diff --git a/src/uml/qumldestroyobjectaction.cpp b/src/uml/qumldestroyobjectaction.cpp index 31fa9b71..bc7817c7 100644 --- a/src/uml/qumldestroyobjectaction.cpp +++ b/src/uml/qumldestroyobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldestroyobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -57,6 +58,9 @@ QUmlDestroyObjectAction::QUmlDestroyObjectAction() : _isDestroyOwnedObjects(false), _target(0) { + d_ptr->object.setProperty("isDestroyLinks", QVariant::fromValue(false)); + d_ptr->object.setProperty("isDestroyOwnedObjects", QVariant::fromValue(false)); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldestroyobjectaction.h b/src/uml/qumldestroyobjectaction.h index 7d0504f4..2a7d9a33 100644 --- a/src/uml/qumldestroyobjectaction.h +++ b/src/uml/qumldestroyobjectaction.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDestroyObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlDestroyObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlDestroyObjectAction *> *) + QT_END_HEADER #endif // QUMLDESTROYOBJECTACTION_H diff --git a/src/uml/qumldestructionoccurrencespecification.cpp b/src/uml/qumldestructionoccurrencespecification.cpp index 5913e5d4..0b6f7790 100644 --- a/src/uml/qumldestructionoccurrencespecification.cpp +++ b/src/uml/qumldestructionoccurrencespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldestructionoccurrencespecification.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumldestructionoccurrencespecification.h b/src/uml/qumldestructionoccurrencespecification.h index de780d97..52faf0af 100644 --- a/src/uml/qumldestructionoccurrencespecification.h +++ b/src/uml/qumldestructionoccurrencespecification.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDestructionOccurrenceSpecification *) +Q_DECLARE_METATYPE(QList<QUmlDestructionOccurrenceSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlDestructionOccurrenceSpecification *> *) + QT_END_HEADER #endif // QUMLDESTRUCTIONOCCURRENCESPECIFICATION_H diff --git a/src/uml/qumldevice.cpp b/src/uml/qumldevice.cpp index 847004ec..1eaa651d 100644 --- a/src/uml/qumldevice.cpp +++ b/src/uml/qumldevice.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldevice.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumldevice.h b/src/uml/qumldevice.h index 0c419115..c604a272 100644 --- a/src/uml/qumldevice.h +++ b/src/uml/qumldevice.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDevice *) +Q_DECLARE_METATYPE(QList<QUmlDevice *> *) +Q_DECLARE_METATYPE(QSet<QUmlDevice *> *) + QT_END_HEADER #endif // QUMLDEVICE_H diff --git a/src/uml/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp index 13f44a1e..b1f8bf83 100644 --- a/src/uml/qumldirectedrelationship.cpp +++ b/src/uml/qumldirectedrelationship.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldirectedrelationship.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlElement> @@ -54,6 +55,8 @@ QT_BEGIN_NAMESPACE QUmlDirectedRelationship::QUmlDirectedRelationship() { + d_ptr->object.setProperty("source", QVariant::fromValue(&_source)); + d_ptr->object.setProperty("target", QVariant::fromValue(&_target)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h index 4bb1787b..9b72c86e 100644 --- a/src/uml/qumldirectedrelationship.h +++ b/src/uml/qumldirectedrelationship.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDirectedRelationship *) +Q_DECLARE_METATYPE(QList<QUmlDirectedRelationship *> *) +Q_DECLARE_METATYPE(QSet<QUmlDirectedRelationship *> *) + QT_END_HEADER #endif // QUMLDIRECTEDRELATIONSHIP_H diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp index 743aa36a..c48c3002 100644 --- a/src/uml/qumlduration.cpp +++ b/src/uml/qumlduration.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlduration.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlObservation> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlDuration::QUmlDuration() : _expr(0) { + d_ptr->object.setProperty("expr", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("observation", QVariant::fromValue(&_observation)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlduration.h b/src/uml/qumlduration.h index 8514131f..246bbc44 100644 --- a/src/uml/qumlduration.h +++ b/src/uml/qumlduration.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDuration *) +Q_DECLARE_METATYPE(QList<QUmlDuration *> *) +Q_DECLARE_METATYPE(QSet<QUmlDuration *> *) + QT_END_HEADER #endif // QUMLDURATION_H diff --git a/src/uml/qumldurationconstraint.cpp b/src/uml/qumldurationconstraint.cpp index 65397210..5f186d7b 100644 --- a/src/uml/qumldurationconstraint.cpp +++ b/src/uml/qumldurationconstraint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldurationconstraint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDurationInterval> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlDurationConstraint::QUmlDurationConstraint() : _specification(0) { + d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false)); + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlDurationInterval *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldurationconstraint.h b/src/uml/qumldurationconstraint.h index dfa566c7..42afd4fe 100644 --- a/src/uml/qumldurationconstraint.h +++ b/src/uml/qumldurationconstraint.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDurationConstraint *) +Q_DECLARE_METATYPE(QList<QUmlDurationConstraint *> *) +Q_DECLARE_METATYPE(QSet<QUmlDurationConstraint *> *) + QT_END_HEADER #endif // QUMLDURATIONCONSTRAINT_H diff --git a/src/uml/qumldurationinterval.cpp b/src/uml/qumldurationinterval.cpp index 7cf49d10..0b180df5 100644 --- a/src/uml/qumldurationinterval.cpp +++ b/src/uml/qumldurationinterval.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldurationinterval.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDuration> @@ -56,6 +57,8 @@ QUmlDurationInterval::QUmlDurationInterval() : _max(0), _min(0) { + d_ptr->object.setProperty("max", QVariant::fromValue((QUmlDuration *)(0))); + d_ptr->object.setProperty("min", QVariant::fromValue((QUmlDuration *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldurationinterval.h b/src/uml/qumldurationinterval.h index 5c0cdf9d..56749656 100644 --- a/src/uml/qumldurationinterval.h +++ b/src/uml/qumldurationinterval.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDurationInterval *) +Q_DECLARE_METATYPE(QList<QUmlDurationInterval *> *) +Q_DECLARE_METATYPE(QSet<QUmlDurationInterval *> *) + QT_END_HEADER #endif // QUMLDURATIONINTERVAL_H diff --git a/src/uml/qumldurationobservation.cpp b/src/uml/qumldurationobservation.cpp index 4d7539c6..e097c3c5 100644 --- a/src/uml/qumldurationobservation.cpp +++ b/src/uml/qumldurationobservation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumldurationobservation.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlDurationObservation::QUmlDurationObservation() : _event(0) { + d_ptr->object.setProperty("event", QVariant::fromValue((QUmlNamedElement *)(0))); + d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumldurationobservation.h b/src/uml/qumldurationobservation.h index ef7320cd..de484d13 100644 --- a/src/uml/qumldurationobservation.h +++ b/src/uml/qumldurationobservation.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlDurationObservation *) +Q_DECLARE_METATYPE(QList<QUmlDurationObservation *> *) +Q_DECLARE_METATYPE(QSet<QUmlDurationObservation *> *) + QT_END_HEADER #endif // QUMLDURATIONOBSERVATION_H diff --git a/src/uml/qumlelement.cpp b/src/uml/qumlelement.cpp index 230873f7..59603108 100644 --- a/src/uml/qumlelement.cpp +++ b/src/uml/qumlelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlComment> @@ -55,6 +56,9 @@ QT_BEGIN_NAMESPACE QUmlElement::QUmlElement() : _owner(0) { + d_ptr->object.setProperty("ownedComment", QVariant::fromValue(&_ownedComment)); + d_ptr->object.setProperty("ownedElement", QVariant::fromValue(&_ownedElement)); + d_ptr->object.setProperty("owner", QVariant::fromValue((QUmlElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h index 86913134..bd6bac99 100644 --- a/src/uml/qumlelement.h +++ b/src/uml/qumlelement.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlElement *) +Q_DECLARE_METATYPE(QList<QUmlElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlElement *> *) + QT_END_HEADER #endif // QUMLELEMENT_H diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp index e26a62c4..25a68b74 100644 --- a/src/uml/qumlelementimport.cpp +++ b/src/uml/qumlelementimport.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlelementimport.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackageableElement> @@ -56,8 +57,12 @@ QT_BEGIN_NAMESPACE QUmlElementImport::QUmlElementImport() : _importedElement(0), _importingNamespace(0), - _visibility(QtUml::VisibilityPublic) + _visibility(QtUml::VisibilityKindPublic) { + d_ptr->object.setProperty("alias", QVariant::fromValue(QString())); + d_ptr->object.setProperty("importedElement", QVariant::fromValue((QUmlPackageableElement *)(0))); + d_ptr->object.setProperty("importingNamespace", QVariant::fromValue((QUmlNamespace *)(0))); + d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlelementimport.h b/src/uml/qumlelementimport.h index b09ae851..4530fc5c 100644 --- a/src/uml/qumlelementimport.h +++ b/src/uml/qumlelementimport.h @@ -82,6 +82,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlElementImport *) +Q_DECLARE_METATYPE(QList<QUmlElementImport *> *) +Q_DECLARE_METATYPE(QSet<QUmlElementImport *> *) + QT_END_HEADER #endif // QUMLELEMENTIMPORT_H diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp index 43728a8d..97286a7b 100644 --- a/src/uml/qumlencapsulatedclassifier.cpp +++ b/src/uml/qumlencapsulatedclassifier.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlencapsulatedclassifier.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPort> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier() { + d_ptr->object.setProperty("ownedPort", QVariant::fromValue(QSet<QUmlPort *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h index a9b51318..aa31fbab 100644 --- a/src/uml/qumlencapsulatedclassifier.h +++ b/src/uml/qumlencapsulatedclassifier.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlEncapsulatedClassifier *) +Q_DECLARE_METATYPE(QList<QUmlEncapsulatedClassifier *> *) +Q_DECLARE_METATYPE(QSet<QUmlEncapsulatedClassifier *> *) + QT_END_HEADER #endif // QUMLENCAPSULATEDCLASSIFIER_H diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp index 583c521e..8e37bf74 100644 --- a/src/uml/qumlenumeration.cpp +++ b/src/uml/qumlenumeration.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlenumeration.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlEnumerationLiteral> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlEnumeration::QUmlEnumeration() { + d_ptr->object.setProperty("ownedLiteral", QVariant::fromValue(&_ownedLiteral)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlenumeration.h b/src/uml/qumlenumeration.h index 11be948b..2388e79e 100644 --- a/src/uml/qumlenumeration.h +++ b/src/uml/qumlenumeration.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlEnumeration *) +Q_DECLARE_METATYPE(QList<QUmlEnumeration *> *) +Q_DECLARE_METATYPE(QSet<QUmlEnumeration *> *) + QT_END_HEADER #endif // QUMLENUMERATION_H diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp index c3b0df34..55d70ba4 100644 --- a/src/uml/qumlenumerationliteral.cpp +++ b/src/uml/qumlenumerationliteral.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlenumerationliteral.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlEnumeration> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlEnumerationLiteral::QUmlEnumerationLiteral() : _enumeration(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue((QUmlEnumeration *)(0))); + d_ptr->object.setProperty("enumeration", QVariant::fromValue((QUmlEnumeration *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlenumerationliteral.h b/src/uml/qumlenumerationliteral.h index affc3d7b..9eed7b11 100644 --- a/src/uml/qumlenumerationliteral.h +++ b/src/uml/qumlenumerationliteral.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlEnumerationLiteral *) +Q_DECLARE_METATYPE(QList<QUmlEnumerationLiteral *> *) +Q_DECLARE_METATYPE(QSet<QUmlEnumerationLiteral *> *) + QT_END_HEADER #endif // QUMLENUMERATIONLITERAL_H diff --git a/src/uml/qumlevent.cpp b/src/uml/qumlevent.cpp index 2764ad82..fd383413 100644 --- a/src/uml/qumlevent.cpp +++ b/src/uml/qumlevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlevent.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlevent.h b/src/uml/qumlevent.h index 7eec8777..f4da6699 100644 --- a/src/uml/qumlevent.h +++ b/src/uml/qumlevent.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlEvent *) +Q_DECLARE_METATYPE(QList<QUmlEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlEvent *> *) + QT_END_HEADER #endif // QUMLEVENT_H diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp index 50e63b61..12c5c2ff 100644 --- a/src/uml/qumlexceptionhandler.cpp +++ b/src/uml/qumlexceptionhandler.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexceptionhandler.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExecutableNode> @@ -59,6 +60,10 @@ QUmlExceptionHandler::QUmlExceptionHandler() : _handlerBody(0), _protectedNode(0) { + d_ptr->object.setProperty("exceptionInput", QVariant::fromValue((QUmlObjectNode *)(0))); + d_ptr->object.setProperty("exceptionType", QVariant::fromValue(&_exceptionType)); + d_ptr->object.setProperty("handlerBody", QVariant::fromValue((QUmlExecutableNode *)(0))); + d_ptr->object.setProperty("protectedNode", QVariant::fromValue((QUmlExecutableNode *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexceptionhandler.h b/src/uml/qumlexceptionhandler.h index ed886a30..fdc43333 100644 --- a/src/uml/qumlexceptionhandler.h +++ b/src/uml/qumlexceptionhandler.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExceptionHandler *) +Q_DECLARE_METATYPE(QList<QUmlExceptionHandler *> *) +Q_DECLARE_METATYPE(QSet<QUmlExceptionHandler *> *) + QT_END_HEADER #endif // QUMLEXCEPTIONHANDLER_H diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp index 860ecf02..60d5d7f8 100644 --- a/src/uml/qumlexecutablenode.cpp +++ b/src/uml/qumlexecutablenode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexecutablenode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExceptionHandler> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlExecutableNode::QUmlExecutableNode() { + d_ptr->object.setProperty("handler", QVariant::fromValue(&_handler)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h index b127a261..c21dd4ac 100644 --- a/src/uml/qumlexecutablenode.h +++ b/src/uml/qumlexecutablenode.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExecutableNode *) +Q_DECLARE_METATYPE(QList<QUmlExecutableNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlExecutableNode *> *) + QT_END_HEADER #endif // QUMLEXECUTABLENODE_H diff --git a/src/uml/qumlexecutionenvironment.cpp b/src/uml/qumlexecutionenvironment.cpp index c9d30e58..c23b4dbe 100644 --- a/src/uml/qumlexecutionenvironment.cpp +++ b/src/uml/qumlexecutionenvironment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexecutionenvironment.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlexecutionenvironment.h b/src/uml/qumlexecutionenvironment.h index c9b92330..b5c886f4 100644 --- a/src/uml/qumlexecutionenvironment.h +++ b/src/uml/qumlexecutionenvironment.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExecutionEnvironment *) +Q_DECLARE_METATYPE(QList<QUmlExecutionEnvironment *> *) +Q_DECLARE_METATYPE(QSet<QUmlExecutionEnvironment *> *) + QT_END_HEADER #endif // QUMLEXECUTIONENVIRONMENT_H diff --git a/src/uml/qumlexecutionoccurrencespecification.cpp b/src/uml/qumlexecutionoccurrencespecification.cpp index 6827fbc5..32a80821 100644 --- a/src/uml/qumlexecutionoccurrencespecification.cpp +++ b/src/uml/qumlexecutionoccurrencespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexecutionoccurrencespecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExecutionSpecification> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification() : _execution(0) { + d_ptr->object.setProperty("execution", QVariant::fromValue((QUmlExecutionSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexecutionoccurrencespecification.h b/src/uml/qumlexecutionoccurrencespecification.h index 76cc41b0..a8459138 100644 --- a/src/uml/qumlexecutionoccurrencespecification.h +++ b/src/uml/qumlexecutionoccurrencespecification.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExecutionOccurrenceSpecification *) +Q_DECLARE_METATYPE(QList<QUmlExecutionOccurrenceSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlExecutionOccurrenceSpecification *> *) + QT_END_HEADER #endif // QUMLEXECUTIONOCCURRENCESPECIFICATION_H diff --git a/src/uml/qumlexecutionspecification.cpp b/src/uml/qumlexecutionspecification.cpp index 5fcbe80e..445732ba 100644 --- a/src/uml/qumlexecutionspecification.cpp +++ b/src/uml/qumlexecutionspecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexecutionspecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOccurrenceSpecification> @@ -56,6 +57,8 @@ QUmlExecutionSpecification::QUmlExecutionSpecification() : _finish(0), _start(0) { + d_ptr->object.setProperty("finish", QVariant::fromValue((QUmlOccurrenceSpecification *)(0))); + d_ptr->object.setProperty("start", QVariant::fromValue((QUmlOccurrenceSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexecutionspecification.h b/src/uml/qumlexecutionspecification.h index 0992a445..5deb7f34 100644 --- a/src/uml/qumlexecutionspecification.h +++ b/src/uml/qumlexecutionspecification.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExecutionSpecification *) +Q_DECLARE_METATYPE(QList<QUmlExecutionSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlExecutionSpecification *> *) + QT_END_HEADER #endif // QUMLEXECUTIONSPECIFICATION_H diff --git a/src/uml/qumlexpansionnode.cpp b/src/uml/qumlexpansionnode.cpp index 5e3d3b93..d6e5079c 100644 --- a/src/uml/qumlexpansionnode.cpp +++ b/src/uml/qumlexpansionnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexpansionnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExpansionRegion> @@ -56,6 +57,8 @@ QUmlExpansionNode::QUmlExpansionNode() : _regionAsInput(0), _regionAsOutput(0) { + d_ptr->object.setProperty("regionAsInput", QVariant::fromValue((QUmlExpansionRegion *)(0))); + d_ptr->object.setProperty("regionAsOutput", QVariant::fromValue((QUmlExpansionRegion *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexpansionnode.h b/src/uml/qumlexpansionnode.h index 66221abd..6187fd0e 100644 --- a/src/uml/qumlexpansionnode.h +++ b/src/uml/qumlexpansionnode.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExpansionNode *) +Q_DECLARE_METATYPE(QList<QUmlExpansionNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlExpansionNode *> *) + QT_END_HEADER #endif // QUMLEXPANSIONNODE_H diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp index 6f3ce6e7..75cd7aec 100644 --- a/src/uml/qumlexpansionregion.cpp +++ b/src/uml/qumlexpansionregion.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexpansionregion.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExpansionNode> @@ -53,8 +54,11 @@ QT_BEGIN_NAMESPACE */ QUmlExpansionRegion::QUmlExpansionRegion() : - _mode(QtUml::ExpansionIterative) + _mode(QtUml::ExpansionKindIterative) { + d_ptr->object.setProperty("inputElement", QVariant::fromValue(&_inputElement)); + d_ptr->object.setProperty("mode", QVariant::fromValue(QtUml::ExpansionKindNone)); + d_ptr->object.setProperty("outputElement", QVariant::fromValue(&_outputElement)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h index 998a47b2..f0901b81 100644 --- a/src/uml/qumlexpansionregion.h +++ b/src/uml/qumlexpansionregion.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExpansionRegion *) +Q_DECLARE_METATYPE(QList<QUmlExpansionRegion *> *) +Q_DECLARE_METATYPE(QSet<QUmlExpansionRegion *> *) + QT_END_HEADER #endif // QUMLEXPANSIONREGION_H diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp index 5f344336..093fde95 100644 --- a/src/uml/qumlexpression.cpp +++ b/src/uml/qumlexpression.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlexpression.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ QT_BEGIN_NAMESPACE QUmlExpression::QUmlExpression() { + d_ptr->object.setProperty("operand", QVariant::fromValue(&_operand)); + d_ptr->object.setProperty("symbol", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlexpression.h b/src/uml/qumlexpression.h index a84bdc87..04722f63 100644 --- a/src/uml/qumlexpression.h +++ b/src/uml/qumlexpression.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExpression *) +Q_DECLARE_METATYPE(QList<QUmlExpression *> *) +Q_DECLARE_METATYPE(QSet<QUmlExpression *> *) + QT_END_HEADER #endif // QUMLEXPRESSION_H diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp index 0ebcecab..0de79755 100644 --- a/src/uml/qumlextend.cpp +++ b/src/uml/qumlextend.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlextend.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlExtensionPoint> @@ -59,6 +60,10 @@ QUmlExtend::QUmlExtend() : _extendedCase(0), _extension(0) { + d_ptr->object.setProperty("condition", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("extendedCase", QVariant::fromValue((QUmlUseCase *)(0))); + d_ptr->object.setProperty("extension", QVariant::fromValue((QUmlUseCase *)(0))); + d_ptr->object.setProperty("extensionLocation", QVariant::fromValue(&_extensionLocation)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlextend.h b/src/uml/qumlextend.h index b227ca45..07153b18 100644 --- a/src/uml/qumlextend.h +++ b/src/uml/qumlextend.h @@ -81,6 +81,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExtend *) +Q_DECLARE_METATYPE(QList<QUmlExtend *> *) +Q_DECLARE_METATYPE(QSet<QUmlExtend *> *) + QT_END_HEADER #endif // QUMLEXTEND_H diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp index d5565818..f8792413 100644 --- a/src/uml/qumlextension.cpp +++ b/src/uml/qumlextension.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlextension.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClass> #include <QtUml/QUmlExtensionEnd> @@ -57,6 +58,9 @@ QT_BEGIN_NAMESPACE QUmlExtension::QUmlExtension() : _ownedEnd(0) { + d_ptr->object.setProperty("isRequired", QVariant::fromValue(false)); + d_ptr->object.setProperty("metaclass", QVariant::fromValue((QUmlClass *)(0))); + d_ptr->object.setProperty("ownedEnd", QVariant::fromValue((QUmlExtensionEnd *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlextension.h b/src/uml/qumlextension.h index c1ceb1bd..2f8722e8 100644 --- a/src/uml/qumlextension.h +++ b/src/uml/qumlextension.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExtension *) +Q_DECLARE_METATYPE(QList<QUmlExtension *> *) +Q_DECLARE_METATYPE(QSet<QUmlExtension *> *) + QT_END_HEADER #endif // QUMLEXTENSION_H diff --git a/src/uml/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp index 14ca1735..6c299bfb 100644 --- a/src/uml/qumlextensionend.cpp +++ b/src/uml/qumlextensionend.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlextensionend.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlStereotype> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlExtensionEnd::QUmlExtensionEnd() : _type(0) { + d_ptr->object.setProperty("lower", QVariant::fromValue((int)(0))); + d_ptr->object.setProperty("type", QVariant::fromValue((QUmlStereotype *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlextensionend.h b/src/uml/qumlextensionend.h index cb7ccc65..dacea3e0 100644 --- a/src/uml/qumlextensionend.h +++ b/src/uml/qumlextensionend.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExtensionEnd *) +Q_DECLARE_METATYPE(QList<QUmlExtensionEnd *> *) +Q_DECLARE_METATYPE(QSet<QUmlExtensionEnd *> *) + QT_END_HEADER #endif // QUMLEXTENSIONEND_H diff --git a/src/uml/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp index bbed1f66..d81328c8 100644 --- a/src/uml/qumlextensionpoint.cpp +++ b/src/uml/qumlextensionpoint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlextensionpoint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlUseCase> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlExtensionPoint::QUmlExtensionPoint() : _useCase(0) { + d_ptr->object.setProperty("useCase", QVariant::fromValue((QUmlUseCase *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlextensionpoint.h b/src/uml/qumlextensionpoint.h index 7ec826ab..159425b6 100644 --- a/src/uml/qumlextensionpoint.h +++ b/src/uml/qumlextensionpoint.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlExtensionPoint *) +Q_DECLARE_METATYPE(QList<QUmlExtensionPoint *> *) +Q_DECLARE_METATYPE(QSet<QUmlExtensionPoint *> *) + QT_END_HEADER #endif // QUMLEXTENSIONPOINT_H diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp index 4554b4f1..0b7ba28e 100644 --- a/src/uml/qumlfeature.cpp +++ b/src/uml/qumlfeature.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlfeature.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlFeature::QUmlFeature() : _isStatic(false) { + d_ptr->object.setProperty("featuringClassifier", QVariant::fromValue(&_featuringClassifier)); + d_ptr->object.setProperty("isStatic", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h index fc5b1d2f..1a7364f3 100644 --- a/src/uml/qumlfeature.h +++ b/src/uml/qumlfeature.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlFeature *) +Q_DECLARE_METATYPE(QList<QUmlFeature *> *) +Q_DECLARE_METATYPE(QSet<QUmlFeature *> *) + QT_END_HEADER #endif // QUMLFEATURE_H diff --git a/src/uml/qumlfinalnode.cpp b/src/uml/qumlfinalnode.cpp index 8fa03017..a3c80425 100644 --- a/src/uml/qumlfinalnode.cpp +++ b/src/uml/qumlfinalnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlfinalnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlfinalnode.h b/src/uml/qumlfinalnode.h index badb9c76..1339b451 100644 --- a/src/uml/qumlfinalnode.h +++ b/src/uml/qumlfinalnode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlFinalNode *) +Q_DECLARE_METATYPE(QList<QUmlFinalNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlFinalNode *> *) + QT_END_HEADER #endif // QUMLFINALNODE_H diff --git a/src/uml/qumlfinalstate.cpp b/src/uml/qumlfinalstate.cpp index 44899f8c..75d06579 100644 --- a/src/uml/qumlfinalstate.cpp +++ b/src/uml/qumlfinalstate.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlfinalstate.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlfinalstate.h b/src/uml/qumlfinalstate.h index 76ac6c2a..c139b7d1 100644 --- a/src/uml/qumlfinalstate.h +++ b/src/uml/qumlfinalstate.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlFinalState *) +Q_DECLARE_METATYPE(QList<QUmlFinalState *> *) +Q_DECLARE_METATYPE(QSet<QUmlFinalState *> *) + QT_END_HEADER #endif // QUMLFINALSTATE_H diff --git a/src/uml/qumlflowfinalnode.cpp b/src/uml/qumlflowfinalnode.cpp index 2a4ddb7d..238546ec 100644 --- a/src/uml/qumlflowfinalnode.cpp +++ b/src/uml/qumlflowfinalnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlflowfinalnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlflowfinalnode.h b/src/uml/qumlflowfinalnode.h index fe5f91a7..7b1e7a0e 100644 --- a/src/uml/qumlflowfinalnode.h +++ b/src/uml/qumlflowfinalnode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlFlowFinalNode *) +Q_DECLARE_METATYPE(QList<QUmlFlowFinalNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlFlowFinalNode *> *) + QT_END_HEADER #endif // QUMLFLOWFINALNODE_H diff --git a/src/uml/qumlforknode.cpp b/src/uml/qumlforknode.cpp index 38d68aa6..df84cc00 100644 --- a/src/uml/qumlforknode.cpp +++ b/src/uml/qumlforknode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlforknode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlforknode.h b/src/uml/qumlforknode.h index 1c6c78e8..c3b3c999 100644 --- a/src/uml/qumlforknode.h +++ b/src/uml/qumlforknode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlForkNode *) +Q_DECLARE_METATYPE(QList<QUmlForkNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlForkNode *> *) + QT_END_HEADER #endif // QUMLFORKNODE_H diff --git a/src/uml/qumlfunctionbehavior.cpp b/src/uml/qumlfunctionbehavior.cpp index a31ba62d..4f0578c3 100644 --- a/src/uml/qumlfunctionbehavior.cpp +++ b/src/uml/qumlfunctionbehavior.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlfunctionbehavior.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlfunctionbehavior.h b/src/uml/qumlfunctionbehavior.h index 0d3d567c..22895a8d 100644 --- a/src/uml/qumlfunctionbehavior.h +++ b/src/uml/qumlfunctionbehavior.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlFunctionBehavior *) +Q_DECLARE_METATYPE(QList<QUmlFunctionBehavior *> *) +Q_DECLARE_METATYPE(QSet<QUmlFunctionBehavior *> *) + QT_END_HEADER #endif // QUMLFUNCTIONBEHAVIOR_H diff --git a/src/uml/qumlgate.cpp b/src/uml/qumlgate.cpp index 44d0a92b..3bc72edf 100644 --- a/src/uml/qumlgate.cpp +++ b/src/uml/qumlgate.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlgate.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlgate.h b/src/uml/qumlgate.h index 26081a0e..7083457d 100644 --- a/src/uml/qumlgate.h +++ b/src/uml/qumlgate.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlGate *) +Q_DECLARE_METATYPE(QList<QUmlGate *> *) +Q_DECLARE_METATYPE(QSet<QUmlGate *> *) + QT_END_HEADER #endif // QUMLGATE_H diff --git a/src/uml/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp index 2e4d2d61..89e75820 100644 --- a/src/uml/qumlgeneralization.cpp +++ b/src/uml/qumlgeneralization.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlgeneralization.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlGeneralizationSet> @@ -58,6 +59,10 @@ QUmlGeneralization::QUmlGeneralization() : _isSubstitutable(true), _specific(0) { + d_ptr->object.setProperty("general", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("generalizationSet", QVariant::fromValue(&_generalizationSet)); + d_ptr->object.setProperty("isSubstitutable", QVariant::fromValue(false)); + d_ptr->object.setProperty("specific", QVariant::fromValue((QUmlClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlgeneralization.h b/src/uml/qumlgeneralization.h index 6156033d..2549fbf9 100644 --- a/src/uml/qumlgeneralization.h +++ b/src/uml/qumlgeneralization.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlGeneralization *) +Q_DECLARE_METATYPE(QList<QUmlGeneralization *> *) +Q_DECLARE_METATYPE(QSet<QUmlGeneralization *> *) + QT_END_HEADER #endif // QUMLGENERALIZATION_H diff --git a/src/uml/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp index 91e673b6..bdecbdd7 100644 --- a/src/uml/qumlgeneralizationset.cpp +++ b/src/uml/qumlgeneralizationset.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlgeneralizationset.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlGeneralization> @@ -58,6 +59,10 @@ QUmlGeneralizationSet::QUmlGeneralizationSet() : _isDisjoint(false), _powertype(0) { + d_ptr->object.setProperty("generalization", QVariant::fromValue(&_generalization)); + d_ptr->object.setProperty("isCovering", QVariant::fromValue(false)); + d_ptr->object.setProperty("isDisjoint", QVariant::fromValue(false)); + d_ptr->object.setProperty("powertype", QVariant::fromValue((QUmlClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlgeneralizationset.h b/src/uml/qumlgeneralizationset.h index c10bd205..88878fe5 100644 --- a/src/uml/qumlgeneralizationset.h +++ b/src/uml/qumlgeneralizationset.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlGeneralizationSet *) +Q_DECLARE_METATYPE(QList<QUmlGeneralizationSet *> *) +Q_DECLARE_METATYPE(QSet<QUmlGeneralizationSet *> *) + QT_END_HEADER #endif // QUMLGENERALIZATIONSET_H diff --git a/src/uml/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp index c7c6953d..ef655ac9 100644 --- a/src/uml/qumlgeneralordering.cpp +++ b/src/uml/qumlgeneralordering.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlgeneralordering.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOccurrenceSpecification> @@ -56,6 +57,8 @@ QUmlGeneralOrdering::QUmlGeneralOrdering() : _after(0), _before(0) { + d_ptr->object.setProperty("after", QVariant::fromValue((QUmlOccurrenceSpecification *)(0))); + d_ptr->object.setProperty("before", QVariant::fromValue((QUmlOccurrenceSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlgeneralordering.h b/src/uml/qumlgeneralordering.h index dae18e79..469dd417 100644 --- a/src/uml/qumlgeneralordering.h +++ b/src/uml/qumlgeneralordering.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlGeneralOrdering *) +Q_DECLARE_METATYPE(QList<QUmlGeneralOrdering *> *) +Q_DECLARE_METATYPE(QSet<QUmlGeneralOrdering *> *) + QT_END_HEADER #endif // QUMLGENERALORDERING_H diff --git a/src/uml/qumlimage.cpp b/src/uml/qumlimage.cpp index 919ba22c..34205b8d 100644 --- a/src/uml/qumlimage.cpp +++ b/src/uml/qumlimage.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlimage.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,9 @@ QT_BEGIN_NAMESPACE QUmlImage::QUmlImage() { + d_ptr->object.setProperty("content", QVariant::fromValue(QString())); + d_ptr->object.setProperty("format", QVariant::fromValue(QString())); + d_ptr->object.setProperty("location", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlimage.h b/src/uml/qumlimage.h index 5da15e79..be7eee16 100644 --- a/src/uml/qumlimage.h +++ b/src/uml/qumlimage.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlImage *) +Q_DECLARE_METATYPE(QList<QUmlImage *> *) +Q_DECLARE_METATYPE(QSet<QUmlImage *> *) + QT_END_HEADER #endif // QUMLIMAGE_H diff --git a/src/uml/qumlinclude.cpp b/src/uml/qumlinclude.cpp index 147186c9..a77f6e55 100644 --- a/src/uml/qumlinclude.cpp +++ b/src/uml/qumlinclude.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinclude.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlUseCase> @@ -56,6 +57,8 @@ QUmlInclude::QUmlInclude() : _addition(0), _includingCase(0) { + d_ptr->object.setProperty("addition", QVariant::fromValue((QUmlUseCase *)(0))); + d_ptr->object.setProperty("includingCase", QVariant::fromValue((QUmlUseCase *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinclude.h b/src/uml/qumlinclude.h index 0f15f89b..5b060b8a 100644 --- a/src/uml/qumlinclude.h +++ b/src/uml/qumlinclude.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInclude *) +Q_DECLARE_METATYPE(QList<QUmlInclude *> *) +Q_DECLARE_METATYPE(QSet<QUmlInclude *> *) + QT_END_HEADER #endif // QUMLINCLUDE_H diff --git a/src/uml/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp index cacd94a6..4a68dfc8 100644 --- a/src/uml/qumlinformationflow.cpp +++ b/src/uml/qumlinformationflow.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinformationflow.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlClassifier> @@ -59,6 +60,13 @@ QT_BEGIN_NAMESPACE QUmlInformationFlow::QUmlInformationFlow() { + d_ptr->object.setProperty("conveyed", QVariant::fromValue(&_conveyed)); + d_ptr->object.setProperty("informationSource", QVariant::fromValue(&_informationSource)); + d_ptr->object.setProperty("informationTarget", QVariant::fromValue(&_informationTarget)); + d_ptr->object.setProperty("realization", QVariant::fromValue(&_realization)); + d_ptr->object.setProperty("realizingActivityEdge", QVariant::fromValue(&_realizingActivityEdge)); + d_ptr->object.setProperty("realizingConnector", QVariant::fromValue(&_realizingConnector)); + d_ptr->object.setProperty("realizingMessage", QVariant::fromValue(&_realizingMessage)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinformationflow.h b/src/uml/qumlinformationflow.h index a0c138b2..68f309ca 100644 --- a/src/uml/qumlinformationflow.h +++ b/src/uml/qumlinformationflow.h @@ -99,6 +99,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInformationFlow *) +Q_DECLARE_METATYPE(QList<QUmlInformationFlow *> *) +Q_DECLARE_METATYPE(QSet<QUmlInformationFlow *> *) + QT_END_HEADER #endif // QUMLINFORMATIONFLOW_H diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp index 0a21daf4..66d10194 100644 --- a/src/uml/qumlinformationitem.cpp +++ b/src/uml/qumlinformationitem.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinformationitem.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlInformationItem::QUmlInformationItem() { + d_ptr->object.setProperty("represented", QVariant::fromValue(&_represented)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinformationitem.h b/src/uml/qumlinformationitem.h index a068f400..14d5113d 100644 --- a/src/uml/qumlinformationitem.h +++ b/src/uml/qumlinformationitem.h @@ -67,6 +67,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInformationItem *) +Q_DECLARE_METATYPE(QList<QUmlInformationItem *> *) +Q_DECLARE_METATYPE(QSet<QUmlInformationItem *> *) + QT_END_HEADER #endif // QUMLINFORMATIONITEM_H diff --git a/src/uml/qumlinitialnode.cpp b/src/uml/qumlinitialnode.cpp index 2f57228f..1c6f3b5a 100644 --- a/src/uml/qumlinitialnode.cpp +++ b/src/uml/qumlinitialnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinitialnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlinitialnode.h b/src/uml/qumlinitialnode.h index 110d9075..c11b4f4f 100644 --- a/src/uml/qumlinitialnode.h +++ b/src/uml/qumlinitialnode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInitialNode *) +Q_DECLARE_METATYPE(QList<QUmlInitialNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlInitialNode *> *) + QT_END_HEADER #endif // QUMLINITIALNODE_H diff --git a/src/uml/qumlinputpin.cpp b/src/uml/qumlinputpin.cpp index afb1b4da..d1c25b00 100644 --- a/src/uml/qumlinputpin.cpp +++ b/src/uml/qumlinputpin.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinputpin.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlinputpin.h b/src/uml/qumlinputpin.h index 5751d016..899817a3 100644 --- a/src/uml/qumlinputpin.h +++ b/src/uml/qumlinputpin.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInputPin *) +Q_DECLARE_METATYPE(QList<QUmlInputPin *> *) +Q_DECLARE_METATYPE(QSet<QUmlInputPin *> *) + QT_END_HEADER #endif // QUMLINPUTPIN_H diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp index df08cc3e..c1cad898 100644 --- a/src/uml/qumlinstancespecification.cpp +++ b/src/uml/qumlinstancespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinstancespecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlSlot> @@ -57,6 +58,9 @@ QT_BEGIN_NAMESPACE QUmlInstanceSpecification::QUmlInstanceSpecification() : _specification(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue(&_classifier)); + d_ptr->object.setProperty("slot", QVariant::fromValue(&_slot_)); + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinstancespecification.h b/src/uml/qumlinstancespecification.h index 51f8a38a..46b66808 100644 --- a/src/uml/qumlinstancespecification.h +++ b/src/uml/qumlinstancespecification.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInstanceSpecification *) +Q_DECLARE_METATYPE(QList<QUmlInstanceSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlInstanceSpecification *> *) + QT_END_HEADER #endif // QUMLINSTANCESPECIFICATION_H diff --git a/src/uml/qumlinstancevalue.cpp b/src/uml/qumlinstancevalue.cpp index 95feebaa..408de4e6 100644 --- a/src/uml/qumlinstancevalue.cpp +++ b/src/uml/qumlinstancevalue.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinstancevalue.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInstanceSpecification> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlInstanceValue::QUmlInstanceValue() : _instance(0) { + d_ptr->object.setProperty("instance", QVariant::fromValue((QUmlInstanceSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinstancevalue.h b/src/uml/qumlinstancevalue.h index 7f835250..dbe4c499 100644 --- a/src/uml/qumlinstancevalue.h +++ b/src/uml/qumlinstancevalue.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInstanceValue *) +Q_DECLARE_METATYPE(QList<QUmlInstanceValue *> *) +Q_DECLARE_METATYPE(QSet<QUmlInstanceValue *> *) + QT_END_HEADER #endif // QUMLINSTANCEVALUE_H diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp index b4892f79..6c25a50b 100644 --- a/src/uml/qumlinteraction.cpp +++ b/src/uml/qumlinteraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinteraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAction> #include <QtUml/QUmlGate> @@ -57,6 +58,11 @@ QT_BEGIN_NAMESPACE QUmlInteraction::QUmlInteraction() { + d_ptr->object.setProperty("action", QVariant::fromValue(&_action)); + d_ptr->object.setProperty("formalGate", QVariant::fromValue(&_formalGate)); + d_ptr->object.setProperty("fragment", QVariant::fromValue(&_fragment)); + d_ptr->object.setProperty("lifeline", QVariant::fromValue(&_lifeline)); + d_ptr->object.setProperty("message", QVariant::fromValue(&_message)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinteraction.h b/src/uml/qumlinteraction.h index 04ee9359..ef82deb9 100644 --- a/src/uml/qumlinteraction.h +++ b/src/uml/qumlinteraction.h @@ -89,6 +89,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInteraction *) +Q_DECLARE_METATYPE(QList<QUmlInteraction *> *) +Q_DECLARE_METATYPE(QSet<QUmlInteraction *> *) + QT_END_HEADER #endif // QUMLINTERACTION_H diff --git a/src/uml/qumlinteractionconstraint.cpp b/src/uml/qumlinteractionconstraint.cpp index 331ef1f4..e9122693 100644 --- a/src/uml/qumlinteractionconstraint.cpp +++ b/src/uml/qumlinteractionconstraint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinteractionconstraint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlValueSpecification> @@ -56,6 +57,8 @@ QUmlInteractionConstraint::QUmlInteractionConstraint() : _maxint(0), _minint(0) { + d_ptr->object.setProperty("maxint", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("minint", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinteractionconstraint.h b/src/uml/qumlinteractionconstraint.h index 1be8e581..d76ac376 100644 --- a/src/uml/qumlinteractionconstraint.h +++ b/src/uml/qumlinteractionconstraint.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInteractionConstraint *) +Q_DECLARE_METATYPE(QList<QUmlInteractionConstraint *> *) +Q_DECLARE_METATYPE(QSet<QUmlInteractionConstraint *> *) + QT_END_HEADER #endif // QUMLINTERACTIONCONSTRAINT_H diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp index 9736c5ca..c2c4347f 100644 --- a/src/uml/qumlinteractionfragment.cpp +++ b/src/uml/qumlinteractionfragment.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinteractionfragment.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlGeneralOrdering> #include <QtUml/QUmlInteraction> @@ -59,6 +60,10 @@ QUmlInteractionFragment::QUmlInteractionFragment() : _enclosingInteraction(0), _enclosingOperand(0) { + d_ptr->object.setProperty("covered", QVariant::fromValue(&_covered)); + d_ptr->object.setProperty("enclosingInteraction", QVariant::fromValue((QUmlInteraction *)(0))); + d_ptr->object.setProperty("enclosingOperand", QVariant::fromValue((QUmlInteractionOperand *)(0))); + d_ptr->object.setProperty("generalOrdering", QVariant::fromValue(&_generalOrdering)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h index 5f22248b..342a7b1f 100644 --- a/src/uml/qumlinteractionfragment.h +++ b/src/uml/qumlinteractionfragment.h @@ -82,6 +82,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInteractionFragment *) +Q_DECLARE_METATYPE(QList<QUmlInteractionFragment *> *) +Q_DECLARE_METATYPE(QSet<QUmlInteractionFragment *> *) + QT_END_HEADER #endif // QUMLINTERACTIONFRAGMENT_H diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp index f648dd41..dcaf1d6c 100644 --- a/src/uml/qumlinteractionoperand.cpp +++ b/src/uml/qumlinteractionoperand.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinteractionoperand.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInteractionConstraint> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlInteractionOperand::QUmlInteractionOperand() : _guard(0) { + d_ptr->object.setProperty("fragment", QVariant::fromValue(&_fragment)); + d_ptr->object.setProperty("guard", QVariant::fromValue((QUmlInteractionConstraint *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinteractionoperand.h b/src/uml/qumlinteractionoperand.h index ad743434..cd4c7cbb 100644 --- a/src/uml/qumlinteractionoperand.h +++ b/src/uml/qumlinteractionoperand.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInteractionOperand *) +Q_DECLARE_METATYPE(QList<QUmlInteractionOperand *> *) +Q_DECLARE_METATYPE(QSet<QUmlInteractionOperand *> *) + QT_END_HEADER #endif // QUMLINTERACTIONOPERAND_H diff --git a/src/uml/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp index 0174719c..af7e4ff9 100644 --- a/src/uml/qumlinteractionuse.cpp +++ b/src/uml/qumlinteractionuse.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinteractionuse.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlGate> #include <QtUml/QUmlInteraction> @@ -60,6 +61,11 @@ QUmlInteractionUse::QUmlInteractionUse() : _returnValue(0), _returnValueRecipient(0) { + d_ptr->object.setProperty("actualGate", QVariant::fromValue(&_actualGate)); + d_ptr->object.setProperty("argument", QVariant::fromValue(&_argument)); + d_ptr->object.setProperty("refersTo", QVariant::fromValue((QUmlInteraction *)(0))); + d_ptr->object.setProperty("returnValue", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("returnValueRecipient", QVariant::fromValue((QUmlProperty *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinteractionuse.h b/src/uml/qumlinteractionuse.h index 17237f10..8d632e13 100644 --- a/src/uml/qumlinteractionuse.h +++ b/src/uml/qumlinteractionuse.h @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) class QUmlGate; +class QUmlInteraction; class QUmlProperty; class QUmlValueSpecification; @@ -84,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInteractionUse *) +Q_DECLARE_METATYPE(QList<QUmlInteractionUse *> *) +Q_DECLARE_METATYPE(QSet<QUmlInteractionUse *> *) + QT_END_HEADER #endif // QUMLINTERACTIONUSE_H diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp index 52fbd99e..e0c97a2f 100644 --- a/src/uml/qumlinterface.cpp +++ b/src/uml/qumlinterface.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinterface.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOperation> #include <QtUml/QUmlProperty> @@ -58,6 +59,12 @@ QT_BEGIN_NAMESPACE QUmlInterface::QUmlInterface() : _protocol(0) { + d_ptr->object.setProperty("nestedClassifier", QVariant::fromValue(&_nestedClassifier)); + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); + d_ptr->object.setProperty("ownedOperation", QVariant::fromValue(&_ownedOperation)); + d_ptr->object.setProperty("ownedReception", QVariant::fromValue(&_ownedReception)); + d_ptr->object.setProperty("protocol", QVariant::fromValue((QUmlProtocolStateMachine *)(0))); + d_ptr->object.setProperty("redefinedInterface", QVariant::fromValue(&_redefinedInterface)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinterface.h b/src/uml/qumlinterface.h index c66fffbe..3e0c960c 100644 --- a/src/uml/qumlinterface.h +++ b/src/uml/qumlinterface.h @@ -91,6 +91,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInterface *) +Q_DECLARE_METATYPE(QList<QUmlInterface *> *) +Q_DECLARE_METATYPE(QSet<QUmlInterface *> *) + QT_END_HEADER #endif // QUMLINTERFACE_H diff --git a/src/uml/qumlinterfacerealization.cpp b/src/uml/qumlinterfacerealization.cpp index 2d9eeadf..4d15501d 100644 --- a/src/uml/qumlinterfacerealization.cpp +++ b/src/uml/qumlinterfacerealization.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinterfacerealization.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlInterface> @@ -57,6 +58,8 @@ QUmlInterfaceRealization::QUmlInterfaceRealization() : _contract(0), _implementingClassifier(0) { + d_ptr->object.setProperty("contract", QVariant::fromValue((QUmlInterface *)(0))); + d_ptr->object.setProperty("implementingClassifier", QVariant::fromValue((QUmlBehavioredClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinterfacerealization.h b/src/uml/qumlinterfacerealization.h index d19485e4..e727592c 100644 --- a/src/uml/qumlinterfacerealization.h +++ b/src/uml/qumlinterfacerealization.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInterfaceRealization *) +Q_DECLARE_METATYPE(QList<QUmlInterfaceRealization *> *) +Q_DECLARE_METATYPE(QSet<QUmlInterfaceRealization *> *) + QT_END_HEADER #endif // QUMLINTERFACEREALIZATION_H diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp index 14d06938..9930995e 100644 --- a/src/uml/qumlinterruptibleactivityregion.cpp +++ b/src/uml/qumlinterruptibleactivityregion.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinterruptibleactivityregion.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityNode> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion() { + d_ptr->object.setProperty("interruptingEdge", QVariant::fromValue(&_interruptingEdge)); + d_ptr->object.setProperty("node", QVariant::fromValue(&_node)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinterruptibleactivityregion.h b/src/uml/qumlinterruptibleactivityregion.h index b22d371d..02dbe03d 100644 --- a/src/uml/qumlinterruptibleactivityregion.h +++ b/src/uml/qumlinterruptibleactivityregion.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInterruptibleActivityRegion *) +Q_DECLARE_METATYPE(QList<QUmlInterruptibleActivityRegion *> *) +Q_DECLARE_METATYPE(QSet<QUmlInterruptibleActivityRegion *> *) + QT_END_HEADER #endif // QUMLINTERRUPTIBLEACTIVITYREGION_H diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp index bfa6e8ac..bc93a476 100644 --- a/src/uml/qumlinterval.cpp +++ b/src/uml/qumlinterval.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinterval.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -54,6 +55,8 @@ QUmlInterval::QUmlInterval() : _max(0), _min(0) { + d_ptr->object.setProperty("max", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("min", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinterval.h b/src/uml/qumlinterval.h index 4903b9de..4eed5c82 100644 --- a/src/uml/qumlinterval.h +++ b/src/uml/qumlinterval.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInterval *) +Q_DECLARE_METATYPE(QList<QUmlInterval *> *) +Q_DECLARE_METATYPE(QSet<QUmlInterval *> *) + QT_END_HEADER #endif // QUMLINTERVAL_H diff --git a/src/uml/qumlintervalconstraint.cpp b/src/uml/qumlintervalconstraint.cpp index 95333877..1d8ee9cf 100644 --- a/src/uml/qumlintervalconstraint.cpp +++ b/src/uml/qumlintervalconstraint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlintervalconstraint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInterval> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlIntervalConstraint::QUmlIntervalConstraint() : _specification(0) { + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlInterval *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlintervalconstraint.h b/src/uml/qumlintervalconstraint.h index 7b3e8346..45a10a9b 100644 --- a/src/uml/qumlintervalconstraint.h +++ b/src/uml/qumlintervalconstraint.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlIntervalConstraint *) +Q_DECLARE_METATYPE(QList<QUmlIntervalConstraint *> *) +Q_DECLARE_METATYPE(QSet<QUmlIntervalConstraint *> *) + QT_END_HEADER #endif // QUMLINTERVALCONSTRAINT_H diff --git a/src/uml/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp index 95c996ac..b7708705 100644 --- a/src/uml/qumlinvocationaction.cpp +++ b/src/uml/qumlinvocationaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlinvocationaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlPort> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlInvocationAction::QUmlInvocationAction() : _onPort(0) { + d_ptr->object.setProperty("argument", QVariant::fromValue(&_argument)); + d_ptr->object.setProperty("onPort", QVariant::fromValue((QUmlPort *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h index 3b63ecad..559918cc 100644 --- a/src/uml/qumlinvocationaction.h +++ b/src/uml/qumlinvocationaction.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlInvocationAction *) +Q_DECLARE_METATYPE(QList<QUmlInvocationAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlInvocationAction *> *) + QT_END_HEADER #endif // QUMLINVOCATIONACTION_H diff --git a/src/uml/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp index c397c7d6..f7c01a8e 100644 --- a/src/uml/qumljoinnode.cpp +++ b/src/uml/qumljoinnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumljoinnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlValueSpecification> @@ -56,6 +57,8 @@ QUmlJoinNode::QUmlJoinNode() : _isCombineDuplicate(true), _joinSpec(0) { + d_ptr->object.setProperty("isCombineDuplicate", QVariant::fromValue(false)); + d_ptr->object.setProperty("joinSpec", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumljoinnode.h b/src/uml/qumljoinnode.h index 72037695..093d4379 100644 --- a/src/uml/qumljoinnode.h +++ b/src/uml/qumljoinnode.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlJoinNode *) +Q_DECLARE_METATYPE(QList<QUmlJoinNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlJoinNode *> *) + QT_END_HEADER #endif // QUMLJOINNODE_H diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp index a07cea03..81563892 100644 --- a/src/uml/qumllifeline.cpp +++ b/src/uml/qumllifeline.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumllifeline.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlInteraction> @@ -62,6 +63,11 @@ QUmlLifeline::QUmlLifeline() : _represents(0), _selector(0) { + d_ptr->object.setProperty("coveredBy", QVariant::fromValue(&_coveredBy)); + d_ptr->object.setProperty("decomposedAs", QVariant::fromValue((QUmlPartDecomposition *)(0))); + d_ptr->object.setProperty("interaction", QVariant::fromValue((QUmlInteraction *)(0))); + d_ptr->object.setProperty("represents", QVariant::fromValue((QUmlConnectableElement *)(0))); + d_ptr->object.setProperty("selector", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumllifeline.h b/src/uml/qumllifeline.h index 048f7171..1e1facca 100644 --- a/src/uml/qumllifeline.h +++ b/src/uml/qumllifeline.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLifeline *) +Q_DECLARE_METATYPE(QList<QUmlLifeline *> *) +Q_DECLARE_METATYPE(QSet<QUmlLifeline *> *) + QT_END_HEADER #endif // QUMLLIFELINE_H diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp index 8c1e484e..d6459113 100644 --- a/src/uml/qumllinkaction.cpp +++ b/src/uml/qumllinkaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumllinkaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlLinkAction::QUmlLinkAction() { + d_ptr->object.setProperty("endData", QVariant::fromValue(&_endData)); + d_ptr->object.setProperty("inputValue", QVariant::fromValue(&_inputValue)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h index 7c15f390..fb3596e8 100644 --- a/src/uml/qumllinkaction.h +++ b/src/uml/qumllinkaction.h @@ -78,6 +78,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLinkAction *) +Q_DECLARE_METATYPE(QList<QUmlLinkAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlLinkAction *> *) + QT_END_HEADER #endif // QUMLLINKACTION_H diff --git a/src/uml/qumllinkendcreationdata.cpp b/src/uml/qumllinkendcreationdata.cpp index 2ee15e14..74402f08 100644 --- a/src/uml/qumllinkendcreationdata.cpp +++ b/src/uml/qumllinkendcreationdata.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumllinkendcreationdata.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlLinkEndCreationData::QUmlLinkEndCreationData() : _insertAt(0), _isReplaceAll(false) { + d_ptr->object.setProperty("insertAt", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("isReplaceAll", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumllinkendcreationdata.h b/src/uml/qumllinkendcreationdata.h index 9ac422de..ec3b12b2 100644 --- a/src/uml/qumllinkendcreationdata.h +++ b/src/uml/qumllinkendcreationdata.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLinkEndCreationData *) +Q_DECLARE_METATYPE(QList<QUmlLinkEndCreationData *> *) +Q_DECLARE_METATYPE(QSet<QUmlLinkEndCreationData *> *) + QT_END_HEADER #endif // QUMLLINKENDCREATIONDATA_H diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp index 9fdb21cf..66199fb2 100644 --- a/src/uml/qumllinkenddata.cpp +++ b/src/uml/qumllinkenddata.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumllinkenddata.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> @@ -58,6 +59,9 @@ QUmlLinkEndData::QUmlLinkEndData() : _end(0), _value(0) { + d_ptr->object.setProperty("end", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("qualifier", QVariant::fromValue(&_qualifier)); + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h index 6f733714..b0373ce2 100644 --- a/src/uml/qumllinkenddata.h +++ b/src/uml/qumllinkenddata.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLinkEndData *) +Q_DECLARE_METATYPE(QList<QUmlLinkEndData *> *) +Q_DECLARE_METATYPE(QSet<QUmlLinkEndData *> *) + QT_END_HEADER #endif // QUMLLINKENDDATA_H diff --git a/src/uml/qumllinkenddestructiondata.cpp b/src/uml/qumllinkenddestructiondata.cpp index 72239f71..06157ee3 100644 --- a/src/uml/qumllinkenddestructiondata.cpp +++ b/src/uml/qumllinkenddestructiondata.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumllinkenddestructiondata.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlLinkEndDestructionData::QUmlLinkEndDestructionData() : _destroyAt(0), _isDestroyDuplicates(false) { + d_ptr->object.setProperty("destroyAt", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("isDestroyDuplicates", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumllinkenddestructiondata.h b/src/uml/qumllinkenddestructiondata.h index 84dd6b69..a4416102 100644 --- a/src/uml/qumllinkenddestructiondata.h +++ b/src/uml/qumllinkenddestructiondata.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLinkEndDestructionData *) +Q_DECLARE_METATYPE(QList<QUmlLinkEndDestructionData *> *) +Q_DECLARE_METATYPE(QSet<QUmlLinkEndDestructionData *> *) + QT_END_HEADER #endif // QUMLLINKENDDESTRUCTIONDATA_H diff --git a/src/uml/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp index 07cfeb4b..7ddb61c0 100644 --- a/src/uml/qumlliteralboolean.cpp +++ b/src/uml/qumlliteralboolean.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralboolean.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlLiteralBoolean::QUmlLiteralBoolean() : _value(false) { + d_ptr->object.setProperty("value", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlliteralboolean.h b/src/uml/qumlliteralboolean.h index 6fbcb0e7..6e328a83 100644 --- a/src/uml/qumlliteralboolean.h +++ b/src/uml/qumlliteralboolean.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralBoolean *) +Q_DECLARE_METATYPE(QList<QUmlLiteralBoolean *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralBoolean *> *) + QT_END_HEADER #endif // QUMLLITERALBOOLEAN_H diff --git a/src/uml/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp index 655f0271..76748db1 100644 --- a/src/uml/qumlliteralinteger.cpp +++ b/src/uml/qumlliteralinteger.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralinteger.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlLiteralInteger::QUmlLiteralInteger() : _value(0) { + d_ptr->object.setProperty("value", QVariant::fromValue((int)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlliteralinteger.h b/src/uml/qumlliteralinteger.h index ad640dec..076ddf92 100644 --- a/src/uml/qumlliteralinteger.h +++ b/src/uml/qumlliteralinteger.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralInteger *) +Q_DECLARE_METATYPE(QList<QUmlLiteralInteger *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralInteger *> *) + QT_END_HEADER #endif // QUMLLITERALINTEGER_H diff --git a/src/uml/qumlliteralnull.cpp b/src/uml/qumlliteralnull.cpp index dfcb970f..e6f8613b 100644 --- a/src/uml/qumlliteralnull.cpp +++ b/src/uml/qumlliteralnull.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralnull.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlliteralnull.h b/src/uml/qumlliteralnull.h index 7e2e1326..3ea571e8 100644 --- a/src/uml/qumlliteralnull.h +++ b/src/uml/qumlliteralnull.h @@ -65,6 +65,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralNull *) +Q_DECLARE_METATYPE(QList<QUmlLiteralNull *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralNull *> *) + QT_END_HEADER #endif // QUMLLITERALNULL_H diff --git a/src/uml/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp index 940a9698..421ebd8a 100644 --- a/src/uml/qumlliteralreal.cpp +++ b/src/uml/qumlliteralreal.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralreal.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlLiteralReal::QUmlLiteralReal() { + d_ptr->object.setProperty("value", QVariant::fromValue((double)(0.0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlliteralreal.h b/src/uml/qumlliteralreal.h index 9ebbd6c9..d543d095 100644 --- a/src/uml/qumlliteralreal.h +++ b/src/uml/qumlliteralreal.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralReal *) +Q_DECLARE_METATYPE(QList<QUmlLiteralReal *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralReal *> *) + QT_END_HEADER #endif // QUMLLITERALREAL_H diff --git a/src/uml/qumlliteralspecification.cpp b/src/uml/qumlliteralspecification.cpp index bc644837..4b291d04 100644 --- a/src/uml/qumlliteralspecification.cpp +++ b/src/uml/qumlliteralspecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralspecification.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlliteralspecification.h b/src/uml/qumlliteralspecification.h index 839d9ed5..de84680e 100644 --- a/src/uml/qumlliteralspecification.h +++ b/src/uml/qumlliteralspecification.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralSpecification *) +Q_DECLARE_METATYPE(QList<QUmlLiteralSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralSpecification *> *) + QT_END_HEADER #endif // QUMLLITERALSPECIFICATION_H diff --git a/src/uml/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp index 36529004..e73d3c74 100644 --- a/src/uml/qumlliteralstring.cpp +++ b/src/uml/qumlliteralstring.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralstring.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlLiteralString::QUmlLiteralString() { + d_ptr->object.setProperty("value", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlliteralstring.h b/src/uml/qumlliteralstring.h index facb7b45..179ba561 100644 --- a/src/uml/qumlliteralstring.h +++ b/src/uml/qumlliteralstring.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralString *) +Q_DECLARE_METATYPE(QList<QUmlLiteralString *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralString *> *) + QT_END_HEADER #endif // QUMLLITERALSTRING_H diff --git a/src/uml/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp index 91aed55b..2d122639 100644 --- a/src/uml/qumlliteralunlimitednatural.cpp +++ b/src/uml/qumlliteralunlimitednatural.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlliteralunlimitednatural.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural() : _value(0) { + d_ptr->object.setProperty("value", QVariant::fromValue((int)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlliteralunlimitednatural.h b/src/uml/qumlliteralunlimitednatural.h index 4c6669e6..26c8c253 100644 --- a/src/uml/qumlliteralunlimitednatural.h +++ b/src/uml/qumlliteralunlimitednatural.h @@ -70,6 +70,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLiteralUnlimitedNatural *) +Q_DECLARE_METATYPE(QList<QUmlLiteralUnlimitedNatural *> *) +Q_DECLARE_METATYPE(QSet<QUmlLiteralUnlimitedNatural *> *) + QT_END_HEADER #endif // QUMLLITERALUNLIMITEDNATURAL_H diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp index dfa9e486..3048b46e 100644 --- a/src/uml/qumlloopnode.cpp +++ b/src/uml/qumlloopnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlloopnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlInputPin> @@ -58,6 +59,15 @@ QUmlLoopNode::QUmlLoopNode() : _decider(0), _isTestedFirst(false) { + d_ptr->object.setProperty("bodyOutput", QVariant::fromValue(&_bodyOutput)); + d_ptr->object.setProperty("bodyPart", QVariant::fromValue(&_bodyPart)); + d_ptr->object.setProperty("decider", QVariant::fromValue((QUmlOutputPin *)(0))); + d_ptr->object.setProperty("isTestedFirst", QVariant::fromValue(false)); + d_ptr->object.setProperty("loopVariable", QVariant::fromValue(&_loopVariable)); + d_ptr->object.setProperty("loopVariableInput", QVariant::fromValue(&_loopVariableInput)); + d_ptr->object.setProperty("result", QVariant::fromValue(&_result)); + d_ptr->object.setProperty("setupPart", QVariant::fromValue(&_setupPart)); + d_ptr->object.setProperty("test", QVariant::fromValue(&_test)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlloopnode.h b/src/uml/qumlloopnode.h index e9378886..b49a6185 100644 --- a/src/uml/qumlloopnode.h +++ b/src/uml/qumlloopnode.h @@ -101,6 +101,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlLoopNode *) +Q_DECLARE_METATYPE(QList<QUmlLoopNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlLoopNode *> *) + QT_END_HEADER #endif // QUMLLOOPNODE_H diff --git a/src/uml/qumlmanifestation.cpp b/src/uml/qumlmanifestation.cpp index facb335d..27f2e552 100644 --- a/src/uml/qumlmanifestation.cpp +++ b/src/uml/qumlmanifestation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmanifestation.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPackageableElement> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlManifestation::QUmlManifestation() : _utilizedElement(0) { + d_ptr->object.setProperty("utilizedElement", QVariant::fromValue((QUmlPackageableElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlmanifestation.h b/src/uml/qumlmanifestation.h index fda136d1..afe70002 100644 --- a/src/uml/qumlmanifestation.h +++ b/src/uml/qumlmanifestation.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlManifestation *) +Q_DECLARE_METATYPE(QList<QUmlManifestation *> *) +Q_DECLARE_METATYPE(QSet<QUmlManifestation *> *) + QT_END_HEADER #endif // QUMLMANIFESTATION_H diff --git a/src/uml/qumlmergenode.cpp b/src/uml/qumlmergenode.cpp index 4532ba2e..5cbc4f63 100644 --- a/src/uml/qumlmergenode.cpp +++ b/src/uml/qumlmergenode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmergenode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlmergenode.h b/src/uml/qumlmergenode.h index 58ca0644..5474ce26 100644 --- a/src/uml/qumlmergenode.h +++ b/src/uml/qumlmergenode.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMergeNode *) +Q_DECLARE_METATYPE(QList<QUmlMergeNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlMergeNode *> *) + QT_END_HEADER #endif // QUMLMERGENODE_H diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp index cdab5edf..dcd09690 100644 --- a/src/uml/qumlmessage.cpp +++ b/src/uml/qumlmessage.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmessage.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnector> #include <QtUml/QUmlInteraction> @@ -58,11 +59,19 @@ QT_BEGIN_NAMESPACE QUmlMessage::QUmlMessage() : _connector(0), _interaction(0), - _messageSort(QtUml::MessageSynchCall), + _messageSort(QtUml::MessageSortSynchCall), _receiveEvent(0), _sendEvent(0), _signature(0) { + d_ptr->object.setProperty("argument", QVariant::fromValue(&_argument)); + d_ptr->object.setProperty("connector", QVariant::fromValue((QUmlConnector *)(0))); + d_ptr->object.setProperty("interaction", QVariant::fromValue((QUmlInteraction *)(0))); + d_ptr->object.setProperty("messageKind", QVariant::fromValue(QtUml::MessageKindNone)); + d_ptr->object.setProperty("messageSort", QVariant::fromValue(QtUml::MessageSortNone)); + d_ptr->object.setProperty("receiveEvent", QVariant::fromValue((QUmlMessageEnd *)(0))); + d_ptr->object.setProperty("sendEvent", QVariant::fromValue((QUmlMessageEnd *)(0))); + d_ptr->object.setProperty("signature", QVariant::fromValue((QUmlNamedElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h index 590c9f90..23b45e88 100644 --- a/src/uml/qumlmessage.h +++ b/src/uml/qumlmessage.h @@ -93,6 +93,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMessage *) +Q_DECLARE_METATYPE(QList<QUmlMessage *> *) +Q_DECLARE_METATYPE(QSet<QUmlMessage *> *) + QT_END_HEADER #endif // QUMLMESSAGE_H diff --git a/src/uml/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp index 49e45d3c..814d2381 100644 --- a/src/uml/qumlmessageend.cpp +++ b/src/uml/qumlmessageend.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmessageend.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlMessage> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlMessageEnd::QUmlMessageEnd() : _message(0) { + d_ptr->object.setProperty("message", QVariant::fromValue((QUmlMessage *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlmessageend.h b/src/uml/qumlmessageend.h index 4c4fb8dd..82f54892 100644 --- a/src/uml/qumlmessageend.h +++ b/src/uml/qumlmessageend.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMessageEnd *) +Q_DECLARE_METATYPE(QList<QUmlMessageEnd *> *) +Q_DECLARE_METATYPE(QSet<QUmlMessageEnd *> *) + QT_END_HEADER #endif // QUMLMESSAGEEND_H diff --git a/src/uml/qumlmessageevent.cpp b/src/uml/qumlmessageevent.cpp index 6230ac46..831e7d15 100644 --- a/src/uml/qumlmessageevent.cpp +++ b/src/uml/qumlmessageevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmessageevent.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlmessageevent.h b/src/uml/qumlmessageevent.h index 29a30db4..eca61b23 100644 --- a/src/uml/qumlmessageevent.h +++ b/src/uml/qumlmessageevent.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMessageEvent *) +Q_DECLARE_METATYPE(QList<QUmlMessageEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlMessageEvent *> *) + QT_END_HEADER #endif // QUMLMESSAGEEVENT_H diff --git a/src/uml/qumlmessageoccurrencespecification.cpp b/src/uml/qumlmessageoccurrencespecification.cpp index e91c4511..c8978d03 100644 --- a/src/uml/qumlmessageoccurrencespecification.cpp +++ b/src/uml/qumlmessageoccurrencespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmessageoccurrencespecification.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlmessageoccurrencespecification.h b/src/uml/qumlmessageoccurrencespecification.h index 0d913b0d..defa11cf 100644 --- a/src/uml/qumlmessageoccurrencespecification.h +++ b/src/uml/qumlmessageoccurrencespecification.h @@ -62,6 +62,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMessageOccurrenceSpecification *) +Q_DECLARE_METATYPE(QList<QUmlMessageOccurrenceSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlMessageOccurrenceSpecification *> *) + QT_END_HEADER #endif // QUMLMESSAGEOCCURRENCESPECIFICATION_H diff --git a/src/uml/qumlmodel.cpp b/src/uml/qumlmodel.cpp index d9a0e186..e903a952 100644 --- a/src/uml/qumlmodel.cpp +++ b/src/uml/qumlmodel.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmodel.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlModel::QUmlModel() { + d_ptr->object.setProperty("viewpoint", QVariant::fromValue(QString())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlmodel.h b/src/uml/qumlmodel.h index 4f18a63c..966a7807 100644 --- a/src/uml/qumlmodel.h +++ b/src/uml/qumlmodel.h @@ -66,6 +66,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlModel *) +Q_DECLARE_METATYPE(QList<QUmlModel *> *) +Q_DECLARE_METATYPE(QSet<QUmlModel *> *) + QT_END_HEADER #endif // QUMLMODEL_H diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp index 9544764d..07467b31 100644 --- a/src/uml/qumlmultiplicityelement.cpp +++ b/src/uml/qumlmultiplicityelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlmultiplicityelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlValueSpecification> @@ -58,6 +59,12 @@ QUmlMultiplicityElement::QUmlMultiplicityElement() : _lowerValue(0), _upperValue(0) { + d_ptr->object.setProperty("isOrdered", QVariant::fromValue(false)); + d_ptr->object.setProperty("isUnique", QVariant::fromValue(false)); + d_ptr->object.setProperty("lower", QVariant::fromValue((int)(0))); + d_ptr->object.setProperty("lowerValue", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("upper", QVariant::fromValue((int)(0))); + d_ptr->object.setProperty("upperValue", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlmultiplicityelement.h b/src/uml/qumlmultiplicityelement.h index 72c04372..7a1d23ac 100644 --- a/src/uml/qumlmultiplicityelement.h +++ b/src/uml/qumlmultiplicityelement.h @@ -90,6 +90,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlMultiplicityElement *) +Q_DECLARE_METATYPE(QList<QUmlMultiplicityElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlMultiplicityElement *> *) + QT_END_HEADER #endif // QUMLMULTIPLICITYELEMENT_H diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp index 8eef857a..d7125e6a 100644 --- a/src/uml/qumlnamedelement.cpp +++ b/src/uml/qumlnamedelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlnamedelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlDependency> #include <QtUml/QUmlNamespace> @@ -59,6 +60,12 @@ QUmlNamedElement::QUmlNamedElement() : _nameExpression(0), _namespace_(0) { + d_ptr->object.setProperty("clientDependency", QVariant::fromValue(&_clientDependency)); + d_ptr->object.setProperty("name", QVariant::fromValue(QString())); + d_ptr->object.setProperty("nameExpression", QVariant::fromValue((QUmlStringExpression *)(0))); + d_ptr->object.setProperty("namespace", QVariant::fromValue((QUmlNamespace *)(0))); + d_ptr->object.setProperty("qualifiedName", QVariant::fromValue(QString())); + d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h index e6f578a4..c273c0dd 100644 --- a/src/uml/qumlnamedelement.h +++ b/src/uml/qumlnamedelement.h @@ -93,6 +93,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlNamedElement *) +Q_DECLARE_METATYPE(QList<QUmlNamedElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlNamedElement *> *) + QT_END_HEADER #endif // QUMLNAMEDELEMENT_H diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp index 544d65e8..14ccbf29 100644 --- a/src/uml/qumlnamespace.cpp +++ b/src/uml/qumlnamespace.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlnamespace.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlElementImport> @@ -57,6 +58,12 @@ QT_BEGIN_NAMESPACE QUmlNamespace::QUmlNamespace() { + d_ptr->object.setProperty("elementImport", QVariant::fromValue(&_elementImport)); + d_ptr->object.setProperty("importedMember", QVariant::fromValue(QSet<QUmlPackageableElement *>())); + d_ptr->object.setProperty("member", QVariant::fromValue(&_member)); + d_ptr->object.setProperty("ownedMember", QVariant::fromValue(&_ownedMember)); + d_ptr->object.setProperty("ownedRule", QVariant::fromValue(&_ownedRule)); + d_ptr->object.setProperty("packageImport", QVariant::fromValue(&_packageImport)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h index 7d9a27f3..e6a198d5 100644 --- a/src/uml/qumlnamespace.h +++ b/src/uml/qumlnamespace.h @@ -97,6 +97,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlNamespace *) +Q_DECLARE_METATYPE(QList<QUmlNamespace *> *) +Q_DECLARE_METATYPE(QSet<QUmlNamespace *> *) + QT_END_HEADER #endif // QUMLNAMESPACE_H diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp index 1a3081f9..4deb8113 100644 --- a/src/uml/qumlnode.cpp +++ b/src/uml/qumlnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlnode.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlNode::QUmlNode() { + d_ptr->object.setProperty("nestedNode", QVariant::fromValue(&_nestedNode)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlnode.h b/src/uml/qumlnode.h index 020b3819..ecce481a 100644 --- a/src/uml/qumlnode.h +++ b/src/uml/qumlnode.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlNode *) +Q_DECLARE_METATYPE(QList<QUmlNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlNode *> *) + QT_END_HEADER #endif // QUMLNODE_H diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp index ad458713..f463e3ba 100644 --- a/src/uml/qumlobjectflow.cpp +++ b/src/uml/qumlobjectflow.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlobjectflow.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> @@ -58,6 +59,10 @@ QUmlObjectFlow::QUmlObjectFlow() : _selection(0), _transformation(0) { + d_ptr->object.setProperty("isMulticast", QVariant::fromValue(false)); + d_ptr->object.setProperty("isMultireceive", QVariant::fromValue(false)); + d_ptr->object.setProperty("selection", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("transformation", QVariant::fromValue((QUmlBehavior *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlobjectflow.h b/src/uml/qumlobjectflow.h index 57327c2e..ac622e90 100644 --- a/src/uml/qumlobjectflow.h +++ b/src/uml/qumlobjectflow.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlObjectFlow *) +Q_DECLARE_METATYPE(QList<QUmlObjectFlow *> *) +Q_DECLARE_METATYPE(QSet<QUmlObjectFlow *> *) + QT_END_HEADER #endif // QUMLOBJECTFLOW_H diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp index 0413ef94..0fc5f201 100644 --- a/src/uml/qumlobjectnode.cpp +++ b/src/uml/qumlobjectnode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlobjectnode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlState> @@ -56,10 +57,15 @@ QT_BEGIN_NAMESPACE QUmlObjectNode::QUmlObjectNode() : _isControlType(false), - _ordering(QtUml::ObjectNodeOrderingFIFO), + _ordering(QtUml::ObjectNodeOrderingKindFIFO), _selection(0), _upperBound(0) { + d_ptr->object.setProperty("inState", QVariant::fromValue(&_inState)); + d_ptr->object.setProperty("isControlType", QVariant::fromValue(false)); + d_ptr->object.setProperty("ordering", QVariant::fromValue(QtUml::ObjectNodeOrderingKindNone)); + d_ptr->object.setProperty("selection", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("upperBound", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h index 676ee69a..1bcdc69e 100644 --- a/src/uml/qumlobjectnode.h +++ b/src/uml/qumlobjectnode.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlObjectNode *) +Q_DECLARE_METATYPE(QList<QUmlObjectNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlObjectNode *> *) + QT_END_HEADER #endif // QUMLOBJECTNODE_H diff --git a/src/uml/qumlobservation.cpp b/src/uml/qumlobservation.cpp index b2431821..c4b19ff6 100644 --- a/src/uml/qumlobservation.cpp +++ b/src/uml/qumlobservation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlobservation.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlobservation.h b/src/uml/qumlobservation.h index 4a959ac1..82ab2b97 100644 --- a/src/uml/qumlobservation.h +++ b/src/uml/qumlobservation.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlObservation *) +Q_DECLARE_METATYPE(QList<QUmlObservation *> *) +Q_DECLARE_METATYPE(QSet<QUmlObservation *> *) + QT_END_HEADER #endif // QUMLOBSERVATION_H diff --git a/src/uml/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp index 683f26a8..8f220858 100644 --- a/src/uml/qumloccurrencespecification.cpp +++ b/src/uml/qumloccurrencespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumloccurrencespecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlGeneralOrdering> #include <QtUml/QUmlLifeline> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlOccurrenceSpecification::QUmlOccurrenceSpecification() : _covered(0) { + d_ptr->object.setProperty("covered", QVariant::fromValue((QUmlLifeline *)(0))); + d_ptr->object.setProperty("toAfter", QVariant::fromValue(&_toAfter)); + d_ptr->object.setProperty("toBefore", QVariant::fromValue(&_toBefore)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumloccurrencespecification.h b/src/uml/qumloccurrencespecification.h index 063fde92..2b34c4a9 100644 --- a/src/uml/qumloccurrencespecification.h +++ b/src/uml/qumloccurrencespecification.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOccurrenceSpecification *) +Q_DECLARE_METATYPE(QList<QUmlOccurrenceSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlOccurrenceSpecification *> *) + QT_END_HEADER #endif // QUMLOCCURRENCESPECIFICATION_H diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp index 159859af..cb96a634 100644 --- a/src/uml/qumlopaqueaction.cpp +++ b/src/uml/qumlopaqueaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlopaqueaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -55,6 +56,10 @@ QT_BEGIN_NAMESPACE QUmlOpaqueAction::QUmlOpaqueAction() { + d_ptr->object.setProperty("body", QVariant::fromValue(&_body)); + d_ptr->object.setProperty("inputValue", QVariant::fromValue(&_inputValue)); + d_ptr->object.setProperty("language", QVariant::fromValue(&_language)); + d_ptr->object.setProperty("outputValue", QVariant::fromValue(&_outputValue)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlopaqueaction.h b/src/uml/qumlopaqueaction.h index 2db85b8f..becd8147 100644 --- a/src/uml/qumlopaqueaction.h +++ b/src/uml/qumlopaqueaction.h @@ -82,6 +82,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOpaqueAction *) +Q_DECLARE_METATYPE(QList<QUmlOpaqueAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlOpaqueAction *> *) + QT_END_HEADER #endif // QUMLOPAQUEACTION_H diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp index e32a2376..cdaea0bf 100644 --- a/src/uml/qumlopaquebehavior.cpp +++ b/src/uml/qumlopaquebehavior.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlopaquebehavior.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ QT_BEGIN_NAMESPACE QUmlOpaqueBehavior::QUmlOpaqueBehavior() { + d_ptr->object.setProperty("body", QVariant::fromValue(&_body)); + d_ptr->object.setProperty("language", QVariant::fromValue(&_language)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlopaquebehavior.h b/src/uml/qumlopaquebehavior.h index a1cdc435..038b2311 100644 --- a/src/uml/qumlopaquebehavior.h +++ b/src/uml/qumlopaquebehavior.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOpaqueBehavior *) +Q_DECLARE_METATYPE(QList<QUmlOpaqueBehavior *> *) +Q_DECLARE_METATYPE(QSet<QUmlOpaqueBehavior *> *) + QT_END_HEADER #endif // QUMLOPAQUEBEHAVIOR_H diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp index 7ad3713c..22c37be7 100644 --- a/src/uml/qumlopaqueexpression.cpp +++ b/src/uml/qumlopaqueexpression.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlopaqueexpression.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlParameter> @@ -56,6 +57,10 @@ QT_BEGIN_NAMESPACE QUmlOpaqueExpression::QUmlOpaqueExpression() : _behavior(0) { + d_ptr->object.setProperty("behavior", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("body", QVariant::fromValue(&_body)); + d_ptr->object.setProperty("language", QVariant::fromValue(&_language)); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlParameter *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlopaqueexpression.h b/src/uml/qumlopaqueexpression.h index 8822dbd1..473c8f23 100644 --- a/src/uml/qumlopaqueexpression.h +++ b/src/uml/qumlopaqueexpression.h @@ -85,6 +85,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOpaqueExpression *) +Q_DECLARE_METATYPE(QList<QUmlOpaqueExpression *> *) +Q_DECLARE_METATYPE(QSet<QUmlOpaqueExpression *> *) + QT_END_HEADER #endif // QUMLOPAQUEEXPRESSION_H diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp index 313df1a9..f1109810 100644 --- a/src/uml/qumloperation.cpp +++ b/src/uml/qumloperation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumloperation.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClass> #include <QtUml/QUmlConstraint> @@ -67,6 +68,22 @@ QUmlOperation::QUmlOperation() : _isQuery(false), _templateParameter(0) { + d_ptr->object.setProperty("bodyCondition", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("class", QVariant::fromValue((QUmlClass *)(0))); + d_ptr->object.setProperty("datatype", QVariant::fromValue((QUmlDataType *)(0))); + d_ptr->object.setProperty("interface", QVariant::fromValue((QUmlInterface *)(0))); + d_ptr->object.setProperty("isOrdered", QVariant::fromValue(false)); + d_ptr->object.setProperty("isQuery", QVariant::fromValue(false)); + d_ptr->object.setProperty("isUnique", QVariant::fromValue(false)); + d_ptr->object.setProperty("lower", QVariant::fromValue((int)(0))); + d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter)); + d_ptr->object.setProperty("postcondition", QVariant::fromValue(&_postcondition)); + d_ptr->object.setProperty("precondition", QVariant::fromValue(&_precondition)); + d_ptr->object.setProperty("raisedException", QVariant::fromValue(&_raisedException)); + d_ptr->object.setProperty("redefinedOperation", QVariant::fromValue(&_redefinedOperation)); + d_ptr->object.setProperty("templateParameter", QVariant::fromValue((QUmlOperationTemplateParameter *)(0))); + d_ptr->object.setProperty("type", QVariant::fromValue((QUmlType *)(0))); + d_ptr->object.setProperty("upper", QVariant::fromValue((int)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumloperation.h b/src/uml/qumloperation.h index 0261232f..64b68020 100644 --- a/src/uml/qumloperation.h +++ b/src/uml/qumloperation.h @@ -126,6 +126,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOperation *) +Q_DECLARE_METATYPE(QList<QUmlOperation *> *) +Q_DECLARE_METATYPE(QSet<QUmlOperation *> *) + QT_END_HEADER #endif // QUMLOPERATION_H diff --git a/src/uml/qumloperationtemplateparameter.cpp b/src/uml/qumloperationtemplateparameter.cpp index 38212a32..476b66a6 100644 --- a/src/uml/qumloperationtemplateparameter.cpp +++ b/src/uml/qumloperationtemplateparameter.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumloperationtemplateparameter.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOperation> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlOperationTemplateParameter::QUmlOperationTemplateParameter() : _parameteredElement(0) { + d_ptr->object.setProperty("parameteredElement", QVariant::fromValue((QUmlOperation *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumloperationtemplateparameter.h b/src/uml/qumloperationtemplateparameter.h index f2f5021e..b3cce399 100644 --- a/src/uml/qumloperationtemplateparameter.h +++ b/src/uml/qumloperationtemplateparameter.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOperationTemplateParameter *) +Q_DECLARE_METATYPE(QList<QUmlOperationTemplateParameter *> *) +Q_DECLARE_METATYPE(QSet<QUmlOperationTemplateParameter *> *) + QT_END_HEADER #endif // QUMLOPERATIONTEMPLATEPARAMETER_H diff --git a/src/uml/qumloutputpin.cpp b/src/uml/qumloutputpin.cpp index e7c80642..4b45fd9c 100644 --- a/src/uml/qumloutputpin.cpp +++ b/src/uml/qumloutputpin.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumloutputpin.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumloutputpin.h b/src/uml/qumloutputpin.h index ba33a069..fc54e911 100644 --- a/src/uml/qumloutputpin.h +++ b/src/uml/qumloutputpin.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlOutputPin *) +Q_DECLARE_METATYPE(QList<QUmlOutputPin *> *) +Q_DECLARE_METATYPE(QSet<QUmlOutputPin *> *) + QT_END_HEADER #endif // QUMLOUTPUTPIN_H diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp index f59cd9ad..c90a8b4b 100644 --- a/src/uml/qumlpackage.cpp +++ b/src/uml/qumlpackage.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpackage.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlPackageMerge> @@ -60,6 +61,14 @@ QT_BEGIN_NAMESPACE QUmlPackage::QUmlPackage() : _nestingPackage(0) { + d_ptr->object.setProperty("uRI", QVariant::fromValue(QString())); + d_ptr->object.setProperty("nestedPackage", QVariant::fromValue(QSet<QUmlPackage *>())); + d_ptr->object.setProperty("nestingPackage", QVariant::fromValue((QUmlPackage *)(0))); + d_ptr->object.setProperty("ownedStereotype", QVariant::fromValue(QSet<QUmlStereotype *>())); + d_ptr->object.setProperty("ownedType", QVariant::fromValue(QSet<QUmlType *>())); + d_ptr->object.setProperty("packageMerge", QVariant::fromValue(&_packageMerge)); + d_ptr->object.setProperty("packagedElement", QVariant::fromValue(&_packagedElement)); + d_ptr->object.setProperty("profileApplication", QVariant::fromValue(&_profileApplication)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpackage.h b/src/uml/qumlpackage.h index 58ed3498..8f3a38d5 100644 --- a/src/uml/qumlpackage.h +++ b/src/uml/qumlpackage.h @@ -106,6 +106,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPackage *) +Q_DECLARE_METATYPE(QList<QUmlPackage *> *) +Q_DECLARE_METATYPE(QSet<QUmlPackage *> *) + QT_END_HEADER #endif // QUMLPACKAGE_H diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp index d0dabee5..35758252 100644 --- a/src/uml/qumlpackageableelement.cpp +++ b/src/uml/qumlpackageableelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpackageableelement.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -51,8 +52,9 @@ QT_BEGIN_NAMESPACE */ QUmlPackageableElement::QUmlPackageableElement() : - _visibility(QtUml::VisibilityPublic) + _visibility(QtUml::VisibilityKindPublic) { + d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpackageableelement.h b/src/uml/qumlpackageableelement.h index d67ebc26..89f91628 100644 --- a/src/uml/qumlpackageableelement.h +++ b/src/uml/qumlpackageableelement.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPackageableElement *) +Q_DECLARE_METATYPE(QList<QUmlPackageableElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlPackageableElement *> *) + QT_END_HEADER #endif // QUMLPACKAGEABLEELEMENT_H diff --git a/src/uml/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp index fec0ee92..ed58143a 100644 --- a/src/uml/qumlpackageimport.cpp +++ b/src/uml/qumlpackageimport.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpackageimport.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> @@ -56,8 +57,11 @@ QT_BEGIN_NAMESPACE QUmlPackageImport::QUmlPackageImport() : _importedPackage(0), _importingNamespace(0), - _visibility(QtUml::VisibilityPublic) + _visibility(QtUml::VisibilityKindPublic) { + d_ptr->object.setProperty("importedPackage", QVariant::fromValue((QUmlPackage *)(0))); + d_ptr->object.setProperty("importingNamespace", QVariant::fromValue((QUmlNamespace *)(0))); + d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpackageimport.h b/src/uml/qumlpackageimport.h index 48c872a7..49290e4d 100644 --- a/src/uml/qumlpackageimport.h +++ b/src/uml/qumlpackageimport.h @@ -76,6 +76,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPackageImport *) +Q_DECLARE_METATYPE(QList<QUmlPackageImport *> *) +Q_DECLARE_METATYPE(QSet<QUmlPackageImport *> *) + QT_END_HEADER #endif // QUMLPACKAGEIMPORT_H diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp index 71bd93ea..d7cc5641 100644 --- a/src/uml/qumlpackagemerge.cpp +++ b/src/uml/qumlpackagemerge.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpackagemerge.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPackage> @@ -56,6 +57,8 @@ QUmlPackageMerge::QUmlPackageMerge() : _mergedPackage(0), _receivingPackage(0) { + d_ptr->object.setProperty("mergedPackage", QVariant::fromValue((QUmlPackage *)(0))); + d_ptr->object.setProperty("receivingPackage", QVariant::fromValue((QUmlPackage *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpackagemerge.h b/src/uml/qumlpackagemerge.h index f8867758..29f7acb5 100644 --- a/src/uml/qumlpackagemerge.h +++ b/src/uml/qumlpackagemerge.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPackageMerge *) +Q_DECLARE_METATYPE(QList<QUmlPackageMerge *> *) +Q_DECLARE_METATYPE(QSet<QUmlPackageMerge *> *) + QT_END_HEADER #endif // QUMLPACKAGEMERGE_H diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp index 0fb60ae1..ef1878cc 100644 --- a/src/uml/qumlparameter.cpp +++ b/src/uml/qumlparameter.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlparameter.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOperation> #include <QtUml/QUmlParameterSet> @@ -56,11 +57,19 @@ QT_BEGIN_NAMESPACE QUmlParameter::QUmlParameter() : _defaultValue(0), - _direction(QtUml::ParameterDirectionIn), + _direction(QtUml::ParameterDirectionKindIn), _isException(false), _isStream(false), _operation(0) { + d_ptr->object.setProperty("default", QVariant::fromValue(QString())); + d_ptr->object.setProperty("defaultValue", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("direction", QVariant::fromValue(QtUml::ParameterDirectionKindNone)); + d_ptr->object.setProperty("effect", QVariant::fromValue(QtUml::ParameterEffectKindNone)); + d_ptr->object.setProperty("isException", QVariant::fromValue(false)); + d_ptr->object.setProperty("isStream", QVariant::fromValue(false)); + d_ptr->object.setProperty("operation", QVariant::fromValue((QUmlOperation *)(0))); + d_ptr->object.setProperty("parameterSet", QVariant::fromValue(&_parameterSet)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h index b611a32e..318ad75f 100644 --- a/src/uml/qumlparameter.h +++ b/src/uml/qumlparameter.h @@ -93,6 +93,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlParameter *) +Q_DECLARE_METATYPE(QList<QUmlParameter *> *) +Q_DECLARE_METATYPE(QSet<QUmlParameter *> *) + QT_END_HEADER #endif // QUMLPARAMETER_H diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp index 4f4ff763..30291706 100644 --- a/src/uml/qumlparameterableelement.cpp +++ b/src/uml/qumlparameterableelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlparameterableelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTemplateParameter> @@ -56,6 +57,8 @@ QUmlParameterableElement::QUmlParameterableElement() : _owningTemplateParameter(0), _templateParameter(0) { + d_ptr->object.setProperty("owningTemplateParameter", QVariant::fromValue((QUmlTemplateParameter *)(0))); + d_ptr->object.setProperty("templateParameter", QVariant::fromValue((QUmlTemplateParameter *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlparameterableelement.h b/src/uml/qumlparameterableelement.h index eb704502..7cd13e20 100644 --- a/src/uml/qumlparameterableelement.h +++ b/src/uml/qumlparameterableelement.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlParameterableElement *) +Q_DECLARE_METATYPE(QList<QUmlParameterableElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlParameterableElement *> *) + QT_END_HEADER #endif // QUMLPARAMETERABLEELEMENT_H diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp index 408a420f..611c324f 100644 --- a/src/uml/qumlparameterset.cpp +++ b/src/uml/qumlparameterset.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlparameterset.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlParameter> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlParameterSet::QUmlParameterSet() { + d_ptr->object.setProperty("condition", QVariant::fromValue(&_condition)); + d_ptr->object.setProperty("parameter", QVariant::fromValue(&_parameter)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlparameterset.h b/src/uml/qumlparameterset.h index a36b45ca..65c824cc 100644 --- a/src/uml/qumlparameterset.h +++ b/src/uml/qumlparameterset.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlParameterSet *) +Q_DECLARE_METATYPE(QList<QUmlParameterSet *> *) +Q_DECLARE_METATYPE(QSet<QUmlParameterSet *> *) + QT_END_HEADER #endif // QUMLPARAMETERSET_H diff --git a/src/uml/qumlpartdecomposition.cpp b/src/uml/qumlpartdecomposition.cpp index 2eb6cf07..b20e6076 100644 --- a/src/uml/qumlpartdecomposition.cpp +++ b/src/uml/qumlpartdecomposition.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpartdecomposition.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlpartdecomposition.h b/src/uml/qumlpartdecomposition.h index c02ce5cb..35b03afb 100644 --- a/src/uml/qumlpartdecomposition.h +++ b/src/uml/qumlpartdecomposition.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPartDecomposition *) +Q_DECLARE_METATYPE(QList<QUmlPartDecomposition *> *) +Q_DECLARE_METATYPE(QSet<QUmlPartDecomposition *> *) + QT_END_HEADER #endif // QUMLPARTDECOMPOSITION_H diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp index 8a0cd6ed..de799889 100644 --- a/src/uml/qumlpin.cpp +++ b/src/uml/qumlpin.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpin.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlPin::QUmlPin() : _isControl(false) { + d_ptr->object.setProperty("isControl", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpin.h b/src/uml/qumlpin.h index 2e9b27d4..61e9aba1 100644 --- a/src/uml/qumlpin.h +++ b/src/uml/qumlpin.h @@ -67,6 +67,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPin *) +Q_DECLARE_METATYPE(QList<QUmlPin *> *) +Q_DECLARE_METATYPE(QSet<QUmlPin *> *) + QT_END_HEADER #endif // QUMLPIN_H diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp index 896ccf47..10bbdd9f 100644 --- a/src/uml/qumlport.cpp +++ b/src/uml/qumlport.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlport.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInterface> #include <QtUml/QUmlProtocolStateMachine> @@ -59,6 +60,13 @@ QUmlPort::QUmlPort() : _isService(true), _protocol(0) { + d_ptr->object.setProperty("isBehavior", QVariant::fromValue(false)); + d_ptr->object.setProperty("isConjugated", QVariant::fromValue(false)); + d_ptr->object.setProperty("isService", QVariant::fromValue(false)); + d_ptr->object.setProperty("protocol", QVariant::fromValue((QUmlProtocolStateMachine *)(0))); + d_ptr->object.setProperty("provided", QVariant::fromValue(QSet<QUmlInterface *>())); + d_ptr->object.setProperty("redefinedPort", QVariant::fromValue(&_redefinedPort)); + d_ptr->object.setProperty("required", QVariant::fromValue(QSet<QUmlInterface *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlport.h b/src/uml/qumlport.h index 6cf1447a..59c84c92 100644 --- a/src/uml/qumlport.h +++ b/src/uml/qumlport.h @@ -88,6 +88,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPort *) +Q_DECLARE_METATYPE(QList<QUmlPort *> *) +Q_DECLARE_METATYPE(QSet<QUmlPort *> *) + QT_END_HEADER #endif // QUMLPORT_H diff --git a/src/uml/qumlprimitivetype.cpp b/src/uml/qumlprimitivetype.cpp index e8f39904..a4eacc4f 100644 --- a/src/uml/qumlprimitivetype.cpp +++ b/src/uml/qumlprimitivetype.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprimitivetype.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlprimitivetype.h b/src/uml/qumlprimitivetype.h index cd5c8563..221e9f2c 100644 --- a/src/uml/qumlprimitivetype.h +++ b/src/uml/qumlprimitivetype.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPrimitiveType *) +Q_DECLARE_METATYPE(QList<QUmlPrimitiveType *> *) +Q_DECLARE_METATYPE(QSet<QUmlPrimitiveType *> *) + QT_END_HEADER #endif // QUMLPRIMITIVETYPE_H diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp index 03fcb17b..2185107c 100644 --- a/src/uml/qumlprofile.cpp +++ b/src/uml/qumlprofile.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprofile.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlElementImport> #include <QtUml/QUmlPackageImport> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlProfile::QUmlProfile() { + d_ptr->object.setProperty("metaclassReference", QVariant::fromValue(&_metaclassReference)); + d_ptr->object.setProperty("metamodelReference", QVariant::fromValue(&_metamodelReference)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlprofile.h b/src/uml/qumlprofile.h index b94d9a2b..fda14034 100644 --- a/src/uml/qumlprofile.h +++ b/src/uml/qumlprofile.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProfile *) +Q_DECLARE_METATYPE(QList<QUmlProfile *> *) +Q_DECLARE_METATYPE(QSet<QUmlProfile *> *) + QT_END_HEADER #endif // QUMLPROFILE_H diff --git a/src/uml/qumlprofileapplication.cpp b/src/uml/qumlprofileapplication.cpp index e18b83ff..424e7ea4 100644 --- a/src/uml/qumlprofileapplication.cpp +++ b/src/uml/qumlprofileapplication.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprofileapplication.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPackage> #include <QtUml/QUmlProfile> @@ -58,6 +59,9 @@ QUmlProfileApplication::QUmlProfileApplication() : _applyingPackage(0), _isStrict(false) { + d_ptr->object.setProperty("appliedProfile", QVariant::fromValue((QUmlProfile *)(0))); + d_ptr->object.setProperty("applyingPackage", QVariant::fromValue((QUmlPackage *)(0))); + d_ptr->object.setProperty("isStrict", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlprofileapplication.h b/src/uml/qumlprofileapplication.h index 415b65d0..e320c679 100644 --- a/src/uml/qumlprofileapplication.h +++ b/src/uml/qumlprofileapplication.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProfileApplication *) +Q_DECLARE_METATYPE(QList<QUmlProfileApplication *> *) +Q_DECLARE_METATYPE(QSet<QUmlProfileApplication *> *) + QT_END_HEADER #endif // QUMLPROFILEAPPLICATION_H diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp index e7e42a11..789d9263 100644 --- a/src/uml/qumlproperty.cpp +++ b/src/uml/qumlproperty.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlproperty.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlClass> @@ -60,7 +61,7 @@ QT_BEGIN_NAMESPACE */ QUmlProperty::QUmlProperty() : - _aggregation(QtUml::AggregationNone), + _aggregation(QtUml::AggregationKindNone), _association(0), _associationEnd(0), _class_(0), @@ -73,6 +74,24 @@ QUmlProperty::QUmlProperty() : _isReadOnly(false), _owningAssociation(0) { + d_ptr->object.setProperty("aggregation", QVariant::fromValue(QtUml::AggregationKindNone)); + d_ptr->object.setProperty("association", QVariant::fromValue((QUmlAssociation *)(0))); + d_ptr->object.setProperty("associationEnd", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("class", QVariant::fromValue((QUmlClass *)(0))); + d_ptr->object.setProperty("datatype", QVariant::fromValue((QUmlDataType *)(0))); + d_ptr->object.setProperty("default", QVariant::fromValue(QString())); + d_ptr->object.setProperty("defaultValue", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("interface", QVariant::fromValue((QUmlInterface *)(0))); + d_ptr->object.setProperty("isComposite", QVariant::fromValue(false)); + d_ptr->object.setProperty("isDerived", QVariant::fromValue(false)); + d_ptr->object.setProperty("isDerivedUnion", QVariant::fromValue(false)); + d_ptr->object.setProperty("isID", QVariant::fromValue(false)); + d_ptr->object.setProperty("isReadOnly", QVariant::fromValue(false)); + d_ptr->object.setProperty("opposite", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("owningAssociation", QVariant::fromValue((QUmlAssociation *)(0))); + d_ptr->object.setProperty("qualifier", QVariant::fromValue(&_qualifier)); + d_ptr->object.setProperty("redefinedProperty", QVariant::fromValue(&_redefinedProperty)); + d_ptr->object.setProperty("subsettedProperty", QVariant::fromValue(&_subsettedProperty)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h index e0295d54..c9672b94 100644 --- a/src/uml/qumlproperty.h +++ b/src/uml/qumlproperty.h @@ -136,6 +136,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProperty *) +Q_DECLARE_METATYPE(QList<QUmlProperty *> *) +Q_DECLARE_METATYPE(QSet<QUmlProperty *> *) + QT_END_HEADER #endif // QUMLPROPERTY_H diff --git a/src/uml/qumlprotocolconformance.cpp b/src/uml/qumlprotocolconformance.cpp index 3eeaeabc..9f70f26f 100644 --- a/src/uml/qumlprotocolconformance.cpp +++ b/src/uml/qumlprotocolconformance.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprotocolconformance.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlProtocolStateMachine> @@ -56,6 +57,8 @@ QUmlProtocolConformance::QUmlProtocolConformance() : _generalMachine(0), _specificMachine(0) { + d_ptr->object.setProperty("generalMachine", QVariant::fromValue((QUmlProtocolStateMachine *)(0))); + d_ptr->object.setProperty("specificMachine", QVariant::fromValue((QUmlProtocolStateMachine *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlprotocolconformance.h b/src/uml/qumlprotocolconformance.h index 7bea6c17..dcfafda1 100644 --- a/src/uml/qumlprotocolconformance.h +++ b/src/uml/qumlprotocolconformance.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProtocolConformance *) +Q_DECLARE_METATYPE(QList<QUmlProtocolConformance *> *) +Q_DECLARE_METATYPE(QSet<QUmlProtocolConformance *> *) + QT_END_HEADER #endif // QUMLPROTOCOLCONFORMANCE_H diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp index af245912..6225a2b1 100644 --- a/src/uml/qumlprotocolstatemachine.cpp +++ b/src/uml/qumlprotocolstatemachine.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprotocolstatemachine.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlProtocolConformance> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlProtocolStateMachine::QUmlProtocolStateMachine() { + d_ptr->object.setProperty("conformance", QVariant::fromValue(&_conformance)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlprotocolstatemachine.h b/src/uml/qumlprotocolstatemachine.h index 2cab49c8..9a8742b4 100644 --- a/src/uml/qumlprotocolstatemachine.h +++ b/src/uml/qumlprotocolstatemachine.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProtocolStateMachine *) +Q_DECLARE_METATYPE(QList<QUmlProtocolStateMachine *> *) +Q_DECLARE_METATYPE(QSet<QUmlProtocolStateMachine *> *) + QT_END_HEADER #endif // QUMLPROTOCOLSTATEMACHINE_H diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp index 192a2763..1450475c 100644 --- a/src/uml/qumlprotocoltransition.cpp +++ b/src/uml/qumlprotocoltransition.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlprotocoltransition.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlOperation> @@ -57,6 +58,9 @@ QUmlProtocolTransition::QUmlProtocolTransition() : _postCondition(0), _preCondition(0) { + d_ptr->object.setProperty("postCondition", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("preCondition", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("referred", QVariant::fromValue(QSet<QUmlOperation *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlprotocoltransition.h b/src/uml/qumlprotocoltransition.h index 6f7eb640..d42ad67f 100644 --- a/src/uml/qumlprotocoltransition.h +++ b/src/uml/qumlprotocoltransition.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlProtocolTransition *) +Q_DECLARE_METATYPE(QList<QUmlProtocolTransition *> *) +Q_DECLARE_METATYPE(QSet<QUmlProtocolTransition *> *) + QT_END_HEADER #endif // QUMLPROTOCOLTRANSITION_H diff --git a/src/uml/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp index 7788f726..7ff29fb2 100644 --- a/src/uml/qumlpseudostate.cpp +++ b/src/uml/qumlpseudostate.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlpseudostate.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlState> #include <QtUml/QUmlStateMachine> @@ -54,10 +55,13 @@ QT_BEGIN_NAMESPACE */ QUmlPseudostate::QUmlPseudostate() : - _kind(QtUml::PseudostateInitial), + _kind(QtUml::PseudostateKindInitial), _state(0), _stateMachine(0) { + d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::PseudostateKindNone)); + d_ptr->object.setProperty("state", QVariant::fromValue((QUmlState *)(0))); + d_ptr->object.setProperty("stateMachine", QVariant::fromValue((QUmlStateMachine *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlpseudostate.h b/src/uml/qumlpseudostate.h index ee9949f1..446936c0 100644 --- a/src/uml/qumlpseudostate.h +++ b/src/uml/qumlpseudostate.h @@ -76,6 +76,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlPseudostate *) +Q_DECLARE_METATYPE(QList<QUmlPseudostate *> *) +Q_DECLARE_METATYPE(QSet<QUmlPseudostate *> *) + QT_END_HEADER #endif // QUMLPSEUDOSTATE_H diff --git a/src/uml/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp index 718e8d42..c7199b43 100644 --- a/src/uml/qumlqualifiervalue.cpp +++ b/src/uml/qumlqualifiervalue.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlqualifiervalue.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> @@ -57,6 +58,8 @@ QUmlQualifierValue::QUmlQualifierValue() : _qualifier(0), _value(0) { + d_ptr->object.setProperty("qualifier", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlqualifiervalue.h b/src/uml/qumlqualifiervalue.h index edcdfe80..1c1fec3d 100644 --- a/src/uml/qumlqualifiervalue.h +++ b/src/uml/qumlqualifiervalue.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlQualifierValue *) +Q_DECLARE_METATYPE(QList<QUmlQualifierValue *> *) +Q_DECLARE_METATYPE(QSet<QUmlQualifierValue *> *) + QT_END_HEADER #endif // QUMLQUALIFIERVALUE_H diff --git a/src/uml/qumlraiseexceptionaction.cpp b/src/uml/qumlraiseexceptionaction.cpp index 02bcbb99..844ec72e 100644 --- a/src/uml/qumlraiseexceptionaction.cpp +++ b/src/uml/qumlraiseexceptionaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlraiseexceptionaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlRaiseExceptionAction::QUmlRaiseExceptionAction() : _exception(0) { + d_ptr->object.setProperty("exception", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlraiseexceptionaction.h b/src/uml/qumlraiseexceptionaction.h index 7614788c..2becca5d 100644 --- a/src/uml/qumlraiseexceptionaction.h +++ b/src/uml/qumlraiseexceptionaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRaiseExceptionAction *) +Q_DECLARE_METATYPE(QList<QUmlRaiseExceptionAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlRaiseExceptionAction *> *) + QT_END_HEADER #endif // QUMLRAISEEXCEPTIONACTION_H diff --git a/src/uml/qumlreadextentaction.cpp b/src/uml/qumlreadextentaction.cpp index 70b26479..e38fde4f 100644 --- a/src/uml/qumlreadextentaction.cpp +++ b/src/uml/qumlreadextentaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadextentaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlOutputPin> @@ -57,6 +58,8 @@ QUmlReadExtentAction::QUmlReadExtentAction() : _classifier(0), _result(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadextentaction.h b/src/uml/qumlreadextentaction.h index 5abd2ee5..b0b54b0f 100644 --- a/src/uml/qumlreadextentaction.h +++ b/src/uml/qumlreadextentaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadExtentAction *) +Q_DECLARE_METATYPE(QList<QUmlReadExtentAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadExtentAction *> *) + QT_END_HEADER #endif // QUMLREADEXTENTACTION_H diff --git a/src/uml/qumlreadisclassifiedobjectaction.cpp b/src/uml/qumlreadisclassifiedobjectaction.cpp index 9f69eb7a..0046e09a 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.cpp +++ b/src/uml/qumlreadisclassifiedobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadisclassifiedobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> @@ -60,6 +61,10 @@ QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction() : _object(0), _result(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("isDirect", QVariant::fromValue(false)); + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadisclassifiedobjectaction.h b/src/uml/qumlreadisclassifiedobjectaction.h index 76a43689..8554582b 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.h +++ b/src/uml/qumlreadisclassifiedobjectaction.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadIsClassifiedObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlReadIsClassifiedObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadIsClassifiedObjectAction *> *) + QT_END_HEADER #endif // QUMLREADISCLASSIFIEDOBJECTACTION_H diff --git a/src/uml/qumlreadlinkaction.cpp b/src/uml/qumlreadlinkaction.cpp index 6cc7c2d6..6cee4216 100644 --- a/src/uml/qumlreadlinkaction.cpp +++ b/src/uml/qumlreadlinkaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadlinkaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlReadLinkAction::QUmlReadLinkAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadlinkaction.h b/src/uml/qumlreadlinkaction.h index cb181c94..4f04376b 100644 --- a/src/uml/qumlreadlinkaction.h +++ b/src/uml/qumlreadlinkaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadLinkAction *) +Q_DECLARE_METATYPE(QList<QUmlReadLinkAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadLinkAction *> *) + QT_END_HEADER #endif // QUMLREADLINKACTION_H diff --git a/src/uml/qumlreadlinkobjectendaction.cpp b/src/uml/qumlreadlinkobjectendaction.cpp index eb391271..591544db 100644 --- a/src/uml/qumlreadlinkobjectendaction.cpp +++ b/src/uml/qumlreadlinkobjectendaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadlinkobjectendaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -59,6 +60,9 @@ QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction() : _object(0), _result(0) { + d_ptr->object.setProperty("end", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadlinkobjectendaction.h b/src/uml/qumlreadlinkobjectendaction.h index e8bc7e96..8cbf2743 100644 --- a/src/uml/qumlreadlinkobjectendaction.h +++ b/src/uml/qumlreadlinkobjectendaction.h @@ -76,6 +76,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadLinkObjectEndAction *) +Q_DECLARE_METATYPE(QList<QUmlReadLinkObjectEndAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadLinkObjectEndAction *> *) + QT_END_HEADER #endif // QUMLREADLINKOBJECTENDACTION_H diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.cpp b/src/uml/qumlreadlinkobjectendqualifieraction.cpp index eee35bde..d17c5e02 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qumlreadlinkobjectendqualifieraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadlinkobjectendqualifieraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -59,6 +60,9 @@ QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction() : _qualifier(0), _result(0) { + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("qualifier", QVariant::fromValue((QUmlProperty *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.h b/src/uml/qumlreadlinkobjectendqualifieraction.h index c6723c39..bf6d0eec 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.h +++ b/src/uml/qumlreadlinkobjectendqualifieraction.h @@ -76,6 +76,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadLinkObjectEndQualifierAction *) +Q_DECLARE_METATYPE(QList<QUmlReadLinkObjectEndQualifierAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadLinkObjectEndQualifierAction *> *) + QT_END_HEADER #endif // QUMLREADLINKOBJECTENDQUALIFIERACTION_H diff --git a/src/uml/qumlreadselfaction.cpp b/src/uml/qumlreadselfaction.cpp index e484a647..53a842e6 100644 --- a/src/uml/qumlreadselfaction.cpp +++ b/src/uml/qumlreadselfaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadselfaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlReadSelfAction::QUmlReadSelfAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadselfaction.h b/src/uml/qumlreadselfaction.h index 261ea72a..29fce22f 100644 --- a/src/uml/qumlreadselfaction.h +++ b/src/uml/qumlreadselfaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadSelfAction *) +Q_DECLARE_METATYPE(QList<QUmlReadSelfAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadSelfAction *> *) + QT_END_HEADER #endif // QUMLREADSELFACTION_H diff --git a/src/uml/qumlreadstructuralfeatureaction.cpp b/src/uml/qumlreadstructuralfeatureaction.cpp index 4e2cd0db..8daafa0b 100644 --- a/src/uml/qumlreadstructuralfeatureaction.cpp +++ b/src/uml/qumlreadstructuralfeatureaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadstructuralfeatureaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadstructuralfeatureaction.h b/src/uml/qumlreadstructuralfeatureaction.h index c7c49a33..eb159dcb 100644 --- a/src/uml/qumlreadstructuralfeatureaction.h +++ b/src/uml/qumlreadstructuralfeatureaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadStructuralFeatureAction *) +Q_DECLARE_METATYPE(QList<QUmlReadStructuralFeatureAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadStructuralFeatureAction *> *) + QT_END_HEADER #endif // QUMLREADSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qumlreadvariableaction.cpp b/src/uml/qumlreadvariableaction.cpp index ed36c9b3..e0307020 100644 --- a/src/uml/qumlreadvariableaction.cpp +++ b/src/uml/qumlreadvariableaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreadvariableaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlReadVariableAction::QUmlReadVariableAction() : _result(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreadvariableaction.h b/src/uml/qumlreadvariableaction.h index 3cde0609..0d8fb6af 100644 --- a/src/uml/qumlreadvariableaction.h +++ b/src/uml/qumlreadvariableaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReadVariableAction *) +Q_DECLARE_METATYPE(QList<QUmlReadVariableAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReadVariableAction *> *) + QT_END_HEADER #endif // QUMLREADVARIABLEACTION_H diff --git a/src/uml/qumlrealization.cpp b/src/uml/qumlrealization.cpp index bfb56bf3..b4a93243 100644 --- a/src/uml/qumlrealization.cpp +++ b/src/uml/qumlrealization.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlrealization.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlrealization.h b/src/uml/qumlrealization.h index f564f3ea..083a50f0 100644 --- a/src/uml/qumlrealization.h +++ b/src/uml/qumlrealization.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRealization *) +Q_DECLARE_METATYPE(QList<QUmlRealization *> *) +Q_DECLARE_METATYPE(QSet<QUmlRealization *> *) + QT_END_HEADER #endif // QUMLREALIZATION_H diff --git a/src/uml/qumlreception.cpp b/src/uml/qumlreception.cpp index 59614e24..24f94223 100644 --- a/src/uml/qumlreception.cpp +++ b/src/uml/qumlreception.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreception.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlSignal> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlReception::QUmlReception() : _signal(0) { + d_ptr->object.setProperty("signal", QVariant::fromValue((QUmlSignal *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreception.h b/src/uml/qumlreception.h index 5d70cdf4..5cd891d4 100644 --- a/src/uml/qumlreception.h +++ b/src/uml/qumlreception.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReception *) +Q_DECLARE_METATYPE(QList<QUmlReception *> *) +Q_DECLARE_METATYPE(QSet<QUmlReception *> *) + QT_END_HEADER #endif // QUMLRECEPTION_H diff --git a/src/uml/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp index 05ec835b..41a04154 100644 --- a/src/uml/qumlreclassifyobjectaction.cpp +++ b/src/uml/qumlreclassifyobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreclassifyobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> @@ -57,6 +58,10 @@ QUmlReclassifyObjectAction::QUmlReclassifyObjectAction() : _isReplaceAll(false), _object(0) { + d_ptr->object.setProperty("isReplaceAll", QVariant::fromValue(false)); + d_ptr->object.setProperty("newClassifier", QVariant::fromValue(&_newClassifier)); + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("oldClassifier", QVariant::fromValue(&_oldClassifier)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreclassifyobjectaction.h b/src/uml/qumlreclassifyobjectaction.h index d7369229..691e5ae1 100644 --- a/src/uml/qumlreclassifyobjectaction.h +++ b/src/uml/qumlreclassifyobjectaction.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReclassifyObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlReclassifyObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReclassifyObjectAction *> *) + QT_END_HEADER #endif // QUMLRECLASSIFYOBJECTACTION_H diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp index 00ef51d4..0095dde3 100644 --- a/src/uml/qumlredefinableelement.cpp +++ b/src/uml/qumlredefinableelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlredefinableelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> @@ -55,6 +56,9 @@ QT_BEGIN_NAMESPACE QUmlRedefinableElement::QUmlRedefinableElement() : _isLeaf(false) { + d_ptr->object.setProperty("isLeaf", QVariant::fromValue(false)); + d_ptr->object.setProperty("redefinedElement", QVariant::fromValue(&_redefinedElement)); + d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue(&_redefinitionContext)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h index 589d9cf9..dc87a68e 100644 --- a/src/uml/qumlredefinableelement.h +++ b/src/uml/qumlredefinableelement.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRedefinableElement *) +Q_DECLARE_METATYPE(QList<QUmlRedefinableElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlRedefinableElement *> *) + QT_END_HEADER #endif // QUMLREDEFINABLEELEMENT_H diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp index 8d3e51eb..faf2dca2 100644 --- a/src/uml/qumlredefinabletemplatesignature.cpp +++ b/src/uml/qumlredefinabletemplatesignature.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlredefinabletemplatesignature.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlTemplateParameter> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature() : _classifier(0) { + d_ptr->object.setProperty("classifier", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("extendedSignature", QVariant::fromValue(&_extendedSignature)); + d_ptr->object.setProperty("inheritedParameter", QVariant::fromValue(QSet<QUmlTemplateParameter *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlredefinabletemplatesignature.h b/src/uml/qumlredefinabletemplatesignature.h index 9fdfb8c9..4496fbfb 100644 --- a/src/uml/qumlredefinabletemplatesignature.h +++ b/src/uml/qumlredefinabletemplatesignature.h @@ -80,6 +80,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRedefinableTemplateSignature *) +Q_DECLARE_METATYPE(QList<QUmlRedefinableTemplateSignature *> *) +Q_DECLARE_METATYPE(QSet<QUmlRedefinableTemplateSignature *> *) + QT_END_HEADER #endif // QUMLREDEFINABLETEMPLATESIGNATURE_H diff --git a/src/uml/qumlreduceaction.cpp b/src/uml/qumlreduceaction.cpp index 697cd22b..a62c2d36 100644 --- a/src/uml/qumlreduceaction.cpp +++ b/src/uml/qumlreduceaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreduceaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlInputPin> @@ -60,6 +61,10 @@ QUmlReduceAction::QUmlReduceAction() : _reducer(0), _result(0) { + d_ptr->object.setProperty("collection", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("isOrdered", QVariant::fromValue(false)); + d_ptr->object.setProperty("reducer", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreduceaction.h b/src/uml/qumlreduceaction.h index 6fd5c846..a75a1482 100644 --- a/src/uml/qumlreduceaction.h +++ b/src/uml/qumlreduceaction.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReduceAction *) +Q_DECLARE_METATYPE(QList<QUmlReduceAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReduceAction *> *) + QT_END_HEADER #endif // QUMLREDUCEACTION_H diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp index 67ffba0a..2fa614ea 100644 --- a/src/uml/qumlregion.cpp +++ b/src/uml/qumlregion.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlregion.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlState> @@ -61,6 +62,12 @@ QUmlRegion::QUmlRegion() : _state(0), _stateMachine(0) { + d_ptr->object.setProperty("extendedRegion", QVariant::fromValue((QUmlRegion *)(0))); + d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("state", QVariant::fromValue((QUmlState *)(0))); + d_ptr->object.setProperty("stateMachine", QVariant::fromValue((QUmlStateMachine *)(0))); + d_ptr->object.setProperty("subvertex", QVariant::fromValue(&_subvertex)); + d_ptr->object.setProperty("transition", QVariant::fromValue(&_transition)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlregion.h b/src/uml/qumlregion.h index 7bb7e5c6..8871ea65 100644 --- a/src/uml/qumlregion.h +++ b/src/uml/qumlregion.h @@ -95,6 +95,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRegion *) +Q_DECLARE_METATYPE(QList<QUmlRegion *> *) +Q_DECLARE_METATYPE(QSet<QUmlRegion *> *) + QT_END_HEADER #endif // QUMLREGION_H diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp index 91216231..51ce440f 100644 --- a/src/uml/qumlrelationship.cpp +++ b/src/uml/qumlrelationship.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlrelationship.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ QT_BEGIN_NAMESPACE QUmlRelationship::QUmlRelationship() { + d_ptr->object.setProperty("relatedElement", QVariant::fromValue(&_relatedElement)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h index bfc727a2..9c0b43a2 100644 --- a/src/uml/qumlrelationship.h +++ b/src/uml/qumlrelationship.h @@ -67,6 +67,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRelationship *) +Q_DECLARE_METATYPE(QList<QUmlRelationship *> *) +Q_DECLARE_METATYPE(QSet<QUmlRelationship *> *) + QT_END_HEADER #endif // QUMLRELATIONSHIP_H diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.cpp b/src/uml/qumlremovestructuralfeaturevalueaction.cpp index 1a875549..23dd8af4 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qumlremovestructuralfeaturevalueaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlremovestructuralfeaturevalueaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction() _isRemoveDuplicates(false), _removeAt(0) { + d_ptr->object.setProperty("isRemoveDuplicates", QVariant::fromValue(false)); + d_ptr->object.setProperty("removeAt", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.h b/src/uml/qumlremovestructuralfeaturevalueaction.h index 13c2093d..0222450d 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.h +++ b/src/uml/qumlremovestructuralfeaturevalueaction.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRemoveStructuralFeatureValueAction *) +Q_DECLARE_METATYPE(QList<QUmlRemoveStructuralFeatureValueAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlRemoveStructuralFeatureValueAction *> *) + QT_END_HEADER #endif // QUMLREMOVESTRUCTURALFEATUREVALUEACTION_H diff --git a/src/uml/qumlremovevariablevalueaction.cpp b/src/uml/qumlremovevariablevalueaction.cpp index 2a91f646..b272286d 100644 --- a/src/uml/qumlremovevariablevalueaction.cpp +++ b/src/uml/qumlremovevariablevalueaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlremovevariablevalueaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction() : _isRemoveDuplicates(false), _removeAt(0) { + d_ptr->object.setProperty("isRemoveDuplicates", QVariant::fromValue(false)); + d_ptr->object.setProperty("removeAt", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlremovevariablevalueaction.h b/src/uml/qumlremovevariablevalueaction.h index c26dcdc8..0eb749ce 100644 --- a/src/uml/qumlremovevariablevalueaction.h +++ b/src/uml/qumlremovevariablevalueaction.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlRemoveVariableValueAction *) +Q_DECLARE_METATYPE(QList<QUmlRemoveVariableValueAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlRemoveVariableValueAction *> *) + QT_END_HEADER #endif // QUMLREMOVEVARIABLEVALUEACTION_H diff --git a/src/uml/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp index bb6c6e9a..438bb827 100644 --- a/src/uml/qumlreplyaction.cpp +++ b/src/uml/qumlreplyaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlreplyaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlTrigger> @@ -57,6 +58,9 @@ QUmlReplyAction::QUmlReplyAction() : _replyToCall(0), _returnInformation(0) { + d_ptr->object.setProperty("replyToCall", QVariant::fromValue((QUmlTrigger *)(0))); + d_ptr->object.setProperty("replyValue", QVariant::fromValue(&_replyValue)); + d_ptr->object.setProperty("returnInformation", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlreplyaction.h b/src/uml/qumlreplyaction.h index a423679a..8cee6bd5 100644 --- a/src/uml/qumlreplyaction.h +++ b/src/uml/qumlreplyaction.h @@ -76,6 +76,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlReplyAction *) +Q_DECLARE_METATYPE(QList<QUmlReplyAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlReplyAction *> *) + QT_END_HEADER #endif // QUMLREPLYACTION_H diff --git a/src/uml/qumlsendobjectaction.cpp b/src/uml/qumlsendobjectaction.cpp index b71700ed..77e3e258 100644 --- a/src/uml/qumlsendobjectaction.cpp +++ b/src/uml/qumlsendobjectaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsendobjectaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -56,6 +57,8 @@ QUmlSendObjectAction::QUmlSendObjectAction() : _request(0), _target(0) { + d_ptr->object.setProperty("request", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsendobjectaction.h b/src/uml/qumlsendobjectaction.h index 021b3f10..dcd21d97 100644 --- a/src/uml/qumlsendobjectaction.h +++ b/src/uml/qumlsendobjectaction.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSendObjectAction *) +Q_DECLARE_METATYPE(QList<QUmlSendObjectAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlSendObjectAction *> *) + QT_END_HEADER #endif // QUMLSENDOBJECTACTION_H diff --git a/src/uml/qumlsendsignalaction.cpp b/src/uml/qumlsendsignalaction.cpp index f34e50c0..97202755 100644 --- a/src/uml/qumlsendsignalaction.cpp +++ b/src/uml/qumlsendsignalaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsendsignalaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlSignal> @@ -57,6 +58,8 @@ QUmlSendSignalAction::QUmlSendSignalAction() : _signal(0), _target(0) { + d_ptr->object.setProperty("signal", QVariant::fromValue((QUmlSignal *)(0))); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsendsignalaction.h b/src/uml/qumlsendsignalaction.h index 2cd31f69..08fa19ad 100644 --- a/src/uml/qumlsendsignalaction.h +++ b/src/uml/qumlsendsignalaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSendSignalAction *) +Q_DECLARE_METATYPE(QList<QUmlSendSignalAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlSendSignalAction *> *) + QT_END_HEADER #endif // QUMLSENDSIGNALACTION_H diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp index 86a09d06..22ea54b2 100644 --- a/src/uml/qumlsequencenode.cpp +++ b/src/uml/qumlsequencenode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsequencenode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlExecutableNode> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlSequenceNode::QUmlSequenceNode() { + d_ptr->object.setProperty("executableNode", QVariant::fromValue(&_executableNode)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsequencenode.h b/src/uml/qumlsequencenode.h index f187043f..fbc6d6fb 100644 --- a/src/uml/qumlsequencenode.h +++ b/src/uml/qumlsequencenode.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSequenceNode *) +Q_DECLARE_METATYPE(QList<QUmlSequenceNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlSequenceNode *> *) + QT_END_HEADER #endif // QUMLSEQUENCENODE_H diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp index b536b6b2..873dc96b 100644 --- a/src/uml/qumlsignal.cpp +++ b/src/uml/qumlsignal.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsignal.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlProperty> @@ -54,6 +55,7 @@ QT_BEGIN_NAMESPACE QUmlSignal::QUmlSignal() { + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsignal.h b/src/uml/qumlsignal.h index 4476d710..114e419a 100644 --- a/src/uml/qumlsignal.h +++ b/src/uml/qumlsignal.h @@ -69,6 +69,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSignal *) +Q_DECLARE_METATYPE(QList<QUmlSignal *> *) +Q_DECLARE_METATYPE(QSet<QUmlSignal *> *) + QT_END_HEADER #endif // QUMLSIGNAL_H diff --git a/src/uml/qumlsignalevent.cpp b/src/uml/qumlsignalevent.cpp index 6e5492c3..fc3be244 100644 --- a/src/uml/qumlsignalevent.cpp +++ b/src/uml/qumlsignalevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsignalevent.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlSignal> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlSignalEvent::QUmlSignalEvent() : _signal(0) { + d_ptr->object.setProperty("signal", QVariant::fromValue((QUmlSignal *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsignalevent.h b/src/uml/qumlsignalevent.h index 807a7165..2e4bcafd 100644 --- a/src/uml/qumlsignalevent.h +++ b/src/uml/qumlsignalevent.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSignalEvent *) +Q_DECLARE_METATYPE(QList<QUmlSignalEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlSignalEvent *> *) + QT_END_HEADER #endif // QUMLSIGNALEVENT_H diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp index 11040cdf..e60b1fb6 100644 --- a/src/uml/qumlslot.cpp +++ b/src/uml/qumlslot.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlslot.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInstanceSpecification> #include <QtUml/QUmlStructuralFeature> @@ -58,6 +59,9 @@ QUmlSlot::QUmlSlot() : _definingFeature(0), _owningInstance(0) { + d_ptr->object.setProperty("definingFeature", QVariant::fromValue((QUmlStructuralFeature *)(0))); + d_ptr->object.setProperty("owningInstance", QVariant::fromValue((QUmlInstanceSpecification *)(0))); + d_ptr->object.setProperty("value", QVariant::fromValue(&_value)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlslot.h b/src/uml/qumlslot.h index 27588bcc..2e8904cb 100644 --- a/src/uml/qumlslot.h +++ b/src/uml/qumlslot.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSlot *) +Q_DECLARE_METATYPE(QList<QUmlSlot *> *) +Q_DECLARE_METATYPE(QSet<QUmlSlot *> *) + QT_END_HEADER #endif // QUMLSLOT_H diff --git a/src/uml/qumlstartclassifierbehavioraction.cpp b/src/uml/qumlstartclassifierbehavioraction.cpp index b39ce6cd..f4cb08c5 100644 --- a/src/uml/qumlstartclassifierbehavioraction.cpp +++ b/src/uml/qumlstartclassifierbehavioraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstartclassifierbehavioraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction() : _object(0) { + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstartclassifierbehavioraction.h b/src/uml/qumlstartclassifierbehavioraction.h index 96545eee..b012fc69 100644 --- a/src/uml/qumlstartclassifierbehavioraction.h +++ b/src/uml/qumlstartclassifierbehavioraction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStartClassifierBehaviorAction *) +Q_DECLARE_METATYPE(QList<QUmlStartClassifierBehaviorAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlStartClassifierBehaviorAction *> *) + QT_END_HEADER #endif // QUMLSTARTCLASSIFIERBEHAVIORACTION_H diff --git a/src/uml/qumlstartobjectbehavioraction.cpp b/src/uml/qumlstartobjectbehavioraction.cpp index 896406c9..038c855d 100644 --- a/src/uml/qumlstartobjectbehavioraction.cpp +++ b/src/uml/qumlstartobjectbehavioraction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstartobjectbehavioraction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction() : _object(0) { + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstartobjectbehavioraction.h b/src/uml/qumlstartobjectbehavioraction.h index 135169e7..201143fb 100644 --- a/src/uml/qumlstartobjectbehavioraction.h +++ b/src/uml/qumlstartobjectbehavioraction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStartObjectBehaviorAction *) +Q_DECLARE_METATYPE(QList<QUmlStartObjectBehaviorAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlStartObjectBehaviorAction *> *) + QT_END_HEADER #endif // QUMLSTARTOBJECTBEHAVIORACTION_H diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp index 56c020a1..56c02351 100644 --- a/src/uml/qumlstate.cpp +++ b/src/uml/qumlstate.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstate.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlClassifier> @@ -67,6 +68,21 @@ QUmlState::QUmlState() : _stateInvariant(0), _submachine(0) { + d_ptr->object.setProperty("connection", QVariant::fromValue(&_connection)); + d_ptr->object.setProperty("connectionPoint", QVariant::fromValue(&_connectionPoint)); + d_ptr->object.setProperty("deferrableTrigger", QVariant::fromValue(&_deferrableTrigger)); + d_ptr->object.setProperty("doActivity", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("entry", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("exit", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("isComposite", QVariant::fromValue(false)); + d_ptr->object.setProperty("isOrthogonal", QVariant::fromValue(false)); + d_ptr->object.setProperty("isSimple", QVariant::fromValue(false)); + d_ptr->object.setProperty("isSubmachineState", QVariant::fromValue(false)); + d_ptr->object.setProperty("redefinedState", QVariant::fromValue((QUmlState *)(0))); + d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("region", QVariant::fromValue(&_region)); + d_ptr->object.setProperty("stateInvariant", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("submachine", QVariant::fromValue((QUmlStateMachine *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstate.h b/src/uml/qumlstate.h index ffc7d63e..80b7a59c 100644 --- a/src/uml/qumlstate.h +++ b/src/uml/qumlstate.h @@ -123,6 +123,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlState *) +Q_DECLARE_METATYPE(QList<QUmlState *> *) +Q_DECLARE_METATYPE(QSet<QUmlState *> *) + QT_END_HEADER #endif // QUMLSTATE_H diff --git a/src/uml/qumlstateinvariant.cpp b/src/uml/qumlstateinvariant.cpp index 3d2c6115..bf9ec436 100644 --- a/src/uml/qumlstateinvariant.cpp +++ b/src/uml/qumlstateinvariant.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstateinvariant.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlLifeline> @@ -57,6 +58,8 @@ QUmlStateInvariant::QUmlStateInvariant() : _covered(0), _invariant(0) { + d_ptr->object.setProperty("covered", QVariant::fromValue((QUmlLifeline *)(0))); + d_ptr->object.setProperty("invariant", QVariant::fromValue((QUmlConstraint *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstateinvariant.h b/src/uml/qumlstateinvariant.h index 962dd916..3884622c 100644 --- a/src/uml/qumlstateinvariant.h +++ b/src/uml/qumlstateinvariant.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStateInvariant *) +Q_DECLARE_METATYPE(QList<QUmlStateInvariant *> *) +Q_DECLARE_METATYPE(QSet<QUmlStateInvariant *> *) + QT_END_HEADER #endif // QUMLSTATEINVARIANT_H diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp index f963cf1b..7db5c1dc 100644 --- a/src/uml/qumlstatemachine.cpp +++ b/src/uml/qumlstatemachine.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstatemachine.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPseudostate> @@ -58,6 +59,10 @@ QT_BEGIN_NAMESPACE QUmlStateMachine::QUmlStateMachine() { + d_ptr->object.setProperty("connectionPoint", QVariant::fromValue(&_connectionPoint)); + d_ptr->object.setProperty("extendedStateMachine", QVariant::fromValue(&_extendedStateMachine)); + d_ptr->object.setProperty("region", QVariant::fromValue(&_region)); + d_ptr->object.setProperty("submachineState", QVariant::fromValue(&_submachineState)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstatemachine.h b/src/uml/qumlstatemachine.h index ade23b21..b6c11203 100644 --- a/src/uml/qumlstatemachine.h +++ b/src/uml/qumlstatemachine.h @@ -91,6 +91,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStateMachine *) +Q_DECLARE_METATYPE(QList<QUmlStateMachine *> *) +Q_DECLARE_METATYPE(QSet<QUmlStateMachine *> *) + QT_END_HEADER #endif // QUMLSTATEMACHINE_H diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp index 3a348cc7..2c204ecc 100644 --- a/src/uml/qumlstereotype.cpp +++ b/src/uml/qumlstereotype.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstereotype.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlImage> #include <QtUml/QUmlProfile> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlStereotype::QUmlStereotype() { + d_ptr->object.setProperty("icon", QVariant::fromValue(&_icon)); + d_ptr->object.setProperty("profile", QVariant::fromValue((QUmlProfile *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstereotype.h b/src/uml/qumlstereotype.h index c92052f6..fa014e3a 100644 --- a/src/uml/qumlstereotype.h +++ b/src/uml/qumlstereotype.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStereotype *) +Q_DECLARE_METATYPE(QList<QUmlStereotype *> *) +Q_DECLARE_METATYPE(QSet<QUmlStereotype *> *) + QT_END_HEADER #endif // QUMLSTEREOTYPE_H diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp index 40429826..6b30f7f9 100644 --- a/src/uml/qumlstringexpression.cpp +++ b/src/uml/qumlstringexpression.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstringexpression.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,8 @@ QT_BEGIN_NAMESPACE QUmlStringExpression::QUmlStringExpression() : _owningExpression(0) { + d_ptr->object.setProperty("owningExpression", QVariant::fromValue((QUmlStringExpression *)(0))); + d_ptr->object.setProperty("subExpression", QVariant::fromValue(&_subExpression)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstringexpression.h b/src/uml/qumlstringexpression.h index 7ee6b3ea..68f2c02e 100644 --- a/src/uml/qumlstringexpression.h +++ b/src/uml/qumlstringexpression.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStringExpression *) +Q_DECLARE_METATYPE(QList<QUmlStringExpression *> *) +Q_DECLARE_METATYPE(QSet<QUmlStringExpression *> *) + QT_END_HEADER #endif // QUMLSTRINGEXPRESSION_H diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp index 55d9901f..fefc62f6 100644 --- a/src/uml/qumlstructuralfeature.cpp +++ b/src/uml/qumlstructuralfeature.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstructuralfeature.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE @@ -53,6 +54,7 @@ QT_BEGIN_NAMESPACE QUmlStructuralFeature::QUmlStructuralFeature() : _isReadOnly(false) { + d_ptr->object.setProperty("isReadOnly", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstructuralfeature.h b/src/uml/qumlstructuralfeature.h index f3a8cba9..e85fd7d9 100644 --- a/src/uml/qumlstructuralfeature.h +++ b/src/uml/qumlstructuralfeature.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStructuralFeature *) +Q_DECLARE_METATYPE(QList<QUmlStructuralFeature *> *) +Q_DECLARE_METATYPE(QSet<QUmlStructuralFeature *> *) + QT_END_HEADER #endif // QUMLSTRUCTURALFEATURE_H diff --git a/src/uml/qumlstructuralfeatureaction.cpp b/src/uml/qumlstructuralfeatureaction.cpp index 2363b213..62b53167 100644 --- a/src/uml/qumlstructuralfeatureaction.cpp +++ b/src/uml/qumlstructuralfeatureaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstructuralfeatureaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlStructuralFeature> @@ -57,6 +58,8 @@ QUmlStructuralFeatureAction::QUmlStructuralFeatureAction() : _object(0), _structuralFeature(0) { + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("structuralFeature", QVariant::fromValue((QUmlStructuralFeature *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstructuralfeatureaction.h b/src/uml/qumlstructuralfeatureaction.h index ea663e92..08245863 100644 --- a/src/uml/qumlstructuralfeatureaction.h +++ b/src/uml/qumlstructuralfeatureaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStructuralFeatureAction *) +Q_DECLARE_METATYPE(QList<QUmlStructuralFeatureAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlStructuralFeatureAction *> *) + QT_END_HEADER #endif // QUMLSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp index b70a5286..8bc8d7ff 100644 --- a/src/uml/qumlstructuredactivitynode.cpp +++ b/src/uml/qumlstructuredactivitynode.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstructuredactivitynode.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> @@ -61,6 +62,13 @@ QUmlStructuredActivityNode::QUmlStructuredActivityNode() : _activity(0), _mustIsolate(false) { + d_ptr->object.setProperty("activity", QVariant::fromValue((QUmlActivity *)(0))); + d_ptr->object.setProperty("edge", QVariant::fromValue(&_edge)); + d_ptr->object.setProperty("mustIsolate", QVariant::fromValue(false)); + d_ptr->object.setProperty("node", QVariant::fromValue(&_node)); + d_ptr->object.setProperty("structuredNodeInput", QVariant::fromValue(&_structuredNodeInput)); + d_ptr->object.setProperty("structuredNodeOutput", QVariant::fromValue(&_structuredNodeOutput)); + d_ptr->object.setProperty("variable", QVariant::fromValue(&_variable)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstructuredactivitynode.h b/src/uml/qumlstructuredactivitynode.h index 1059865f..0845203f 100644 --- a/src/uml/qumlstructuredactivitynode.h +++ b/src/uml/qumlstructuredactivitynode.h @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) +class QUmlActivity; class QUmlActivityEdge; class QUmlActivityNode; class QUmlInputPin; @@ -97,6 +98,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStructuredActivityNode *) +Q_DECLARE_METATYPE(QList<QUmlStructuredActivityNode *> *) +Q_DECLARE_METATYPE(QSet<QUmlStructuredActivityNode *> *) + QT_END_HEADER #endif // QUMLSTRUCTUREDACTIVITYNODE_H diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp index 6ad724a0..105fc654 100644 --- a/src/uml/qumlstructuredclassifier.cpp +++ b/src/uml/qumlstructuredclassifier.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlstructuredclassifier.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlConnector> @@ -56,6 +57,10 @@ QT_BEGIN_NAMESPACE QUmlStructuredClassifier::QUmlStructuredClassifier() { + d_ptr->object.setProperty("ownedAttribute", QVariant::fromValue(&_ownedAttribute)); + d_ptr->object.setProperty("ownedConnector", QVariant::fromValue(&_ownedConnector)); + d_ptr->object.setProperty("part", QVariant::fromValue(QSet<QUmlProperty *>())); + d_ptr->object.setProperty("role", QVariant::fromValue(&_role)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h index 65867e66..7e4c39ef 100644 --- a/src/uml/qumlstructuredclassifier.h +++ b/src/uml/qumlstructuredclassifier.h @@ -82,6 +82,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlStructuredClassifier *) +Q_DECLARE_METATYPE(QList<QUmlStructuredClassifier *> *) +Q_DECLARE_METATYPE(QSet<QUmlStructuredClassifier *> *) + QT_END_HEADER #endif // QUMLSTRUCTUREDCLASSIFIER_H diff --git a/src/uml/qumlsubstitution.cpp b/src/uml/qumlsubstitution.cpp index fb59397d..6e6312fa 100644 --- a/src/uml/qumlsubstitution.cpp +++ b/src/uml/qumlsubstitution.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlsubstitution.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> @@ -56,6 +57,8 @@ QUmlSubstitution::QUmlSubstitution() : _contract(0), _substitutingClassifier(0) { + d_ptr->object.setProperty("contract", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("substitutingClassifier", QVariant::fromValue((QUmlClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlsubstitution.h b/src/uml/qumlsubstitution.h index bcc4c89c..bf1b8437 100644 --- a/src/uml/qumlsubstitution.h +++ b/src/uml/qumlsubstitution.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlSubstitution *) +Q_DECLARE_METATYPE(QList<QUmlSubstitution *> *) +Q_DECLARE_METATYPE(QSet<QUmlSubstitution *> *) + QT_END_HEADER #endif // QUMLSUBSTITUTION_H diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp index d50194f0..c6c20ecb 100644 --- a/src/uml/qumltemplateableelement.cpp +++ b/src/uml/qumltemplateableelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltemplateableelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> @@ -57,6 +58,8 @@ QT_BEGIN_NAMESPACE QUmlTemplateableElement::QUmlTemplateableElement() : _ownedTemplateSignature(0) { + d_ptr->object.setProperty("ownedTemplateSignature", QVariant::fromValue((QUmlTemplateSignature *)(0))); + d_ptr->object.setProperty("templateBinding", QVariant::fromValue(&_templateBinding)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h index f3367fc4..21c661c2 100644 --- a/src/uml/qumltemplateableelement.h +++ b/src/uml/qumltemplateableelement.h @@ -78,6 +78,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTemplateableElement *) +Q_DECLARE_METATYPE(QList<QUmlTemplateableElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlTemplateableElement *> *) + QT_END_HEADER #endif // QUMLTEMPLATEABLEELEMENT_H diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp index 7c02c6fc..ef6fe6c7 100644 --- a/src/uml/qumltemplatebinding.cpp +++ b/src/uml/qumltemplatebinding.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltemplatebinding.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameterSubstitution> @@ -58,6 +59,9 @@ QUmlTemplateBinding::QUmlTemplateBinding() : _boundElement(0), _signature(0) { + d_ptr->object.setProperty("boundElement", QVariant::fromValue((QUmlTemplateableElement *)(0))); + d_ptr->object.setProperty("parameterSubstitution", QVariant::fromValue(&_parameterSubstitution)); + d_ptr->object.setProperty("signature", QVariant::fromValue((QUmlTemplateSignature *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h index 2daedc47..4a4b3178 100644 --- a/src/uml/qumltemplatebinding.h +++ b/src/uml/qumltemplatebinding.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTemplateBinding *) +Q_DECLARE_METATYPE(QList<QUmlTemplateBinding *> *) +Q_DECLARE_METATYPE(QSet<QUmlTemplateBinding *> *) + QT_END_HEADER #endif // QUMLTEMPLATEBINDING_H diff --git a/src/uml/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp index 2ef6dbc6..378bd6e1 100644 --- a/src/uml/qumltemplateparameter.cpp +++ b/src/uml/qumltemplateparameter.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltemplateparameter.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateSignature> @@ -60,6 +61,11 @@ QUmlTemplateParameter::QUmlTemplateParameter() : _parameteredElement(0), _signature(0) { + d_ptr->object.setProperty("default", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("ownedDefault", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("ownedParameteredElement", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("parameteredElement", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("signature", QVariant::fromValue((QUmlTemplateSignature *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltemplateparameter.h b/src/uml/qumltemplateparameter.h index 1973234e..65095457 100644 --- a/src/uml/qumltemplateparameter.h +++ b/src/uml/qumltemplateparameter.h @@ -81,6 +81,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTemplateParameter *) +Q_DECLARE_METATYPE(QList<QUmlTemplateParameter *> *) +Q_DECLARE_METATYPE(QSet<QUmlTemplateParameter *> *) + QT_END_HEADER #endif // QUMLTEMPLATEPARAMETER_H diff --git a/src/uml/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp index bd7d38dc..85d6372d 100644 --- a/src/uml/qumltemplateparametersubstitution.cpp +++ b/src/uml/qumltemplateparametersubstitution.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltemplateparametersubstitution.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> @@ -60,6 +61,10 @@ QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution() : _ownedActual(0), _templateBinding(0) { + d_ptr->object.setProperty("actual", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("formal", QVariant::fromValue((QUmlTemplateParameter *)(0))); + d_ptr->object.setProperty("ownedActual", QVariant::fromValue((QUmlParameterableElement *)(0))); + d_ptr->object.setProperty("templateBinding", QVariant::fromValue((QUmlTemplateBinding *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltemplateparametersubstitution.h b/src/uml/qumltemplateparametersubstitution.h index a79c9bfa..d1df17df 100644 --- a/src/uml/qumltemplateparametersubstitution.h +++ b/src/uml/qumltemplateparametersubstitution.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTemplateParameterSubstitution *) +Q_DECLARE_METATYPE(QList<QUmlTemplateParameterSubstitution *> *) +Q_DECLARE_METATYPE(QSet<QUmlTemplateParameterSubstitution *> *) + QT_END_HEADER #endif // QUMLTEMPLATEPARAMETERSUBSTITUTION_H diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp index de4cd68b..8c4e4a79 100644 --- a/src/uml/qumltemplatesignature.cpp +++ b/src/uml/qumltemplatesignature.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltemplatesignature.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameter> @@ -56,6 +57,9 @@ QT_BEGIN_NAMESPACE QUmlTemplateSignature::QUmlTemplateSignature() : _template_(0) { + d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter)); + d_ptr->object.setProperty("parameter", QVariant::fromValue(&_parameter)); + d_ptr->object.setProperty("template", QVariant::fromValue((QUmlTemplateableElement *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltemplatesignature.h b/src/uml/qumltemplatesignature.h index 35e91f4f..304cf143 100644 --- a/src/uml/qumltemplatesignature.h +++ b/src/uml/qumltemplatesignature.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTemplateSignature *) +Q_DECLARE_METATYPE(QList<QUmlTemplateSignature *> *) +Q_DECLARE_METATYPE(QSet<QUmlTemplateSignature *> *) + QT_END_HEADER #endif // QUMLTEMPLATESIGNATURE_H diff --git a/src/uml/qumltestidentityaction.cpp b/src/uml/qumltestidentityaction.cpp index 6c982ced..d321fe0a 100644 --- a/src/uml/qumltestidentityaction.cpp +++ b/src/uml/qumltestidentityaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltestidentityaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -58,6 +59,9 @@ QUmlTestIdentityAction::QUmlTestIdentityAction() : _result(0), _second(0) { + d_ptr->object.setProperty("first", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); + d_ptr->object.setProperty("second", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltestidentityaction.h b/src/uml/qumltestidentityaction.h index 6fa70560..d75565f1 100644 --- a/src/uml/qumltestidentityaction.h +++ b/src/uml/qumltestidentityaction.h @@ -75,6 +75,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTestIdentityAction *) +Q_DECLARE_METATYPE(QList<QUmlTestIdentityAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlTestIdentityAction *> *) + QT_END_HEADER #endif // QUMLTESTIDENTITYACTION_H diff --git a/src/uml/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp index a961a7e2..33c2a1fe 100644 --- a/src/uml/qumltimeconstraint.cpp +++ b/src/uml/qumltimeconstraint.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltimeconstraint.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTimeInterval> @@ -56,6 +57,8 @@ QUmlTimeConstraint::QUmlTimeConstraint() : _firstEvent(true), _specification(0) { + d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false)); + d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlTimeInterval *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltimeconstraint.h b/src/uml/qumltimeconstraint.h index 986b66bd..fe39cad5 100644 --- a/src/uml/qumltimeconstraint.h +++ b/src/uml/qumltimeconstraint.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTimeConstraint *) +Q_DECLARE_METATYPE(QList<QUmlTimeConstraint *> *) +Q_DECLARE_METATYPE(QSet<QUmlTimeConstraint *> *) + QT_END_HEADER #endif // QUMLTIMECONSTRAINT_H diff --git a/src/uml/qumltimeevent.cpp b/src/uml/qumltimeevent.cpp index 3184b944..48a6693e 100644 --- a/src/uml/qumltimeevent.cpp +++ b/src/uml/qumltimeevent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltimeevent.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTimeExpression> @@ -56,6 +57,8 @@ QUmlTimeEvent::QUmlTimeEvent() : _isRelative(false), _when(0) { + d_ptr->object.setProperty("isRelative", QVariant::fromValue(false)); + d_ptr->object.setProperty("when", QVariant::fromValue((QUmlTimeExpression *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltimeevent.h b/src/uml/qumltimeevent.h index 88d2391c..6c69fff2 100644 --- a/src/uml/qumltimeevent.h +++ b/src/uml/qumltimeevent.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTimeEvent *) +Q_DECLARE_METATYPE(QList<QUmlTimeEvent *> *) +Q_DECLARE_METATYPE(QSet<QUmlTimeEvent *> *) + QT_END_HEADER #endif // QUMLTIMEEVENT_H diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp index 346818fa..9437afea 100644 --- a/src/uml/qumltimeexpression.cpp +++ b/src/uml/qumltimeexpression.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltimeexpression.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlObservation> @@ -55,6 +56,8 @@ QT_BEGIN_NAMESPACE QUmlTimeExpression::QUmlTimeExpression() : _expr(0) { + d_ptr->object.setProperty("expr", QVariant::fromValue((QUmlValueSpecification *)(0))); + d_ptr->object.setProperty("observation", QVariant::fromValue(&_observation)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltimeexpression.h b/src/uml/qumltimeexpression.h index 5cd1ef6c..f78cfe35 100644 --- a/src/uml/qumltimeexpression.h +++ b/src/uml/qumltimeexpression.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTimeExpression *) +Q_DECLARE_METATYPE(QList<QUmlTimeExpression *> *) +Q_DECLARE_METATYPE(QSet<QUmlTimeExpression *> *) + QT_END_HEADER #endif // QUMLTIMEEXPRESSION_H diff --git a/src/uml/qumltimeinterval.cpp b/src/uml/qumltimeinterval.cpp index ac3894ed..70f872a8 100644 --- a/src/uml/qumltimeinterval.cpp +++ b/src/uml/qumltimeinterval.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltimeinterval.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlTimeExpression> @@ -56,6 +57,8 @@ QUmlTimeInterval::QUmlTimeInterval() : _max(0), _min(0) { + d_ptr->object.setProperty("max", QVariant::fromValue((QUmlTimeExpression *)(0))); + d_ptr->object.setProperty("min", QVariant::fromValue((QUmlTimeExpression *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltimeinterval.h b/src/uml/qumltimeinterval.h index 4b0fca5e..202635c3 100644 --- a/src/uml/qumltimeinterval.h +++ b/src/uml/qumltimeinterval.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTimeInterval *) +Q_DECLARE_METATYPE(QList<QUmlTimeInterval *> *) +Q_DECLARE_METATYPE(QSet<QUmlTimeInterval *> *) + QT_END_HEADER #endif // QUMLTIMEINTERVAL_H diff --git a/src/uml/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp index 0ce4ebf4..9787ddcb 100644 --- a/src/uml/qumltimeobservation.cpp +++ b/src/uml/qumltimeobservation.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltimeobservation.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlNamedElement> @@ -56,6 +57,8 @@ QUmlTimeObservation::QUmlTimeObservation() : _event(0), _firstEvent(true) { + d_ptr->object.setProperty("event", QVariant::fromValue((QUmlNamedElement *)(0))); + d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltimeobservation.h b/src/uml/qumltimeobservation.h index 0dfcd7ae..edc30725 100644 --- a/src/uml/qumltimeobservation.h +++ b/src/uml/qumltimeobservation.h @@ -71,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTimeObservation *) +Q_DECLARE_METATYPE(QList<QUmlTimeObservation *> *) +Q_DECLARE_METATYPE(QSet<QUmlTimeObservation *> *) + QT_END_HEADER #endif // QUMLTIMEOBSERVATION_H diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp index 0ba0f2c1..198d2511 100644 --- a/src/uml/qumltransition.cpp +++ b/src/uml/qumltransition.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltransition.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlClassifier> @@ -62,11 +63,20 @@ QUmlTransition::QUmlTransition() : _container(0), _effect(0), _guard(0), - _kind(QtUml::TransitionExternal), + _kind(QtUml::TransitionKindExternal), _redefinedTransition(0), _source(0), _target(0) { + d_ptr->object.setProperty("container", QVariant::fromValue((QUmlRegion *)(0))); + d_ptr->object.setProperty("effect", QVariant::fromValue((QUmlBehavior *)(0))); + d_ptr->object.setProperty("guard", QVariant::fromValue((QUmlConstraint *)(0))); + d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::TransitionKindNone)); + d_ptr->object.setProperty("redefinedTransition", QVariant::fromValue((QUmlTransition *)(0))); + d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue((QUmlClassifier *)(0))); + d_ptr->object.setProperty("source", QVariant::fromValue((QUmlVertex *)(0))); + d_ptr->object.setProperty("target", QVariant::fromValue((QUmlVertex *)(0))); + d_ptr->object.setProperty("trigger", QVariant::fromValue(&_trigger)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h index c3910211..5b5ac56d 100644 --- a/src/uml/qumltransition.h +++ b/src/uml/qumltransition.h @@ -104,6 +104,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTransition *) +Q_DECLARE_METATYPE(QList<QUmlTransition *> *) +Q_DECLARE_METATYPE(QSet<QUmlTransition *> *) + QT_END_HEADER #endif // QUMLTRANSITION_H diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp index c18b07dc..392b7fef 100644 --- a/src/uml/qumltrigger.cpp +++ b/src/uml/qumltrigger.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltrigger.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlEvent> #include <QtUml/QUmlPort> @@ -56,6 +57,8 @@ QT_BEGIN_NAMESPACE QUmlTrigger::QUmlTrigger() : _event(0) { + d_ptr->object.setProperty("event", QVariant::fromValue((QUmlEvent *)(0))); + d_ptr->object.setProperty("port", QVariant::fromValue(&_port)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltrigger.h b/src/uml/qumltrigger.h index 90aa098e..b1fc471b 100644 --- a/src/uml/qumltrigger.h +++ b/src/uml/qumltrigger.h @@ -73,6 +73,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTrigger *) +Q_DECLARE_METATYPE(QList<QUmlTrigger *> *) +Q_DECLARE_METATYPE(QSet<QUmlTrigger *> *) + QT_END_HEADER #endif // QUMLTRIGGER_H diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp index ba8c3f4c..19e29f64 100644 --- a/src/uml/qumltype.cpp +++ b/src/uml/qumltype.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltype.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlPackage> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlType::QUmlType() : _package(0) { + d_ptr->object.setProperty("package", QVariant::fromValue((QUmlPackage *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltype.h b/src/uml/qumltype.h index ceec1a62..73a1bf24 100644 --- a/src/uml/qumltype.h +++ b/src/uml/qumltype.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) +class QUmlPackage; + class Q_UML_EXPORT QUmlType : public QUmlPackageableElement { public: @@ -69,6 +71,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlType *) +Q_DECLARE_METATYPE(QList<QUmlType *> *) +Q_DECLARE_METATYPE(QSet<QUmlType *> *) + QT_END_HEADER #endif // QUMLTYPE_H diff --git a/src/uml/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp index 264d58d3..fa5d71fa 100644 --- a/src/uml/qumltypedelement.cpp +++ b/src/uml/qumltypedelement.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumltypedelement.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlType> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlTypedElement::QUmlTypedElement() : _type(0) { + d_ptr->object.setProperty("type", QVariant::fromValue((QUmlType *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumltypedelement.h b/src/uml/qumltypedelement.h index 0cd56545..09be825c 100644 --- a/src/uml/qumltypedelement.h +++ b/src/uml/qumltypedelement.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlTypedElement *) +Q_DECLARE_METATYPE(QList<QUmlTypedElement *> *) +Q_DECLARE_METATYPE(QSet<QUmlTypedElement *> *) + QT_END_HEADER #endif // QUMLTYPEDELEMENT_H diff --git a/src/uml/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp index 17d284e2..ab0e180d 100644 --- a/src/uml/qumlunmarshallaction.cpp +++ b/src/uml/qumlunmarshallaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlunmarshallaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> @@ -58,6 +59,9 @@ QUmlUnmarshallAction::QUmlUnmarshallAction() : _object(0), _unmarshallType(0) { + d_ptr->object.setProperty("object", QVariant::fromValue((QUmlInputPin *)(0))); + d_ptr->object.setProperty("result", QVariant::fromValue(&_result)); + d_ptr->object.setProperty("unmarshallType", QVariant::fromValue((QUmlClassifier *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlunmarshallaction.h b/src/uml/qumlunmarshallaction.h index 5111d50e..e1c29383 100644 --- a/src/uml/qumlunmarshallaction.h +++ b/src/uml/qumlunmarshallaction.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlUnmarshallAction *) +Q_DECLARE_METATYPE(QList<QUmlUnmarshallAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlUnmarshallAction *> *) + QT_END_HEADER #endif // QUMLUNMARSHALLACTION_H diff --git a/src/uml/qumlusage.cpp b/src/uml/qumlusage.cpp index 1b7bec5d..202f0549 100644 --- a/src/uml/qumlusage.cpp +++ b/src/uml/qumlusage.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlusage.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlusage.h b/src/uml/qumlusage.h index 05ea20af..faf7ef0d 100644 --- a/src/uml/qumlusage.h +++ b/src/uml/qumlusage.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlUsage *) +Q_DECLARE_METATYPE(QList<QUmlUsage *> *) +Q_DECLARE_METATYPE(QSet<QUmlUsage *> *) + QT_END_HEADER #endif // QUMLUSAGE_H diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp index 6a4e3bf3..90ee153a 100644 --- a/src/uml/qumlusecase.cpp +++ b/src/uml/qumlusecase.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlusecase.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExtend> @@ -57,6 +58,10 @@ QT_BEGIN_NAMESPACE QUmlUseCase::QUmlUseCase() { + d_ptr->object.setProperty("extend", QVariant::fromValue(&_extend)); + d_ptr->object.setProperty("extensionPoint", QVariant::fromValue(&_extensionPoint)); + d_ptr->object.setProperty("include", QVariant::fromValue(&_include)); + d_ptr->object.setProperty("subject", QVariant::fromValue(&_subject)); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlusecase.h b/src/uml/qumlusecase.h index 93f7c6df..f06926ff 100644 --- a/src/uml/qumlusecase.h +++ b/src/uml/qumlusecase.h @@ -87,6 +87,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlUseCase *) +Q_DECLARE_METATYPE(QList<QUmlUseCase *> *) +Q_DECLARE_METATYPE(QSet<QUmlUseCase *> *) + QT_END_HEADER #endif // QUMLUSECASE_H diff --git a/src/uml/qumlvaluepin.cpp b/src/uml/qumlvaluepin.cpp index 28510bbf..89376ab1 100644 --- a/src/uml/qumlvaluepin.cpp +++ b/src/uml/qumlvaluepin.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvaluepin.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlValueSpecification> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlValuePin::QUmlValuePin() : _value(0) { + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlvaluepin.h b/src/uml/qumlvaluepin.h index ce1b8d74..950a4c77 100644 --- a/src/uml/qumlvaluepin.h +++ b/src/uml/qumlvaluepin.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlValuePin *) +Q_DECLARE_METATYPE(QList<QUmlValuePin *> *) +Q_DECLARE_METATYPE(QSet<QUmlValuePin *> *) + QT_END_HEADER #endif // QUMLVALUEPIN_H diff --git a/src/uml/qumlvaluespecification.cpp b/src/uml/qumlvaluespecification.cpp index 1a1ab058..f71498f7 100644 --- a/src/uml/qumlvaluespecification.cpp +++ b/src/uml/qumlvaluespecification.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvaluespecification.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlParameterableElement> diff --git a/src/uml/qumlvaluespecification.h b/src/uml/qumlvaluespecification.h index 4b05b2e1..33bb1d2f 100644 --- a/src/uml/qumlvaluespecification.h +++ b/src/uml/qumlvaluespecification.h @@ -74,6 +74,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlValueSpecification *) +Q_DECLARE_METATYPE(QList<QUmlValueSpecification *> *) +Q_DECLARE_METATYPE(QSet<QUmlValueSpecification *> *) + QT_END_HEADER #endif // QUMLVALUESPECIFICATION_H diff --git a/src/uml/qumlvaluespecificationaction.cpp b/src/uml/qumlvaluespecificationaction.cpp index 4df7f9d3..910e422b 100644 --- a/src/uml/qumlvaluespecificationaction.cpp +++ b/src/uml/qumlvaluespecificationaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvaluespecificationaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlOutputPin> #include <QtUml/QUmlValueSpecification> @@ -57,6 +58,8 @@ QUmlValueSpecificationAction::QUmlValueSpecificationAction() : _result(0), _value(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlValueSpecification *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlvaluespecificationaction.h b/src/uml/qumlvaluespecificationaction.h index 9fe43a38..1358cd55 100644 --- a/src/uml/qumlvaluespecificationaction.h +++ b/src/uml/qumlvaluespecificationaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlValueSpecificationAction *) +Q_DECLARE_METATYPE(QList<QUmlValueSpecificationAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlValueSpecificationAction *> *) + QT_END_HEADER #endif // QUMLVALUESPECIFICATIONACTION_H diff --git a/src/uml/qumlvariable.cpp b/src/uml/qumlvariable.cpp index 506bc77b..f5223113 100644 --- a/src/uml/qumlvariable.cpp +++ b/src/uml/qumlvariable.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvariable.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlAction> #include <QtUml/QUmlActivity> @@ -58,6 +59,8 @@ QUmlVariable::QUmlVariable() : _activityScope(0), _scope(0) { + d_ptr->object.setProperty("activityScope", QVariant::fromValue((QUmlActivity *)(0))); + d_ptr->object.setProperty("scope", QVariant::fromValue((QUmlStructuredActivityNode *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlvariable.h b/src/uml/qumlvariable.h index 48d240fb..f8f24c99 100644 --- a/src/uml/qumlvariable.h +++ b/src/uml/qumlvariable.h @@ -77,6 +77,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlVariable *) +Q_DECLARE_METATYPE(QList<QUmlVariable *> *) +Q_DECLARE_METATYPE(QSet<QUmlVariable *> *) + QT_END_HEADER #endif // QUMLVARIABLE_H diff --git a/src/uml/qumlvariableaction.cpp b/src/uml/qumlvariableaction.cpp index beda0a4c..46ffd982 100644 --- a/src/uml/qumlvariableaction.cpp +++ b/src/uml/qumlvariableaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvariableaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlVariable> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlVariableAction::QUmlVariableAction() : _variable(0) { + d_ptr->object.setProperty("variable", QVariant::fromValue((QUmlVariable *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlvariableaction.h b/src/uml/qumlvariableaction.h index 3a31bff0..08b01465 100644 --- a/src/uml/qumlvariableaction.h +++ b/src/uml/qumlvariableaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlVariableAction *) +Q_DECLARE_METATYPE(QList<QUmlVariableAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlVariableAction *> *) + QT_END_HEADER #endif // QUMLVARIABLEACTION_H diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp index 995d17f0..abc0878d 100644 --- a/src/uml/qumlvertex.cpp +++ b/src/uml/qumlvertex.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlvertex.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlRegion> #include <QtUml/QUmlStateMachine> @@ -57,6 +58,9 @@ QT_BEGIN_NAMESPACE QUmlVertex::QUmlVertex() : _container(0) { + d_ptr->object.setProperty("container", QVariant::fromValue((QUmlRegion *)(0))); + d_ptr->object.setProperty("incoming", QVariant::fromValue(QSet<QUmlTransition *>())); + d_ptr->object.setProperty("outgoing", QVariant::fromValue(QSet<QUmlTransition *>())); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h index 1e13834d..1ddfae5b 100644 --- a/src/uml/qumlvertex.h +++ b/src/uml/qumlvertex.h @@ -79,6 +79,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlVertex *) +Q_DECLARE_METATYPE(QList<QUmlVertex *> *) +Q_DECLARE_METATYPE(QSet<QUmlVertex *> *) + QT_END_HEADER #endif // QUMLVERTEX_H diff --git a/src/uml/qumlwritelinkaction.cpp b/src/uml/qumlwritelinkaction.cpp index 89150790..088d69c5 100644 --- a/src/uml/qumlwritelinkaction.cpp +++ b/src/uml/qumlwritelinkaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlwritelinkaction.h" +#include "private/qmodelingobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlwritelinkaction.h b/src/uml/qumlwritelinkaction.h index d3c59c1c..a0490265 100644 --- a/src/uml/qumlwritelinkaction.h +++ b/src/uml/qumlwritelinkaction.h @@ -61,6 +61,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlWriteLinkAction *) +Q_DECLARE_METATYPE(QList<QUmlWriteLinkAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlWriteLinkAction *> *) + QT_END_HEADER #endif // QUMLWRITELINKACTION_H diff --git a/src/uml/qumlwritestructuralfeatureaction.cpp b/src/uml/qumlwritestructuralfeatureaction.cpp index acdb29ac..5289d78b 100644 --- a/src/uml/qumlwritestructuralfeatureaction.cpp +++ b/src/uml/qumlwritestructuralfeatureaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlwritestructuralfeatureaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -57,6 +58,8 @@ QUmlWriteStructuralFeatureAction::QUmlWriteStructuralFeatureAction() : _result(0), _value(0) { + d_ptr->object.setProperty("result", QVariant::fromValue((QUmlOutputPin *)(0))); + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlwritestructuralfeatureaction.h b/src/uml/qumlwritestructuralfeatureaction.h index bd7e5121..aa2c2f46 100644 --- a/src/uml/qumlwritestructuralfeatureaction.h +++ b/src/uml/qumlwritestructuralfeatureaction.h @@ -72,6 +72,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlWriteStructuralFeatureAction *) +Q_DECLARE_METATYPE(QList<QUmlWriteStructuralFeatureAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlWriteStructuralFeatureAction *> *) + QT_END_HEADER #endif // QUMLWRITESTRUCTURALFEATUREACTION_H diff --git a/src/uml/qumlwritevariableaction.cpp b/src/uml/qumlwritevariableaction.cpp index c05fbfd6..2018f1c1 100644 --- a/src/uml/qumlwritevariableaction.cpp +++ b/src/uml/qumlwritevariableaction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ #include "qumlwritevariableaction.h" +#include "private/qmodelingobject_p.h" #include <QtUml/QUmlInputPin> @@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE QUmlWriteVariableAction::QUmlWriteVariableAction() : _value(0) { + d_ptr->object.setProperty("value", QVariant::fromValue((QUmlInputPin *)(0))); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlwritevariableaction.h b/src/uml/qumlwritevariableaction.h index ad51e7f4..d43227e8 100644 --- a/src/uml/qumlwritevariableaction.h +++ b/src/uml/qumlwritevariableaction.h @@ -68,6 +68,10 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QUmlWriteVariableAction *) +Q_DECLARE_METATYPE(QList<QUmlWriteVariableAction *> *) +Q_DECLARE_METATYPE(QSet<QUmlWriteVariableAction *> *) + QT_END_HEADER #endif // QUMLWRITEVARIABLEACTION_H diff --git a/src/uml/uml.pro b/src/uml/uml.pro index 143c124f..00372a69 100644 --- a/src/uml/uml.pro +++ b/src/uml/uml.pro @@ -1,7 +1,7 @@ load(qt_build_config) TARGET = QtUml -QT = core modeling +QT = core modeling-private QMAKE_DOCS = $$PWD/doc/qtuml.qdocconf |