X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.h;h=1c93fb58cee64c17ca8f0a1dfd7ce3a58ecee5c4;hb=e4b80698be91708ce1b9fd86d6032245ef4f3dc7;hp=c1956c13ccbb0207f187a8a0aa2283a9d735fcf2;hpb=183b188ebe3489aebb372c00818afaab870cf4b8;p=lyx.git diff --git a/src/Compare.h b/src/Compare.h index c1956c13cc..1c93fb58ce 100644 --- a/src/Compare.h +++ b/src/Compare.h @@ -12,8 +12,6 @@ #ifndef COMPARE_H #define COMPARE_H -#include "Buffer.h" - #include #include #include @@ -22,7 +20,9 @@ namespace lyx { -/** +class Buffer; + +/** * The options that are used by the Comparison algorithm * and are set in the GuiCompare Dialog. */ @@ -32,7 +32,7 @@ public: CompareOptions() : settings_from_new(0) {} - + /// Copy the settings from the new or old document bool settings_from_new; }; @@ -89,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_;