X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.h;h=40ecf5c23aec832a42f3108782bfb9a2a2609341;hb=eeaea7cbbb98141c98c189751907a8fc0b10f7d4;hp=2467cbc59251676e7f916cafda136b8ace1c7eee;hpb=154319d0635da7da3523519e28702e4a0ff85bba;p=lyx.git diff --git a/src/Compare.h b/src/Compare.h index 2467cbc592..40ecf5c23a 100644 --- a/src/Compare.h +++ b/src/Compare.h @@ -14,8 +14,6 @@ #include "Buffer.h" -#include "support/FileName.h" - #include #include #include @@ -24,7 +22,7 @@ namespace lyx { -/** +/** * The options that are used by the Comparison algorithm * and are set in the GuiCompare Dialog. */ @@ -34,7 +32,7 @@ public: CompareOptions() : settings_from_new(0) {} - + /// Copy the settings from the new or old document bool settings_from_new; }; @@ -91,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_;