Reorder a bit status messages, but they are still cleared at the end of LyXFunc

[lyx.git] / src / Compare.h

diff --git a/src/Compare.h b/src/Compare.h
index 5458c5a3f2a5f8c6a6d9339c7cd440c6bb95f6ed..f2583aebaa87346b42c29091fed9a9090ff12ca4 100644 (file)
--- a/src/Compare.h
+++ b/src/Compare.h
@@ -60,8 +60,11 @@ public:
        }
 
 Q_SIGNALS:
+       /// The thread has finished due to an error.
+       void error() const;
+
        /// The thread has finished. If the thread is cancelled
-       /// by the user or due to an error \c aborted is true.
+       /// by the user \c aborted is true.
        void finished(bool aborted) const;
 
        /// Adds \c progress to the value of the progress bar in the dialog
@@ -83,12 +86,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_;