FilePersistence::Conflicts Member List

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

addDeleteNonEmptyTreeConflict(MergeChange *change)	FilePersistence::Conflicts	private
addDirectConflicts(MergeChange *change)	FilePersistence::Conflicts
addInsertOrMoveToDeletedConflict(MergeChange *change)	FilePersistence::Conflicts	private
addLabelConfict(MergeChange *change)	FilePersistence::Conflicts	private
addSameNodeConflict(MergeChange *change)	FilePersistence::Conflicts	private
allConflictingChanges() const	FilePersistence::Conflicts	inline
changes_	FilePersistence::Conflicts	private
changesForChildren_	FilePersistence::Conflicts	private
changesForNode_	FilePersistence::Conflicts	private
Conflicts(const QList< MergeChange * > &changes, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForNode, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForChildren)	FilePersistence::Conflicts
conflictsOf(MergeChange *change) const	FilePersistence::Conflicts	inline
copyConflicts(MergeChange *sourceChange, MergeChange *destinationChange)	FilePersistence::Conflicts
directConflicts_	FilePersistence::Conflicts	private
hasConflicts(MergeChange *change) const	FilePersistence::Conflicts	inline
insert(MergeChange *changeA, MergeChange *changeB)	FilePersistence::Conflicts	inline
isEmpty() const	FilePersistence::Conflicts	inline
remove(MergeChange *changeA, MergeChange *changeB)	FilePersistence::Conflicts	inline
removeAll(MergeChange *change)	FilePersistence::Conflicts