X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCompare.h;h=47f70a12abc9153ff2ebc0441e19a4d041a975d0;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=cb2f2706ab97d4ba684f0597e5b3e991fd0ab362;hpb=36a874529131375f65255e7b21fdc1fc66056818;p=lyx.git diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h index cb2f2706ab..47f70a12ab 100644 --- a/src/frontends/qt4/GuiCompare.h +++ b/src/frontends/qt4/GuiCompare.h @@ -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_; };