Commit b3b6ede6 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

clang-tidy: fix `readability-redundant-access-specifiers` warnings

parent cdfc4e31
......@@ -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,\
......
......@@ -17,7 +17,6 @@ class cmBase32Encoder
public:
static const char paddingChar = '=';
public:
cmBase32Encoder();
~cmBase32Encoder() = default;
......
......@@ -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,
......
......@@ -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,
......
......@@ -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;
......
......@@ -89,7 +89,6 @@ private:
Result CheckGraph() const;
void Initialize();
private:
const cmGeneratorExpressionDAGChecker* const Parent;
cmGeneratorTarget const* Target;
const std::string Property;
......
......@@ -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;
......
......@@ -108,7 +108,6 @@ private:
std::vector<cmGeneratorExpressionEvaluatorVector>::const_iterator pit)
const;
private:
cmGeneratorExpressionEvaluatorVector IdentifierChildren;
std::vector<cmGeneratorExpressionEvaluatorVector> ParamChildren;
const char* StartContent;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -62,7 +62,6 @@ public:
private:
bool MustSkip();
private:
cmGeneratorTarget* GT;
cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator;
......
......@@ -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;
......
......@@ -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
......
......@@ -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_;
......
......@@ -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;
......
......@@ -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_;
};
......
......@@ -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_;
......
......@@ -52,7 +52,6 @@ private:
bool GenerateRcc();
bool GenerateWrapper();
private:
// -- Config settings
bool MultiConfig_ = false;
// -- Directories
......
......@@ -97,7 +97,6 @@ private:
void ComputeRelativePathTopSource();
void ComputeRelativePathTopBinary();
private:
cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator
DirectoryState;
cmStateSnapshot Snapshot_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment