diff options
author | Regina Pfeifer <regina@mailbox.org> | 2019-09-04 16:03:01 (GMT) |
---|---|---|
committer | Regina Pfeifer <regina@mailbox.org> | 2019-09-04 16:03:01 (GMT) |
commit | a1ddf2d0ba6268e29a9456948828f59d044791f1 (patch) | |
tree | b7046d67c6667c945e3683cf890d725c7123e2bd /Source/CPack/WiX | |
parent | ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (diff) | |
download | CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.zip CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.tar.gz CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.tar.bz2 |
clang-tidy: Replace typedef with using
Automate the conversion with
perl -i -0pe 's/typedef ([^;]*) ([^ ]+);/using $2 = $1;/g'
then manually fix a few places.
Diffstat (limited to 'Source/CPack/WiX')
-rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.h | 6 | ||||
-rw-r--r-- | Source/CPack/WiX/cmWIXPatchParser.h | 6 | ||||
-rw-r--r-- | Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx | 2 | ||||
-rw-r--r-- | Source/CPack/WiX/cmWIXShortcut.h | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index f8c7644..3b72e38 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -44,9 +44,9 @@ protected: bool SupportsComponentInstallation() const override { return true; } private: - typedef std::map<std::string, std::string> id_map_t; - typedef std::map<std::string, size_t> ambiguity_map_t; - typedef std::set<std::string> extension_set_t; + using id_map_t = std::map<std::string, std::string>; + using ambiguity_map_t = std::map<std::string, size_t>; + using extension_set_t = std::set<std::string>; enum class DefinitionType { diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h index 52c7e35..e0e3470 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.h +++ b/Source/CPack/WiX/cmWIXPatchParser.h @@ -36,8 +36,8 @@ struct cmWIXPatchElement : cmWIXPatchNode ~cmWIXPatchElement(); - typedef std::vector<cmWIXPatchNode*> child_list_t; - typedef std::map<std::string, std::string> attributes_t; + using child_list_t = std::vector<cmWIXPatchNode*>; + using attributes_t = std::map<std::string, std::string>; std::string name; child_list_t children; @@ -50,7 +50,7 @@ struct cmWIXPatchElement : cmWIXPatchNode class cmWIXPatchParser : public cmXMLParser { public: - typedef std::map<std::string, cmWIXPatchElement> fragment_map_t; + using fragment_map_t = std::map<std::string, cmWIXPatchElement>; cmWIXPatchParser(fragment_map_t& Fragments, cmCPackLog* logger); diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx b/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx index 2c99a22..751f7dc 100644 --- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx +++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx @@ -25,7 +25,7 @@ cmWIXRichTextFormatWriter::~cmWIXRichTextFormatWriter() void cmWIXRichTextFormatWriter::AddText(std::string const& text) { - typedef unsigned char rtf_byte_t; + using rtf_byte_t = unsigned char; for (size_t i = 0; i < text.size(); ++i) { rtf_byte_t c = rtf_byte_t(text[i]); diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h index 23ddc6a..d9eecdf 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -28,8 +28,8 @@ public: STARTUP }; - typedef std::vector<cmWIXShortcut> shortcut_list_t; - typedef std::map<std::string, shortcut_list_t> shortcut_id_map_t; + using shortcut_list_t = std::vector<cmWIXShortcut>; + using shortcut_id_map_t = std::map<std::string, shortcut_list_t>; void insert(Type type, std::string const& id, cmWIXShortcut const& shortcut); @@ -46,7 +46,7 @@ public: cmInstalledFile const& installedFile); private: - typedef std::map<Type, shortcut_id_map_t> shortcut_type_map_t; + using shortcut_type_map_t = std::map<Type, shortcut_id_map_t>; void CreateFromProperty(std::string const& propertyName, Type type, std::string const& id, |