X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCompare.h;h=025d2da9895caa8680384935aef7e0c8dd820005;hb=1f10969bb5c5f36017bf5ba8671381b09945cf57;hp=cb2f2706ab97d4ba684f0597e5b3e991fd0ab362;hpb=36a874529131375f65255e7b21fdc1fc66056818;p=lyx.git

diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h
index cb2f2706ab..025d2da989 100644
--- a/src/frontends/qt4/GuiCompare.h
+++ b/src/frontends/qt4/GuiCompare.h
@@ -13,12 +13,13 @@
 #define GUICOMPARE_H
 
 #include "GuiDialog.h"
-#include "ui_CompareUi.h"
-#include "qt_helpers.h"
 
-#include "Compare.h"
+#include "ui_CompareUi.h"
 
 namespace lyx {
+
+class Compare;
+
 namespace frontend {
 
 
@@ -39,18 +40,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:
 	///
@@ -58,7 +63,7 @@ private:
 	///
 	bool isValid();
 	///
-	bool initialiseParams(std::string const &) { return true; }
+	bool initialiseParams(std::string const &);
 	///
 	bool isBufferDependent() const { return false; }
 	///
@@ -70,7 +75,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;
@@ -90,9 +95,6 @@ private:
 	Buffer const * old_buffer_;
 	/// the buffer that will contain the result
 	Buffer const * new_buffer_;
-
-	/// the window title
-	mutable QString window_title_;
 };