DiffModel Class Reference

TODO: rewrite doc A data model representing a 2-way or 3-way diff. More...

#include <DiffModel.h++>

Inheritance diagram for DiffModel:

Signals
void	objectChanged ()
	Emitted when the object has changed in some way. More...

Public Member Functions
	DiffModel ()
	~DiffModel ()
void	diff2 (const QString &baseText, const QString &yoursText)
void	diff3 (const QString &theirsText, const QString &baseText, const QString &yoursText)
void	setTheirsConflictMarker (const QString &marker)
void	setBaseConflictMarker (const QString &marker)
void	setYoursConflictMarker (const QString &marker)
void	setEndConflictMarker (const QString &marker)
int	sequenceLength (DiffRole role) const
bool	isTwoWay () const
bool	isThreeWay () const
bool	isEmpty () const
void	clear ()
const QVector< DiffChunk * > *	diffChunks () const
const DiffChunk *	chunkForIndex (DiffRole role, int index) const
bool	outputMerge (QTextStream &stream, DiffCounts *counts) const
void	outputEdScript (DiffRole source, DiffRole destination, QTextStream &stream) const
void	setRecursiveDiff (bool recursiveDiff)
void	setAggressiveMerge (bool aggressiveMerge)
void	dump (DiffDirection diffDir) const
void	notifyChanged ()
	Emits the objectChanged() signal. More...

Detailed Description

TODO: rewrite doc A data model representing a 2-way or 3-way diff.

Encapsulates access to the diff and merge engines.

Constructor & Destructor Documentation

DiffModel()

DiffModel

(

)

~DiffModel()

~DiffModel

(

)

Member Function Documentation

chunkForIndex()

const DiffChunk* chunkForIndex	(	DiffRole	role,
		int	index
	)		const

clear()

void clear

(

)

diff2()

void diff2	(	const QString &	baseText,
		const QString &	yoursText
	)

diff3()

void diff3	(	const QString &	theirsText,
		const QString &	baseText,
		const QString &	yoursText
	)

diffChunks()

const QVector<DiffChunk*>* diffChunks

(

)

const

dump()

void dump

(

DiffDirection

diffDir

)

const

isEmpty()

bool isEmpty

(

)

const

isThreeWay()

bool isThreeWay

(

)

const

isTwoWay()

bool isTwoWay

(

)

const

notifyChanged()

void notifyChanged ( )

inherited

Emits the objectChanged() signal.

objectChanged

void objectChanged ( )

signalinherited

Emitted when the object has changed in some way.

outputEdScript()

void outputEdScript	(	DiffRole	source,
		DiffRole	destination,
		QTextStream &	stream
	)		const

outputMerge()

bool outputMerge	(	QTextStream &	stream,
		DiffCounts *	counts
	)		const

sequenceLength()

int sequenceLength

(

DiffRole

role

)

const

setAggressiveMerge()

void setAggressiveMerge ( bool  aggressiveMerge )

inline

setBaseConflictMarker()

void setBaseConflictMarker ( const QString &  marker )

inline

setEndConflictMarker()

void setEndConflictMarker ( const QString &  marker )

inline

setRecursiveDiff()

void setRecursiveDiff ( bool  recursiveDiff )

inline

setTheirsConflictMarker()

void setTheirsConflictMarker ( const QString &  marker )

inline

setYoursConflictMarker()

void setYoursConflictMarker ( const QString &  marker )

inline

---

The documentation for this class was generated from the following file:

• DiffModel.h++