From d5ace749e89a6b6fbf4ec836e054fab21729a0ef Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 19 May 2019 02:29:11 +0200 Subject: Fix readability-static-definition-in-anonymous-namespace warnings Move static functions out of anonymous namespaces Change-Id: Iae6d13189b716e47b21f4c11e1c337487f78fad5 Reviewed-by: Christian Kandeler --- src/app/qbs-setup-toolchains/iarewprobe.cpp | 4 - src/app/qbs-setup-toolchains/keilprobe.cpp | 4 - src/app/qbs-setup-toolchains/sdccprobe.cpp | 4 - src/app/qbs-setup-toolchains/xcodeprobe.cpp | 86 +++++++++++----------- .../visualstudio/msbuildfiltersproject.cpp | 4 - 5 files changed, 43 insertions(+), 59 deletions(-) (limited to 'src') diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index fe3cf4082..5d3785759 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -55,8 +55,6 @@ using namespace qbs; using Internal::Tr; using Internal::HostOsInfo; -namespace { - static QStringList knownIarCompilerNames() { return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr")}; @@ -166,8 +164,6 @@ static std::vector installedIarsFromRegistry() return infos; } -} // end of anonymous namespace - bool isIarCompiler(const QString &compilerName) { return Internal::any_of(knownIarCompilerNames(), [compilerName]( diff --git a/src/app/qbs-setup-toolchains/keilprobe.cpp b/src/app/qbs-setup-toolchains/keilprobe.cpp index 9de9958cd..dc327d2ee 100644 --- a/src/app/qbs-setup-toolchains/keilprobe.cpp +++ b/src/app/qbs-setup-toolchains/keilprobe.cpp @@ -55,8 +55,6 @@ using namespace qbs; using Internal::Tr; using Internal::HostOsInfo; -namespace { - static QStringList knownKeilCompilerNames() { return {QStringLiteral("c51"), QStringLiteral("armcc")}; @@ -161,8 +159,6 @@ static std::vector installedKeilsFromRegistry() return infos; } -} // end of anonymous namespace - bool isKeilCompiler(const QString &compilerName) { return Internal::any_of(knownKeilCompilerNames(), [compilerName]( diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp index 00275e51d..751e872ee 100644 --- a/src/app/qbs-setup-toolchains/sdccprobe.cpp +++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp @@ -55,8 +55,6 @@ using namespace qbs; using Internal::Tr; using Internal::HostOsInfo; -namespace { - static QStringList knownSdccCompilerNames() { return {QStringLiteral("sdcc")}; @@ -136,8 +134,6 @@ static std::vector installedSdccsFromRegistry() return infos; } -} // end of anonymous namespace - bool isSdccCompiler(const QString &compilerName) { return Internal::any_of(knownSdccCompilerNames(), [compilerName]( diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 9b8acc79e..a0f6f80d1 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -59,12 +59,54 @@ using namespace qbs; using Internal::Tr; -namespace { static const QString defaultDeveloperPath = QStringLiteral("/Applications/Xcode.app/Contents/Developer"); static const std::regex defaultDeveloperPathRegex( "^/Applications/Xcode([a-zA-Z0-9 _-]+)\\.app/Contents/Developer$"); +static QString targetOS(const QString &applePlatformName) +{ + if (applePlatformName == QStringLiteral("macosx")) + return QStringLiteral("macos"); + if (applePlatformName == QStringLiteral("iphoneos")) + return QStringLiteral("ios"); + if (applePlatformName == QStringLiteral("iphonesimulator")) + return QStringLiteral("ios-simulator"); + if (applePlatformName == QStringLiteral("appletvos")) + return QStringLiteral("tvos"); + if (applePlatformName == QStringLiteral("appletvsimulator")) + return QStringLiteral("tvos-simulator"); + if (applePlatformName == QStringLiteral("watchos")) + return QStringLiteral("watchos"); + if (applePlatformName == QStringLiteral("watchsimulator")) + return QStringLiteral("watchos-simulator"); + return {}; +} + +static QStringList archList(const QString &applePlatformName) +{ + QStringList archs; + if (applePlatformName == QStringLiteral("macosx") + || applePlatformName == QStringLiteral("iphonesimulator") + || applePlatformName == QStringLiteral("appletvsimulator") + || applePlatformName == QStringLiteral("watchsimulator")) { + if (applePlatformName != QStringLiteral("appletvsimulator")) + archs << QStringLiteral("x86"); + if (applePlatformName != QStringLiteral("watchsimulator")) + archs << QStringLiteral("x86_64"); + } else if (applePlatformName == QStringLiteral("iphoneos") + || applePlatformName == QStringLiteral("appletvos")) { + if (applePlatformName != QStringLiteral("appletvos")) + archs << QStringLiteral("armv7a"); + archs << QStringLiteral("arm64"); + } else if (applePlatformName == QStringLiteral("watchos")) { + archs << QStringLiteral("armv7k"); + } + + return archs; +} + +namespace { class XcodeProbe { public: @@ -124,48 +166,6 @@ void XcodeProbe::detectDeveloperPaths() } } -static QString targetOS(const QString &applePlatformName) -{ - if (applePlatformName == QStringLiteral("macosx")) - return QStringLiteral("macos"); - if (applePlatformName == QStringLiteral("iphoneos")) - return QStringLiteral("ios"); - if (applePlatformName == QStringLiteral("iphonesimulator")) - return QStringLiteral("ios-simulator"); - if (applePlatformName == QStringLiteral("appletvos")) - return QStringLiteral("tvos"); - if (applePlatformName == QStringLiteral("appletvsimulator")) - return QStringLiteral("tvos-simulator"); - if (applePlatformName == QStringLiteral("watchos")) - return QStringLiteral("watchos"); - if (applePlatformName == QStringLiteral("watchsimulator")) - return QStringLiteral("watchos-simulator"); - return {}; -} - -static QStringList archList(const QString &applePlatformName) -{ - QStringList archs; - if (applePlatformName == QStringLiteral("macosx") - || applePlatformName == QStringLiteral("iphonesimulator") - || applePlatformName == QStringLiteral("appletvsimulator") - || applePlatformName == QStringLiteral("watchsimulator")) { - if (applePlatformName != QStringLiteral("appletvsimulator")) - archs << QStringLiteral("x86"); - if (applePlatformName != QStringLiteral("watchsimulator")) - archs << QStringLiteral("x86_64"); - } else if (applePlatformName == QStringLiteral("iphoneos") - || applePlatformName == QStringLiteral("appletvos")) { - if (applePlatformName != QStringLiteral("appletvos")) - archs << QStringLiteral("armv7a"); - archs << QStringLiteral("arm64"); - } else if (applePlatformName == QStringLiteral("watchos")) { - archs << QStringLiteral("armv7k"); - } - - return archs; -} - void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName) { qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(xcodeName).arg(devPath); diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp index 54a1dfb5e..1cd2573c3 100644 --- a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp @@ -45,8 +45,6 @@ namespace qbs { -namespace { - static QStringList sourceFileExtensions() { return {QStringLiteral("c"), QStringLiteral("C"), QStringLiteral("cpp"), @@ -91,8 +89,6 @@ static bool matchesFilter(const MSBuildFilter *filter, const QString &filePath) return filter->extensions().contains(QFileInfo(filePath).completeSuffix()); } -} - MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &product, QObject *parent) : MSBuildProject(parent) -- cgit v1.2.3