Envision
A visual programming IDE for object-oriented languages
|
Public Member Functions | |
virtual void | run (MergeData &mergeData) override |
Public Member Functions inherited from FilePersistence::MergePipelineComponent | |
virtual | ~MergePipelineComponent () |
Static Public Member Functions | |
static bool | isConflictUnitType (const QString &type) |
Private Types | |
using | NodesInConflictUnit = QMultiHash< Model::NodeIdType, Model::NodeIdType > |
Static Private Member Functions | |
static QPair< NodesInConflictUnit, NodesInConflictUnit > | computeAffectedCUs (MergeData &mergeData) |
static Model::NodeIdType | findConflictUnit (const GenericNode *node) |
Static Private Attributes | |
static bool | ADD_STRUCTURAL_CHANGES = true |
|
private |
|
staticprivate |
|
staticprivate |
|
static |
|
overridevirtual |
Implements FilePersistence::MergePipelineComponent.
|
staticprivate |