* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h
index 4b4c7e494c6778524a6513c7162eb23a36b95a19..47f70a12abc9153ff2ebc0441e19a4d041a975d0 100644 (file)
--- a/src/frontends/qt4/GuiCompare.h
+++ b/src/frontends/qt4/GuiCompare.h
@@ -1,103 +1,104 @@
-// -*- C++ -*-\r
-/**\r
- * \file GuiCompare.h\r
- * This file is part of LyX, the document processor.\r
- * Licence details can be found in the file COPYING.\r
- *\r
- * \author Vincent van Ravesteijn\r
- *\r
- * Full author contact details are available in file CREDITS.\r
- */\r
-\r
-#ifndef GUICOMPARE_H\r
-#define GUICOMPARE_H\r
-\r
-#include "GuiDialog.h"\r
-#include "ui_CompareUi.h"\r
-#include "qt_helpers.h"\r
-\r
-#include "Compare.h"\r
-\r
-namespace lyx {\r
-namespace frontend {\r
-\r
-\r
-class GuiCompare : public GuiDialog, public Ui::CompareUi\r
-{\r
-       Q_OBJECT\r
-\r
-public:\r
-       ///\r
-       GuiCompare(GuiView & lv);\r
-       ~GuiCompare();\r
-\r
-       void closeEvent(QCloseEvent *);\r
-               \r
-private Q_SLOTS:\r
-       ///\r
-       void slotOK();\r
-       ///\r
-       void slotCancel();\r
-       ///\r
-       void change_adaptor();\r
-       ///\r
-       void select_newfile();\r
-       ///\r
-       void select_oldfile();\r
-\r
-       ///\r
-       void finished(bool aborted);\r
-       ///\r
-       void nextIt(int);\r
-       ///\r
-       void progress_max(int) const;\r
-\r
-private:\r
-       ///\r
-       void updateContents();\r
-       ///\r
-       bool isValid();\r
-       ///\r
-       bool initialiseParams(std::string const &) { return true; }\r
-       ///\r
-       bool isBufferDependent() const { return false; }\r
-       ///\r
-       void clearParams() {}\r
-       ///\r
-       void dispatchParams() {}\r
-       ///\r
-       void apply() {}\r
-\r
-\r
-       /// enable or disable all controls and rename the Close/Cancel button\r
-       void enableControls(bool enable) const;\r
-       \r
-       /// browse for a file\r
-       QString browse(QString const & in_name) const;\r
-       /// retrieve the buffer from the specified filename\r
-       Buffer const * bufferFromFileName(std::string const & file) const;\r
-\r
-       /// create the compare object and run the comparison\r
-       int run();\r
-\r
-private:\r
-       /// the object that will do the comparison\r
-       Compare * compare_;\r
-\r
-       /// the buffer that will contain the result\r
-       Buffer * dest_buffer_;\r
-       /// the buffer that will contain the result\r
-       Buffer const * old_buffer_;\r
-       /// the buffer that will contain the result\r
-       Buffer const * new_buffer_;\r
-\r
-       /// the window title\r
-       mutable QString window_title_;\r
-};\r
-\r
-\r
-\r
-} // namespace frontend\r
-} // namespace lyx\r
-\r
-#endif // GUICOMPARE_H\r
+// -*- C++ -*-
+/**
+ * \file GuiCompare.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Vincent van Ravesteijn
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef GUICOMPARE_H
+#define GUICOMPARE_H
+
+#include "GuiDialog.h"
+#include "ui_CompareUi.h"
+#include "qt_helpers.h"
+
+#include "Compare.h"
+
+namespace lyx {
+namespace frontend {
+
+
+class GuiCompare : public GuiDialog, public Ui::CompareUi
+{
+       Q_OBJECT
+
+public:
+       ///
+       GuiCompare(GuiView & lv);
+       ~GuiCompare();
+
+       void closeEvent(QCloseEvent *);
+               
+private Q_SLOTS:
+       ///
+       void slotOK();
+       ///
+       void slotCancel();
+       ///
+       void changeAdaptor();
+       ///
+       void selectNewFile();
+       ///
+       void selectOldFile();
+
+       ///
+       void error();
+       ///
+       void finished(bool aborted);
+       ///
+       void progress(int);
+       ///
+       void progressMax(int) const;
+       ///
+       void setStatusMessage(QString);
+
+private:
+       ///
+       void updateContents();
+       ///
+       bool isValid();
+       ///
+       bool initialiseParams(std::string const &) { return true; }
+       ///
+       bool isBufferDependent() const { return false; }
+       ///
+       void clearParams() {}
+       ///
+       void dispatchParams() {}
+       ///
+       void apply() {}
+
+
+       /// enable or disable all controls and rename the Close/Cancel button
+       void enableControls(bool enable);
+       
+       /// browse for a file
+       QString browse(QString const & in_name) const;
+       /// retrieve the buffer from the specified filename
+       Buffer const * bufferFromFileName(std::string const & file) const;
+
+       /// create the compare object and run the comparison
+       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_;
+};
+
+
+
+} // namespace frontend
+} // namespace lyx
+
+#endif // GUICOMPARE_H