MergeProposal Class Reference

Holds the result of determining the type of change a "Difference" class represents, and its recommended merge result. More...

#include <Tools/WorkflowMerge/mergeproposal.h>

Public Member Functions
	MergeProposal (AutoMergeType type, MergeAction action, bool needsConfirmation, WorkflowChoice choice=WorkflowChoice_BothWorkflows)
	MergeProposal (const QString &tag, WorkflowChoice choice)
AutoMergeRole	role ()
void	setRole (AutoMergeRole role)
void	setType (const QString &tag, AutoMergeRole role)
void	setType (const QString &tag, const QString &name)

Public Attributes
MergeAction	action_
WorkflowChoice	choice_
bool	needsConfirmation_
AutoMergeType	type_

Detailed Description

Based on the auto merge setting for this type of difference

Constructor & Destructor Documentation

MergeProposal() [1/2]

MergeProposal	(	const QString &	tag,
		WorkflowChoice	choice
	)

MergeProposal() [2/2]

MergeProposal ( AutoMergeType  type, MergeAction  action, bool  needsConfirmation, WorkflowChoice  choice = WorkflowChoice_BothWorkflows  )

inline

Member Function Documentation

role()

AutoMergeRole role ( )

inline

setRole()

void setRole ( AutoMergeRole  role )

inline

setType() [1/2]

void setType ( const QString &  tag, AutoMergeRole  role  )

inline

setType() [2/2]

void setType ( const QString &  tag, const QString &  name  )

inline

Member Data Documentation

action_

MergeAction action_

choice_

WorkflowChoice choice_

needsConfirmation_

bool needsConfirmation_

type_

AutoMergeType type_