diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-10-19 11:57:37 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-10-19 11:57:37 +0300 |
| commit | df135a0bb258b673977003421f5ea2f23b7c14e7 (patch) | |
| tree | aa4973eeea8784700cf8b1a0f8732ef2f3760394 /src/gui/updater | |
| parent | b5e75afc171f79a3fa97dee438dde997e27a5558 (diff) | |
| parent | b7c927f34915fde9433aba6419c044e8885200cc (diff) | |
Merge branch '2.0'
Conflicts:
src/gui/folder.cpp
Diffstat (limited to 'src/gui/updater')
| -rw-r--r-- | src/gui/updater/updater.cpp | 5 | ||||
| -rw-r--r-- | src/gui/updater/updater.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp index d9d0a669d..6794e5909 100644 --- a/src/gui/updater/updater.cpp +++ b/src/gui/updater/updater.cpp @@ -126,9 +126,4 @@ QString Updater::clientVersion() return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_FULL)); } -int Updater::downloadState() const -{ - return instance()->downloadState(); -} - } // namespace OCC diff --git a/src/gui/updater/updater.h b/src/gui/updater/updater.h index 746120a19..6f3c35256 100644 --- a/src/gui/updater/updater.h +++ b/src/gui/updater/updater.h @@ -32,9 +32,6 @@ public: virtual void checkForUpdate() = 0; virtual void backgroundCheckForUpdate() = 0; - - int downloadState() const; - virtual bool handleStartup() = 0; protected: |