]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiCompare.h
* fix spelling in comments to please John.
[lyx.git] / src / frontends / qt4 / GuiCompare.h
index cb2f2706ab97d4ba684f0597e5b3e991fd0ab362..47f70a12abc9153ff2ebc0441e19a4d041a975d0 100644 (file)
@@ -39,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:
        ///
@@ -70,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;
@@ -90,9 +94,6 @@ private:
        Buffer const * old_buffer_;
        /// the buffer that will contain the result
        Buffer const * new_buffer_;
-
-       /// the window title
-       mutable QString window_title_;
 };