diff --git a/src/libs/clangbackendipc/clangbackendipc_global.h b/src/libs/clangbackendipc/clangbackendipc_global.h index 33775c7cac7..aaa4e244ea0 100644 --- a/src/libs/clangbackendipc/clangbackendipc_global.h +++ b/src/libs/clangbackendipc/clangbackendipc_global.h @@ -48,9 +48,9 @@ #endif #ifdef UNIT_TESTS -#define unitttest_public public +#define unittest_public public #else -#define unitttest_public private +#define unittest_public private #endif namespace ClangBackEnd { diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index 0a38d5ddecc..5689d9414ab 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -48,9 +48,9 @@ #include #ifdef UNIT_TESTS -#define unitttest_public public +#define unittest_public public #else -#define unitttest_public private +#define unittest_public private #endif namespace Utils { @@ -658,7 +658,7 @@ public: return comparison < 0; } -unitttest_public: +unittest_public: bool isShortString() const noexcept { return !m_data.shortString.isReference; diff --git a/src/plugins/clangpchmanager/pchmanagerclient.h b/src/plugins/clangpchmanager/pchmanagerclient.h index 173b1078650..05ebc42e47b 100644 --- a/src/plugins/clangpchmanager/pchmanagerclient.h +++ b/src/plugins/clangpchmanager/pchmanagerclient.h @@ -45,7 +45,7 @@ public: void setConnectionClient(PchManagerConnectionClient *connectionClient); -unitttest_public: +unittest_public: const std::vector ¬ifiers() const; void precompiledHeaderUpdated(const QString &projectPartId, const QString &pchFilePath); diff --git a/src/plugins/clangrefactoring/refactoringclient.h b/src/plugins/clangrefactoring/refactoringclient.h index 82085458ff2..ea1abac026c 100644 --- a/src/plugins/clangrefactoring/refactoringclient.h +++ b/src/plugins/clangrefactoring/refactoringclient.h @@ -68,7 +68,7 @@ public: void setRefactoringConnectionClient(ClangBackEnd::RefactoringConnectionClient *connectionClient); -unitttest_public: +unittest_public: void addSearchResult(const ClangBackEnd::SourceRangeWithTextContainer &sourceRange, std::unordered_map &filePaths); diff --git a/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h b/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h index 20634488f3b..b808db64592 100644 --- a/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h +++ b/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h @@ -67,7 +67,7 @@ public: [this, callback=std::move(callback)] { callback(takeFilePaths()); }); } -unitttest_public: +unittest_public: virtual void restartTimer() { m_timer.start(20); diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h b/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h index 0aadc7bf2a3..9109aee15a6 100644 --- a/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h +++ b/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h @@ -110,7 +110,7 @@ public: m_notifier = notifier; } -unitttest_public: +unittest_public: static std::vector idsFromIdPaths(const std::vector &idPaths) { std::vector ids; diff --git a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend_global.h b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend_global.h index b5b5fdc0c76..b38de487bba 100644 --- a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend_global.h +++ b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend_global.h @@ -28,10 +28,10 @@ #include #ifdef UNIT_TESTS -#define unitttest_public public +#define unittest_public public #define non_unittest_final #else -#define unitttest_public private +#define unittest_public private #define non_unittest_final final #endif diff --git a/src/tools/clangpchmanagerbackend/source/pchcreator.h b/src/tools/clangpchmanagerbackend/source/pchcreator.h index 1ea1e080373..c9e59bd89fe 100644 --- a/src/tools/clangpchmanagerbackend/source/pchcreator.h +++ b/src/tools/clangpchmanagerbackend/source/pchcreator.h @@ -61,7 +61,7 @@ public: void setGenerator(PchGeneratorInterface *pchGenerator); -unitttest_public: +unittest_public: Utils::PathStringVector generateGlobalHeaderPaths() const; Utils::PathStringVector generateGlobalSourcePaths() const; Utils::PathStringVector generateGlobalHeaderAndSourcePaths() const; diff --git a/src/tools/clangpchmanagerbackend/source/pchgenerator.h b/src/tools/clangpchmanagerbackend/source/pchgenerator.h index 7c5b50f13b7..ca8438506fd 100644 --- a/src/tools/clangpchmanagerbackend/source/pchgenerator.h +++ b/src/tools/clangpchmanagerbackend/source/pchgenerator.h @@ -63,7 +63,7 @@ public: m_notifier = notifier; } -unitttest_public: +unittest_public: Process *addTask(Utils::SmallStringVector &&compilerArguments, ProjectPartPch &&projectPartPch) { auto process = std::make_unique(); diff --git a/src/tools/clangpchmanagerbackend/source/projectparts.h b/src/tools/clangpchmanagerbackend/source/projectparts.h index 2651e22ce66..67c8bc02563 100644 --- a/src/tools/clangpchmanagerbackend/source/projectparts.h +++ b/src/tools/clangpchmanagerbackend/source/projectparts.h @@ -42,7 +42,7 @@ public: void remove(const Utils::SmallStringVector &projectPartIds) override; V2::ProjectPartContainers projects(const Utils::SmallStringVector &projectPartIds) const override; -unitttest_public: +unittest_public: static V2::ProjectPartContainers uniqueProjectParts(V2::ProjectPartContainers &&projectsParts); V2::ProjectPartContainers newProjectParts(V2::ProjectPartContainers &&projectsParts) const; void mergeProjectParts(const V2::ProjectPartContainers &projectsParts);