From: Claudio Cambra Date: Tue, 9 May 2023 06:37:15 +0000 (+0800) Subject: Simplify findSvgFilePath, define result value on definition X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~82^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1284749d703e5e177c9ad5f3d2b36dd0292a90dc;p=nextcloud-desktop.git Simplify findSvgFilePath, define result value on definition Signed-off-by: Claudio Cambra --- diff --git a/src/gui/iconutils.cpp b/src/gui/iconutils.cpp index 01a1abbe5..fa41f492a 100644 --- a/src/gui/iconutils.cpp +++ b/src/gui/iconutils.cpp @@ -23,15 +23,16 @@ #include namespace { + QString findSvgFilePath(const QString &fileName, const QStringList &possibleColors) { - QString result; - result = QString{OCC::Theme::themePrefix} + fileName; + auto result = QString{OCC::Theme::themePrefix + fileName}; + if (QFile::exists(result)) { return result; } else { for (const auto &color : possibleColors) { - result = QString{OCC::Theme::themePrefix} + color + QStringLiteral("/") + fileName; + result = QString{OCC::Theme::themePrefix + color + QStringLiteral("/") + fileName}; if (QFile::exists(result)) { return result; @@ -42,6 +43,7 @@ QString findSvgFilePath(const QString &fileName, const QStringList &possibleColo return result; } + } namespace OCC {