diff options
-rw-r--r-- | .clang-tidy | 1 | ||||
-rw-r--r-- | Source/cmBase32.h | 1 | ||||
-rw-r--r-- | Source/cmDepends.h | 1 | ||||
-rw-r--r-- | Source/cmExtraCodeLiteGenerator.h | 1 | ||||
-rw-r--r-- | Source/cmFunctionBlocker.h | 1 | ||||
-rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.h | 1 | ||||
-rw-r--r-- | Source/cmGeneratorExpressionEvaluationFile.h | 1 | ||||
-rw-r--r-- | Source/cmGeneratorExpressionEvaluator.h | 1 | ||||
-rw-r--r-- | Source/cmGeneratorExpressionParser.h | 1 | ||||
-rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 2 | ||||
-rw-r--r-- | Source/cmNinjaNormalTargetGenerator.h | 1 | ||||
-rw-r--r-- | Source/cmOSXBundleGenerator.h | 1 | ||||
-rw-r--r-- | Source/cmOutputConverter.h | 1 | ||||
-rw-r--r-- | Source/cmQtAutoGen.h | 1 | ||||
-rw-r--r-- | Source/cmQtAutoGenGlobalInitializer.h | 2 | ||||
-rw-r--r-- | Source/cmQtAutoGenInitializer.h | 2 | ||||
-rw-r--r-- | Source/cmQtAutoGenerator.h | 3 | ||||
-rw-r--r-- | Source/cmQtAutoMocUic.cxx | 6 | ||||
-rw-r--r-- | Source/cmQtAutoRcc.cxx | 1 | ||||
-rw-r--r-- | Source/cmStateDirectory.h | 1 | ||||
-rw-r--r-- | Source/cmTarget.cxx | 1 | ||||
-rw-r--r-- | Source/cmTarget.h | 1 | ||||
-rw-r--r-- | Source/cmWorkerPool.cxx | 6 | ||||
-rw-r--r-- | Source/cmWorkerPool.h | 2 | ||||
-rw-r--r-- | Source/cmXMLWriter.h | 2 |
25 files changed, 0 insertions, 42 deletions
diff --git a/.clang-tidy b/.clang-tidy index 1ee68c2..17d37f5 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -25,7 +25,6 @@ readability-*,\ -readability-inconsistent-declaration-parameter-name,\ -readability-magic-numbers,\ -readability-named-parameter,\ --readability-redundant-access-specifiers,\ -readability-redundant-declaration,\ -readability-redundant-string-init,\ -readability-simplify-boolean-expr,\ diff --git a/Source/cmBase32.h b/Source/cmBase32.h index 25f7ab7..d70a062 100644 --- a/Source/cmBase32.h +++ b/Source/cmBase32.h @@ -17,7 +17,6 @@ class cmBase32Encoder public: static const char paddingChar = '='; -public: cmBase32Encoder(); ~cmBase32Encoder() = default; diff --git a/Source/cmDepends.h b/Source/cmDepends.h index 6875902..76af4db 100644 --- a/Source/cmDepends.h +++ b/Source/cmDepends.h @@ -25,7 +25,6 @@ class cmDepends public: using DependencyMap = std::map<std::string, std::vector<std::string>>; -public: /** Instances need to know the build directory name and the relative path from the build directory to the target file. */ cmDepends(cmLocalUnixMakefileGenerator3* lg = nullptr, diff --git a/Source/cmExtraCodeLiteGenerator.h b/Source/cmExtraCodeLiteGenerator.h index 2478585..2bb1c04 100644 --- a/Source/cmExtraCodeLiteGenerator.h +++ b/Source/cmExtraCodeLiteGenerator.h @@ -24,7 +24,6 @@ protected: std::string WorkspacePath; unsigned int CpuCount = 2; -protected: std::string GetCodeLiteCompilerName(const cmMakefile* mf) const; std::string GetConfigurationName(const cmMakefile* mf) const; std::string GetBuildCommand(const cmMakefile* mf, diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h index b4b493b..38abeba 100644 --- a/Source/cmFunctionBlocker.h +++ b/Source/cmFunctionBlocker.h @@ -44,7 +44,6 @@ private: virtual bool Replay(std::vector<cmListFileFunction> functions, cmExecutionStatus& status) = 0; -private: cmListFileContext StartingContext; std::vector<cmListFileFunction> Functions; unsigned int ScopeDepth = 1; diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h index 53225cd..93b44db 100644 --- a/Source/cmGeneratorExpressionDAGChecker.h +++ b/Source/cmGeneratorExpressionDAGChecker.h @@ -89,7 +89,6 @@ private: Result CheckGraph() const; void Initialize(); -private: const cmGeneratorExpressionDAGChecker* const Parent; cmGeneratorTarget const* Target; const std::string Property; diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h index 5ad5e23..9a870ac 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.h +++ b/Source/cmGeneratorExpressionEvaluationFile.h @@ -52,7 +52,6 @@ private: std::string FixRelativePath(std::string const& filePath, PathRole role, cmLocalGenerator* lg); -private: const std::string Input; const std::string Target; const std::unique_ptr<cmCompiledGeneratorExpression> OutputFileExpr; diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index af2afd6..8f47c0b 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -108,7 +108,6 @@ private: std::vector<cmGeneratorExpressionEvaluatorVector>::const_iterator pit) const; -private: cmGeneratorExpressionEvaluatorVector IdentifierChildren; std::vector<cmGeneratorExpressionEvaluatorVector> ParamChildren; const char* StartContent; diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h index d49bf3e..efaef3e 100644 --- a/Source/cmGeneratorExpressionParser.h +++ b/Source/cmGeneratorExpressionParser.h @@ -24,7 +24,6 @@ private: void ParseContent(cmGeneratorExpressionEvaluatorVector&); void ParseGeneratorExpression(cmGeneratorExpressionEvaluatorVector&); -private: std::vector<cmGeneratorExpressionToken>::const_iterator it; const std::vector<cmGeneratorExpressionToken> Tokens; unsigned int NestingLevel; diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index fd8542f..78fcb49 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -152,7 +152,6 @@ public: bool IsGCCOnWindows() const { return this->UsingGCCOnWindows; } -public: cmGlobalNinjaGenerator(cmake* cm); static std::unique_ptr<cmGlobalGeneratorFactory> NewFactory() @@ -570,7 +569,6 @@ private: bool DiagnosedCxxModuleSupport = false; -private: void InitOutputPathPrefix(); std::string OutputPathPrefix; diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h index ffc405c..30127fe 100644 --- a/Source/cmNinjaNormalTargetGenerator.h +++ b/Source/cmNinjaNormalTargetGenerator.h @@ -52,7 +52,6 @@ private: std::vector<std::string> ComputeLinkCmd(const std::string& config); std::vector<std::string> ComputeDeviceLinkCmd(); -private: // Target name info. cmGeneratorTarget::Names TargetNames(const std::string& config) const; std::string TargetLinkLanguage(const std::string& config) const; diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h index 4c33fcc..a3b6f98 100644 --- a/Source/cmOSXBundleGenerator.h +++ b/Source/cmOSXBundleGenerator.h @@ -62,7 +62,6 @@ public: private: bool MustSkip(); -private: cmGeneratorTarget* GT; cmMakefile* Makefile; cmLocalGenerator* LocalGenerator; diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h index ac7e7a0..f1a8041 100644 --- a/Source/cmOutputConverter.h +++ b/Source/cmOutputConverter.h @@ -111,7 +111,6 @@ private: static bool Shell_ArgumentNeedsQuotes(cm::string_view in, int flags); static std::string Shell_GetArgument(cm::string_view in, int flags); -private: cmStateSnapshot StateSnapshot; bool LinkScriptShell; diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h index e12a653..466a954 100644 --- a/Source/cmQtAutoGen.h +++ b/Source/cmQtAutoGen.h @@ -64,7 +64,6 @@ public: /// @brief Maximum number of parallel threads/processes in a generator static unsigned int const ParallelMax; -public: /// @brief Returns the generator name static cm::string_view GeneratorName(GenT genType); /// @brief Returns the generator name in upper case diff --git a/Source/cmQtAutoGenGlobalInitializer.h b/Source/cmQtAutoGenGlobalInitializer.h index ea3821d..afcb4a2 100644 --- a/Source/cmQtAutoGenGlobalInitializer.h +++ b/Source/cmQtAutoGenGlobalInitializer.h @@ -45,7 +45,6 @@ public: std::string ui; }; -public: cmQtAutoGenGlobalInitializer( std::vector<std::unique_ptr<cmLocalGenerator>> const& localGenerators); ~cmQtAutoGenGlobalInitializer(); @@ -73,7 +72,6 @@ private: std::string const& generator, std::string const& executable, std::string& error); -private: std::vector<std::unique_ptr<cmQtAutoGenInitializer>> Initializers_; std::map<cmLocalGenerator*, std::string> GlobalAutoGenTargets_; std::map<cmLocalGenerator*, std::string> GlobalAutoRccTargets_; diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index e0e66f1..f7e126d 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -98,7 +98,6 @@ public: , GenNameUpper(cmQtAutoGen::GeneratorNameUpper(gen)){}; }; -public: /** @return The detected Qt version and the required Qt major version. */ static std::pair<IntegerVersion, unsigned int> GetQtVersion( cmGeneratorTarget const* genTarget); @@ -149,7 +148,6 @@ private: bool GetQtExecutable(GenVarsT& genVars, const std::string& executable, bool ignoreMissingTarget) const; -private: cmQtAutoGenGlobalInitializer* GlobalInitializer = nullptr; cmGeneratorTarget* GenTarget = nullptr; cmGlobalGenerator* GlobalGen = nullptr; diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index af0b76d..5c3a8ad 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -54,7 +54,6 @@ public: private: static std::string HeadLine(cm::string_view title); - private: mutable std::mutex Mutex_; unsigned int Verbosity_ = 0; bool ColorOutput_ = false; @@ -79,7 +78,6 @@ public: static bool FileDiffers(std::string const& filename, std::string const& content); -public: // -- Constructors cmQtAutoGenerator(GenT genType); virtual ~cmQtAutoGenerator(); @@ -140,7 +138,6 @@ public: private: std::string ConfigKey(cm::string_view key) const; - private: Json::Value Json_; cmQtAutoGenerator& Gen_; }; diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index a9cc1c6..48354bc 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -55,7 +55,6 @@ public: cmQtAutoMocUicT(cmQtAutoMocUicT const&) = delete; cmQtAutoMocUicT& operator=(cmQtAutoMocUicT const&) = delete; -public: // -- Types /** Include string with sub parts. */ @@ -112,7 +111,6 @@ public: using FileHandleT = std::shared_ptr<FileT>; using GetOrInsertT = std::pair<FileHandleT, bool>; - public: ParseCacheT(); ~ParseCacheT(); @@ -135,7 +133,6 @@ public: { } - public: std::string FileName; cmFileTime FileTime; ParseCacheT::FileHandleT ParseData; @@ -266,7 +263,6 @@ public: std::vector<std::string> Options; }; - public: UicSettingsT(); ~UicSettingsT(); @@ -379,7 +375,6 @@ public: void MocIncludes(); void UicIncludes(); - protected: SourceFileHandleT FileHandle; std::string Content; }; @@ -572,7 +567,6 @@ private: static std::vector<std::string> dependenciesFromDepFile( const char* filePath); -private: // -- Settings BaseSettingsT BaseConst_; BaseEvalT BaseEval_; diff --git a/Source/cmQtAutoRcc.cxx b/Source/cmQtAutoRcc.cxx index 943cc93..414a692 100644 --- a/Source/cmQtAutoRcc.cxx +++ b/Source/cmQtAutoRcc.cxx @@ -52,7 +52,6 @@ private: bool GenerateRcc(); bool GenerateWrapper(); -private: // -- Config settings bool MultiConfig_ = false; // -- Directories diff --git a/Source/cmStateDirectory.h b/Source/cmStateDirectory.h index 56a262d..70c19bc 100644 --- a/Source/cmStateDirectory.h +++ b/Source/cmStateDirectory.h @@ -97,7 +97,6 @@ private: void ComputeRelativePathTopSource(); void ComputeRelativePathTopBinary(); -private: cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator DirectoryState; cmStateSnapshot Snapshot_; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index c12d5dd..91dcd0e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -209,7 +209,6 @@ public: TLLCommands; cmListFileBacktrace Backtrace; -public: bool CheckImportedLibName(std::string const& prop, std::string const& value) const; diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 3066eb2..30d9f5d 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -288,6 +288,5 @@ private: const char* GetPrefixVariableInternal( cmStateEnums::ArtifactType artifact) const; -private: std::unique_ptr<cmTargetInternals> impl; }; diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx index 7971009..1d15c27 100644 --- a/Source/cmWorkerPool.cxx +++ b/Source/cmWorkerPool.cxx @@ -31,7 +31,6 @@ public: /// On error the ssize_t argument is a non zero libuv error code using EndFunction = std::function<void(ssize_t)>; -public: /** * Reset to construction state */ @@ -65,7 +64,6 @@ private: uv_buf_t* buf); static void UVData(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf); -private: cm::uv_pipe_ptr UVPipe_; std::vector<char> Buffer_; DataFunction DataFunction_; @@ -154,7 +152,6 @@ public: bool MergedOutput = false; }; -public: // -- Const accessors SetupT const& Setup() const { return this->Setup_; } cmWorkerPool::ProcessResultT* Result() const { return this->Setup_.Result; } @@ -176,7 +173,6 @@ private: void UVPipeErrEnd(ssize_t error); void UVTryFinish(); -private: // -- Setup SetupT Setup_; // -- Runtime @@ -407,7 +403,6 @@ private: static void UVProcessStart(uv_async_t* handle); void UVProcessFinished(); -private: // -- Process management struct { @@ -520,7 +515,6 @@ public: static void UVSlotBegin(uv_async_t* handle); static void UVSlotEnd(uv_async_t* handle); -public: // -- UV loop #ifdef CMAKE_UV_SIGNAL_HACK std::unique_ptr<cmUVSignalHackRAII> UVHackRAII; diff --git a/Source/cmWorkerPool.h b/Source/cmWorkerPool.h index 9082d7f..ff25526 100644 --- a/Source/cmWorkerPool.h +++ b/Source/cmWorkerPool.h @@ -117,7 +117,6 @@ public: this->Process(); } - private: cmWorkerPool* Pool_ = nullptr; unsigned int WorkerIndex_ = 0; bool Fence_ = false; @@ -154,7 +153,6 @@ public: void Process() override { this->Pool()->Abort(); } }; -public: // -- Methods cmWorkerPool(); ~cmWorkerPool(); diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h index 8a32377..6e8eeb7 100644 --- a/Source/cmXMLWriter.h +++ b/Source/cmXMLWriter.h @@ -75,7 +75,6 @@ private: void CloseStartElement(); -private: static cmXMLSafe SafeAttribute(const char* value) { return { value }; } static cmXMLSafe SafeAttribute(std::string const& value) @@ -121,7 +120,6 @@ private: return value; } -private: std::ostream& Output; std::stack<std::string, std::vector<std::string>> Elements; std::string IndentationElement; |