From ba889e2c46a3f32a91c1fe75e2b22faca6b29db9 Mon Sep 17 00:00:00 2001 From: ComixHe Date: Fri, 10 Jan 2025 12:04:42 +0800 Subject: [PATCH] chore: fix some compiler warnings Signed-off-by: ComixHe --- apps/ll-dialog/src/permissionDialog.cpp | 8 ++++---- apps/ll-dialog/src/permissionDialog.h | 3 ++- libs/linglong/src/linglong/cli/cli.cpp | 4 ++-- libs/linglong/src/linglong/repo/repo_cache.cpp | 4 ++-- libs/linglong/src/linglong/runtime/container.cpp | 2 +- libs/utils/src/linglong/utils/serialize/json.cpp | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/ll-dialog/src/permissionDialog.cpp b/apps/ll-dialog/src/permissionDialog.cpp index 1a7fe53b4..f1f8a0b49 100644 --- a/apps/ll-dialog/src/permissionDialog.cpp +++ b/apps/ll-dialog/src/permissionDialog.cpp @@ -15,13 +15,13 @@ #include PermissionDialog::PermissionDialog( - const linglong::api::types::v1::ApplicationPermissionsRequest &requires) + const linglong::api::types::v1::ApplicationPermissionsRequest &request) : QWidget(nullptr) { // content QStringList dirs; - std::transform(requires.xdgDirectories.cbegin(), - requires.xdgDirectories.cend(), + std::transform(request.xdgDirectories.cbegin(), + request.xdgDirectories.cend(), std::back_inserter(dirs), [](const linglong::api::types::v1::XdgDirectoryPermission &perm) { return QString::fromStdString(perm.dirType); @@ -31,7 +31,7 @@ PermissionDialog::PermissionDialog( content->setWordWrap(true); content->setMinimumSize(210, 90); auto contentText = - QString{ _("Whether to allow %1 to access %2?") }.arg(QString::fromStdString(requires.appID), + QString{ _("Whether to allow %1 to access %2?") }.arg(QString::fromStdString(request.appID), dirs.join(" ")); content->setText(contentText); diff --git a/apps/ll-dialog/src/permissionDialog.h b/apps/ll-dialog/src/permissionDialog.h index 1bb237094..c6f59495a 100644 --- a/apps/ll-dialog/src/permissionDialog.h +++ b/apps/ll-dialog/src/permissionDialog.h @@ -13,6 +13,7 @@ class PermissionDialog : public QWidget { Q_OBJECT public: - explicit PermissionDialog(const linglong::api::types::v1::ApplicationPermissionsRequest &perms); + explicit PermissionDialog( + const linglong::api::types::v1::ApplicationPermissionsRequest &request); ~PermissionDialog() override = default; }; diff --git a/libs/linglong/src/linglong/cli/cli.cpp b/libs/linglong/src/linglong/cli/cli.cpp index 8e325195f..5bd0ecb19 100644 --- a/libs/linglong/src/linglong/cli/cli.cpp +++ b/libs/linglong/src/linglong/cli/cli.cpp @@ -2289,7 +2289,7 @@ int Cli::generateCache(const package::Reference &ref) QString jobIDReply = ""; auto ret = connect(&this->pkgMan, &api::dbus::v1::PackageManager::GenerateCacheFinished, - [this, &loop, &jobIDReply](const QString &jobID, bool success) { + [&loop, &jobIDReply](const QString &jobID, bool success) { if (jobIDReply != jobID) { return; } @@ -2423,7 +2423,7 @@ Cli::ensureCache(const package::Reference &ref, void Cli::updateAM() noexcept { - // NOTE: make sure AM refresh the cache of desktop + // NOTE: make sure AM refresh the cache of desktop if ((QSysInfo::productType() == "Deepin" || QSysInfo::productType() == "deepin") && this->lastState == linglong::api::types::v1::State::Succeed) { QDBusConnection conn = QDBusConnection::systemBus(); diff --git a/libs/linglong/src/linglong/repo/repo_cache.cpp b/libs/linglong/src/linglong/repo/repo_cache.cpp index ff3906a04..8de46f51c 100644 --- a/libs/linglong/src/linglong/repo/repo_cache.cpp +++ b/libs/linglong/src/linglong/repo/repo_cache.cpp @@ -94,7 +94,7 @@ utils::error::Result RepoCache::rebuildCache(const api::types::v1::RepoCon // occurred, copy refs out g_hash_table_foreach( refsTable, - [](gpointer key, gpointer value, gpointer data) { + [](gpointer key, [[maybe_unused]] gpointer value, gpointer data) { // key,value -> ref,checksum auto *vec = static_cast *>(data); vec->emplace_back(static_cast(key)); @@ -133,7 +133,7 @@ utils::error::Result RepoCache::rebuildCache(const api::types::v1::RepoCon } // FIXME: ll-cli may initialize repo, it can make states.json own by root - if (getuid() == 0) { + if (getuid() == 0) { qWarning() << "Rebuild the cache by root, skip to write data to states.json"; return LINGLONG_OK; } diff --git a/libs/linglong/src/linglong/runtime/container.cpp b/libs/linglong/src/linglong/runtime/container.cpp index d59848863..deb8ab12f 100644 --- a/libs/linglong/src/linglong/runtime/container.cpp +++ b/libs/linglong/src/linglong/runtime/container.cpp @@ -203,7 +203,7 @@ utils::error::Result Container::run(const ocppi::runtime::config::types::P qDebug() << "run container in " << bundle.path(); // 禁用crun自己创建cgroup，便于AM识别和管理玲珑应用 opt.GlobalOption::extra.emplace_back("--cgroup-manager=disabled"); - auto result = this->cli.run(ocppi::runtime::ContainerID(this->id.toStdString()), + auto result = this->cli.run(this->id.toStdString(), std::filesystem::path(bundle.absolutePath().toStdString()), opt); diff --git a/libs/utils/src/linglong/utils/serialize/json.cpp b/libs/utils/src/linglong/utils/serialize/json.cpp index 3c99375a7..d1744b785 100644 --- a/libs/utils/src/linglong/utils/serialize/json.cpp +++ b/libs/utils/src/linglong/utils/serialize/json.cpp @@ -32,7 +32,7 @@ static QVariant decodeQDBusArgument(const QVariant &v) complexType >> list; QVariantList res; res.reserve(list.size()); - for (const auto &item : qAsConst(list)) { + for (const auto &item : std::as_const(list)) { res << decodeQDBusArgument(item); } return res;