Changeset View
Changeset View
Standalone View
Standalone View
libdiscover/resources/StandardBackendUpdater.cpp
Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s) | 61 | { | |||
---|---|---|---|---|---|
62 | return !m_upgradeable.isEmpty(); | 62 | return !m_upgradeable.isEmpty(); | ||
63 | } | 63 | } | ||
64 | 64 | | |||
65 | void StandardBackendUpdater::start() | 65 | void StandardBackendUpdater::start() | ||
66 | { | 66 | { | ||
67 | m_settingUp = true; | 67 | m_settingUp = true; | ||
68 | emit progressingChanged(true); | 68 | emit progressingChanged(true); | ||
69 | setProgress(0); | 69 | setProgress(0); | ||
70 | auto upgradeList = m_toUpgrade.toList(); | 70 | auto upgradeList = m_toUpgrade.values(); | ||
71 | std::sort(upgradeList.begin(), upgradeList.end(), [](const AbstractResource* a, const AbstractResource* b){ return a->name() < b->name(); }); | 71 | std::sort(upgradeList.begin(), upgradeList.end(), [](const AbstractResource* a, const AbstractResource* b){ return a->name() < b->name(); }); | ||
72 | 72 | | |||
73 | const bool couldCancel = m_canCancel; | 73 | const bool couldCancel = m_canCancel; | ||
74 | foreach(AbstractResource* res, upgradeList) { | 74 | foreach(AbstractResource* res, upgradeList) { | ||
75 | m_pendingResources += res; | 75 | m_pendingResources += res; | ||
76 | auto t = m_backend->installApplication(res); | 76 | auto t = m_backend->installApplication(res); | ||
77 | t->setVisible(false); | 77 | t->setVisible(false); | ||
78 | t->setProperty("updater", QVariant::fromValue<QObject*>(this)); | 78 | t->setProperty("updater", QVariant::fromValue<QObject*>(this)); | ||
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Line(s) | |||||
212 | 212 | | |||
213 | int StandardBackendUpdater::updatesCount() const | 213 | int StandardBackendUpdater::updatesCount() const | ||
214 | { | 214 | { | ||
215 | return m_upgradeable.count(); | 215 | return m_upgradeable.count(); | ||
216 | } | 216 | } | ||
217 | 217 | | |||
218 | void StandardBackendUpdater::addResources(const QList< AbstractResource* >& apps) | 218 | void StandardBackendUpdater::addResources(const QList< AbstractResource* >& apps) | ||
219 | { | 219 | { | ||
220 | Q_ASSERT(m_upgradeable.contains(apps.toSet())); | 220 | #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) | ||
221 | m_toUpgrade += apps.toSet(); | 221 | const QSet<AbstractResource *> upgradeableApps(apps.begin(), apps.end()); | ||
222 | #else | ||||
223 | const QSet<AbstractResource *> upgradeableApps = apps.toSet(); | ||||
224 | #endif | ||||
225 | Q_ASSERT(m_upgradeable.contains(upgradeableApps)); | ||||
226 | m_toUpgrade += upgradeableApps; | ||||
222 | } | 227 | } | ||
223 | 228 | | |||
224 | void StandardBackendUpdater::removeResources(const QList< AbstractResource* >& apps) | 229 | void StandardBackendUpdater::removeResources(const QList< AbstractResource* >& apps) | ||
225 | { | 230 | { | ||
226 | Q_ASSERT(m_upgradeable.contains(apps.toSet())); | 231 | #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) | ||
227 | Q_ASSERT(m_toUpgrade.contains(apps.toSet())); | 232 | const QSet<AbstractResource *> upgradeableApps(apps.begin(), apps.end()); | ||
228 | m_toUpgrade -= apps.toSet(); | 233 | #else | ||
234 | const QSet<AbstractResource *> upgradeableApps = apps.toSet(); | ||||
235 | #endif | ||||
236 | Q_ASSERT(m_upgradeable.contains(upgradeableApps)); | ||||
237 | Q_ASSERT(m_toUpgrade.contains(upgradeableApps)); | ||||
238 | m_toUpgrade -= upgradeableApps; | ||||
229 | } | 239 | } | ||
230 | 240 | | |||
231 | void StandardBackendUpdater::cleanup() | 241 | void StandardBackendUpdater::cleanup() | ||
232 | { | 242 | { | ||
233 | m_lastUpdate = QDateTime::currentDateTime(); | 243 | m_lastUpdate = QDateTime::currentDateTime(); | ||
234 | m_toUpgrade.clear(); | 244 | m_toUpgrade.clear(); | ||
235 | 245 | | |||
236 | refreshUpdateable(); | 246 | refreshUpdateable(); | ||
237 | emit progressingChanged(false); | 247 | emit progressingChanged(false); | ||
238 | } | 248 | } | ||
239 | 249 | | |||
240 | QList<AbstractResource*> StandardBackendUpdater::toUpdate() const | 250 | QList<AbstractResource*> StandardBackendUpdater::toUpdate() const | ||
241 | { | 251 | { | ||
242 | return m_toUpgrade.toList(); | 252 | return m_toUpgrade.values(); | ||
243 | } | 253 | } | ||
244 | 254 | | |||
245 | bool StandardBackendUpdater::isMarked(AbstractResource* res) const | 255 | bool StandardBackendUpdater::isMarked(AbstractResource* res) const | ||
246 | { | 256 | { | ||
247 | return m_toUpgrade.contains(res); | 257 | return m_toUpgrade.contains(res); | ||
248 | } | 258 | } | ||
249 | 259 | | |||
250 | QDateTime StandardBackendUpdater::lastUpdate() const | 260 | QDateTime StandardBackendUpdater::lastUpdate() const | ||
Show All 39 Lines |