X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCompare.h;h=1c93fb58cee64c17ca8f0a1dfd7ce3a58ecee5c4;hb=33b7088719c3c72e81483e3a82a321971403f505;hp=f07ecea714280060348179115aebe8e0b15ef1fe;hpb=a4e03846cd4a5c369548e0913994e5f482a83277;p=lyx.git diff --git a/src/Compare.h b/src/Compare.h index f07ecea714..1c93fb58ce 100644 --- a/src/Compare.h +++ b/src/Compare.h @@ -12,21 +12,17 @@ #ifndef COMPARE_H #define COMPARE_H -#include "Buffer.h" - -#include "support/FileName.h" - #include #include #include #include -#include - namespace lyx { -/** +class Buffer; + +/** * The options that are used by the Comparison algorithm * and are set in the GuiCompare Dialog. */ @@ -36,7 +32,7 @@ public: CompareOptions() : settings_from_new(0) {} - + /// Copy the settings from the new or old document bool settings_from_new; }; @@ -93,14 +89,14 @@ public: private: /// Starts the comparison algorithm int doCompare(); - + /// The new document's buffer Buffer const * const new_buffer; /// The old document's buffer Buffer const * const old_buffer; /// The buffer with the differences marked with track changes Buffer * const dest_buffer; - + /// The options that are set in the GuiCompare dialog CompareOptions options_;