Envision
A visual programming IDE for object-oriented languages
FilePersistence::Conflicts Member List

This is the complete list of members for FilePersistence::Conflicts, including all inherited members.

addDeleteNonEmptyTreeConflict(MergeChange *change)FilePersistence::Conflictsprivate
addDirectConflicts(MergeChange *change)FilePersistence::Conflicts
addInsertOrMoveToDeletedConflict(MergeChange *change)FilePersistence::Conflictsprivate
addLabelConfict(MergeChange *change)FilePersistence::Conflictsprivate
addSameNodeConflict(MergeChange *change)FilePersistence::Conflictsprivate
allConflictingChanges() constFilePersistence::Conflictsinline
changes_FilePersistence::Conflictsprivate
changesForChildren_FilePersistence::Conflictsprivate
changesForNode_FilePersistence::Conflictsprivate
Conflicts(const QList< MergeChange * > &changes, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForNode, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForChildren)FilePersistence::Conflicts
conflictsOf(MergeChange *change) constFilePersistence::Conflictsinline
copyConflicts(MergeChange *sourceChange, MergeChange *destinationChange)FilePersistence::Conflicts
directConflicts_FilePersistence::Conflictsprivate
hasConflicts(MergeChange *change) constFilePersistence::Conflictsinline
insert(MergeChange *changeA, MergeChange *changeB)FilePersistence::Conflictsinline
isEmpty() constFilePersistence::Conflictsinline
remove(MergeChange *changeA, MergeChange *changeB)FilePersistence::Conflictsinline
removeAll(MergeChange *change)FilePersistence::Conflicts
Generated by doxygen 1.9.1