From ff711a132281eefacd0b540f87476d14b39fd052 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Mon, 2 Sep 2024 10:20:40 +0300 Subject: [PATCH] [win-linux] updmanager: small refactoring --- win-linux/src/cupdatemanager.cpp | 9 ++------- win-linux/src/cupdatemanager.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/win-linux/src/cupdatemanager.cpp b/win-linux/src/cupdatemanager.cpp index d527df2f4..3278b68da 100644 --- a/win-linux/src/cupdatemanager.cpp +++ b/win-linux/src/cupdatemanager.cpp @@ -721,11 +721,6 @@ void CUpdateManager::setServiceLang(QString lang) CLogger::log("Cannot set service language to: " + lang); } -QString CUpdateManager::getVersion() const -{ - return m_packageData->version; -} - void CUpdateManager::onLoadUpdateFinished(const QString &filePath) { if (getFileHash(filePath) != m_packageData->hash) { @@ -961,7 +956,7 @@ void CUpdateManager::showUpdateMessage(QWidget *parent) { "To install updates, you can download the required package from the official website."); int result = WinDlg::showDialog(parent, tr("Update is available"), QString("%1\n%2: %3\n%4: %5\n%6 (%7 MB)").arg(name, tr("Current version"), - curr_version, tr("New version"), getVersion(), + curr_version, tr("New version"), m_packageData->version, text, m_packageData->fileSize), WinDlg::DlgBtns::mbSkipRemindDownload); __UNLOCK @@ -990,7 +985,7 @@ void CUpdateManager::showStartInstallMessage(QWidget *parent) getFileVersion(QStrToTStr(qApp->applicationDirPath()) + DAEMON_NAME); int result = WinDlg::showDialog(parent, tr("Update is ready to install"), QString("%1\n%2: %3\n%4: %5\n%6").arg(name, tr("Current version"), - curr_version, tr("New version"), getVersion(), + curr_version, tr("New version"), m_packageData->version, tr("To finish updating, restart the app")), WinDlg::DlgBtns::mbInslaterRestart); __UNLOCK diff --git a/win-linux/src/cupdatemanager.h b/win-linux/src/cupdatemanager.h index df6e89095..a75b1ef7b 100644 --- a/win-linux/src/cupdatemanager.h +++ b/win-linux/src/cupdatemanager.h @@ -88,7 +88,6 @@ public: void cancelLoading(); void skipVersion(); int getUpdateMode(); - QString getVersion() const; void handleAppClose(); void loadUpdates(); void installUpdates();