diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2020-06-01 21:48:52 +0200 |
|---|---|---|
| committer | Mikaël Capelle <capelle.mikael@gmail.com> | 2020-06-01 21:48:52 +0200 |
| commit | 30361186c14d43b9fa72b7dc4d6ceaf1c3f57868 (patch) | |
| tree | 5ba2f28d81ed95004dc8385d7e9d71d0b8049d59 /src | |
| parent | 2c20a4115d0fdc4ce81787d8d78bd06fbf838b25 (diff) | |
Update installation manager after namespace changes in archive.
Diffstat (limited to 'src')
| -rw-r--r-- | src/installationmanager.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index d2262d13..0a97225e 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -90,17 +90,18 @@ InstallationManager::InstallationManager() throw MyException(getErrorString(m_ArchiveHandler->getLastError())); } m_ArchiveHandler->setLogCallback([](auto level, auto const& message) { + using LogLevel = ArchiveCallbacks::LogLevel; switch (level) { - case NArchive::LogLevel::Debug: + case LogLevel::Debug: log::debug("{}", message); break; - case NArchive::LogLevel::Info: + case LogLevel::Info: log::info("{}", message); break; - case NArchive::LogLevel::Warning: + case LogLevel::Warning: log::warn("{}", message); break; - case NArchive::LogLevel::Error: + case LogLevel::Error: log::error("{}", message); break; } @@ -169,11 +170,11 @@ bool InstallationManager::extractFiles(QString extractPath, QString title, bool QString errorMessage; // The callbacks: - ProgressCallback progressCallback = [&progress](float p) { progress = static_cast<int>(p * 100.0); }; - FileChangeCallback fileChangeCallback = [&progressFile](std::wstring const& file) { + ArchiveCallbacks::ProgressCallback progressCallback = [&progress](float p) { progress = static_cast<int>(p * 100.0); }; + ArchiveCallbacks::FileChangeCallback fileChangeCallback = [&progressFile](std::wstring const& file) { progressFile = QString::fromStdWString(file); }; - ErrorCallback errorCallback = [&errorMessage, this](std::wstring const& message) { + ArchiveCallbacks::ErrorCallback errorCallback = [&errorMessage, this](std::wstring const& message) { m_ArchiveHandler->cancel(); errorMessage = QString::fromStdWString(message); }; |
