Skip to content

refactor: fix most compiler and clazy warnings #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ComixHe merged 1 commit into from
Jan 28, 2026
Merged

refactor: fix most compiler and clazy warnings #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/app-identifier/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int main(int argc, char *argv[])
return;
}

auto appID = reply.arguments().first().toString();
auto appID = reply.arguments().constFirst().toString();
if (!appID.isEmpty()) {
qInfo() << "The capacity of process" << pid << "is:" << appID;
return;
Expand Down
85 changes: 37 additions & 48 deletions apps/app-launch-helper/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,26 @@
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#include <numeric>
#include <unordered_map>
#include <vector>
#include <deque>
#include <memory>
#include <iostream>
#include <algorithm>
#include <cstdlib>
#include <map>
#include <list>
#include <thread>
#include <filesystem>
#include <cctype>
#include "constant.h"
#include "types.h"
#include "variantValue.h"
#include <algorithm>
#include <cstdlib>
#include <deque>
#include <filesystem>
#include <memory>
#include <unordered_map>
#include <vector>

namespace {

ExitCode fromString(const std::string &str)
ExitCode fromString(std::string_view str)
{
if (str == "done") {
return ExitCode::Done;
}

if (str == "canceled" or str == "timeout" or str == "failed" or str == "dependency" or str == "skipped") {
if (str == "canceled" || str == "timeout" || str == "failed" || str == "dependency" || str == "skipped") {
return ExitCode::SystemdError;
}

Expand All @@ -44,10 +38,10 @@ ExitCode fromString(const std::string &str)

ExitCode fromString(const char *str)
{
if (!str) {
if (str == nullptr) {
return ExitCode::Waiting;
}
std::string tmp{str};
const std::string tmp{str};
return fromString(tmp);
}

Expand All @@ -62,7 +56,7 @@ ExitCode fromString(const char *str)

int processExecStart(msg_ptr &msg, const std::deque<std::string_view> &execArgs)
{
int ret;
int ret{0};

if (ret = sd_bus_message_open_container(msg, SD_BUS_TYPE_STRUCT, "sv"); ret < 0) {
sd_journal_perror("open struct of ExecStart failed.");
Expand Down Expand Up @@ -99,7 +93,7 @@ int processExecStart(msg_ptr &msg, const std::deque<std::string_view> &execArgs)
return ret;
}

for (auto execArg : execArgs) {
for (const auto &execArg : execArgs) {
if (ret = sd_bus_message_append(msg, "s", execArg.data()); ret < 0) {
sd_journal_perror("append args of execStart failed.");
return ret;
Expand Down Expand Up @@ -147,16 +141,16 @@ DBusValueType getPropType(std::string_view key)
{"WorkingDirectory", DBusValueType::String},
{"ExecSearchPath", DBusValueType::ArrayOfString}};

if (auto it = map.find(key); it != map.cend()) {
if (const auto it = map.find(key); it != map.cend()) {
return it->second;
}

return DBusValueType::String; // fallback to string
}

int appendPropValue(msg_ptr &msg, DBusValueType type, const std::list<std::string_view> &value)
int appendPropValue(msg_ptr &msg, DBusValueType type, const std::vector<std::string> &value)
{
int ret;
int ret{0};

auto handler = creatValueHandler(msg, type);
if (handler == nullptr) {
Expand Down Expand Up @@ -184,47 +178,42 @@ int appendPropValue(msg_ptr &msg, DBusValueType type, const std::list<std::strin
return 0;
}

int processKVPair(msg_ptr &msg, const std::map<std::string_view, std::list<std::string_view>> &props)
int processKVPair(msg_ptr &msg, std::unordered_map<std::string_view, std::vector<std::string>> &props)
{
int ret;
int ret{0};
if (!props.empty()) {
for (auto [key, value] : props) {
const std::list<std::string_view> *valuePtr = &value;
std::list<std::string_view> normalizedValue;
std::vector<std::string> normalizedStorage;

for (auto &[key, value] : props) {
if (key == "ExecSearchPath") {
std::vector<std::string> normalizedValue;
for (const auto &v : value) {
std::filesystem::path p{std::string{v}};
const std::filesystem::path p{std::string{v}};
if (!p.is_absolute()) {
sd_journal_print(LOG_INFO, "ExecSearchPath ignoring relative path: %s", std::string{v}.c_str());
continue;
}
normalizedStorage.emplace_back(p.lexically_normal().string());
normalizedValue.emplace_back(p.lexically_normal().string());
}

normalizedValue.assign(normalizedStorage.begin(), normalizedStorage.end());

if (normalizedValue.empty()) {
sd_journal_print(LOG_WARNING, "ExecSearchPath normalized to empty, skipping property");
continue;
}

valuePtr = &normalizedValue;
value = std::move(normalizedValue);
}

std::string keyStr{key};
const std::string keyStr{key};
if (ret = sd_bus_message_open_container(msg, SD_BUS_TYPE_STRUCT, "sv"); ret < 0) {
sd_journal_perror("open struct of properties failed.");
return ret;
}

if (ret = sd_bus_message_append(msg, "s", keyStr.data()); ret < 0) {
if (ret = sd_bus_message_append(msg, "s", keyStr.c_str()); ret < 0) {
sd_journal_perror("append key of property failed.");
return ret;
}

if (ret = appendPropValue(msg, getPropType(key), *valuePtr); ret < 0) {
if (ret = appendPropValue(msg, getPropType(key), value); ret < 0) {
sd_journal_perror("append value of property failed.");
return ret;
}
Expand All @@ -241,7 +230,7 @@ int processKVPair(msg_ptr &msg, const std::map<std::string_view, std::list<std::
std::string cmdParse(msg_ptr &msg, std::deque<std::string_view> cmdLines)
{
std::string serviceName{"internalError"};
std::map<std::string_view, std::list<std::string_view>> props;
std::unordered_map<std::string_view, std::vector<std::string>> props;

while (!cmdLines.empty()) { // NOTE: avoid stl exception
auto str = cmdLines.front();
Expand Down Expand Up @@ -280,7 +269,7 @@ std::string cmdParse(msg_ptr &msg, std::deque<std::string_view> cmdLines)
continue;
}

props[key].push_back(kvStr.substr(splitIndex + 1));
props[key].emplace_back(kvStr.substr(splitIndex + 1));
cmdLines.pop_front();
continue;
}
Expand All @@ -290,7 +279,7 @@ std::string cmdParse(msg_ptr &msg, std::deque<std::string_view> cmdLines)
}

// Processing of the binary file and its parameters that am want to launch
auto &execArgs = cmdLines;
const auto &execArgs = cmdLines;
if (execArgs.empty()) {
sd_journal_print(LOG_ERR, "param exec is empty.");
serviceName = "invalidInput";
Expand All @@ -302,8 +291,8 @@ std::string cmdParse(msg_ptr &msg, std::deque<std::string_view> cmdLines)
return serviceName;
}

int ret;
if (ret = sd_bus_message_append(msg, "s", props["unitName"].front().data()); ret < 0) { // unitName
int ret{0};
if (ret = sd_bus_message_append(msg, "s", props["unitName"].front().c_str()); ret < 0) { // unitName
sd_journal_perror("append unitName failed.");
return serviceName;
}
Expand Down Expand Up @@ -368,7 +357,7 @@ std::string cmdParse(msg_ptr &msg, std::deque<std::string_view> cmdLines)

int jobRemovedReceiver(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
{
int ret;
int ret{0};
if (ret = sd_bus_error_is_set(ret_error); ret != 0) {
sd_journal_print(LOG_ERR, "JobRemoved error: [%s,%s]", ret_error->name, ret_error->message);
} else {
Expand All @@ -385,7 +374,7 @@ int jobRemovedReceiver(sd_bus_message *m, void *userdata, sd_bus_error *ret_erro
}
}

if (ret_error and ret_error->_need_free) {
if (ret_error != nullptr && ret_error->_need_free != 0) {
sd_bus_error_free(ret_error);
}

Expand All @@ -394,7 +383,7 @@ int jobRemovedReceiver(sd_bus_message *m, void *userdata, sd_bus_error *ret_erro

int process_dbus_message(sd_bus *bus)
{
int ret;
int ret{0};
ret = sd_bus_process(bus, nullptr);
if (ret < 0) {
sd_journal_print(LOG_ERR, "event loop error.");
Expand Down Expand Up @@ -422,7 +411,7 @@ int main(int argc, const char *argv[])
sd_bus_message *msg{nullptr};
sd_bus *bus{nullptr};
std::string serviceId;
int ret;
int ret{0};

if (ret = sd_bus_open_user(&bus); ret < 0) {
sd_journal_perror("Failed to connect to user bus.");
Expand Down Expand Up @@ -476,12 +465,12 @@ int main(int argc, const char *argv[])
sd_bus_message_unref(reply);

while (true) { // wait for jobRemoved
int ret = process_dbus_message(bus);
const auto ret = process_dbus_message(bus);
if (ret < 0) {
releaseRes(error, msg, bus, ExitCode::InternalError);
}

if (resultData.removedFlag) {
if (resultData.removedFlag != 0) {
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/dde-autostart/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int main(int argc, char *argv[])

auto reply = QDBusConnection::sessionBus().call(msg);
if (reply.type() == QDBusMessage::ReplyMessage) {
if (reply.arguments().first().toBool()) {
if (reply.arguments().constFirst().toBool()) {
launchSlot();
return 0;
}
Expand All @@ -119,6 +119,6 @@ int main(int argc, char *argv[])
}

// Wait for signal
return app.exec();
return QCoreApplication::exec();
}
}
16 changes: 9 additions & 7 deletions src/compatibilitymanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,19 @@ ParserError CompatibilityManager::parse(QFile &file) noexcept{
}

auto obj = json.object();
for (const QString &desktopId : obj.keys()) {
auto existDesktopId = m_compatibilityConfig.find(desktopId);
if(existDesktopId != m_compatibilityConfig.end()){
qWarning() << "the desktop id : "<<desktopId<<"exist skip";
for (auto it = obj.constBegin(); it != obj.constEnd(); ++it) {
const auto &desktopId = it.key();
auto existDesktopId = m_compatibilityConfig.constFind(desktopId);
if(existDesktopId != m_compatibilityConfig.cend()){
qWarning() << "the desktop id : "<< it.key() <<"exist skip";
continue;
}
auto desktopEntry = obj[desktopId].toObject();

// 处理 Desktop Entry
CompatibilityDesktopEntry compatibilityEntry;
for(auto entryId : desktopEntry.keys()){
const auto& keys = desktopEntry.keys();
for(const auto &entryId : std::as_const(keys)){
if(!entryId.startsWith(DesktopFileEntryKey) && !entryId.startsWith(DesktopFileActionKey)){
qWarning() << "parse entry : "<<entryId<<" fail";
return ParserError::MissingInfo;
Expand All @@ -145,13 +147,13 @@ ParserError CompatibilityManager::parse(QFile &file) noexcept{
auto envArray = entry[DesktopEntryEnv].toArray();

QStringList env;
for (const QJsonValue &envJson : envArray) {
for (const auto &envJson : std::as_const(envArray)) {
env.push_back(envJson.toString());
}

//auto tub = std::make_tuple(exec,std::move(env.join("; ") + ";"));
auto tub = std::make_tuple(exec,env);
compatibilityEntry.insert(entryId,std::move(tub));
compatibilityEntry.insert(entryId,tub);
qInfo()<<"insert desktop id : " << entryId <<", with Exec : "<< exec << "and Env : "<<env;
}

Expand Down
Loading