refs #509,renamed CDownload to CUpdateInfo

* as discussed in meeting
* follow up adjustments (file renaming, msg. renaming)
This commit is contained in:
Klaus Basan
2015-11-19 03:12:03 +01:00
parent 502b41ff96
commit 025457c43b
14 changed files with 86 additions and 86 deletions

View File

@@ -11,7 +11,7 @@
#include "ui_swiftlauncher.h"
#include "blackgui/stylesheetutility.h"
#include "blackcore/dbus_server.h"
#include "blackcore/data/download.h"
#include "blackcore/data/updateinfo.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/icons.h"
#include "blackmisc/project.h"
@@ -259,9 +259,9 @@ void CSwiftLauncher::ps_loadSetup()
void CSwiftLauncher::ps_loadedSetup()
{
CDownload download(this->m_download.get());
QString latestVersion(download.getLatestVersion()) ; // need to get this from somewhere
CUrlList downloadUrls(download.getDownloadUrls());
CUpdateInfo updateInfo(this->m_updateInfo.get());
QString latestVersion(updateInfo.getLatestVersion()) ; // need to get this from somewhere
CUrlList downloadUrls(updateInfo.getDownloadUrls());
bool newVersionAvailable = CProject::isNewerVersion(latestVersion) && !downloadUrls.isEmpty();
this->ui->wi_NewVersionAvailable->setVisible(newVersionAvailable);
this->ui->wi_NoNewVersion->setVisible(!newVersionAvailable);

View File

@@ -59,7 +59,7 @@ protected:
private:
QScopedPointer<Ui::CSwiftLauncher> ui;
BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup { this, &CSwiftLauncher::ps_loadedSetup }; //!< setup cache
BlackCore::CData<BlackCore::Data::Download> m_download { this, &CSwiftLauncher::ps_loadedSetup };
BlackCore::CData<BlackCore::Data::UpdateInfo> m_updateInfo { this, &CSwiftLauncher::ps_loadedSetup };
QString m_executable;
QStringList m_executableArgs;