Merge with branch1.2

1 files changed, 4 insertions, 1 deletions

diff --git a/src/selfupdater.h b/src/selfupdater.h
index 5877e1ec..b5bbc406 100644
--- a/src/selfupdater.h
+++ b/src/selfupdater.h
@@ -65,10 +65,12 @@ public:
    * @param parent parent widget

    * @todo passing the nexus interface is unneccessary

    **/

-  SelfUpdater(NexusInterface *nexusInterface, QWidget *parent);

+  SelfUpdater(NexusInterface *nexusInterface);

 

   virtual ~SelfUpdater();

 

+  void setUserInterface(QWidget *widget);

+

   /**

    * @brief start the update process

    * @note this should not be called if there is no update available

@@ -118,6 +120,7 @@ private:
   void updateProgressFile(LPCWSTR fileName);

   void report7ZipError(LPCWSTR errorMessage);

   QString retrieveNews(const QString &description);

+  void showProgress();

 

 private slots: