X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.h;h=40ecf5c23aec832a42f3108782bfb9a2a2609341;hb=e75fa6f3ac5735dfcd588acb5c187556bface16d;hp=f07ecea714280060348179115aebe8e0b15ef1fe;hpb=a4e03846cd4a5c369548e0913994e5f482a83277;p=lyx.git diff --git a/src/Compare.h b/src/Compare.h index f07ecea714..40ecf5c23a 100644 --- a/src/Compare.h +++ b/src/Compare.h @@ -14,19 +14,15 @@ #include "Buffer.h" -#include "support/FileName.h" - #include #include #include #include -#include - namespace lyx { -/** +/** * 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_;