X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.h;h=df2c7facd53f24f02f155e4bced14cdb732f26cc;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=f94761fc57628a2b7ff188a7927a61b47b4889de;hpb=d378b5d8ee962a66c28eb4a9f0c4d1be2d4f08f4;p=lyx.git

diff --git a/src/Compare.h b/src/Compare.h
index f94761fc57..df2c7facd5 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 <QObject>
 #include <QThread>
 #include <QTimer>
 #include <QWaitCondition>
 
-#include <string>
-
 
 namespace lyx {
 
-/** 
+class Buffer;
+
+/**
  * The options that are used by the Comparison algorithm
  * and are set in the GuiCompare Dialog.
  */
@@ -34,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;
 };
 
 /**
@@ -82,7 +80,7 @@ public Q_SLOTS:
 	void doStatusMessage();
 
 public:
-	/// QThread inherited methods
+	/// \name QThread inherited methods
 	//@{
 	void run();
 	//@}
@@ -93,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_;