24#ifndef KICAD_DIFF_MERGE_DISPATCH_H
25#define KICAD_DIFF_MERGE_DISPATCH_H
54 int aCurrentVersion );
65 const wxString& aOurs,
const wxString& aTheirs,
66 const wxString& aOutput,
bool aInteractive,
bool aSingleFile,
67 REPORTER* aReporter );
78 const wxString& aFileB,
const wxString& aLabelA,
79 const wxString& aLabelB, wxWindow* aParent,
80 REPORTER* aReporter =
nullptr );
Keeps the documents drawn on a pair of diff canvases alive.
virtual ~DIFF_CANVAS_CONTEXT()=default
A minimalistic software bus for communications between various DLLs/DSOs (DSOs) within the same KiCad...
A pure virtual class used to derive REPORTER objects from.
wxString OlderFormatNotice(int aAncestorVersion, int aOursVersion, int aTheirsVersion, int aCurrentVersion)
Empty when every side is already in the current file format.
std::unique_ptr< DIFF_CANVAS_CONTEXT > DispatchAttachDiffCanvases(KIWAY &aKiway, DOC_KIND aKind, const wxString &aFileA, const wxString &aFileB, WIDGET_DIFF_CANVAS &aBefore, WIDGET_DIFF_CANVAS &aAfter, DOCUMENT_DIFF &aDiff, REPORTER *aReporter)
Diff two files in the owning kiface through its KIFACE_ATTACH_DIFF_CANVASES export.
int DispatchMerge(KIWAY &aKiway, DOC_KIND aKind, const wxString &aAncestor, const wxString &aOurs, const wxString &aTheirs, const wxString &aOutput, bool aInteractive, bool aSingleFile, REPORTER *aReporter)
Run a 3-way document/library merge by calling the owning kiface's KIFACE_MERGE_DOCUMENT function expo...
DOC_KIND
Document type a diff/merge entry point should route to, derived from a file path's extension.
int DispatchOpenDiffDialog(KIWAY &aKiway, DOC_KIND aKind, const wxString &aFileA, const wxString &aFileB, const wxString &aLabelA, const wxString &aLabelB, wxWindow *aParent, REPORTER *aReporter)
Open DIALOG_KICAD_DIFF on two files by calling the owning kiface's KIFACE_OPEN_DIFF_DIALOG function e...
The full set of changes between two parsed documents of one type.