automerge.h File Reference

#include <memory>
#include <QMap>
#include <QSettings>
#include <QString>
#include "Workspace/Application/textlogger.h"
#include "Tools/WorkflowComparison/itemdifference.h"
#include "Tools/WorkflowComparison/workflowtoolutil.h"

Include dependency graph for automerge.h:

This graph shows which files directly or indirectly include this file:

Classes
class	AutoMerge
struct	AutoMergeType

Namespaces
namespace	CSIRO
	Top level namespace for all Workspace code.
namespace	CSIRO::Tools

Typedefs
using	MergeCategory = DifferenceType

Enumerations
enum	AutoMergeDefaultResponse { AlwaysAccept , ConfirmIfPossible , AlwaysConfirm , AlwaysIgnore }
enum	AutoMergeRole {   UndeterminedRole = 0 , ItemAddedToOne , ItemAddedToBothSame , ItemAddedToBothDiff ,   ItemRemovedFromOne , ItemRemovedFromBoth , ItemEditedInOne , ItemEditedInBothSame ,   ItemEditedInBothDiff , ItemEditedInOneRemovedInOne , ItemMovedInOne , ItemMovedInBothSame ,   ItemMovedInBothDiff , CustomRole , AutoMergeRoleEnd }
enum	AutoMergeState {   AddedToWorkflow1Only = 0 , AddedToWorkflow2Only , AddedtoBothWorkflowsIdentically , AddedtoBothWorkflowsDifferently ,   RemovedFromWorkflow1UnchangedInWorkflow2 , RemovedFromWorkflow2UnchangedInWorkflow1 , RemovedFromWorkflow1ModifiedInWorkflow2 , RemovedFromWorkflow2ModifiedInWorkflow1 ,   RemovedFromBothWorkflows , ModifiedInWorkflow1UnchangedInWorkflow2 , ModifiedInWorkflow2UnchangedInWorkflow1 , ModifiedInBothWorkflowsIdentically ,   ModifiedInBothWorkflowsDifferently , Unchanged }