Skip to content

fix: [cppcheck] Improve code formatting for architecture mapping #533

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
deepin-bot merged 1 commit into from
Sep 15, 2025
Merged

fix: [cppcheck] Improve code formatting for architecture mapping #533

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
3 changes: 2 additions & 1 deletion deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
#include <QString>
#include <QMap>

#include <sys/utsname.h>

Check warning on line 12 in deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <sys/utsname.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.

static QMap<QString, QString> mapArch = { {"aarch64", "arm64"}
static QMap<QString, QString> mapArch = {
{"aarch64", "arm64"}
, {"x86_64", "amd64"}
, {"mips64", "mips64el"}
, {"i386", "i386"}
Expand Down
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/Tool/DBusAnythingInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ class DBusAnythingInterface : public QObject

private:
static std::atomic<DBusAnythingInterface *> s_Instance;
static std::mutex m_mutex;
QDBusInterface *mp_Iface;
static std::mutex m_mutex;
QDBusInterface *mp_Iface;
};

#endif // DBUSANYTHINGINTERFACE_H
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/Tool/EDIDParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ class EDIDParser
private:
/**@brief:机器的存储模式不同，会导致计算结果不同，所以在解析的时候需要考虑大小端模式*/
QString m_Vendor; // 显示屏的厂商信息
QString m_Model; // 显示屏的型号信息
QString m_Model; // 显示屏的型号信息
QString m_ReleaseDate; // 显示屏的生产日期
QString m_ScreenSize; // 屏幕大小
QString m_MonitorName; // 监视器名称
bool m_LittleEndianMode; // 小端模式
int m_Width; // width
int m_Height; // heigth
QStringList m_ListEdid; // edid数据
QMap<QString, QString> m_MapCh; //
QMap<QString, QString> m_MapCh; // 二进制字符串映射到字母A-Z


};
Expand Down
2 changes: 1 addition & 1 deletion deepin-devicemanager/src/Tool/ThreadExecXrandr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class ThreadExecXrandr : public QThread
private:
bool m_Gpu; //<! 判断是否是gpu
bool m_isDXcbPlatform; //<! 判断是否是DXcbPlatform
QStringList m_monitorLst;
QStringList m_monitorLst; //<! DBus中反馈的显示器列表
};

#endif // THREADEXECXRANDR_H
3 changes: 1 addition & 2 deletions deepin-devicemanager/src/Tool/commontools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ public slots:
static QMap<DriverType, QString> m_MapDriverType;
static QMap<Status, QString> m_MapStatusIcon;
static QMap<Status, QString> m_MapStatusType;

static QMap<int, QString> m_MapErrorString;
static QMap<int, QString> m_MapErrorString;
};

#endif // COMMONTOOLS_H
3 changes: 2 additions & 1 deletion deepin-devicemanager/src/commonfunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

using namespace DDLog;

static QMap<QString, QString> mapArch = { {"aarch64", "arm64"}
static QMap<QString, QString> mapArch = {
{"aarch64", "arm64"}
, {"x86_64", "amd64"}
, {"mips64", "mips64el"}
, {"i386", "i386"}
Expand Down