fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-13 22:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code refactoring - change code style to the new clang-format rules

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-09-23 15:24:16 +03:00
parent 5a62cd3b13
commit b88a5fbce8
175 changed files with 6200 additions and 5356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/utils/desktopfileparse.cpp
View File

@@ -16,25 +16,26 @@
// along with Flameshot. If not, see <http://www.gnu.org/licenses/>.
#include "desktopfileparse.h"
#include <QFile>
#include <QDir>
#include <QFile>
#include <QLocale>
#include <QString>
#include <QTextStream>
#include <QLocale>
DesktopFileParser::DesktopFileParser() {
DesktopFileParser::DesktopFileParser()
{
QString locale = QLocale().name();
QString localeShort = QLocale().name().left(2);
m_localeName = QStringLiteral("Name[%1]").arg(locale);
m_localeDescription = QStringLiteral("Comment[%1]").arg(locale);
m_localeNameShort = QStringLiteral("Name[%1]").arg(localeShort);
m_localeDescriptionShort = QStringLiteral("Comment[%1]")
.arg(localeShort);
m_defaultIcon = QIcon::fromTheme(QStringLiteral("application-x-executable"));
m_localeDescriptionShort = QStringLiteral("Comment[%1]").arg(localeShort);
m_defaultIcon =
QIcon::fromTheme(QStringLiteral("application-x-executable"));
}
DesktopAppData DesktopFileParser::parseDesktopFile(
const QString &fileName, bool &ok) const
DesktopAppData DesktopFileParser::parseDesktopFile(const QString& fileName,
bool& ok) const
{
DesktopAppData res;
ok = true;
@@ -55,51 +56,48 @@ DesktopAppData DesktopFileParser::parseDesktopFile(
QString line = in.readLine();
if (line.startsWith(QLatin1String("Icon"))) {
res.icon = QIcon::fromTheme(
line.mid(line.indexOf(QLatin1String("="))+1).trimmed(),
m_defaultIcon);
}
else if (!nameLocaleSet && line.startsWith(QLatin1String("Name"))) {
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed(),
m_defaultIcon);
} else if (!nameLocaleSet && line.startsWith(QLatin1String("Name"))) {
if (line.startsWith(m_localeName) ||
line.startsWith(m_localeNameShort))
{
res.name = line.mid(line.indexOf(QLatin1String("="))+1).trimmed();
line.startsWith(m_localeNameShort)) {
res.name =
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed();
nameLocaleSet = true;
} else if (line.startsWith(QLatin1String("Name="))) {
res.name = line.mid(line.indexOf(QLatin1String("="))+1).trimmed();
res.name =
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed();
}
}
else if (!descriptionLocaleSet && line.startsWith(QLatin1String("Comment"))) {
} else if (!descriptionLocaleSet &&
line.startsWith(QLatin1String("Comment"))) {
if (line.startsWith(m_localeDescription) ||
line.startsWith(m_localeDescriptionShort))
{
res.description = line.mid(line.indexOf(QLatin1String("="))+1).trimmed();
line.startsWith(m_localeDescriptionShort)) {
res.description =
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed();
descriptionLocaleSet = true;
} else if (line.startsWith(QLatin1String("Comment="))) {
res.description = line.mid(line.indexOf(QLatin1String("="))+1).trimmed();
res.description =
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed();
}
}
else if (line.startsWith(QLatin1String("Exec"))) {
} else if (line.startsWith(QLatin1String("Exec"))) {
if (line.contains(QLatin1String("%"))) {
res.exec = line.mid(line.indexOf(QLatin1String("="))+1)
.trimmed();
res.exec =
line.mid(line.indexOf(QLatin1String("=")) + 1).trimmed();
} else {
ok = false;
break;
}
}
else if (line.startsWith(QLatin1String("Type"))) {
} else if (line.startsWith(QLatin1String("Type"))) {
if (line.contains(QLatin1String("Application"))) {
isApplication = true;
}
}
else if (line.startsWith(QLatin1String("Categories"))) {
res.categories = line.mid(line.indexOf(QLatin1String("="))+1).split(QStringLiteral(";"));
}
else if (line == QLatin1String("NoDisplay=true")) {
} else if (line.startsWith(QLatin1String("Categories"))) {
res.categories = line.mid(line.indexOf(QLatin1String("=")) + 1)
.split(QStringLiteral(";"));
} else if (line == QLatin1String("NoDisplay=true")) {
ok = false;
break;
}
else if (line == QLatin1String("Terminal=true")) {
} else if (line == QLatin1String("Terminal=true")) {
res.showInTerminal = true;
}
// ignore the other entries
@@ -114,11 +112,12 @@ DesktopAppData DesktopFileParser::parseDesktopFile(
return res;
}
int DesktopFileParser::processDirectory(const QDir &dir) {
int DesktopFileParser::processDirectory(const QDir& dir)
{
QStringList entries = dir.entryList(QDir::NoDotAndDotDot | QDir::Files);
bool ok;
int length = m_appList.length();
for (QString file: entries){
for (QString file : entries) {
DesktopAppData app = parseDesktopFile(dir.absoluteFilePath(file), ok);
if (ok) {
m_appList.append(app);
@@ -127,9 +126,11 @@ int DesktopFileParser::processDirectory(const QDir &dir) {
return m_appList.length() - length;
}
QVector<DesktopAppData> DesktopFileParser::getAppsByCategory(const QString &category) {
QVector<DesktopAppData> DesktopFileParser::getAppsByCategory(
const QString& category)
{
QVector<DesktopAppData> res;
for (const DesktopAppData &app : m_appList) {
for (const DesktopAppData& app : m_appList) {
if (app.categories.contains(category)) {
res.append(app);
}
@@ -138,11 +139,11 @@ QVector<DesktopAppData> DesktopFileParser::getAppsByCategory(const QString &cate
}
QMap<QString, QVector<DesktopAppData>> DesktopFileParser::getAppsByCategory(
const QStringList &categories)
const QStringList& categories)
{
QMap<QString, QVector<DesktopAppData>> res;
for (const DesktopAppData &app : m_appList) {
for (const QString &category: categories) {
for (const DesktopAppData& app : m_appList) {
for (const QString& category : categories) {
if (app.categories.contains(category)) {
res[category].append(app);
}