diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-06-01 17:48:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-06-01 17:48:11 +0300 |
commit | 6b15e62c1fefe8838bbc56cb314f3ab24ccebbc4 (patch) | |
tree | d158a975756cdd5983632af8ff34229dbb9007d9 /src/gui/windows | |
parent | 41d9ca028de0740fd23a3dabaece8d1fd1bf93c1 (diff) | |
download | manaplus-6b15e62c1fefe8838bbc56cb314f3ab24ccebbc4.tar.gz manaplus-6b15e62c1fefe8838bbc56cb314f3ab24ccebbc4.tar.bz2 manaplus-6b15e62c1fefe8838bbc56cb314f3ab24ccebbc4.tar.xz manaplus-6b15e62c1fefe8838bbc56cb314f3ab24ccebbc4.zip |
Convert DownloadStatus enum into strong typed enum.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/serverdialog.cpp | 6 | ||||
-rw-r--r-- | src/gui/windows/serverdialog.h | 6 | ||||
-rw-r--r-- | src/gui/windows/updaterwindow.cpp | 6 | ||||
-rw-r--r-- | src/gui/windows/updaterwindow.h | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 26b12b0d1..8bd1dceb3 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -701,8 +701,10 @@ void ServerDialog::saveCustomServers(const ServerInfo ¤tServer, config.setValue("MostUsedServerName" + toString(savedServerCount), ""); } -int ServerDialog::downloadUpdate(void *ptr, DownloadStatus::Type status, - size_t total, size_t remaining) +int ServerDialog::downloadUpdate(void *ptr, + DownloadStatusT status, + size_t total, + size_t remaining) { if (!ptr || status == DownloadStatus::Cancelled) return -1; diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index e64177591..59105dd47 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -118,8 +118,10 @@ class ServerDialog final : public Window, bool needUpdateServers() const; - static int downloadUpdate(void *ptr, DownloadStatus::Type status, - size_t total, size_t remaining); + static int downloadUpdate(void *ptr, + DownloadStatusT status, + size_t total, + size_t remaining); Mutex mMutex; ServerInfos mServers; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 1a6a75093..b8ead9549 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -478,8 +478,10 @@ void UpdaterWindow::loadPatch() mScrollArea->setVerticalScrollAmount(0); } -int UpdaterWindow::updateProgress(void *ptr, DownloadStatus::Type status, - size_t dt, size_t dn) +int UpdaterWindow::updateProgress(void *ptr, + DownloadStatusT status, + size_t dt, + size_t dn) { UpdaterWindow *const uw = reinterpret_cast<UpdaterWindow *>(ptr); if (!uw) diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index 93922a7a9..06f707528 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -158,8 +158,10 @@ class UpdaterWindow final : public Window, /** * A download callback for progress updates. */ - static int updateProgress(void *ptr, DownloadStatus::Type status, - size_t dt, size_t dn); + static int updateProgress(void *ptr, + DownloadStatusT status, + size_t dt, + size_t dn); /** * A libcurl callback for writing to memory. |