Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiCompare.h

diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h
index cb2f2706ab97d4ba684f0597e5b3e991fd0ab362..c6f8eaa26de8377aed6c4d0fe362ca0948bc325d 100644 (file)
--- 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 {
 
 
@@ -32,25 +33,31 @@ public:
        ~GuiCompare();
 
        void closeEvent(QCloseEvent *);
-               
+
 private Q_SLOTS:
        ///
        void slotOK();
        ///
        void slotCancel();
        ///
-       void change_adaptor();
+       void slotButtonBox(QAbstractButton *);
        ///
-       void select_newfile();
+       void changeAdaptor();
        ///
-       void select_oldfile();
+       void selectNewFile();
+       ///
+       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 +65,7 @@ private:
        ///
        bool isValid();
        ///
-       bool initialiseParams(std::string const &) { return true; }
+       bool initialiseParams(std::string const &);
        ///
        bool isBufferDependent() const { return false; }
        ///
@@ -70,8 +77,8 @@ 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;
        /// retrieve the buffer from the specified filename
@@ -90,9 +97,6 @@ private:
        Buffer const * old_buffer_;
        /// the buffer that will contain the result
        Buffer const * new_buffer_;
-
-       /// the window title
-       mutable QString window_title_;
 };