Update Win installer for new dictionary links. Untested.

[lyx.git] / src / Compare.h

diff --git a/src/Compare.h b/src/Compare.h
index f2583aebaa87346b42c29091fed9a9090ff12ca4..df2c7facd53f24f02f155e4bced14cdb732f26cc 100644 (file)
--- a/src/Compare.h
+++ b/src/Compare.h
@@ -12,20 +12,17 @@
 #ifndef COMPARE_H
 #define COMPARE_H
 
-#include "Buffer.h"
-
-#include "support/FileName.h"
-
-#include <string>
-
 #include <QObject>
 #include <QThread>
+#include <QTimer>
 #include <QWaitCondition>
 
 
 namespace lyx {
 
-/** 
+class Buffer;
+
+/**
  * The options that are used by the Comparison algorithm
  * and are set in the GuiCompare Dialog.
  */
@@ -33,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;
 };
 
 /**
@@ -73,8 +72,15 @@ Q_SIGNALS:
        /// Sets the maximum value of the progress bar in the dialog.
        void progressMax(int max) const;
 
+       /// A message describing the process
+       void statusMessage(QString msg) const;
+
+public Q_SLOTS:
+       /// Emits the status message signal
+       void doStatusMessage();
+
 public:
-       /// QThread inherited methods
+       /// \name QThread inherited methods
        //@{
        void run();
        //@}
@@ -85,20 +91,23 @@ 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_;
 
        ///
        QWaitCondition condition_;
 
+       /// Emit a statusMessage signal from time to time
+       QTimer status_timer_;
+
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
        ///