X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.h;h=df2c7facd53f24f02f155e4bced14cdb732f26cc;hb=1d637b8af0f76d7c758db91ee3a196306f861a21;hp=2467cbc59251676e7f916cafda136b8ace1c7eee;hpb=154319d0635da7da3523519e28702e4a0ff85bba;p=lyx.git diff --git a/src/Compare.h b/src/Compare.h index 2467cbc592..df2c7facd5 100644 --- a/src/Compare.h +++ b/src/Compare.h @@ -12,10 +12,6 @@ #ifndef COMPARE_H #define COMPARE_H -#include "Buffer.h" - -#include "support/FileName.h" - #include #include #include @@ -24,7 +20,9 @@ namespace lyx { -/** +class Buffer; + +/** * The options that are used by the Comparison algorithm * and are set in the GuiCompare Dialog. */ @@ -32,11 +30,13 @@ class CompareOptions { public: /// CompareOptions() - : settings_from_new(0) + : settings_from_new(0), author(0) {} - + /// Copy the settings from the new or old document bool settings_from_new; + /// Author id for change tracking + bool author; }; /** @@ -91,14 +91,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_;