diff --git a/cmake/FindLIBFWUPD.cmake b/cmake/FindLIBFWUPD.cmake --- a/cmake/FindLIBFWUPD.cmake +++ b/cmake/FindLIBFWUPD.cmake @@ -1,35 +1,33 @@ -# - Try to find the Fwupd library +# CMake support for Fwupd library # Once done this will define # # LIBFWUPD_FOUND - system has the fwupd library # LIBFWUPD_INCLUDE_DIR - the Fwupd include directory # LIBFWUPD_LIBRARY - Link this to use the fwupd # -# Copyright © 2018, Abhijeet Sharma +# License: # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. +# Copyright © 2018, Abhijeet Sharma # -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. if(LIBFWUPD_INCLUDE_DIRS AND LIBFWUPD_LIBRARIES) set(LIBFWUPD_FOUND TRUE) diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.h b/libdiscover/backends/FwupdBackend/FwupdBackend.h --- a/libdiscover/backends/FwupdBackend/FwupdBackend.h +++ b/libdiscover/backends/FwupdBackend/FwupdBackend.h @@ -81,16 +81,16 @@ bool refreshRemotes(uint cacheAge); bool refreshRemote(FwupdRemote *remote, uint cacheAge); const QUrl cacheFile(const QString &kind, const QFileInfo &resource); - FwupdResource * createDevice(FwupdDevice *device); - FwupdResource * createRelease(FwupdDevice *device); - FwupdResource * createApp(FwupdDevice *device); + FwupdResource * createDevice(FwupdDevice *dev); + FwupdResource * createRelease(FwupdDevice *dev); + FwupdResource * createApp(FwupdDevice *dev); QByteArray getChecksum(const QUrl filename, QCryptographicHash::Algorithm hashAlgorithm); - QString buildDeviceID(FwupdDevice* device); + QString buildDeviceID(FwupdDevice* dev); void addUpdates(); void addResourceToList(FwupdResource *res); void addHistoricalUpdates(); void setReleaseDetails(FwupdResource *res, FwupdRelease *rel); - void setDeviceDetails(FwupdResource *res, FwupdDevice *device); + void setDeviceDetails(FwupdResource *res, FwupdDevice *dev); void handleError(GError **perror); QSet getAllUpdates(); QString getAppName(QString ID); diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp --- a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp +++ b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp @@ -44,7 +44,7 @@ QTimer::singleShot(500, this, &FwupdBackend::toggleFetching); connect(m_updater, &StandardBackendUpdater::updatesCountChanged, this, &FwupdBackend::updatesCountChanged); - client = fwupd_client_new (); + client = fwupd_client_new(); populate(QStringLiteral("Releases")); SourcesModel::global()->addSourcesBackend(new FwupdSourcesBackend(this)); @@ -67,9 +67,9 @@ g_object_unref (client); } -QString FwupdBackend::buildDeviceID(FwupdDevice* device) +QString FwupdBackend::buildDeviceID(FwupdDevice* dev) { - QString DeviceID = QString::fromUtf8(fwupd_device_get_id (device)); + QString DeviceID = QString::fromUtf8(fwupd_device_get_id(dev)); DeviceID.replace(QLatin1Char('/'),QLatin1Char('_')); return QStringLiteral("org.fwupd.%1.device").arg(DeviceID); } @@ -80,33 +80,35 @@ m_resources.insert(res->packageName().toLower(), res); } -FwupdResource * FwupdBackend::createDevice(FwupdDevice *device) +FwupdResource * FwupdBackend::createDevice(FwupdDevice *dev) { - const QString name = QString::fromUtf8(fwupd_device_get_name(device)); + const QString name = QString::fromUtf8(fwupd_device_get_name(dev)); FwupdResource* res = new FwupdResource(name, true, this); - res->setId(buildDeviceID(device)); + res->setId(buildDeviceID(dev)); res->addCategories(QStringLiteral("Releases")); - res->setIconName(QString::fromUtf8((const gchar *)g_ptr_array_index (fwupd_device_get_icons(device),0)));// Implement a Better way to decide icon - - setDeviceDetails(res,device); + if(fwupd_device_get_icons(dev)->len > 1) + res->setIconName(QString::fromUtf8((const gchar *)g_ptr_array_index(fwupd_device_get_icons(dev),0)));// Need to check if icon exist or not! + setDeviceDetails(res,dev); return res; } -FwupdResource * FwupdBackend::createRelease(FwupdDevice *device) +FwupdResource * FwupdBackend::createRelease(FwupdDevice *dev) { - FwupdRelease *rel = fwupd_device_get_release_default (device); + FwupdRelease *rel = fwupd_device_get_release_default(dev); const QString name = QString::fromUtf8(fwupd_release_get_name(rel)); FwupdResource* res = new FwupdResource(name, true, this); - res->setDeviceID(QString::fromUtf8(fwupd_device_get_id (device))); + if (fwupd_release_get_appstream_id(rel)) + res->setId(QString::fromUtf8(fwupd_release_get_appstream_id(rel))); + else + return nullptr; + + res->setDeviceID(QString::fromUtf8(fwupd_device_get_id(dev))); setReleaseDetails(res,rel); - setDeviceDetails(res,device); - - if (fwupd_release_get_appstream_id (rel)) - res->setId(QString::fromUtf8(fwupd_release_get_appstream_id (rel))); + setDeviceDetails(res,dev); /* the same as we have already */ - if(QLatin1Literal(fwupd_device_get_version (device)) == QLatin1Literal(fwupd_release_get_version (rel))) + if(QLatin1Literal(fwupd_device_get_version(dev)) == QLatin1Literal(fwupd_release_get_version(rel))) { qWarning() << "Fwupd Error: same firmware version as installed"; } @@ -121,66 +123,72 @@ res->setSummary(QString::fromUtf8(fwupd_release_get_summary(rel))); if(fwupd_release_get_vendor(rel)) res->setVendor(QString::fromUtf8(fwupd_release_get_vendor(rel))); + if(fwupd_release_get_size(rel)) + res->setSize(fwupd_release_get_size(rel)); if(fwupd_release_get_version(rel)) res->setVersion(QString::fromUtf8(fwupd_release_get_version(rel))); if(fwupd_release_get_description(rel)) - res->setDescription(QString::fromUtf8((fwupd_release_get_description (rel)))); + res->setDescription(QString::fromUtf8((fwupd_release_get_description(rel)))); if(fwupd_release_get_homepage(rel)) res->setHomePage(QUrl(QString::fromUtf8(fwupd_release_get_homepage(rel)))); if(fwupd_release_get_license(rel)) res->setLicense(QString::fromUtf8(fwupd_release_get_license(rel))); - if (fwupd_release_get_uri (rel)) - res->m_updateURI = QString::fromUtf8(fwupd_release_get_uri (rel)); + if (fwupd_release_get_uri(rel)) + res->m_updateURI = QString::fromUtf8(fwupd_release_get_uri(rel)); } void FwupdBackend::setDeviceDetails(FwupdResource *res, FwupdDevice *dev) { - res->isLiveUpdatable = fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_UPDATABLE); - res->isOnlyOffline = fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_ONLY_OFFLINE); - res->needsReboot = fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_NEEDS_REBOOT); - res->isDeviceRemoval = !fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_INTERNAL); + res->isLiveUpdatable = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_UPDATABLE); + res->isOnlyOffline = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_ONLY_OFFLINE); + res->needsReboot = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_NEEDS_REBOOT); + res->isDeviceRemoval = !fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_INTERNAL); + res->needsBootLoader = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_NEEDS_BOOTLOADER); - GPtrArray *guids = fwupd_device_get_guids (dev); + GPtrArray *guids = fwupd_device_get_guids(dev); if(guids->len > 0) { - QString guidStr = QString::fromUtf8((char *)g_ptr_array_index (guids, 0)); + QString guidStr = QString::fromUtf8((char *)g_ptr_array_index(guids, 0)); for (uint i = 1; i < guids->len; i++) { - guidStr += QLatin1Char(',') + QString::fromUtf8((char *)g_ptr_array_index (guids, i)); + guidStr += QLatin1Char(',') + QString::fromUtf8((char *)g_ptr_array_index(guids, i)); } res->guidString = guidStr; } - if(fwupd_device_get_name (dev)) + if(fwupd_device_get_name(dev)) { QString vendorName; - vendorName.sprintf("%s",fwupd_device_get_name (dev)); + vendorName.sprintf("%s",fwupd_device_get_name(dev)); - if(vendorName.indexOf(QString::fromUtf8(fwupd_device_get_vendor (dev))) == 0) - vendorName.sprintf("%s %s",fwupd_device_get_vendor (dev), fwupd_device_get_name (dev)); + if(vendorName.indexOf(QString::fromUtf8(fwupd_device_get_vendor(dev))) == 0) + vendorName.sprintf("%s %s",fwupd_device_get_vendor(dev), fwupd_device_get_name(dev)); res->setName(vendorName); } - if(fwupd_device_get_summary (dev)) + if(fwupd_device_get_summary(dev)) res->setSummary(QString::fromUtf8(fwupd_device_get_summary(dev))); if(fwupd_device_get_vendor(dev)) res->setVendor(QString::fromUtf8(fwupd_device_get_vendor(dev))); + if(fwupd_device_get_created(dev)) + res->setReleaseDate((QDateTime::fromSecsSinceEpoch(fwupd_device_get_created(dev))).date()); if(fwupd_device_get_version(dev)) res->setVersion(QString::fromUtf8(fwupd_device_get_version(dev))); if(fwupd_device_get_description(dev)) res->setDescription(QString::fromUtf8((fwupd_device_get_description(dev)))); + res->setIconName(QString::fromUtf8("device-notifier")); } void FwupdBackend::populate(const QString& n) { /* get devices */ - g_autoptr(GPtrArray) devices = fwupd_client_get_devices (client, nullptr, nullptr); + g_autoptr(GPtrArray) devices = fwupd_client_get_devices(client, nullptr, nullptr); if (devices) { for (uint i = 0; i < devices->len; i++) { - FwupdDevice *device = (FwupdDevice *)g_ptr_array_index (devices, i); + FwupdDevice *device = (FwupdDevice *)g_ptr_array_index(devices, i); /* Devices Which are not updatable */ - if (!fwupd_device_has_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE)) + if (!fwupd_device_has_flag(device, FWUPD_DEVICE_FLAG_UPDATABLE)) continue; /* add releases */ @@ -188,13 +196,13 @@ res->addCategories(n); - g_autoptr(GPtrArray) releases = fwupd_client_get_releases (client, res->m_deviceID.toUtf8().constData(), nullptr, nullptr); + g_autoptr(GPtrArray) releases = fwupd_client_get_releases(client, res->m_deviceID.toUtf8().constData(), nullptr, nullptr); if (releases) { for (uint j = 0; j < releases->len; j++) { - FwupdRelease *rel = (FwupdRelease *)g_ptr_array_index (releases, j); + FwupdRelease *rel = (FwupdRelease *)g_ptr_array_index(releases, j); const QString name = QString::fromUtf8(fwupd_release_get_name(rel)); FwupdResource* res_ = new FwupdResource(name, true, this); setReleaseDetails (res_, rel); @@ -212,11 +220,11 @@ { g_autoptr(GError) error = nullptr; g_autoptr(GError) error2 = nullptr; - g_autoptr(GPtrArray) devices = fwupd_client_get_devices (client, nullptr, &error); + g_autoptr(GPtrArray) devices = fwupd_client_get_devices(client, nullptr, &error); if(!devices) { - if (g_error_matches (error, FWUPD_ERROR, FWUPD_ERROR_NOTHING_TO_DO)) + if (g_error_matches(error, FWUPD_ERROR, FWUPD_ERROR_NOTHING_TO_DO)) { qDebug() << "Fwupd Info: No Devices Found"; handleError(&error); @@ -228,11 +236,11 @@ FwupdDevice *device = (FwupdDevice *)g_ptr_array_index (devices, i); FwupdResource* res; - if (!fwupd_device_has_flag (device, FWUPD_DEVICE_FLAG_SUPPORTED)) + if (!fwupd_device_has_flag(device, FWUPD_DEVICE_FLAG_SUPPORTED)) continue; /*Device is Locked Needs Unlocking*/ - if (fwupd_device_has_flag (device, FWUPD_DEVICE_FLAG_LOCKED)) + if (fwupd_device_has_flag(device, FWUPD_DEVICE_FLAG_LOCKED)) { res = createDevice(device); res->setIsDeviceLocked(true); @@ -242,11 +250,11 @@ } - g_autoptr(GPtrArray) rels = fwupd_client_get_upgrades (client, fwupd_device_get_id(device), nullptr, &error2); + g_autoptr(GPtrArray) rels = fwupd_client_get_upgrades(client, fwupd_device_get_id(device), nullptr, &error2); if (!rels) { - if (g_error_matches (error2, FWUPD_ERROR, FWUPD_ERROR_NOTHING_TO_DO)) + if (g_error_matches(error2, FWUPD_ERROR, FWUPD_ERROR_NOTHING_TO_DO)) { qWarning() << "Fwupd Error: No Packages Found for "<< fwupd_device_get_id(device); handleError(&error2); @@ -269,10 +277,10 @@ for(uint j = 0; j < rels->len; j++) { FwupdRelease *rel = (FwupdRelease *)g_ptr_array_index (rels, j); - if (fwupd_release_get_description (rel) == nullptr) + if (fwupd_release_get_description(rel) == nullptr) continue; - longdescription += QStringLiteral("Version %1\n").arg(QString::fromUtf8(fwupd_release_get_version (rel))); - longdescription += QString::fromUtf8(fwupd_release_get_description (rel)) + QLatin1Char('\n'); + longdescription += QStringLiteral("Version %1\n").arg(QString::fromUtf8(fwupd_release_get_version(rel))); + longdescription += QString::fromUtf8(fwupd_release_get_description(rel)) + QLatin1Char('\n'); } res->setDescription(longdescription); } @@ -286,7 +294,7 @@ void FwupdBackend::addHistoricalUpdates() { g_autoptr(GError) error = nullptr; - g_autoptr(FwupdDevice) device = fwupd_client_get_results (client, FWUPD_DEVICE_ID_ANY, nullptr, &error); + g_autoptr(FwupdDevice) device = fwupd_client_get_results(client, FWUPD_DEVICE_ID_ANY, nullptr, &error); if(!device) { handleError(&error); @@ -318,11 +326,11 @@ return QByteArray(); } -FwupdResource* FwupdBackend::createApp(FwupdDevice *device) +FwupdResource* FwupdBackend::createApp(FwupdDevice *dev) { - FwupdRelease *rel = fwupd_device_get_release_default (device); + FwupdRelease *rel = fwupd_device_get_release_default(dev); GPtrArray *checksums; - FwupdResource* app = createRelease(device); + FwupdResource* app = createRelease(dev); /* update unsupported */ if (!app->isLiveUpdatable) @@ -347,7 +355,7 @@ qWarning() << "Fwupd Error: No update-version! for " << app->m_id; return nullptr; } - checksums = fwupd_release_get_checksums (rel); + checksums = fwupd_release_get_checksums(rel); if (checksums->len == 0) { qWarning() << "Fwupd Error: " << app->m_name << "[" << app->m_id << "]" << "(" << app->m_updateVersion << ")" "has no checksums, ignoring as unsafe"; @@ -369,7 +377,7 @@ if (filename_cache.isLocalFile()) { - QByteArray checksum_tmp = QByteArray(fwupd_checksum_get_by_kind (checksums, G_CHECKSUM_SHA1)); + QByteArray checksum_tmp = QByteArray(fwupd_checksum_get_by_kind(checksums, G_CHECKSUM_SHA1)); /* Currently LVFS supports SHA1 only*/ if (checksum_tmp.isNull()) @@ -449,10 +457,10 @@ { FwupdRemote *remote = (FwupdRemote *)g_ptr_array_index(remotes, i); /*Remotes disabled by user so ignore*/ - if (!fwupd_remote_get_enabled (remote)) + if (!fwupd_remote_get_enabled(remote)) continue; /*Local Remotes Ignore*/ - if (fwupd_remote_get_kind (remote) == FWUPD_REMOTE_KIND_LOCAL) + if (fwupd_remote_get_kind(remote) == FWUPD_REMOTE_KIND_LOCAL) continue; /*Refresh the left ones*/ if (!refreshRemote(remote, cacheAge)) @@ -467,7 +475,7 @@ if (fwupd_remote_get_filename_cache_sig(remote) == nullptr) { - qWarning() << "Fwupd Error: " << "Remote " << fwupd_remote_get_id (remote) << "has no cache signature!"; + qWarning() << "Fwupd Error: " << "Remote " << fwupd_remote_get_id(remote) << "has no cache signature!"; return false; } @@ -478,13 +486,13 @@ uint tmp = age < std::numeric_limits::max() ? (uint) age : std::numeric_limits::max(); if (tmp < cacheAge) { - qDebug() << "Fwupd Info:" << fwupd_remote_get_id (remote) << "is only" << tmp << "seconds old, so ignoring refresh! "; + qDebug() << "Fwupd Info:" << fwupd_remote_get_id(remote) << "is only" << tmp << "seconds old, so ignoring refresh! "; return true; } } - QString cacheId = QStringLiteral("fwupd/remotes.d/%1").arg(QString::fromUtf8(fwupd_remote_get_id (remote))); - QFileInfo basenameSig = QFileInfo(QString::fromUtf8(g_path_get_basename(fwupd_remote_get_filename_cache_sig (remote)))); + QString cacheId = QStringLiteral("fwupd/remotes.d/%1").arg(QString::fromUtf8(fwupd_remote_get_id(remote))); + QFileInfo basenameSig = QFileInfo(QString::fromUtf8(g_path_get_basename(fwupd_remote_get_filename_cache_sig(remote)))); const QUrl filenameSig = cacheFile(cacheId, basenameSig); if (filenameSig.isEmpty()) @@ -541,7 +549,7 @@ return false; } /* Sending Metadata to fwupd Daemon*/ - if (!fwupd_client_update_metadata (client, fwupd_remote_get_id(remote), filename.toString().toUtf8().constData(), filenameSig.toString().toUtf8().constData(), nullptr, &error)) + if (!fwupd_client_update_metadata(client, fwupd_remote_get_id(remote), filename.toString().toUtf8().constData(), filenameSig.toString().toUtf8().constData(), nullptr, &error)) { handleError(&error); return false; diff --git a/libdiscover/backends/FwupdBackend/FwupdResource.h b/libdiscover/backends/FwupdBackend/FwupdResource.h --- a/libdiscover/backends/FwupdBackend/FwupdResource.h +++ b/libdiscover/backends/FwupdBackend/FwupdResource.h @@ -73,6 +73,7 @@ void setHomePage(const QUrl &homepage){ m_homepage = homepage;} void setLicense(const QString &license){ m_license = license;} void setIconName(const QString &iconName){ m_iconName = iconName;} + void setReleaseDate(const QDate &date){ m_releaseDate = date;} virtual QStringList allResourceNames() const; void setIsDeviceLocked(bool status){ isDeviceLocked = status;} @@ -80,8 +81,8 @@ void setUpdateURI(const QString &updateURI){m_updateURI = updateURI;} void setAddonInstalled(const QString& addon, bool installed); - QString sourceIcon() const override { return QStringLiteral("player-time"); } - QDate releaseDate() const override { return {}; } + QString sourceIcon() const override { return m_iconName; } + QDate releaseDate() const override { return m_releaseDate; } public: QString m_id; @@ -93,6 +94,7 @@ QString m_vendor; QStringList m_categories; QString m_license; + QDate m_releaseDate; AbstractResource::State m_state; QUrl m_homepage; @@ -109,6 +111,7 @@ bool isLiveUpdatable = false; // True if device is live updatable bool needsReboot = false; // True if device needs Reboot bool isDeviceRemoval = false; //True if device is Removal + bool needsBootLoader = false; //True if BootLoader Required QString guidString; diff --git a/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp b/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp --- a/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp +++ b/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp @@ -101,21 +101,21 @@ void FwupdSourcesBackend::populateSources() { /* find all remotes */ - g_autoptr(GPtrArray) remotes = fwupd_client_get_remotes (backend->client,nullptr,nullptr); + g_autoptr(GPtrArray) remotes = fwupd_client_get_remotes(backend->client,nullptr,nullptr); if(remotes != nullptr) { for (uint i = 0; i < remotes->len; i++) { FwupdRemote *remote = (FwupdRemote *)g_ptr_array_index (remotes, i); - if (fwupd_remote_get_kind (remote) == FWUPD_REMOTE_KIND_LOCAL) + if (fwupd_remote_get_kind(remote) == FWUPD_REMOTE_KIND_LOCAL) continue; - const QString id = QString::fromUtf8(fwupd_remote_get_id (remote)); + const QString id = QString::fromUtf8(fwupd_remote_get_id(remote)); if (id.isEmpty()) continue; bool status = !fwupd_remote_get_enabled(remote); QStandardItem* it = new QStandardItem(id); it->setData(id, AbstractSourcesBackend::IdRole); - it->setData(QVariant(QString::fromUtf8(fwupd_remote_get_title (remote))), Qt::ToolTipRole); + it->setData(QVariant(QString::fromUtf8(fwupd_remote_get_title(remote))), Qt::ToolTipRole); it->setCheckable(true); it->setCheckState(status ? Qt::Unchecked : Qt::Checked); m_sources->appendRow(it); diff --git a/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp b/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp --- a/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp +++ b/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp @@ -64,7 +64,7 @@ qWarning("Fwupd Error: No Device ID set, cannot unlock device "); return false; } - if (!fwupd_client_unlock (m_backend->client, device_id.toUtf8().constData(),nullptr, &error)) + if (!fwupd_client_unlock(m_backend->client, device_id.toUtf8().constData(),nullptr, &error)) { m_backend->handleError(&error); return false; @@ -140,7 +140,7 @@ m_iterate = true; QTimer::singleShot(100, this, &FwupdTransaction::updateProgress); - if (!fwupd_client_install (m_backend->client, deviceId.toUtf8().constData(), localFile.toUtf8().constData(), install_flags, nullptr, &error)) + if (!fwupd_client_install(m_backend->client, deviceId.toUtf8().constData(), localFile.toUtf8().constData(), install_flags, nullptr, &error)) { m_backend->handleError(&error); m_iterate = false; @@ -164,7 +164,7 @@ setStatus(CommittingStatus); if(progress()<100) { - setProgress(fwupd_client_get_percentage (m_backend->client)); + setProgress(fwupd_client_get_percentage(m_backend->client)); QTimer::singleShot(100, this, &FwupdTransaction::updateProgress); } }