Commit b2aa3aed authored by wahikihiki's avatar wahikihiki

clang-tidy: Use default member initialization

parent 32cb564b
......@@ -15,7 +15,6 @@ modernize-*,\
-modernize-raw-string-literal,\
-modernize-return-braced-init-list,\
-modernize-use-auto,\
-modernize-use-default-member-init,\
-modernize-use-emplace,\
-modernize-use-equals-default,\
-modernize-use-equals-delete,\
......@@ -36,4 +35,7 @@ readability-*,\
-readability-simplify-boolean-expr,\
"
HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$'
CheckOptions:
- key: modernize-use-default-member-init.UseAssignment
value: '1'
...
......@@ -503,10 +503,7 @@ public:
: FTC(ftc)
{
}
FragmentCompare()
: FTC(nullptr)
{
}
FragmentCompare() {}
bool operator()(std::string const& l, std::string const& r) const
{
// Order files by modification time. Use lexicographic order
......@@ -520,7 +517,7 @@ public:
}
private:
cmFileTimeComparison* FTC;
cmFileTimeComparison* FTC = nullptr;
};
void cmCTestBuildHandler::GenerateXMLLaunched(cmXMLWriter& xml)
......
......@@ -475,13 +475,9 @@ private:
{
std::string Name;
std::string EMail;
unsigned long Time;
long TimeZone;
Person()
: Time(0)
, TimeZone(0)
{
}
unsigned long Time = 0;
long TimeZone = 0;
Person() {}
};
void ParsePerson(const char* str, Person& person)
......
......@@ -475,11 +475,8 @@ int CCONV cmGetTotalArgumentSize(int argc, char** argv)
// API for source files.
struct cmCPluginAPISourceFile
{
cmCPluginAPISourceFile()
: RealSourceFile(nullptr)
{
}
cmSourceFile* RealSourceFile;
cmCPluginAPISourceFile() {}
cmSourceFile* RealSourceFile = nullptr;
std::string SourceName;
std::string SourceExtension;
std::string FullPath;
......
......@@ -57,10 +57,7 @@ public:
/** Representation of one part. */
struct PartInfo
{
PartInfo()
: Enabled(false)
{
}
PartInfo() {}
void SetName(const std::string& name) { this->Name = name; }
const std::string& GetName() const { return this->Name; }
......@@ -71,7 +68,7 @@ public:
std::vector<std::string> SubmitFiles;
private:
bool Enabled;
bool Enabled = false;
std::string Name;
};
#ifdef CMAKE_BUILD_WITH_CMAKE
......
......@@ -34,20 +34,15 @@ private:
struct CacheEntry
{
std::string Value;
cmStateEnums::CacheEntryType Type;
cmStateEnums::CacheEntryType Type = cmStateEnums::UNINITIALIZED;
cmPropertyMap Properties;
std::vector<std::string> GetPropertyList() const;
const char* GetProperty(const std::string&) const;
void SetProperty(const std::string& property, const char* value);
void AppendProperty(const std::string& property, const char* value,
bool asString = false);
bool Initialized;
CacheEntry()
: Value("")
, Type(cmStateEnums::UNINITIALIZED)
, Initialized(false)
{
}
bool Initialized = false;
CacheEntry() {}
};
public:
......
......@@ -30,10 +30,7 @@ public:
/**
* Construct the command. By default it has no makefile.
*/
cmCommand()
: Makefile(nullptr)
{
}
cmCommand() {}
/**
* Need virtual destructor to destroy real command type.
......@@ -90,7 +87,7 @@ public:
void SetError(const std::string& e);
protected:
cmMakefile* Makefile;
cmMakefile* Makefile = nullptr;
private:
std::string Error;
......
......@@ -35,15 +35,10 @@ public:
struct LinkEntry
{
std::string Item;
cmGeneratorTarget const* Target;
bool IsSharedDep;
bool IsFlag;
LinkEntry()
: Target(nullptr)
, IsSharedDep(false)
, IsFlag(false)
{
}
cmGeneratorTarget const* Target = nullptr;
bool IsSharedDep = false;
bool IsFlag = false;
LinkEntry() {}
LinkEntry(LinkEntry const& r)
: Item(r.Item)
, Target(r.Target)
......
......@@ -30,11 +30,7 @@ public:
struct Item
{
Item()
: IsPath(true)
, Target(nullptr)
{
}
Item() {}
Item(std::string const& v, bool p,
cmGeneratorTarget const* target = nullptr)
: Value(v)
......@@ -43,8 +39,8 @@ public:
{
}
std::string Value;
bool IsPath;
cmGeneratorTarget const* Target;
bool IsPath = true;
cmGeneratorTarget const* Target = nullptr;
};
typedef std::vector<Item> ItemVector;
ItemVector const& GetItems() const;
......
......@@ -18,9 +18,6 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
, Comment(comment ? comment : "")
, WorkingDirectory(workingDirectory ? workingDirectory : "")
, HaveComment(comment != nullptr)
, EscapeAllowMakeVars(false)
, EscapeOldStyle(true)
, CommandExpandLists(false)
{
if (mf) {
this->Backtrace = mf->GetBacktrace();
......
......@@ -47,25 +47,19 @@ private:
typedef std::string std_string;
public:
Def()
: Exists(false)
, Used(false)
{
}
Def() {}
Def(const char* v)
: std_string(v ? v : "")
, Exists(v ? true : false)
, Used(false)
{
}
Def(const std_string& v)
: std_string(v)
, Exists(true)
, Used(false)
{
}
bool Exists;
bool Used;
bool Exists = false;
bool Used = false;
};
static Def NoDef;
......
......@@ -15,10 +15,7 @@
cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir)
: LocalGenerator(lg)
, Verbose(false)
, FileComparison(nullptr)
, TargetDirectory(targetDir)
, MaxPath(16384)
, Dependee(new char[MaxPath])
, Depender(new char[MaxPath])
{
......
......@@ -96,15 +96,15 @@ protected:
cmLocalGenerator* LocalGenerator;
// Flag for verbose output.
bool Verbose;
cmFileTimeComparison* FileComparison;
bool Verbose = false;
cmFileTimeComparison* FileComparison = nullptr;
std::string Language;
// The full path to the target's build directory.
std::string TargetDirectory;
size_t MaxPath;
size_t MaxPath = 16384;
char* Dependee;
char* Depender;
......
......@@ -20,7 +20,6 @@
#define INCLUDE_REGEX_TRANSFORM_MARKER "#IncludeRegexTransform: "
cmDependsC::cmDependsC()
: ValidDeps(nullptr)
{
}
......
......@@ -75,16 +75,13 @@ public:
struct cmIncludeLines
{
cmIncludeLines()
: Used(false)
{
}
cmIncludeLines() {}
std::vector<UnscannedEntry> UnscannedEntries;
bool Used;
bool Used = false;
};
protected:
const std::map<std::string, DependencyVector>* ValidDeps;
const std::map<std::string, DependencyVector>* ValidDeps = nullptr;
std::set<std::string> Encountered;
std::queue<UnscannedEntry> Unscanned;
......
......@@ -69,7 +69,6 @@ public:
};
cmDependsFortran::cmDependsFortran()
: Internal(nullptr)
{
}
......
......@@ -76,7 +76,7 @@ protected:
std::set<std::string> PPDefinitions;
// Internal implementation details.
cmDependsFortranInternals* Internal;
cmDependsFortranInternals* Internal = nullptr;
private:
std::string MaybeConvertToRelativePath(std::string const& base,
......
......@@ -116,11 +116,8 @@ private:
struct RequestedHelpItem
{
RequestedHelpItem()
: HelpType(None)
{
}
cmDocumentationEnums::Type HelpType;
RequestedHelpItem() {}
cmDocumentationEnums::Type HelpType = None;
std::string Filename;
std::string Argument;
};
......
......@@ -11,8 +11,6 @@
#include <vector>
cmDocumentationFormatter::cmDocumentationFormatter()
: TextWidth(77)
, TextIndent("")
{
}
......
......@@ -59,8 +59,8 @@ public:
void SetIndent(const char* indent);
private:
int TextWidth;
const char* TextIndent;
int TextWidth = 77;
const char* TextIndent = "";
};
#endif
......@@ -11,13 +11,7 @@
class cmExecutionStatus
{
public:
cmExecutionStatus()
: ReturnInvoked(false)
, BreakInvoked(false)
, ContinueInvoked(false)
, NestedError(false)
{
}
cmExecutionStatus() {}
void Clear()
{
......@@ -40,10 +34,10 @@ public:
bool GetNestedError() const { return this->NestedError; }
private:
bool ReturnInvoked;
bool BreakInvoked;
bool ContinueInvoked;
bool NestedError;
bool ReturnInvoked = false;
bool BreakInvoked = false;
bool ContinueInvoked = false;
bool NestedError = false;
};
#endif
......@@ -3,7 +3,6 @@
#include "cmExpandedCommandArgument.h"
cmExpandedCommandArgument::cmExpandedCommandArgument()
: Quoted(false)
{
}
......
......@@ -33,7 +33,7 @@ public:
private:
std::string Value;
bool Quoted;
bool Quoted = false;
};
#endif
......@@ -22,7 +22,6 @@
cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator()
: ConfigName("NoConfig")
, CpuCount(2)
{
}
......
......@@ -23,7 +23,7 @@ class cmExtraCodeLiteGenerator : public cmExternalMakefileProjectGenerator
protected:
std::string ConfigName;
std::string WorkspacePath;
unsigned int CpuCount;
unsigned int CpuCount = 2;
protected:
std::string GetCodeLiteCompilerName(const cmMakefile* mf) const;
......
......@@ -1095,13 +1095,9 @@ protected:
// Properties set by pattern and regex match rules.
struct MatchProperties
{
bool Exclude;
mode_t Permissions;
MatchProperties()
: Exclude(false)
, Permissions(0)
{
}
bool Exclude = false;
mode_t Permissions = 0;
MatchProperties() {}
};
struct MatchRule
{
......
......@@ -51,14 +51,13 @@ private:
cmFileLockResult LockWithTimeout(unsigned long timeoutSec);
#if defined(_WIN32)
typedef HANDLE FileId;
HANDLE File = INVALID_HANDLE_VALUE;
BOOL LockFile(DWORD flags);
#else
typedef int FileId;
int File = -1;
int LockFile(int cmd, int type);
#endif
FileId File;
std::string Filename;
};
......
......@@ -9,7 +9,6 @@
#include <unistd.h>
cmFileLock::cmFileLock()
: File(-1)
{
}
......
......@@ -6,7 +6,6 @@
#include <windows.h> // CreateFileW
cmFileLock::cmFileLock()
: File(INVALID_HANDLE_VALUE)
{
}
......
......@@ -198,13 +198,10 @@ struct cmFindLibraryHelper
// Current names under consideration.
struct Name
{
bool TryRaw;
bool TryRaw = false;
std::string Raw;
cmsys::RegularExpression Regex;
Name()
: TryRaw(false)
{
}
Name() {}
};
std::vector<Name> Names;
......
......@@ -1675,10 +1675,7 @@ private:
class cmFileList
{
public:
cmFileList()
: Last(nullptr)
{
}
cmFileList() {}
virtual ~cmFileList() {}
cmFileList& operator/(cmFileListGeneratorBase const& rhs)
{
......@@ -1702,7 +1699,7 @@ private:
virtual bool Visit(std::string const& fullPath) = 0;
friend class cmFileListGeneratorBase;
std::unique_ptr<cmFileListGeneratorBase> First;
cmFileListGeneratorBase* Last;
cmFileListGeneratorBase* Last = nullptr;
};
class cmFindPackageFileList : public cmFileList
......
......@@ -103,18 +103,10 @@ void cmGeneratedFileStream::SetCompressionExtraExtension(bool ext)
}
cmGeneratedFileStreamBase::cmGeneratedFileStreamBase()
: CopyIfDifferent(false)
, Okay(false)
, Compress(false)
, CompressExtraExtension(true)
{
}
cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(std::string const& name)
: CopyIfDifferent(false)
, Okay(false)
, Compress(false)
, CompressExtraExtension(true)
{
this->Open(name);
}
......
......@@ -45,16 +45,16 @@ protected:
std::string TempName;
// Whether to do a copy-if-different.
bool CopyIfDifferent;
bool CopyIfDifferent = false;
// Whether the real file stream was valid when it was closed.
bool Okay;
bool Okay = false;
// Whether the destination file is compressed
bool Compress;
bool Compress = false;
// Whether the destination file is compressed
bool CompressExtraExtension;
bool CompressExtraExtension = true;
};
/** \class cmGeneratedFileStream
......
......@@ -3,8 +3,6 @@
#include "cmGeneratorExpressionLexer.h"
cmGeneratorExpressionLexer::cmGeneratorExpressionLexer()
: SawBeginExpression(false)
, SawGeneratorExpression(false)
{
}
......
......@@ -46,8 +46,8 @@ public:
}
private:
bool SawBeginExpression;
bool SawGeneratorExpression;
bool SawBeginExpression = false;
bool SawGeneratorExpression = false;
};
#endif
......@@ -110,11 +110,8 @@ public:
std::set<std::string> ExpectedResxHeaders;
std::set<std::string> ExpectedXamlHeaders;
std::set<std::string> ExpectedXamlSources;
bool Initialized;
KindedSources()
: Initialized(false)
{
}
bool Initialized = false;
KindedSources() {}
};
/** Get all sources needed for a configuration with kinds assigned. */
......@@ -565,13 +562,9 @@ public:
};
struct SourceFileFlags
{
SourceFileFlags()
: Type(SourceFileTypeNormal)
, MacFolder(nullptr)
{
}
SourceFileType Type;
const char* MacFolder; // location inside Mac content folders
SourceFileFlags() {}
SourceFileType Type = SourceFileTypeNormal;
const char* MacFolder = nullptr; // location inside Mac content folders
};
void GetAutoUicOptions(std::vector<std::string>& result,
const std::string& config) const;
......@@ -757,11 +750,8 @@ private:
struct CompatibleInterfaces : public CompatibleInterfacesBase
{
CompatibleInterfaces()
: Done(false)
{
}
bool Done;
CompatibleInterfaces() {}
bool Done = false;
};
mutable std::map<std::string, CompatibleInterfaces> CompatibleInterfacesMap;
......@@ -774,11 +764,8 @@ private:
struct LinkImplClosure : public std::vector<cmGeneratorTarget const*>
{
LinkImplClosure()
: Done(false)
{
}
bool Done;
LinkImplClosure() {}
bool Done = false;
};
mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap;
......@@ -797,15 +784,10 @@ private:
// Cache import information from properties for each configuration.
struct ImportInfo
{
ImportInfo()
: NoSOName(false)
, Managed(Native)
, Multiplicity(0)
{
}
bool NoSOName;
ManagedType Managed;
unsigned int Multiplicity;
ImportInfo() {}
bool NoSOName = false;
ManagedType Managed = Native;
unsigned int Multiplicity = 0;
std::string Location;
std::string SOName;
std::string ImportLibrary;
......
......@@ -70,13 +70,10 @@ private:
struct CacheEntryValue
{
bool Initialized;
bool Initialized = false;
std::vector<std::string> Files;
std::vector<std::pair<std::string, cmListFileBacktrace>> Backtraces;
CacheEntryValue()
: Initialized(false)
{
}
CacheEntryValue() {}
};
typedef std::map<CacheEntryKey, CacheEntryValue> CacheEntryMap;
......
......@@ -478,11 +478,8 @@ protected:
cmCustomCommandLines CommandLines;
std::vector<std::string> Depends;
std::string WorkingDir;
bool UsesTerminal;
GlobalTargetInfo()
: UsesTerminal(false)
{
}
bool UsesTerminal = false;
GlobalTargetInfo() {}
};
void CreateDefaultGlobalTargets(std::vector<GlobalTargetInfo>& targets);
......@@ -608,13 +605,10 @@ private:
// Cache directory content and target files to be built.
struct DirectoryContent
{
long LastDiskTime;
long LastDiskTime = -1;
std::set<std::string> All;
std::set<std::string> Generated;
DirectoryContent()
: LastDiskTime(-1)
{
}
DirectoryContent() {}
};
std::map<std::string, DirectoryContent> DirectoryContentMap;
......
......@@ -217,11 +217,8 @@ protected:
// Store per-target progress counters.
struct TargetProgress
{
TargetProgress()
: NumberOfActions(0)
{
}
unsigned long NumberOfActions;
TargetProgress() {}
unsigned long NumberOfActions = 0;
std::string VariableFile;
std::vector<unsigned long> Marks;
void WriteProgressVariables(unsigned long total, unsigned long& current);
......
......@@ -10,7 +10,6 @@
#include <utility>
cmInstalledFile::cmInstalledFile()
: NameExpression(nullptr)
{
}
......
......@@ -68,7 +68,7 @@ public:
private:
std::string Name;
cmCompiledGeneratorExpression* NameExpression;
cmCompiledGeneratorExpression* NameExpression = nullptr;