linuxdeepin
/
dtkcore
mirror of https://github.com/linuxdeepin/dtkcore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: use '&&' and '||' instead of 'and' and 'or' 

一些项目使用了 -fno-operator-names，会导致编译失败
This commit is contained in:
zsien 2024-06-07 15:33:27 +08:00 committed by mike
parent f326ac4c20
commit a1add007e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/dutil.h
View File

@ -78,7 +78,7 @@ inline QString unescapeFromObjectPath(const QString &str)
{
auto ret = str;
for (int i = 0; i < str.size(); ++i) {
if (str[i] == '_' and i + 2 < str.size()) {
if (str[i] == '_' && i + 2 < str.size()) {
auto hexStr = str.mid(i + 1, 2);
ret.replace(QString{"_%1"}.arg(hexStr), QChar::fromLatin1(hexStr.toUInt(nullptr, 16)));
i += 2;
@ -91,7 +91,7 @@ inline QString getAppIdFromAbsolutePath(const QString &path)
{
static QString desktopSuffix{u8".desktop"};
const auto &appDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
if (!path.endsWith(desktopSuffix) or
if (!path.endsWith(desktopSuffix) ||
!std::any_of(appDirs.cbegin(), appDirs.constEnd(), [&path](const QString &dir) { return path.startsWith(dir); })) {
return {};
}