FilePersistence::Conflicts Class Reference

Public Member Functions
	Conflicts (const QList< MergeChange * > &changes, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForNode, const QMultiHash< Model::NodeIdType, MergeChange * > &changesForChildren)
void	addDirectConflicts (MergeChange *change)
QList< MergeChange * >	allConflictingChanges () const
QList< MergeChange * >	conflictsOf (MergeChange *change) const
void	copyConflicts (MergeChange *sourceChange, MergeChange *destinationChange)
bool	hasConflicts (MergeChange *change) const
void	insert (MergeChange *changeA, MergeChange *changeB)
bool	isEmpty () const
void	remove (MergeChange *changeA, MergeChange *changeB)
void	removeAll (MergeChange *change)

Private Member Functions
void	addDeleteNonEmptyTreeConflict (MergeChange *change)
void	addInsertOrMoveToDeletedConflict (MergeChange *change)
void	addLabelConfict (MergeChange *change)
void	addSameNodeConflict (MergeChange *change)

Private Attributes
const QList< MergeChange * > &	changes_
const QMultiHash< Model::NodeIdType, MergeChange * > &	changesForChildren_
const QMultiHash< Model::NodeIdType, MergeChange * > &	changesForNode_
QMultiHash< MergeChange *, MergeChange * >	directConflicts_

Constructor & Destructor Documentation

Conflicts()

FilePersistence::Conflicts::Conflicts	(	const QList< MergeChange * > &	changes,
		const QMultiHash< Model::NodeIdType, MergeChange * > &	changesForNode,
		const QMultiHash< Model::NodeIdType, MergeChange * > &	changesForChildren
	)

Member Function Documentation

addDeleteNonEmptyTreeConflict()

void FilePersistence::Conflicts::addDeleteNonEmptyTreeConflict ( MergeChange *  change )

private

addDirectConflicts()

void FilePersistence::Conflicts::addDirectConflicts

(

MergeChange *

change

)

addInsertOrMoveToDeletedConflict()

void FilePersistence::Conflicts::addInsertOrMoveToDeletedConflict ( MergeChange *  change )

private

addLabelConfict()

void FilePersistence::Conflicts::addLabelConfict ( MergeChange *  change )

private

addSameNodeConflict()

void FilePersistence::Conflicts::addSameNodeConflict ( MergeChange *  change )

private

allConflictingChanges()

QList< MergeChange * > FilePersistence::Conflicts::allConflictingChanges ( ) const

inline

conflictsOf()

QList< MergeChange * > FilePersistence::Conflicts::conflictsOf ( MergeChange *  change ) const

inline

copyConflicts()

void FilePersistence::Conflicts::copyConflicts	(	MergeChange *	sourceChange,
		MergeChange *	destinationChange
	)

hasConflicts()

bool FilePersistence::Conflicts::hasConflicts ( MergeChange *  change ) const

inline

insert()

void FilePersistence::Conflicts::insert ( MergeChange *  changeA, MergeChange *  changeB  )

inline

isEmpty()

bool FilePersistence::Conflicts::isEmpty ( ) const

inline

remove()

void FilePersistence::Conflicts::remove ( MergeChange *  changeA, MergeChange *  changeB  )

inline

removeAll()

void FilePersistence::Conflicts::removeAll

(

MergeChange *

change

)

Member Data Documentation

changes_

const QList<MergeChange*>& FilePersistence::Conflicts::changes_

private

changesForChildren_

const QMultiHash<Model::NodeIdType, MergeChange*>& FilePersistence::Conflicts::changesForChildren_

private

changesForNode_

const QMultiHash<Model::NodeIdType, MergeChange*>& FilePersistence::Conflicts::changesForNode_

private

directConflicts_

QMultiHash<MergeChange*, MergeChange*> FilePersistence::Conflicts::directConflicts_

private