From 2ae40e006c02e53b222cfd0ced59565da3a22d71 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 29 Aug 2022 22:57:24 +0200 Subject: [PATCH] Points: modernize C++: replace 'typedef' with 'using' --- src/Mod/Points/App/Points.h | 26 +++++++++++++------------- src/Mod/Points/App/PointsAlgos.cpp | 2 +- src/Mod/Points/App/PointsFeature.h | 4 ++-- src/Mod/Points/App/Structured.h | 2 +- src/Mod/Points/Gui/ViewProvider.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h index 0776e1f4e7..49c529ba5f 100644 --- a/src/Mod/Points/App/Points.h +++ b/src/Mod/Points/App/Points.h @@ -48,10 +48,10 @@ class PointsExport PointKernel : public Data::ComplexGeoData TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - typedef float float_type; - typedef Base::Vector3 value_type; - typedef std::vector::difference_type difference_type; - typedef std::vector::size_type size_type; + using float_type = float; + using value_type = Base::Vector3; + using difference_type = std::vector::difference_type; + using size_type = std::vector::size_type; PointKernel() { @@ -144,13 +144,13 @@ public: class PointsExport const_point_iterator { public: - typedef PointKernel::value_type kernel_type; - typedef Base::Vector3d value_type; - typedef std::vector::const_iterator iter_type; - typedef iter_type::difference_type difference_type; - typedef iter_type::iterator_category iterator_category; - typedef const value_type* pointer; - typedef const value_type& reference; + using kernel_type = PointKernel::value_type; + using value_type = Base::Vector3d; + using iter_type = std::vector::const_iterator; + using difference_type = iter_type::difference_type; + using iterator_category = iter_type::iterator_category; + using pointer = const value_type*; + using reference = const value_type&; const_point_iterator(const PointKernel*, std::vector::const_iterator index); const_point_iterator(const const_point_iterator& pi); @@ -177,8 +177,8 @@ public: std::vector::const_iterator _p_it; }; - typedef const_point_iterator const_iterator; - typedef std::reverse_iterator const_reverse_iterator; + using const_iterator = const_point_iterator; + using const_reverse_iterator = std::reverse_iterator; /** @name Iterator */ //@{ diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp index 785550b74f..f65408187c 100644 --- a/src/Mod/Points/App/PointsAlgos.cpp +++ b/src/Mod/Points/App/PointsAlgos.cpp @@ -246,7 +246,7 @@ public: } }; -typedef std::shared_ptr ConverterPtr; +using ConverterPtr = std::shared_ptr; class DataStreambuf : public std::streambuf { diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h index 667ffed87a..64ff6a9f3e 100644 --- a/src/Mod/Points/App/PointsFeature.h +++ b/src/Mod/Points/App/PointsFeature.h @@ -81,8 +81,8 @@ public: PropertyPointKernel Points; /**< The point kernel property. */ }; -typedef App::FeatureCustomT FeatureCustom; -typedef App::FeaturePythonT FeaturePython; +using FeatureCustom = App::FeatureCustomT; +using FeaturePython = App::FeaturePythonT; } //namespace Points diff --git a/src/Mod/Points/App/Structured.h b/src/Mod/Points/App/Structured.h index fb67f5bb93..236c511414 100644 --- a/src/Mod/Points/App/Structured.h +++ b/src/Mod/Points/App/Structured.h @@ -57,7 +57,7 @@ public: //@} }; -typedef App::FeatureCustomT StructuredCustom; +using StructuredCustom = App::FeatureCustomT; } //namespace Points diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h index c473d21b70..0e1aa63fff 100644 --- a/src/Mod/Points/Gui/ViewProvider.h +++ b/src/Mod/Points/Gui/ViewProvider.h @@ -169,7 +169,7 @@ protected: SoIndexedPointSet * pcPoints; }; -typedef Gui::ViewProviderPythonFeatureT ViewProviderPython; +using ViewProviderPython = Gui::ViewProviderPythonFeatureT; } // namespace PointsGui