dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless else

Browse Source
This commit is contained in:
Jonas Kvinge
2024-06-12 17:38:58 +02:00
parent 93df859aa4
commit b233600b8c
32 changed files with 178 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utilities/filemanagerutils.cpp
View File

@@ -86,10 +86,10 @@ void OpenInFileManager(const QString &path, const QUrl &url) {
if (command.isEmpty() || command == QLatin1String("exo-open")) {
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
}
else if (command.startsWith(QLatin1String("nautilus"))) {
proc.startDetached(command, QStringList() << command_params << QStringLiteral("--select") << url.toLocalFile());
}
else if (command.startsWith(QLatin1String("dolphin")) || command.startsWith(QLatin1String("konqueror")) || command.startsWith(QLatin1String("kfmclient"))) {
else if (command.startsWith(QLatin1String("nautilus")) ||
command.startsWith(QLatin1String("dolphin")) ||
command.startsWith(QLatin1String("konqueror")) ||
command.startsWith(QLatin1String("kfmclient"))) {
proc.startDetached(command, QStringList() << command_params << QStringLiteral("--select") << url.toLocalFile());
}
else if (command.startsWith(QLatin1String("caja"))) {

15
src/utilities/imageutils.cpp
View File

@@ -78,13 +78,14 @@ QByteArray ImageUtils::FileToJpegData(const QString &filename) {
if (filename.isEmpty()) return QByteArray();
QByteArray image_data = Utilities::ReadDataFromFile(filename);
if (Utilities::MimeTypeFromData(image_data) == QStringLiteral("image/jpeg")) return image_data;
else {
QImage image;
if (image.loadFromData(image_data)) {
if (!image.isNull()) {
image_data = SaveImageToJpegData(image);
}
if (Utilities::MimeTypeFromData(image_data) == QStringLiteral("image/jpeg")) {
return image_data;
}
QImage image;
if (image.loadFromData(image_data)) {
if (!image.isNull()) {
image_data = SaveImageToJpegData(image);
}
}