diff --git a/src/citron/updater/updater_dialog.cpp b/src/citron/updater/updater_dialog.cpp index 42a93926d..d3157d1f8 100644 --- a/src/citron/updater/updater_dialog.cpp +++ b/src/citron/updater/updater_dialog.cpp @@ -361,7 +361,16 @@ namespace Updater { struct UpdateInfo {}; class UpdaterService { public: - enum class UpdateResult { Success }; + enum class UpdateResult { + Success, + Failed, + Cancelled, + NetworkError, + ExtractionError, + PermissionError, + InvalidArchive, + NoUpdateAvailable + }; }; } @@ -374,11 +383,7 @@ void UpdaterDialog::ShowUpdateChecking() {} void UpdaterDialog::OnUpdateCheckCompleted(bool, const Updater::UpdateInfo&) {} void UpdaterDialog::OnUpdateDownloadProgress(int, qint64, qint64) {} void UpdaterDialog::OnUpdateInstallProgress(int, const QString&) {} -#ifdef _WIN32 void UpdaterDialog::OnUpdateCompleted(Updater::UpdaterService::UpdateResult, const QString&) {} -#else -void UpdaterDialog::OnUpdateCompleted(int, const QString&) {} -#endif void UpdaterDialog::OnUpdateError(const QString&) {} void UpdaterDialog::OnDownloadButtonClicked() {} void UpdaterDialog::OnCancelButtonClicked() {} @@ -395,11 +400,7 @@ void UpdaterDialog::ShowErrorState() {} void UpdaterDialog::UpdateDownloadProgress(int, qint64, qint64) {} void UpdaterDialog::UpdateInstallProgress(int, const QString&) {} QString UpdaterDialog::FormatBytes(qint64) const { return QString(); } -#ifdef _WIN32 QString UpdaterDialog::GetUpdateMessage(Updater::UpdaterService::UpdateResult) const { return QString(); } -#else -QString UpdaterDialog::GetUpdateMessage(int) const { return QString(); } -#endif #include "updater_dialog.moc" diff --git a/src/citron/updater/updater_dialog.h b/src/citron/updater/updater_dialog.h index 48489208e..6a3edde19 100644 --- a/src/citron/updater/updater_dialog.h +++ b/src/citron/updater/updater_dialog.h @@ -18,7 +18,19 @@ // Forward declarations for non-Windows platforms namespace Updater { struct UpdateInfo; -class UpdaterService; +class UpdaterService { +public: + enum class UpdateResult { + Success, + Failed, + Cancelled, + NetworkError, + ExtractionError, + PermissionError, + InvalidArchive, + NoUpdateAvailable + }; +}; } #endif @@ -46,11 +58,7 @@ private slots: void OnUpdateCheckCompleted(bool has_update, const Updater::UpdateInfo& update_info); void OnUpdateDownloadProgress(int percentage, qint64 bytes_received, qint64 bytes_total); void OnUpdateInstallProgress(int percentage, const QString& current_file); -#ifdef _WIN32 void OnUpdateCompleted(Updater::UpdaterService::UpdateResult result, const QString& message); -#else - void OnUpdateCompleted(int result, const QString& message); -#endif void OnUpdateError(const QString& error_message); void OnDownloadButtonClicked(); @@ -72,11 +80,7 @@ private: void UpdateInstallProgress(int percentage, const QString& current_file); QString FormatBytes(qint64 bytes) const; -#ifdef _WIN32 QString GetUpdateMessage(Updater::UpdaterService::UpdateResult result) const; -#else - QString GetUpdateMessage(int result) const; -#endif private: #ifdef _WIN32