X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCompare.h;h=47f70a12abc9153ff2ebc0441e19a4d041a975d0;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=5ec8a18dadda3eea6393be8239e61b1111a766b0;hpb=0e4d0ad7e99832c292bd6a909a104a8f8140ba5b;p=lyx.git

diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h
index 5ec8a18dad..47f70a12ab 100644
--- a/src/frontends/qt4/GuiCompare.h
+++ b/src/frontends/qt4/GuiCompare.h
@@ -16,6 +16,8 @@
 #include "ui_CompareUi.h"
 #include "qt_helpers.h"
 
+#include "Compare.h"
+
 namespace lyx {
 namespace frontend {
 
@@ -37,18 +39,22 @@ private Q_SLOTS:
 	///
 	void slotCancel();
 	///
-	void change_adaptor();
+	void changeAdaptor();
 	///
-	void select_newfile();
+	void selectNewFile();
 	///
-	void select_oldfile();
+	void selectOldFile();
 
+	///
+	void error();
 	///
 	void finished(bool aborted);
 	///
-	void nextIt(int);
+	void progress(int);
+	///
+	void progressMax(int) const;
 	///
-	void progress_max(int) const;
+	void setStatusMessage(QString);
 
 private:
 	///
@@ -68,7 +74,7 @@ private:
 
 
 	/// enable or disable all controls and rename the Close/Cancel button
-	void enableControls(bool enable) const;
+	void enableControls(bool enable);
 	
 	/// browse for a file
 	QString browse(QString const & in_name) const;
@@ -79,15 +85,15 @@ private:
 	int run();
 
 private:
+	/// the object that will do the comparison
+	Compare * compare_;
+
 	/// the buffer that will contain the result
 	Buffer * dest_buffer_;
 	/// the buffer that will contain the result
 	Buffer const * old_buffer_;
 	/// the buffer that will contain the result
 	Buffer const * new_buffer_;
-
-	/// the window title
-	mutable QString window_title_;
 };