diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-12-19 17:02:19 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-19 17:02:27 (GMT) |
commit | fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be (patch) | |
tree | ea232ad31d2830f803e82e2f0ba6e4d4bfd58117 /Source/cmFindPackageCommand.cxx | |
parent | e4c5e81f3116f620104d377b78e718ee47723125 (diff) | |
parent | b2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 (diff) | |
download | CMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.zip CMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.tar.gz CMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.tar.bz2 |
Merge topic 'member-init'
b2aa3aedea clang-tidy: Use default member initialization
32cb564bea clang-tidy: Remove redundant member initializations
7ffa6bf999 cmUVHandlePtr: Use inherited constructors
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2726
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
-rw-r--r-- | Source/cmFindPackageCommand.cxx | 47 |
1 files changed, 15 insertions, 32 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index bf928fc..3d9cd08 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1675,11 +1675,7 @@ private: class cmFileList { public: - cmFileList() - : First() - , Last(nullptr) - { - } + cmFileList() {} virtual ~cmFileList() {} cmFileList& operator/(cmFileListGeneratorBase const& rhs) { @@ -1703,15 +1699,14 @@ 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 { public: cmFindPackageFileList(cmFindPackageCommand* fpc, bool use_suffixes = true) - : cmFileList() - , FPC(fpc) + : FPC(fpc) , UseSuffixes(use_suffixes) { } @@ -1753,13 +1748,11 @@ class cmFileListGeneratorFixed : public cmFileListGeneratorBase { public: cmFileListGeneratorFixed(std::string const& str) - : cmFileListGeneratorBase() - , String(str) + : String(str) { } cmFileListGeneratorFixed(cmFileListGeneratorFixed const& r) - : cmFileListGeneratorBase() - , String(r.String) + : String(r.String) { } @@ -1782,13 +1775,11 @@ class cmFileListGeneratorEnumerate : public cmFileListGeneratorBase { public: cmFileListGeneratorEnumerate(std::vector<std::string> const& v) - : cmFileListGeneratorBase() - , Vector(v) + : Vector(v) { } cmFileListGeneratorEnumerate(cmFileListGeneratorEnumerate const& r) - : cmFileListGeneratorBase() - , Vector(r.Vector) + : Vector(r.Vector) { } @@ -1817,14 +1808,12 @@ public: cmFileListGeneratorProject(std::vector<std::string> const& names, cmFindPackageCommand::SortOrderType so, cmFindPackageCommand::SortDirectionType sd) - : cmFileListGeneratorBase() - , Names(names) + : Names(names) { this->SetSort(so, sd); } cmFileListGeneratorProject(cmFileListGeneratorProject const& r) - : cmFileListGeneratorBase() - , Names(r.Names) + : Names(r.Names) { this->SetSort(r.SortOrder, r.SortDirection); } @@ -1888,14 +1877,12 @@ class cmFileListGeneratorMacProject : public cmFileListGeneratorBase public: cmFileListGeneratorMacProject(std::vector<std::string> const& names, const char* ext) - : cmFileListGeneratorBase() - , Names(names) + : Names(names) , Extension(ext) { } cmFileListGeneratorMacProject(cmFileListGeneratorMacProject const& r) - : cmFileListGeneratorBase() - , Names(r.Names) + : Names(r.Names) , Extension(r.Extension) { } @@ -1941,14 +1928,12 @@ class cmFileListGeneratorCaseInsensitive : public cmFileListGeneratorBase { public: cmFileListGeneratorCaseInsensitive(std::string const& str) - : cmFileListGeneratorBase() - , String(str) + : String(str) { } cmFileListGeneratorCaseInsensitive( cmFileListGeneratorCaseInsensitive const& r) - : cmFileListGeneratorBase() - , String(r.String) + : String(r.String) { } @@ -1985,13 +1970,11 @@ class cmFileListGeneratorGlob : public cmFileListGeneratorBase { public: cmFileListGeneratorGlob(std::string const& str) - : cmFileListGeneratorBase() - , Pattern(str) + : Pattern(str) { } cmFileListGeneratorGlob(cmFileListGeneratorGlob const& r) - : cmFileListGeneratorBase() - , Pattern(r.Pattern) + : Pattern(r.Pattern) { } |