diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-02-26 14:38:54 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-02-26 15:52:26 +0000 |
commit | 4fd17d627106fde01284075038e15cc0680611bc (patch) | |
tree | 25c5b7e8ec774d362ad97e86d0ecd1d8527fbac5 /tests | |
parent | 0b8f0b771080e51a59664782ced6b3a1cc5111ca (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')
-rw-r--r-- | tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 28 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 4 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackboxbase.cpp | 6 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackboxjava.cpp | 4 |
6 files changed, 20 insertions, 26 deletions
diff --git a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp index 466ed4b8e..5e4f348d2 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp +++ b/tests/auto/blackbox/testdata-qt/dbus-adaptors/car.cpp @@ -56,7 +56,7 @@ static const double Pi = 3.14159265358979323846264338327950288419717; QRectF Car::boundingRect() const { - return QRectF(-35, -81, 70, 115); + return {-35, -81, 70, 115}; } Car::Car() : color(Qt::green), wheelsAngle(0), speed(0) diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index d8c2d2c82..8dd79528b 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -89,11 +89,9 @@ QMap<QString, QString> TestBlackbox::findCli(int *status) *status = res; QFile file(temp.path() + "/" + relativeProductBuildDir("find-cli") + "/cli.json"); if (!file.open(QIODevice::ReadOnly)) - return QMap<QString, QString> { }; + return {}; const auto tools = QJsonDocument::fromJson(file.readAll()).toVariant().toMap(); - return QMap<QString, QString> { - {"path", QDir::fromNativeSeparators(tools["path"].toString())}, - }; + return {{"path", QDir::fromNativeSeparators(tools["path"].toString())}}; } QMap<QString, QString> TestBlackbox::findNodejs(int *status) @@ -107,11 +105,9 @@ QMap<QString, QString> TestBlackbox::findNodejs(int *status) *status = res; QFile file(temp.path() + "/" + relativeProductBuildDir("find-nodejs") + "/nodejs.json"); if (!file.open(QIODevice::ReadOnly)) - return QMap<QString, QString> { }; + return {}; const auto tools = QJsonDocument::fromJson(file.readAll()).toVariant().toMap(); - return QMap<QString, QString> { - {"node", QDir::fromNativeSeparators(tools["node"].toString())} - }; + return {{"node", QDir::fromNativeSeparators(tools["node"].toString())}}; } QMap<QString, QString> TestBlackbox::findTypeScript(int *status) @@ -125,11 +121,9 @@ QMap<QString, QString> TestBlackbox::findTypeScript(int *status) *status = res; QFile file(temp.path() + "/" + relativeProductBuildDir("find-typescript") + "/typescript.json"); if (!file.open(QIODevice::ReadOnly)) - return QMap<QString, QString> { }; + return {}; const auto tools = QJsonDocument::fromJson(file.readAll()).toVariant().toMap(); - return QMap<QString, QString> { - {"tsc", QDir::fromNativeSeparators(tools["tsc"].toString())} - }; + return {{"tsc", QDir::fromNativeSeparators(tools["tsc"].toString())}}; } QString TestBlackbox::findArchiver(const QString &fileName, int *status) @@ -823,7 +817,7 @@ static QJsonObject findByName(const QJsonArray &objects, const QString &name) if (objName == name) return obj; } - return QJsonObject(); + return {}; } static void readDepsOutput(const QString &depsFilePath, QJsonDocument &jsonDocument) @@ -2546,16 +2540,16 @@ static QString soName(const QString &readElfPath, const QString &libFilePath) readElf.start(readElfPath, QStringList() << "-a" << libFilePath); if (!readElf.waitForStarted() || !readElf.waitForFinished() || readElf.exitCode() != 0) { qDebug() << readElf.errorString() << readElf.readAllStandardError(); - return QString(); + return {}; } const QByteArray output = readElf.readAllStandardOutput(); const QByteArray magicString = "Library soname: ["; const int magicStringIndex = output.indexOf(magicString); if (magicStringIndex == -1) - return QString(); + return {}; const int endIndex = output.indexOf(']', magicStringIndex); if (endIndex == -1) - return QString(); + return {}; const int nameIndex = magicStringIndex + magicString.size(); const QByteArray theName = output.mid(nameIndex, endIndex - nameIndex); return QString::fromLatin1(theName); @@ -5537,7 +5531,7 @@ void TestBlackbox::assembly() QFile propertiesFile(relativeProductBuildDir("assembly") + "/properties.json"); if (propertiesFile.open(QIODevice::ReadOnly)) return QJsonDocument::fromJson(propertiesFile.readAll()).toVariant().toMap(); - return QVariantMap(); + return QVariantMap{}; })(); QVERIFY(!properties.empty()); const auto toolchain = properties.value("qbs.toolchain").toStringList(); diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index e02f70213..caf7cf0bc 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -53,9 +53,9 @@ QMap<QString, QString> TestBlackboxAndroid::findAndroid(int *status, const QStri QFile file(temp.path() + "/" + relativeProductBuildDir("find-android") + "/android.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 { {"sdk", QDir::fromNativeSeparators(tools["sdk"].toString())}, {"sdk-build-tools-dx", QDir::fromNativeSeparators(tools["sdk-build-tools-dx"].toString())}, {"ndk", QDir::fromNativeSeparators(tools["ndk"].toString())}, diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 0cb4d5abb..7cbc07b95 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -784,7 +784,7 @@ QVariantMap TestBlackboxApple::findXcode(int *status) QFile file(temp.path() + "/" + relativeProductBuildDir("find-xcode") + "/xcode.json"); if (!file.open(QIODevice::ReadOnly)) - return QVariantMap { }; + return {}; return QJsonDocument::fromJson(file.readAll()).toVariant().toMap(); } 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())} diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 0ea3c41ce..f7feb0612 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -134,7 +134,7 @@ static QString dpkgArch(const QString &prefix = QString()) dpkg.waitForFinished(); if (dpkg.exitStatus() == QProcess::NormalExit && dpkg.exitCode() == 0) return prefix + QString::fromLocal8Bit(dpkg.readAllStandardOutput().trimmed()); - return QString(); + return {}; } void TestBlackboxJava::javaDependencyTracking() @@ -191,7 +191,7 @@ void TestBlackboxJava::javaDependencyTracking_data() } } - return QString(); + return {}; }; static const auto knownJdkVersions = QStringList() << "1.6" << "1.7" << "1.8" << "1.9" |