Fix oddly phrased string.

[lyx.git] / src / Compare.h

diff --git a/src/Compare.h b/src/Compare.h
index dff108e3adb5a2e02a6b5dcf60d5d7eaa86d1cf9..f07ecea714280060348179115aebe8e0b15ef1fe 100644 (file)
--- a/src/Compare.h
+++ b/src/Compare.h
@@ -16,12 +16,13 @@
 
 #include "support/FileName.h"
 
-#include <string>
-
 #include <QObject>
 #include <QThread>
+#include <QTimer>
 #include <QWaitCondition>
 
+#include <string>
+
 
 namespace lyx {
 
@@ -73,8 +74,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();
        //@}
@@ -86,12 +94,12 @@ private:
        /// Starts the comparison algorithm
        int doCompare();
        
-       /// The buffer with the differences marked with track changes
-       Buffer * const dest_buffer;
-       /// The old document's buffer
-       Buffer const * const old_buffer;
        /// 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_;
@@ -99,6 +107,9 @@ private:
        ///
        QWaitCondition condition_;
 
+       /// Emit a statusMessage signal from time to time
+       QTimer status_timer_;
+
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
        ///