aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/tst_blackboxbase.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-02-26 14:38:54 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-02-26 15:52:26 +0000
commit4fd17d627106fde01284075038e15cc0680611bc (patch)
tree25c5b7e8ec774d362ad97e86d0ecd1d8527fbac5 /tests/auto/blackbox/tst_blackboxbase.cpp
parent0b8f0b771080e51a59664782ced6b3a1cc5111ca (diff)
Return initializer list where it is possible
This fixes this clang-tidy warning: warning: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list] Change-Id: I421e1e47462fe0e97788672684d47943af7df850 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxbase.cpp')
-rw-r--r--tests/auto/blackbox/tst_blackboxbase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp
index 85bc26ba4..61b0271f6 100644
--- a/tests/auto/blackbox/tst_blackboxbase.cpp
+++ b/tests/auto/blackbox/tst_blackboxbase.cpp
@@ -210,7 +210,7 @@ QString TestBlackboxBase::findExecutable(const QStringList &fileNames)
return QDir::cleanPath(fullPath);
}
}
- return QString();
+ return {};
}
QMap<QString, QString> TestBlackboxBase::findJdkTools(int *status)
@@ -224,9 +224,9 @@ QMap<QString, QString> TestBlackboxBase::findJdkTools(int *status)
*status = res;
QFile file(temp.path() + "/" + relativeProductBuildDir("find-jdk") + "/jdk.json");
if (!file.open(QIODevice::ReadOnly))
- return QMap<QString, QString> { };
+ return {};
const auto tools = QJsonDocument::fromJson(file.readAll()).toVariant().toMap();
- return QMap<QString, QString> {
+ return {
{"java", QDir::fromNativeSeparators(tools["java"].toString())},
{"javac", QDir::fromNativeSeparators(tools["javac"].toString())},
{"jar", QDir::fromNativeSeparators(tools["jar"].toString())}