From ecad88d2128f920f5e11cc3ff443d62b225c79d3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 8 Dec 2019 17:12:50 +0100 Subject: Cleanup: Use "using" instead of "typedef" where appropriate --- src/server/events/CreateBlock.cpp | 2 +- src/server/events/CreateGraph.cpp | 2 +- src/server/events/CreatePort.cpp | 6 +++--- src/server/events/Delta.hpp | 2 +- src/server/events/DisconnectAll.hpp | 2 +- src/server/events/Mark.hpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/events') diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index b9c844cb..cfeb0e3d 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -54,7 +54,7 @@ CreateBlock::CreateBlock(Engine& engine, bool CreateBlock::pre_process(PreProcessContext& ctx) { - typedef Properties::const_iterator iterator; + using iterator = Properties::const_iterator; const ingen::URIs& uris = _engine.world().uris(); const SPtr store = _engine.store(); diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index e2dffc61..5561d147 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -109,7 +109,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) const ingen::URIs& uris = _engine.world().uris(); - typedef Properties::const_iterator iterator; + using iterator = Properties::const_iterator; uint32_t ext_poly = 1; uint32_t int_poly = 1; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index f463eb4f..09eb8cff 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -57,8 +57,8 @@ CreatePort::CreatePort(Engine& engine, { const ingen::URIs& uris = _engine.world().uris(); - typedef Properties::const_iterator Iterator; - typedef std::pair Range; + using Iterator = Properties::const_iterator; + using Range = std::pair; const Range types = properties.equal_range(uris.rdf_type); for (Iterator i = types.first; i != types.second; ++i) { @@ -116,7 +116,7 @@ CreatePort::pre_process(PreProcessContext& ctx) const uint32_t buf_size = bufs.default_size(_buf_type); const int32_t old_n_ports = _graph->num_ports_non_rt(); - typedef Properties::const_iterator PropIter; + using PropIter = Properties::const_iterator; PropIter index_i = _properties.find(uris.lv2_index); int32_t index = 0; diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index dcc265f8..4328ad83 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -95,7 +95,7 @@ private: LOADED_BUNDLE }; - typedef std::vector> SetEvents; + using SetEvents = std::vector>; void init(); diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 8aa63d2b..3edfedd6 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -60,7 +60,7 @@ public: void undo(Interface& target) override; private: - typedef std::list Impls; + using Impls = std::list; const ingen::DisconnectAll _msg; GraphImpl* _parent; diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index 33aedcd6..ad8cb66b 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -59,7 +59,7 @@ public: private: enum class Type { BUNDLE_BEGIN, BUNDLE_END }; - typedef std::map> CompiledGraphs; + using CompiledGraphs = std::map>; CompiledGraphs _compiled_graphs; Type _type; -- cgit v1.2.1