Style (#2954)

Source/Samples/03_Sprites/Sprites.h

@@ -43,5 +43,5 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
 
     /// Vector to store the sprites for iterating through them.
-    Vector<SharedPtr<Sprite> > sprites_;
+    Vector<SharedPtr<Sprite>> sprites_;
 };

Source/Samples/15_Navigation/Navigation.h

@@ -151,7 +151,7 @@ private:
     /// Streaming distance.
     int streamingDistance_;
     /// Tile data.
-    HashMap<IntVector2, PODVector<unsigned char> > tileData_;
+    HashMap<IntVector2, PODVector<unsigned char>> tileData_;
     /// Added tiles.
     HashSet<IntVector2> addedTiles_;
 };

Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -395,7 +395,7 @@ void SceneReplication::HandlePhysicsPreStep(StringHash eventType, VariantMap& ev
     // Server: apply controls to client objects
     else if (network->IsServerRunning())
     {
-        const Vector<SharedPtr<Connection> >& connections = network->GetClientConnections();
+        const Vector<SharedPtr<Connection>>& connections = network->GetClientConnections();
 
         for (unsigned i = 0; i < connections.Size(); ++i)
         {

Source/Samples/17_SceneReplication/SceneReplication.h

@@ -80,7 +80,7 @@ private:
     void HandleClientObjectID(StringHash eventType, VariantMap& eventData);
 
     /// Mapping from client connections to controllable objects.
-    HashMap<Connection*, WeakPtr<Node> > serverObjects_;
+    HashMap<Connection*, WeakPtr<Node>> serverObjects_;
     /// Button container element.
     SharedPtr<UIElement> buttonContainer_;
     /// Server address line editor element.

Source/Samples/20_HugeObjectCount/HugeObjectCount.h

@@ -71,7 +71,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
 
     /// Box scene nodes.
-    Vector<SharedPtr<Node> > boxNodes_;
+    Vector<SharedPtr<Node>> boxNodes_;
     /// Animation flag.
     bool animate_;
     /// Group optimization flag.

Source/Samples/24_Urho2DSprite/Urho2DSprite.h

@@ -65,5 +65,5 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
 
     /// Sprite nodes.
-    Vector<SharedPtr<Node> > spriteNodes_;
+    Vector<SharedPtr<Node>> spriteNodes_;
 };

Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp

@@ -225,8 +225,8 @@ void DynamicGeometry::CreateScene()
         fromScratchModel->SetBoundingBox(BoundingBox(Vector3(-0.5f, -0.5f, -0.5f), Vector3(0.5f, 0.5f, 0.5f)));
 
         // Though not necessary to render, the vertex & index buffers must be listed in the model so that it can be saved properly
-        Vector<SharedPtr<VertexBuffer> > vertexBuffers;
-        Vector<SharedPtr<IndexBuffer> > indexBuffers;
+        Vector<SharedPtr<VertexBuffer>> vertexBuffers;
+        Vector<SharedPtr<IndexBuffer>> indexBuffers;
         vertexBuffers.Push(vb);
         indexBuffers.Push(ib);
         // Morph ranges could also be not defined. Here we simply define a zero range (no morphing) for the vertex buffer

Source/Samples/34_DynamicGeometry/DynamicGeometry.h

@@ -61,7 +61,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
 
     /// Cloned models' vertex buffers that we will animate.
-    Vector<SharedPtr<VertexBuffer> > animatingBuffers_;
+    Vector<SharedPtr<VertexBuffer>> animatingBuffers_;
     /// Original vertex positions for the sphere model.
     PODVector<Vector3> originalVertices_;
     /// If the vertices are duplicates, indices to the original vertices (to allow seamless animation.)

Source/Samples/39_CrowdNavigation/CrowdNavigation.cpp

@@ -274,7 +274,7 @@ void CrowdNavigation::CreateMushroom(const Vector3& pos)
 
 void CrowdNavigation::CreateBoxOffMeshConnections(DynamicNavigationMesh* navMesh, Node* boxGroup)
 {
-    const Vector<SharedPtr<Node> >& boxes = boxGroup->GetChildren();
+    const Vector<SharedPtr<Node>>& boxes = boxGroup->GetChildren();
     for (unsigned i=0; i < boxes.Size(); ++i)
     {
         Node* box = boxes[i];

Source/Samples/39_CrowdNavigation/CrowdNavigation.h

@@ -155,7 +155,7 @@ private:
     /// Streaming distance.
     int streamingDistance_{2};
     /// Tile data.
-    HashMap<IntVector2, PODVector<unsigned char> > tileData_;
+    HashMap<IntVector2, PODVector<unsigned char>> tileData_;
     /// Added tiles.
     HashSet<IntVector2> addedTiles_;
     /// Flag for drawing debug geometry.

Source/Urho3D/AngelScript/APITemplates.h

@@ -101,7 +101,7 @@ template <class T> CScriptArray* VectorToHandleArray(const Vector<T*>& vector, c
 }
 
 /// Template function for shared pointer Vector to handle array conversion.
-template <class T> CScriptArray* VectorToHandleArray(const Vector<SharedPtr<T> >& vector, const char* arrayName)
+template <class T> CScriptArray* VectorToHandleArray(const Vector<SharedPtr<T>>& vector, const char* arrayName)
 {
     Context* context = GetScriptContext();
 
@@ -135,10 +135,10 @@ template <class T> Vector<T> ArrayToVector(CScriptArray* arr)
     return dest;
 }
 
-template <class T> Vector<SharedPtr<T> > HandleArrayToVector(CScriptArray* arr)
+template <class T> Vector<SharedPtr<T>> HandleArrayToVector(CScriptArray* arr)
 {
     Vector<T*> rawPtrs = ArrayToVector<T*>(arr);
-    Vector<SharedPtr<T> > result(rawPtrs.Size());
+    Vector<SharedPtr<T>> result(rawPtrs.Size());
     for (unsigned i = 0; i < rawPtrs.Size(); ++i)
         result[i] = SharedPtr<T>(rawPtrs[i]);
     return result;

Source/Urho3D/AngelScript/Manual_Scene.h

@@ -80,8 +80,8 @@ template <class T> CScriptArray* Node_GetChildren_Script_ClassName(const String&
     for (PODVector<Node*>::Iterator i = nodes.Begin(); i != nodes.End(); ++i)
     {
         Node* node = *i;
-        const Vector<SharedPtr<Component> >& components = node->GetComponents();
-        for (Vector<SharedPtr<Component> >::ConstIterator j = components.Begin(); j != components.End(); ++j)
+        const Vector<SharedPtr<Component>>& components = node->GetComponents();
+        for (Vector<SharedPtr<Component>>::ConstIterator j = components.Begin(); j != components.End(); ++j)
         {
             if (auto* instance = (*j)->Cast<ScriptInstance>())
             {
@@ -117,7 +117,7 @@ template <class T> unsigned Node_GetNumChildren_Recursive(T* ptr)
 // Node* Node::GetChild(unsigned index) const | File: ../Scene/Node.h
 template <class T> Node* Node_GetChild(unsigned index, T* ptr)
 {
-    const Vector<SharedPtr<Node> >& children = ptr->GetChildren();
+    const Vector<SharedPtr<Node>>& children = ptr->GetChildren();
     if (index >= children.Size())
     {
         GetActiveASContext()->SetException("Index out of bounds");
@@ -142,7 +142,7 @@ template <class T> Node* Node_GetChild_Name_Recursive(const String& name, T* ptr
 // const Vector<SharedPtr<Component>>& Node::GetComponents() const | File: ../Scene/Node.h
 template <class T> Component* Node_GetComponent(unsigned index, T* ptr)
 {
-    const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
+    const Vector<SharedPtr<Component>>& components = ptr->GetComponents();
     if (index >= components.Size())
     {
         GetActiveASContext()->SetException("Index out of bounds");

Source/Urho3D/AngelScript/SceneAPI.cpp

@@ -29,19 +29,19 @@ static CScriptArray* GetObjectCategories()
 
 static CScriptArray* GetObjectsByCategory(const String& category)
 {
-    const HashMap<String, Vector<StringHash> >& categories = GetScriptContext()->GetObjectCategories();
+    const HashMap<String, Vector<StringHash>>& categories = GetScriptContext()->GetObjectCategories();
     Vector<String> components;
 
-    HashMap<String, Vector<StringHash> >::ConstIterator i = categories.Find(category);
+    HashMap<String, Vector<StringHash>>::ConstIterator i = categories.Find(category);
     if (i != categories.End())
     {
-        const HashMap<StringHash, SharedPtr<ObjectFactory> >& factories = GetScriptContext()->GetObjectFactories();
+        const HashMap<StringHash, SharedPtr<ObjectFactory>>& factories = GetScriptContext()->GetObjectFactories();
         const Vector<StringHash>& factoryHashes = i->second_;
         components.Reserve(factoryHashes.Size());
 
         for (unsigned j = 0; j < factoryHashes.Size(); ++j)
         {
-            HashMap<StringHash, SharedPtr<ObjectFactory> >::ConstIterator k = factories.Find(factoryHashes[j]);
+            HashMap<StringHash, SharedPtr<ObjectFactory>>::ConstIterator k = factories.Find(factoryHashes[j]);
             if (k != factories.End())
                 components.Push(k->second_->GetTypeName());
         }

Source/Urho3D/AngelScript/ScriptAPI.cpp

@@ -47,8 +47,8 @@ static asIScriptObject* NodeCreateScriptObjectWithFile(ScriptFile* file, const S
         return nullptr;
 
     // Try first to reuse an existing, empty ScriptInstance
-    const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
-    for (Vector<SharedPtr<Component> >::ConstIterator i = components.Begin(); i != components.End(); ++i)
+    const Vector<SharedPtr<Component>>& components = ptr->GetComponents();
+    for (Vector<SharedPtr<Component>>::ConstIterator i = components.Begin(); i != components.End(); ++i)
     {
         if ((*i)->GetType() == ScriptInstance::GetTypeStatic())
         {
@@ -108,8 +108,8 @@ static asIScriptObject* NodeCreateScriptObject(const String& scriptFileName, con
 asIScriptObject* NodeGetScriptObject(Node* ptr)
 {
     // Get the first available ScriptInstance with an object
-    const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
-    for (Vector<SharedPtr<Component> >::ConstIterator i = components.Begin(); i != components.End(); ++i)
+    const Vector<SharedPtr<Component>>& components = ptr->GetComponents();
+    for (Vector<SharedPtr<Component>>::ConstIterator i = components.Begin(); i != components.End(); ++i)
     {
         if ((*i)->GetType() == ScriptInstance::GetTypeStatic())
         {
@@ -125,8 +125,8 @@ asIScriptObject* NodeGetScriptObject(Node* ptr)
 
 asIScriptObject* NodeGetNamedScriptObject(const String& className, Node* ptr)
 {
-    const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
-    for (Vector<SharedPtr<Component> >::ConstIterator i = components.Begin(); i != components.End(); ++i)
+    const Vector<SharedPtr<Component>>& components = ptr->GetComponents();
+    for (Vector<SharedPtr<Component>>::ConstIterator i = components.Begin(); i != components.End(); ++i)
     {
         if ((*i)->GetType() == ScriptInstance::GetTypeStatic())
         {

Source/Urho3D/AngelScript/ScriptAPIDump.cpp

@@ -249,10 +249,10 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
 
         Log::WriteRaw("\n\\page AttributeList Attribute list\n");
 
-        const HashMap<StringHash, Vector<AttributeInfo> >& attributes = context_->GetAllAttributes();
+        const HashMap<StringHash, Vector<AttributeInfo>>& attributes = context_->GetAllAttributes();
 
         Vector<String> objectTypes;
-        for (HashMap<StringHash, Vector<AttributeInfo> >::ConstIterator i = attributes.Begin(); i != attributes.End(); ++i)
+        for (HashMap<StringHash, Vector<AttributeInfo>>::ConstIterator i = attributes.Begin(); i != attributes.End(); ++i)
             objectTypes.Push(context_->GetTypeName(i->first_));
 
         Sort(objectTypes.Begin(), objectTypes.End());
@@ -327,7 +327,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
         );
 
     unsigned types = scriptEngine_->GetObjectTypeCount();
-    Vector<Pair<String, unsigned> > sortedTypes;
+    Vector<Pair<String, unsigned>> sortedTypes;
     for (unsigned i = 0; i < types; ++i)
     {
         asITypeInfo* type = scriptEngine_->GetObjectTypeByIndex(i);
@@ -340,7 +340,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
     Sort(sortedTypes.Begin(), sortedTypes.End());
 
     // Get global constants by namespace
-    HashMap<String, Vector<String> > globalConstants;
+    HashMap<String, Vector<String>> globalConstants;
     unsigned properties = scriptEngine_->GetGlobalPropertyCount();
     for (unsigned i = 0; i < properties; ++i)
     {
@@ -354,7 +354,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
         String type(propertyDeclaration);
         globalConstants[String(propertyNameSpace)].Push(type + " " + String(propertyName));
     }
-    for (HashMap<String, Vector<String> >::Iterator i = globalConstants.Begin(); i != globalConstants.End(); ++i)
+    for (HashMap<String, Vector<String>>::Iterator i = globalConstants.Begin(); i != globalConstants.End(); ++i)
         Sort(i->second_.Begin(), i->second_.End(), ComparePropertyStrings);
 
     if (mode == DOXYGEN)
@@ -551,7 +551,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
             }
 
             // Check for namespaced constants to be included in the class documentation
-            HashMap<String, Vector<String> >::ConstIterator gcIt = globalConstants.Find(typeName);
+            HashMap<String, Vector<String>>::ConstIterator gcIt = globalConstants.Find(typeName);
             if (gcIt != globalConstants.End())
             {
                 String prefix;
@@ -606,7 +606,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
         Log::WriteRaw("\n// Enumerations\n");
 
     unsigned enums = scriptEngine_->GetEnumCount();
-    Vector<Pair<String, unsigned> > sortedEnums;
+    Vector<Pair<String, unsigned>> sortedEnums;
     for (unsigned i = 0; i < enums; ++i)
         sortedEnums.Push(MakePair(String(scriptEngine_->GetEnumByIndex(i)->GetName()), i));
     Sort(sortedEnums.Begin(), sortedEnums.End());

Source/Urho3D/AngelScript/ScriptFile.cpp

@@ -192,7 +192,7 @@ void ScriptFile::AddEventHandler(Object* sender, StringHash eventType, const Str
 void ScriptFile::RemoveEventHandler(StringHash eventType)
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
     {
         i->second_->UnsubscribeFromEvent(eventType);
@@ -205,7 +205,7 @@ void ScriptFile::RemoveEventHandler(StringHash eventType)
 void ScriptFile::RemoveEventHandler(Object* sender, StringHash eventType)
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
     {
         i->second_->UnsubscribeFromEvent(sender, eventType);
@@ -217,7 +217,7 @@ void ScriptFile::RemoveEventHandler(Object* sender, StringHash eventType)
 void ScriptFile::RemoveEventHandlers(Object* sender)
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
     {
         i->second_->UnsubscribeFromEvents(sender);
@@ -229,7 +229,7 @@ void ScriptFile::RemoveEventHandlers(Object* sender)
 void ScriptFile::RemoveEventHandlers()
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
     {
         i->second_->UnsubscribeFromAllEvents();
@@ -241,7 +241,7 @@ void ScriptFile::RemoveEventHandlers()
 void ScriptFile::RemoveEventHandlersExcept(const PODVector<StringHash>& exceptions)
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
     {
         i->second_->UnsubscribeFromAllEventsExcept(exceptions, true);
@@ -253,7 +253,7 @@ void ScriptFile::RemoveEventHandlersExcept(const PODVector<StringHash>& exceptio
 bool ScriptFile::HasEventHandler(StringHash eventType) const
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::ConstIterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::ConstIterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
         return i->second_->HasSubscribedToEvent(eventType);
     else
@@ -263,7 +263,7 @@ bool ScriptFile::HasEventHandler(StringHash eventType) const
 bool ScriptFile::HasEventHandler(Object* sender, StringHash eventType) const
 {
     auto* receiver = static_cast<asIScriptObject*>(asGetActiveContext()->GetThisPointer());
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::ConstIterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::ConstIterator i = eventInvokers_.Find(receiver);
     if (i != eventInvokers_.End())
         return i->second_->HasSubscribedToEvent(sender, eventType);
     else
@@ -622,7 +622,7 @@ asIScriptFunction* ScriptFile::GetMethod(asIScriptObject* object, const String&
     if (!type)
         return nullptr;
 
-    HashMap<asITypeInfo*, HashMap<String, asIScriptFunction*> >::ConstIterator i = methods_.Find(type);
+    HashMap<asITypeInfo*, HashMap<String, asIScriptFunction*>>::ConstIterator i = methods_.Find(type);
     if (i != methods_.End())
     {
         HashMap<String, asIScriptFunction*>::ConstIterator j = i->second_.Find(trimDecl);
@@ -666,7 +666,7 @@ void ScriptFile::AddEventHandlerInternal(Object* sender, StringHash eventType, c
         }
     }
 
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> >::Iterator i = eventInvokers_.Find(receiver);
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>>::Iterator i = eventInvokers_.Find(receiver);
     // Remove previous handler in case an object pointer gets reused
     if (i != eventInvokers_.End() && !i->second_->IsObjectAlive())
     {

Source/Urho3D/AngelScript/ScriptFile.h

@@ -128,11 +128,11 @@ private:
     /// Search cache for functions.
     HashMap<String, asIScriptFunction*> functions_;
     /// Search cache for methods.
-    HashMap<asITypeInfo*, HashMap<String, asIScriptFunction*> > methods_;
+    HashMap<asITypeInfo*, HashMap<String, asIScriptFunction*>> methods_;
     /// Delayed function calls.
     Vector<DelayedCall> delayedCalls_;
     /// Event helper objects for handling procedural or non-ScriptInstance script events.
-    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker> > eventInvokers_;
+    HashMap<asIScriptObject*, SharedPtr<ScriptEventInvoker>> eventInvokers_;
     /// Byte code for asynchronous loading.
     SharedArrayPtr<unsigned char> loadByteCode_;
     bool onlyCompile_{false};

Source/Urho3D/AngelScript/ScriptInstance.cpp

@@ -705,8 +705,8 @@ void ScriptInstance::GetScriptAttributes()
             {
                 // For a handle type, check if it's an Object subclass with a registered factory
                 StringHash typeHash(typeName);
-                const HashMap<StringHash, SharedPtr<ObjectFactory> >& factories = context_->GetObjectFactories();
-                HashMap<StringHash, SharedPtr<ObjectFactory> >::ConstIterator j = factories.Find(typeHash);
+                const HashMap<StringHash, SharedPtr<ObjectFactory>>& factories = context_->GetObjectFactories();
+                HashMap<StringHash, SharedPtr<ObjectFactory>>::ConstIterator j = factories.Find(typeHash);
                 if (j != factories.End())
                 {
                     // Check base class type. Node & Component are supported as ID attributes, Resource as a resource reference

Source/Urho3D/Audio/BufferedSoundStream.cpp

@@ -26,7 +26,7 @@ unsigned BufferedSoundStream::GetData(signed char* dest, unsigned numBytes)
     while (numBytes && buffers_.Size())
     {
         // Copy as much from the front buffer as possible, then discard it and move to the next
-        List<Pair<SharedArrayPtr<signed char>, unsigned> >::Iterator front = buffers_.Begin();
+        List<Pair<SharedArrayPtr<signed char>, unsigned>>::Iterator front = buffers_.Begin();
 
         unsigned copySize = front->second_ - position_;
         if (copySize > numBytes)
@@ -93,7 +93,7 @@ unsigned BufferedSoundStream::GetBufferNumBytes() const
     MutexLock lock(bufferMutex_);
 
     unsigned ret = 0;
-    for (List<Pair<SharedArrayPtr<signed char>, unsigned> >::ConstIterator i = buffers_.Begin(); i != buffers_.End(); ++i)
+    for (List<Pair<SharedArrayPtr<signed char>, unsigned>>::ConstIterator i = buffers_.Begin(); i != buffers_.End(); ++i)
         ret += i->second_;
     // Subtract amount of sound data played from the front buffer
     ret -= position_;

Source/Urho3D/Audio/BufferedSoundStream.h

@@ -40,7 +40,7 @@ public:
 
 private:
     /// Buffers and their sizes.
-    List<Pair<SharedArrayPtr<signed char>, unsigned> > buffers_;
+    List<Pair<SharedArrayPtr<signed char>, unsigned>> buffers_;
     /// Byte position in the front most buffer.
     unsigned position_;
     /// Mutex for buffer data.

Source/Urho3D/Container/HashMap.h

@@ -214,7 +214,7 @@ public:
     }
 
     /// Move-construct from another hash map.
-    HashMap(HashMap<T, U> && map) noexcept
+    HashMap(HashMap<T, U>&& map) noexcept
     {
         Swap(map);
     }

Source/Urho3D/Container/HashSet.h

@@ -171,7 +171,7 @@ public:
     }
 
     /// Move-construct from another hash set.
-    HashSet(HashSet<T> && set) noexcept
+    HashSet(HashSet<T>&& set) noexcept
     {
         Swap(set);
     }
@@ -210,7 +210,7 @@ public:
     }
 
     /// Move-assign a hash set.
-    HashSet& operator =(HashSet<T> && rhs) noexcept
+    HashSet& operator =(HashSet<T>&& rhs) noexcept
     {
         Swap(rhs);
         return *this;

Source/Urho3D/Container/List.h

@@ -163,7 +163,7 @@ public:
     }
 
     /// Move-construct from another list.
-    List(List<T> && list) noexcept
+    List(List<T>&& list) noexcept
     {
         Swap(list);
     }
@@ -198,7 +198,7 @@ public:
     }
 
     /// Move-assign from another list.
-    List& operator =(List<T> && rhs) noexcept
+    List& operator =(List<T>&& rhs) noexcept
     {
         Swap(rhs);
         return *this;

Source/Urho3D/Container/Ptr.h

@@ -545,7 +545,7 @@ template<class T> inline void CheckedDelete(T* x)
 }
 
 /// Construct SharedPtr.
-template <class T, class ... Args> SharedPtr<T> MakeShared(Args && ... args)
+template <class T, class ... Args> SharedPtr<T> MakeShared(Args&&... args)
 {
     return SharedPtr<T>(new T(std::forward<Args>(args)...));
 }

Source/Urho3D/Container/Str.h

@@ -45,7 +45,7 @@ public:
     }
 
     /// Move-construct from another string.
-    String(String && str) noexcept
+    String(String&& str) noexcept
         : String()
     {
         Swap(str);
@@ -146,7 +146,7 @@ public:
     }
 
     /// Move-assign a string.
-    String& operator =(String && rhs) noexcept
+    String& operator =(String&& rhs) noexcept
     {
         Swap(rhs);
         return *this;

Source/Urho3D/Container/Vector.h

@@ -79,7 +79,7 @@ public:
     }
 
     /// Move-construct from another vector.
-    Vector(Vector<T> && vector)
+    Vector(Vector<T>&& vector)
     {
         Swap(vector);
     }
@@ -124,7 +124,7 @@ public:
     }
 
     /// Move-assign from another vector.
-    Vector<T>& operator =(Vector<T> && rhs)
+    Vector<T>& operator =(Vector<T>&& rhs)
     {
         Swap(rhs);
         return *this;
@@ -268,7 +268,7 @@ public:
     }
 
     /// Move-add an element at the end.
-    void Push(T && value)
+    void Push(T&& value)
     {
         if (size_ < capacity_)
         {
@@ -377,7 +377,7 @@ public:
     }
 
     /// Move-insert an element by iterator.
-    Iterator Insert(const Iterator& dest, T && value)
+    Iterator Insert(const Iterator& dest, T&& value)
     {
         auto pos = (unsigned)(dest - Begin());
         return DoInsertElements(pos, &value, &value + 1, MoveTag{});

Source/Urho3D/Core/Context.cpp

@@ -79,9 +79,9 @@ void EventReceiverGroup::Remove(Object* object)
         receivers_.Remove(object);
 }
 
-void RemoveNamedAttribute(HashMap<StringHash, Vector<AttributeInfo> >& attributes, StringHash objectType, const char* name)
+void RemoveNamedAttribute(HashMap<StringHash, Vector<AttributeInfo>>& attributes, StringHash objectType, const char* name)
 {
-    HashMap<StringHash, Vector<AttributeInfo> >::Iterator i = attributes.Find(objectType);
+    HashMap<StringHash, Vector<AttributeInfo>>::Iterator i = attributes.Find(objectType);
     if (i == attributes.End())
         return;
 
@@ -134,7 +134,7 @@ Context::~Context()
 
 SharedPtr<Object> Context::CreateObject(StringHash objectType)
 {
-    HashMap<StringHash, SharedPtr<ObjectFactory> >::ConstIterator i = factories_.Find(objectType);
+    HashMap<StringHash, SharedPtr<ObjectFactory>>::ConstIterator i = factories_.Find(objectType);
     if (i != factories_.End())
         return i->second_->CreateObject();
     else
@@ -169,7 +169,7 @@ void Context::RegisterSubsystem(Object* object)
 
 void Context::RemoveSubsystem(StringHash objectType)
 {
-    HashMap<StringHash, SharedPtr<Object> >::Iterator i = subsystems_.Find(objectType);
+    HashMap<StringHash, SharedPtr<Object>>::Iterator i = subsystems_.Find(objectType);
     if (i != subsystems_.End())
         subsystems_.Erase(i);
 }
@@ -334,7 +334,7 @@ void Context::CopyBaseAttributes(StringHash baseType, StringHash derivedType)
 
 Object* Context::GetSubsystem(StringHash type) const
 {
-    HashMap<StringHash, SharedPtr<Object> >::ConstIterator i = subsystems_.Find(type);
+    HashMap<StringHash, SharedPtr<Object>>::ConstIterator i = subsystems_.Find(type);
     if (i != subsystems_.End())
         return i->second_;
     else
@@ -363,13 +363,13 @@ Object* Context::GetEventSender() const
 const String& Context::GetTypeName(StringHash objectType) const
 {
     // Search factories to find the hash-to-name mapping
-    HashMap<StringHash, SharedPtr<ObjectFactory> >::ConstIterator i = factories_.Find(objectType);
+    HashMap<StringHash, SharedPtr<ObjectFactory>>::ConstIterator i = factories_.Find(objectType);
     return i != factories_.End() ? i->second_->GetTypeName() : String::EMPTY;
 }
 
 AttributeInfo* Context::GetAttribute(StringHash objectType, const char* name)
 {
-    HashMap<StringHash, Vector<AttributeInfo> >::Iterator i = attributes_.Find(objectType);
+    HashMap<StringHash, Vector<AttributeInfo>>::Iterator i = attributes_.Find(objectType);
     if (i == attributes_.End())
         return nullptr;
 
@@ -402,10 +402,10 @@ void Context::AddEventReceiver(Object* receiver, Object* sender, StringHash even
 
 void Context::RemoveEventSender(Object* sender)
 {
-    HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup> > >::Iterator i = specificEventReceivers_.Find(sender);
+    HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup>>>::Iterator i = specificEventReceivers_.Find(sender);
     if (i != specificEventReceivers_.End())
     {
-        for (HashMap<StringHash, SharedPtr<EventReceiverGroup> >::Iterator j = i->second_.Begin(); j != i->second_.End(); ++j)
+        for (HashMap<StringHash, SharedPtr<EventReceiverGroup>>::Iterator j = i->second_.Begin(); j != i->second_.End(); ++j)
         {
             for (PODVector<Object*>::Iterator k = j->second_->receivers_.Begin(); k != j->second_->receivers_.End(); ++k)
             {

Source/Urho3D/Core/Context.h

@@ -124,13 +124,13 @@ public:
     void SetGlobalVar(StringHash key, const Variant& value);
 
     /// Return all subsystems.
-    const HashMap<StringHash, SharedPtr<Object> >& GetSubsystems() const { return subsystems_; }
+    const HashMap<StringHash, SharedPtr<Object>>& GetSubsystems() const { return subsystems_; }
 
     /// Return all object factories.
-    const HashMap<StringHash, SharedPtr<ObjectFactory> >& GetObjectFactories() const { return factories_; }
+    const HashMap<StringHash, SharedPtr<ObjectFactory>>& GetObjectFactories() const { return factories_; }
 
     /// Return all object categories.
-    const HashMap<String, Vector<StringHash> >& GetObjectCategories() const { return objectCategories_; }
+    const HashMap<String, Vector<StringHash>>& GetObjectCategories() const { return objectCategories_; }
 
     /// Return active event sender. Null outside event handling.
     Object* GetEventSender() const;
@@ -150,27 +150,27 @@ public:
     /// Return attribute descriptions for an object type, or null if none defined.
     const Vector<AttributeInfo>* GetAttributes(StringHash type) const
     {
-        HashMap<StringHash, Vector<AttributeInfo> >::ConstIterator i = attributes_.Find(type);
+        HashMap<StringHash, Vector<AttributeInfo>>::ConstIterator i = attributes_.Find(type);
         return i != attributes_.End() ? &i->second_ : nullptr;
     }
 
     /// Return network replication attribute descriptions for an object type, or null if none defined.
     const Vector<AttributeInfo>* GetNetworkAttributes(StringHash type) const
     {
-        HashMap<StringHash, Vector<AttributeInfo> >::ConstIterator i = networkAttributes_.Find(type);
+        HashMap<StringHash, Vector<AttributeInfo>>::ConstIterator i = networkAttributes_.Find(type);
         return i != networkAttributes_.End() ? &i->second_ : nullptr;
     }
 
     /// Return all registered attributes.
-    const HashMap<StringHash, Vector<AttributeInfo> >& GetAllAttributes() const { return attributes_; }
+    const HashMap<StringHash, Vector<AttributeInfo>>& GetAllAttributes() const { return attributes_; }
 
     /// Return event receivers for a sender and event type, or null if they do not exist.
     EventReceiverGroup* GetEventReceivers(Object* sender, StringHash eventType)
     {
-        HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup> > >::Iterator i = specificEventReceivers_.Find(sender);
+        HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup>>>::Iterator i = specificEventReceivers_.Find(sender);
         if (i != specificEventReceivers_.End())
         {
-            HashMap<StringHash, SharedPtr<EventReceiverGroup> >::Iterator j = i->second_.Find(eventType);
+            HashMap<StringHash, SharedPtr<EventReceiverGroup>>::Iterator j = i->second_.Find(eventType);
             return j != i->second_.End() ? j->second_ : nullptr;
         }
         else
@@ -180,7 +180,7 @@ public:
     /// Return event receivers for an event type, or null if they do not exist.
     EventReceiverGroup* GetEventReceivers(StringHash eventType)
     {
-        HashMap<StringHash, SharedPtr<EventReceiverGroup> >::Iterator i = eventReceivers_.Find(eventType);
+        HashMap<StringHash, SharedPtr<EventReceiverGroup>>::Iterator i = eventReceivers_.Find(eventType);
         return i != eventReceivers_.End() ? i->second_ : nullptr;
     }
 
@@ -204,17 +204,17 @@ private:
     void SetEventHandler(EventHandler* handler) { eventHandler_ = handler; }
 
     /// Object factories.
-    HashMap<StringHash, SharedPtr<ObjectFactory> > factories_;
+    HashMap<StringHash, SharedPtr<ObjectFactory>> factories_;
     /// Subsystems.
-    HashMap<StringHash, SharedPtr<Object> > subsystems_;
+    HashMap<StringHash, SharedPtr<Object>> subsystems_;
     /// Attribute descriptions per object type.
-    HashMap<StringHash, Vector<AttributeInfo> > attributes_;
+    HashMap<StringHash, Vector<AttributeInfo>> attributes_;
     /// Network replication attribute descriptions per object type.
-    HashMap<StringHash, Vector<AttributeInfo> > networkAttributes_;
+    HashMap<StringHash, Vector<AttributeInfo>> networkAttributes_;
     /// Event receivers for non-specific events.
-    HashMap<StringHash, SharedPtr<EventReceiverGroup> > eventReceivers_;
+    HashMap<StringHash, SharedPtr<EventReceiverGroup>> eventReceivers_;
     /// Event receivers for specific senders' events.
-    HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup> > > specificEventReceivers_;
+    HashMap<Object*, HashMap<StringHash, SharedPtr<EventReceiverGroup>>> specificEventReceivers_;
     /// Event sender stack.
     PODVector<Object*> eventSenders_;
     /// Event data stack.
@@ -222,7 +222,7 @@ private:
     /// Active event handler. Not stored in a stack for performance reasons; is needed only in esoteric cases.
     EventHandler* eventHandler_;
     /// Object categories.
-    HashMap<String, Vector<StringHash> > objectCategories_;
+    HashMap<String, Vector<StringHash>> objectCategories_;
     /// Variant map for global variables that can persist throughout application execution.
     VariantMap globalVars_;
 };

Source/Urho3D/Core/Object.cpp

@@ -437,8 +437,8 @@ bool Object::HasSubscribedToEvent(Object* sender, StringHash eventType) const
 
 const String& Object::GetCategory() const
 {
-    const HashMap<String, Vector<StringHash> >& objectCategories = context_->GetObjectCategories();
-    for (HashMap<String, Vector<StringHash> >::ConstIterator i = objectCategories.Begin(); i != objectCategories.End(); ++i)
+    const HashMap<String, Vector<StringHash>>& objectCategories = context_->GetObjectCategories();
+    for (HashMap<String, Vector<StringHash>>::ConstIterator i = objectCategories.Begin(); i != objectCategories.End(); ++i)
     {
         if (i->second_.Contains(GetType()))
             return i->first_;

Source/Urho3D/Core/Variant.cpp

@@ -922,7 +922,7 @@ template <> IntVector3 Variant::Get<IntVector3>() const
     return GetIntVector3();
 }
 
-template <> PODVector<unsigned char> Variant::Get<PODVector<unsigned char> >() const
+template <> PODVector<unsigned char> Variant::Get<PODVector<unsigned char>>() const
 {
     return GetBuffer();
 }

Source/Urho3D/Core/Variant.h

@@ -1430,7 +1430,7 @@ template <> inline VariantType GetVariantType<String>() { return VAR_STRING; }
 
 template <> inline VariantType GetVariantType<StringHash>() { return VAR_INT; }
 
-template <> inline VariantType GetVariantType<PODVector<unsigned char> >() { return VAR_BUFFER; }
+template <> inline VariantType GetVariantType<PODVector<unsigned char>>() { return VAR_BUFFER; }
 
 template <> inline VariantType GetVariantType<ResourceRef>() { return VAR_RESOURCEREF; }
 
@@ -1535,7 +1535,7 @@ template <> URHO3D_API IntVector2 Variant::Get<IntVector2>() const;
 
 template <> URHO3D_API IntVector3 Variant::Get<IntVector3>() const;
 
-template <> URHO3D_API PODVector<unsigned char> Variant::Get<PODVector<unsigned char> >() const;
+template <> URHO3D_API PODVector<unsigned char> Variant::Get<PODVector<unsigned char>>() const;
 
 template <> URHO3D_API Matrix3 Variant::Get<Matrix3>() const;
 

Source/Urho3D/Core/WorkQueue.cpp

@@ -167,7 +167,7 @@ bool WorkQueue::RemoveWorkItem(SharedPtr<WorkItem> item)
     List<WorkItem*>::Iterator i = queue_.Find(item.Get());
     if (i != queue_.End())
     {
-        List<SharedPtr<WorkItem> >::Iterator j = workItems_.Find(item);
+        List<SharedPtr<WorkItem>>::Iterator j = workItems_.Find(item);
         if (j != workItems_.End())
         {
             queue_.Erase(i);
@@ -180,17 +180,17 @@ bool WorkQueue::RemoveWorkItem(SharedPtr<WorkItem> item)
     return false;
 }
 
-unsigned WorkQueue::RemoveWorkItems(const Vector<SharedPtr<WorkItem> >& items)
+unsigned WorkQueue::RemoveWorkItems(const Vector<SharedPtr<WorkItem>>& items)
 {
     MutexLock lock(queueMutex_);
     unsigned removed = 0;
 
-    for (Vector<SharedPtr<WorkItem> >::ConstIterator i = items.Begin(); i != items.End(); ++i)
+    for (Vector<SharedPtr<WorkItem>>::ConstIterator i = items.Begin(); i != items.End(); ++i)
     {
         List<WorkItem*>::Iterator j = queue_.Find(i->Get());
         if (j != queue_.End())
         {
-            List<SharedPtr<WorkItem> >::Iterator k = workItems_.Find(*i);
+            List<SharedPtr<WorkItem>>::Iterator k = workItems_.Find(*i);
             if (k != workItems_.End())
             {
                 queue_.Erase(j);
@@ -281,7 +281,7 @@ void WorkQueue::Complete(unsigned priority)
 
 bool WorkQueue::IsCompleted(unsigned priority) const
 {
-    for (List<SharedPtr<WorkItem> >::ConstIterator i = workItems_.Begin(); i != workItems_.End(); ++i)
+    for (List<SharedPtr<WorkItem>>::ConstIterator i = workItems_.Begin(); i != workItems_.End(); ++i)
     {
         if ((*i)->priority_ >= priority && !(*i)->completed_)
             return false;
@@ -330,7 +330,7 @@ void WorkQueue::PurgeCompleted(unsigned priority)
     // Purge completed work items and send completion events. Do not signal items lower than priority threshold,
     // as those may be user submitted and lead to eg. scene manipulation that could happen in the middle of the
     // render update, which is not allowed
-    for (List<SharedPtr<WorkItem> >::Iterator i = workItems_.Begin(); i != workItems_.End();)
+    for (List<SharedPtr<WorkItem>>::Iterator i = workItems_.Begin(); i != workItems_.End();)
     {
         if ((*i)->completed_ && (*i)->priority_ >= priority)
         {

Source/Urho3D/Core/WorkQueue.h

@@ -68,7 +68,7 @@ public:
     /// Remove a work item before it has started executing. Return true if successfully removed.
     bool RemoveWorkItem(SharedPtr<WorkItem> item);
     /// Remove a number of work items before they have started executing. Return the number of items successfully removed.
-    unsigned RemoveWorkItems(const Vector<SharedPtr<WorkItem> >& items);
+    unsigned RemoveWorkItems(const Vector<SharedPtr<WorkItem>>& items);
     /// Pause worker threads.
     void Pause();
     /// Resume worker threads.
@@ -109,11 +109,11 @@ private:
     void HandleBeginFrame(StringHash eventType, VariantMap& eventData);
 
     /// Worker threads.
-    Vector<SharedPtr<WorkerThread> > threads_;
+    Vector<SharedPtr<WorkerThread>> threads_;
     /// Work item pool for reuse to cut down on allocation. The bool is a flag for item pooling and whether it is available or not.
-    List<SharedPtr<WorkItem> > poolItems_;
+    List<SharedPtr<WorkItem>> poolItems_;
     /// Work item collection. Accessed only by the main thread.
-    List<SharedPtr<WorkItem> > workItems_;
+    List<SharedPtr<WorkItem>> workItems_;
     /// Work item prioritized queue for worker threads. Pointers are guaranteed to be valid (point to workItems).
     List<WorkItem*> queue_;
     /// Worker queue mutex.

Source/Urho3D/Database/Database.cpp

@@ -35,7 +35,7 @@ DbConnection* Database::Connect(const String& connectionString)
     SharedPtr<DbConnection> connection;
     if (IsPooling())
     {
-        Vector<SharedPtr<DbConnection> >& connectionsPool = connectionsPool_[connectionString];
+        Vector<SharedPtr<DbConnection>>& connectionsPool = connectionsPool_[connectionString];
         while (!connectionsPool.Empty())
         {
             connection = connectionsPool.Back();
@@ -71,7 +71,7 @@ void Database::Disconnect(DbConnection* connection)
 
     if (IsPooling())
     {
-        Vector<SharedPtr<DbConnection> >& connectionsPool = connectionsPool_[connection->GetConnectionString()];
+        Vector<SharedPtr<DbConnection>>& connectionsPool = connectionsPool_[connection->GetConnectionString()];
         if (connectionsPool.Size() < poolSize_)
             connectionsPool.Push(dbConnection);
     }

Source/Urho3D/Engine/Console.h

@@ -161,7 +161,7 @@ private:
     /// Command history.
     Vector<String> history_;
     /// Pending log message rows.
-    Vector<Pair<int, String> > pendingRows_;
+    Vector<Pair<int, String>> pendingRows_;
     /// Current row being edited.
     String currentRow_;
     /// Maximum displayed rows.

Source/Urho3D/Engine/Engine.cpp

@@ -358,7 +358,7 @@ bool Engine::InitializeResourceCache(const VariantMap& parameters, bool removeOl
     if (removeOld)
     {
         Vector<String> resourceDirs = cache->GetResourceDirs();
-        Vector<SharedPtr<PackageFile> > packageFiles = cache->GetPackageFiles();
+        Vector<SharedPtr<PackageFile>> packageFiles = cache->GetPackageFiles();
         for (unsigned i = 0; i < resourceDirs.Size(); ++i)
             cache->RemoveResourceDir(resourceDirs[i]);
         for (unsigned i = 0; i < packageFiles.Size(); ++i)
@@ -662,10 +662,10 @@ void Engine::DumpResources(bool dumpFileName)
         URHO3D_LOGRAW("Used resources:\n");
         for (HashMap<StringHash, ResourceGroup>::ConstIterator i = resourceGroups.Begin(); i != resourceGroups.End(); ++i)
         {
-            const HashMap<StringHash, SharedPtr<Resource> >& resources = i->second_.resources_;
+            const HashMap<StringHash, SharedPtr<Resource>>& resources = i->second_.resources_;
             if (dumpFileName)
             {
-                for (HashMap<StringHash, SharedPtr<Resource> >::ConstIterator j = resources.Begin(); j != resources.End(); ++j)
+                for (HashMap<StringHash, SharedPtr<Resource>>::ConstIterator j = resources.Begin(); j != resources.End(); ++j)
                     URHO3D_LOGRAW(j->second_->GetName() + "\n");
             }
         }

Source/Urho3D/Graphics/AnimatedModel.cpp

@@ -333,7 +333,7 @@ void AnimatedModel::SetModel(Model* model, bool createBones)
 
         // Copy the subgeometry & LOD level structure
         SetNumGeometries(model->GetNumGeometries());
-        const Vector<Vector<SharedPtr<Geometry> > >& geometries = model->GetGeometries();
+        const Vector<Vector<SharedPtr<Geometry>>>& geometries = model->GetGeometries();
         const PODVector<Vector3>& geometryCenters = model->GetGeometryCenters();
         for (unsigned i = 0; i < geometries.Size(); ++i)
         {
@@ -342,7 +342,7 @@ void AnimatedModel::SetModel(Model* model, bool createBones)
         }
 
         // Copy geometry bone mappings
-        const Vector<PODVector<unsigned> >& geometryBoneMappings = model->GetGeometryBoneMappings();
+        const Vector<PODVector<unsigned>>& geometryBoneMappings = model->GetGeometryBoneMappings();
         geometryBoneMappings_.Clear();
         geometryBoneMappings_.Reserve(geometryBoneMappings.Size());
         for (unsigned i = 0; i < geometryBoneMappings.Size(); ++i)
@@ -449,7 +449,7 @@ void AnimatedModel::RemoveAnimationState(Animation* animation)
         RemoveAnimationState(animation->GetNameHash());
     else
     {
-        for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+        for (Vector<SharedPtr<AnimationState>>::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
         {
             AnimationState* state = *i;
             if (!state->GetAnimation())
@@ -469,7 +469,7 @@ void AnimatedModel::RemoveAnimationState(const String& animationName)
 
 void AnimatedModel::RemoveAnimationState(StringHash animationNameHash)
 {
-    for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         AnimationState* state = *i;
         Animation* animation = state->GetAnimation();
@@ -488,7 +488,7 @@ void AnimatedModel::RemoveAnimationState(StringHash animationNameHash)
 
 void AnimatedModel::RemoveAnimationState(AnimationState* state)
 {
-    for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         if (*i == state)
         {
@@ -637,7 +637,7 @@ float AnimatedModel::GetMorphWeight(StringHash nameHash) const
 
 AnimationState* AnimatedModel::GetAnimationState(Animation* animation) const
 {
-    for (Vector<SharedPtr<AnimationState> >::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         if ((*i)->GetAnimation() == animation)
             return *i;
@@ -653,7 +653,7 @@ AnimationState* AnimatedModel::GetAnimationState(const String& animationName) co
 
 AnimationState* AnimatedModel::GetAnimationState(StringHash animationNameHash) const
 {
-    for (Vector<SharedPtr<AnimationState> >::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         Animation* animation = (*i)->GetAnimation();
         if (animation)
@@ -860,7 +860,7 @@ VariantVector AnimatedModel::GetAnimationStatesAttr() const
     VariantVector ret;
     ret.Reserve(animationStates_.Size() * 6 + 1);
     ret.Push(animationStates_.Size());
-    for (Vector<SharedPtr<AnimationState> >::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::ConstIterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         AnimationState* state = *i;
         Animation* animation = state->GetAnimation();
@@ -984,7 +984,7 @@ void AnimatedModel::AssignBoneNodes()
         SetSkeleton(model_->GetSkeleton(), true);
 
     // Re-assign the same start bone to animations to get the proper bone node this time
-    for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
     {
         AnimationState* state = *i;
         state->SetStartBone(state->GetStartBone());
@@ -1085,8 +1085,8 @@ void AnimatedModel::MarkMorphsDirty()
 
 void AnimatedModel::CloneGeometries()
 {
-    const Vector<SharedPtr<VertexBuffer> >& originalVertexBuffers = model_->GetVertexBuffers();
-    HashMap<VertexBuffer*, SharedPtr<VertexBuffer> > clonedVertexBuffers;
+    const Vector<SharedPtr<VertexBuffer>>& originalVertexBuffers = model_->GetVertexBuffers();
+    HashMap<VertexBuffer*, SharedPtr<VertexBuffer>> clonedVertexBuffers;
     morphVertexBuffers_.Resize(originalVertexBuffers.Size());
 
     for (unsigned i = 0; i < originalVertexBuffers.Size(); ++i)
@@ -1120,7 +1120,7 @@ void AnimatedModel::CloneGeometries()
 
             // Add an additional vertex stream into the clone, which supplies only the morphable vertex data, while the static
             // data comes from the original vertex buffer(s)
-            const Vector<SharedPtr<VertexBuffer> >& originalBuffers = original->GetVertexBuffers();
+            const Vector<SharedPtr<VertexBuffer>>& originalBuffers = original->GetVertexBuffers();
             unsigned totalBuf = originalBuffers.Size();
             for (unsigned k = 0; k < originalBuffers.Size(); ++k)
             {
@@ -1268,7 +1268,7 @@ void AnimatedModel::ApplyAnimation()
     if (isMaster_)
     {
         skeleton_.ResetSilent();
-        for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
+        for (Vector<SharedPtr<AnimationState>>::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
             (*i)->Apply();
 
         // Skeleton reset and animations apply the node transforms "silently" to avoid repeated marking dirty. Mark dirty now

Source/Urho3D/Graphics/AnimatedModel.h

@@ -89,7 +89,7 @@ public:
     Skeleton& GetSkeleton() { return skeleton_; }
 
     /// Return all animation states.
-    const Vector<SharedPtr<AnimationState> >& GetAnimationStates() const { return animationStates_; }
+    const Vector<SharedPtr<AnimationState>>& GetAnimationStates() const { return animationStates_; }
 
     /// Return number of animation states.
     /// @property
@@ -117,7 +117,7 @@ public:
     const Vector<ModelMorph>& GetMorphs() const { return morphs_; }
 
     /// Return all morph vertex buffers.
-    const Vector<SharedPtr<VertexBuffer> >& GetMorphVertexBuffers() const { return morphVertexBuffers_; }
+    const Vector<SharedPtr<VertexBuffer>>& GetMorphVertexBuffers() const { return morphVertexBuffers_; }
 
     /// Return number of vertex morphs.
     /// @property
@@ -152,10 +152,10 @@ public:
     const PODVector<unsigned char>& GetMorphsAttr() const;
 
     /// Return per-geometry bone mappings.
-    const Vector<PODVector<unsigned> >& GetGeometryBoneMappings() const { return geometryBoneMappings_; }
+    const Vector<PODVector<unsigned>>& GetGeometryBoneMappings() const { return geometryBoneMappings_; }
 
     /// Return per-geometry skin matrices. If empty, uses global skinning.
-    const Vector<PODVector<Matrix3x4> >& GetGeometrySkinMatrices() const { return geometrySkinMatrices_; }
+    const Vector<PODVector<Matrix3x4>>& GetGeometrySkinMatrices() const { return geometrySkinMatrices_; }
 
     /// Recalculate the bone bounding box. Normally called internally, but can also be manually called if up-to-date information before rendering is necessary.
     void UpdateBoneBoundingBox();
@@ -204,19 +204,19 @@ private:
     /// Skeleton.
     Skeleton skeleton_;
     /// Morph vertex buffers.
-    Vector<SharedPtr<VertexBuffer> > morphVertexBuffers_;
+    Vector<SharedPtr<VertexBuffer>> morphVertexBuffers_;
     /// Vertex morphs.
     Vector<ModelMorph> morphs_;
     /// Animation states.
-    Vector<SharedPtr<AnimationState> > animationStates_;
+    Vector<SharedPtr<AnimationState>> animationStates_;
     /// Skinning matrices.
     PODVector<Matrix3x4> skinMatrices_;
     /// Mapping of subgeometry bone indices, used if more bones than skinning shader can manage.
-    Vector<PODVector<unsigned> > geometryBoneMappings_;
+    Vector<PODVector<unsigned>> geometryBoneMappings_;
     /// Subgeometry skinning matrices, used if more bones than skinning shader can manage.
-    Vector<PODVector<Matrix3x4> > geometrySkinMatrices_;
+    Vector<PODVector<Matrix3x4>> geometrySkinMatrices_;
     /// Subgeometry skinning matrix pointers, if more bones than skinning shader can manage.
-    Vector<PODVector<Matrix3x4*> > geometrySkinMatrixPtrs_;
+    Vector<PODVector<Matrix3x4*>> geometrySkinMatrixPtrs_;
     /// Bounding box calculated from bones.
     BoundingBox boneBoundingBox_;
     /// Attribute buffer.

Source/Urho3D/Graphics/AnimationController.cpp

@@ -133,7 +133,7 @@ void AnimationController::Update(float timeStep)
     }
 
     // Node hierarchy animations need to be applied manually
-    for (Vector<SharedPtr<AnimationState> >::Iterator i = nodeAnimationStates_.Begin(); i != nodeAnimationStates_.End(); ++i)
+    for (Vector<SharedPtr<AnimationState>>::Iterator i = nodeAnimationStates_.Begin(); i != nodeAnimationStates_.End(); ++i)
         (*i)->Apply();
 }
 

Source/Urho3D/Graphics/AnimationController.h

@@ -188,7 +188,7 @@ private:
     /// Animation control structures.
     Vector<AnimationControl> animations_;
     /// Node hierarchy mode animation states.
-    Vector<SharedPtr<AnimationState> > nodeAnimationStates_;
+    Vector<SharedPtr<AnimationState>> nodeAnimationStates_;
     /// Attribute buffer for network replication.
     mutable VectorBuffer attrBuffer_;
 };

Source/Urho3D/Graphics/AnimationState.cpp

@@ -202,7 +202,7 @@ void AnimationState::SetBoneWeight(unsigned index, float weight, bool recursive)
         Node* boneNode = stateTracks_[index].node_;
         if (boneNode)
         {
-            const Vector<SharedPtr<Node> >& children = boneNode->GetChildren();
+            const Vector<SharedPtr<Node>>& children = boneNode->GetChildren();
             for (unsigned i = 0; i < children.Size(); ++i)
             {
                 unsigned childTrackIndex = GetTrackIndex(children[i]);

Source/Urho3D/Graphics/Batch.cpp

@@ -594,8 +594,8 @@ void Batch::Prepare(View* view, Camera* camera, bool setModelTransform, bool all
                 graphics->SetShaderParameter(i->first_, i->second_.value_);
         }
 
-        const HashMap<TextureUnit, SharedPtr<Texture> >& textures = material_->GetTextures();
-        for (HashMap<TextureUnit, SharedPtr<Texture> >::ConstIterator i = textures.Begin(); i != textures.End(); ++i)
+        const HashMap<TextureUnit, SharedPtr<Texture>>& textures = material_->GetTextures();
+        for (HashMap<TextureUnit, SharedPtr<Texture>>::ConstIterator i = textures.Begin(); i != textures.End(); ++i)
         {
             if (graphics->HasTextureUnit(i->first_))
                 graphics->SetTexture(i->first_, i->second_.Get());
@@ -687,7 +687,7 @@ void BatchGroup::Draw(View* view, Camera* camera, bool allowDepthWrite) const
 
             // Get the geometry vertex buffers, then add the instancing stream buffer
             // Hack: use a const_cast to avoid dynamic allocation of new temp vectors
-            auto& vertexBuffers = const_cast<Vector<SharedPtr<VertexBuffer> >&>(
+            auto& vertexBuffers = const_cast<Vector<SharedPtr<VertexBuffer>>&>(
                 geometry_->GetVertexBuffers());
             vertexBuffers.Push(SharedPtr<VertexBuffer>(instanceBuffer));
 

Source/Urho3D/Graphics/CustomGeometry.h

@@ -99,7 +99,7 @@ public:
     Material* GetMaterial(unsigned index = 0) const;
 
     /// Return all vertices. These can be edited; calling Commit() updates the vertex buffer.
-    Vector<PODVector<CustomGeometryVertex> >& GetVertices() { return vertices_; }
+    Vector<PODVector<CustomGeometryVertex>>& GetVertices() { return vertices_; }
 
     /// Return a vertex in a geometry for editing, or null if out of bounds. After the edits are finished, calling Commit() updates  the vertex buffer.
     CustomGeometryVertex* GetVertex(unsigned geometryIndex, unsigned vertexNum);
@@ -121,9 +121,9 @@ private:
     /// Primitive type per geometry.
     PODVector<PrimitiveType> primitiveTypes_;
     /// Source vertices per geometry.
-    Vector<PODVector<CustomGeometryVertex> > vertices_;
+    Vector<PODVector<CustomGeometryVertex>> vertices_;
     /// All geometries.
-    Vector<SharedPtr<Geometry> > geometries_;
+    Vector<SharedPtr<Geometry>> geometries_;
     /// Vertex buffer.
     SharedPtr<VertexBuffer> vertexBuffer_;
     /// Element mask used so far.

Source/Urho3D/Graphics/DecalSet.cpp

@@ -364,7 +364,7 @@ bool DecalSet::AddDecal(Drawable* target, const Vector3& worldPosition, const Qu
     Decal& newDecal = decals_.Back();
     newDecal.timeToLive_ = timeToLive;
 
-    Vector<PODVector<DecalVertex> > faces;
+    Vector<PODVector<DecalVertex>> faces;
     PODVector<DecalVertex> tempFace;
 
     unsigned numBatches = target->GetBatches().Size();
@@ -675,7 +675,7 @@ void DecalSet::OnWorldBoundingBoxUpdate()
     }
 }
 
-void DecalSet::GetFaces(Vector<PODVector<DecalVertex> >& faces, Drawable* target, unsigned batchIndex, const Frustum& frustum,
+void DecalSet::GetFaces(Vector<PODVector<DecalVertex>>& faces, Drawable* target, unsigned batchIndex, const Frustum& frustum,
     const Vector3& decalNormal, float normalCutoff)
 {
     // Try to use the most accurate LOD level if possible
@@ -788,7 +788,7 @@ void DecalSet::GetFaces(Vector<PODVector<DecalVertex> >& faces, Drawable* target
     }
 }
 
-void DecalSet::GetFace(Vector<PODVector<DecalVertex> >& faces, Drawable* target, unsigned batchIndex, unsigned i0, unsigned i1,
+void DecalSet::GetFace(Vector<PODVector<DecalVertex>>& faces, Drawable* target, unsigned batchIndex, unsigned i0, unsigned i1,
     unsigned i2, const unsigned char* positionData, const unsigned char* normalData, const unsigned char* skinningData,
     unsigned positionStride, unsigned normalStride, unsigned skinningStride, const Frustum& frustum, const Vector3& decalNormal,
     float normalCutoff)
@@ -870,8 +870,8 @@ bool DecalSet::GetBones(Drawable* target, unsigned batchIndex, const float* blen
         return false;
 
     // Check whether target is using global or per-geometry skinning
-    const Vector<PODVector<Matrix3x4> >& geometrySkinMatrices = animatedModel->GetGeometrySkinMatrices();
-    const Vector<PODVector<unsigned> >& geometryBoneMappings = animatedModel->GetGeometryBoneMappings();
+    const Vector<PODVector<Matrix3x4>>& geometrySkinMatrices = animatedModel->GetGeometrySkinMatrices();
+    const Vector<PODVector<unsigned>>& geometryBoneMappings = animatedModel->GetGeometryBoneMappings();
 
     for (unsigned i = 0; i < 4; ++i)
     {

Source/Urho3D/Graphics/DecalSet.h

@@ -173,11 +173,11 @@ protected:
 
 private:
     /// Get triangle faces from the target geometry.
-    void GetFaces(Vector<PODVector<DecalVertex> >& faces, Drawable* target, unsigned batchIndex, const Frustum& frustum,
+    void GetFaces(Vector<PODVector<DecalVertex>>& faces, Drawable* target, unsigned batchIndex, const Frustum& frustum,
         const Vector3& decalNormal, float normalCutoff);
     /// Get triangle face from the target geometry.
     void GetFace
-        (Vector<PODVector<DecalVertex> >& faces, Drawable* target, unsigned batchIndex, unsigned i0, unsigned i1, unsigned i2,
+        (Vector<PODVector<DecalVertex>>& faces, Drawable* target, unsigned batchIndex, unsigned i0, unsigned i1, unsigned i2,
             const unsigned char* positionData, const unsigned char* normalData, const unsigned char* skinningData,
             unsigned positionStride, unsigned normalStride, unsigned skinningStride, const Frustum& frustum,
             const Vector3& decalNormal, float normalCutoff);

Source/Urho3D/Graphics/Geometry.h

@@ -52,7 +52,7 @@ public:
     void Draw(Graphics* graphics);
 
     /// Return all vertex buffers.
-    const Vector<SharedPtr<VertexBuffer> >& GetVertexBuffers() const { return vertexBuffers_; }
+    const Vector<SharedPtr<VertexBuffer>>& GetVertexBuffers() const { return vertexBuffers_; }
 
     /// Return number of vertex buffers.
     /// @property
@@ -108,7 +108,7 @@ public:
 
 private:
     /// Vertex buffers.
-    Vector<SharedPtr<VertexBuffer> > vertexBuffers_;
+    Vector<SharedPtr<VertexBuffer>> vertexBuffers_;
     /// Index buffer.
     SharedPtr<IndexBuffer> indexBuffer_;
     /// Primitive type.

Source/Urho3D/Graphics/Graphics.cpp

@@ -1049,7 +1049,7 @@ bool Graphics::SetVertexBuffers(const PODVector<VertexBuffer*>& buffers, unsigne
     return {}; // Prevent warning
 }
 
-bool Graphics::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset)
+bool Graphics::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset)
 {
     GAPI gapi = Graphics::GetGAPI();
 

Source/Urho3D/Graphics/Graphics.h

@@ -231,7 +231,7 @@ public:
     /// @nobind
     bool SetVertexBuffers(const PODVector<VertexBuffer*>& buffers, unsigned instanceOffset = 0);
     /// Set multiple vertex buffers.
-    bool SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset = 0);
+    bool SetVertexBuffers(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset = 0);
     /// Set index buffer.
     void SetIndexBuffer(IndexBuffer* buffer);
     /// Set shaders.
@@ -904,7 +904,7 @@ private:
     void DrawInstanced_OGL(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount, unsigned instanceCount);
     void SetVertexBuffer_OGL(VertexBuffer* buffer);
     bool SetVertexBuffers_OGL(const PODVector<VertexBuffer*>& buffers, unsigned instanceOffset = 0);
-    bool SetVertexBuffers_OGL(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset = 0);
+    bool SetVertexBuffers_OGL(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset = 0);
     void SetIndexBuffer_OGL(IndexBuffer* buffer);
     void SetShaders_OGL(ShaderVariation* vs, ShaderVariation* ps);
     void SetShaderParameter_OGL(StringHash param, const float* data, unsigned count);
@@ -1008,7 +1008,7 @@ private:
     void DrawInstanced_D3D9(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount, unsigned instanceCount);
     void SetVertexBuffer_D3D9(VertexBuffer* buffer);
     bool SetVertexBuffers_D3D9(const PODVector<VertexBuffer*>& buffers, unsigned instanceOffset = 0);
-    bool SetVertexBuffers_D3D9(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset = 0);
+    bool SetVertexBuffers_D3D9(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset = 0);
     void SetIndexBuffer_D3D9(IndexBuffer* buffer);
     void SetShaders_D3D9(ShaderVariation* vs, ShaderVariation* ps);
     void SetShaderParameter_D3D9(StringHash param, const float* data, unsigned count);
@@ -1112,7 +1112,7 @@ private:
     void DrawInstanced_D3D11(PrimitiveType type, unsigned indexStart, unsigned indexCount, unsigned baseVertexIndex, unsigned minVertex, unsigned vertexCount, unsigned instanceCount);
     void SetVertexBuffer_D3D11(VertexBuffer* buffer);
     bool SetVertexBuffers_D3D11(const PODVector<VertexBuffer*>& buffers, unsigned instanceOffset = 0);
-    bool SetVertexBuffers_D3D11(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset = 0);
+    bool SetVertexBuffers_D3D11(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset = 0);
     void SetIndexBuffer_D3D11(IndexBuffer* buffer);
     void SetShaders_D3D11(ShaderVariation* vs, ShaderVariation* ps);
     void SetShaderParameter_D3D11(StringHash param, const float* data, unsigned count);

Source/Urho3D/Graphics/Material.cpp

@@ -746,7 +746,7 @@ bool Material::Save(XMLElement& dest) const
     }
 
     // Write shader parameter animations
-    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo> >::ConstIterator j = shaderParameterAnimationInfos_.Begin();
+    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo>>::ConstIterator j = shaderParameterAnimationInfos_.Begin();
          j != shaderParameterAnimationInfos_.End(); ++j)
     {
         ShaderParameterAnimationInfo* info = j->second_;
@@ -853,7 +853,7 @@ bool Material::Save(JSONValue& dest) const
 
     // Write shader parameter animations
     JSONValue shaderParamAnimationsVal;
-    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo> >::ConstIterator j = shaderParameterAnimationInfos_.Begin();
+    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo>>::ConstIterator j = shaderParameterAnimationInfos_.Begin();
          j != shaderParameterAnimationInfos_.End(); ++j)
     {
         ShaderParameterAnimationInfo* info = j->second_;
@@ -1177,7 +1177,7 @@ Pass* Material::GetPass(unsigned index, const String& passName) const
 
 Texture* Material::GetTexture(TextureUnit unit) const
 {
-    HashMap<TextureUnit, SharedPtr<Texture> >::ConstIterator i = textures_.Find(unit);
+    HashMap<TextureUnit, SharedPtr<Texture>>::ConstIterator i = textures_.Find(unit);
     return i != textures_.End() ? i->second_.Get() : nullptr;
 }
 
@@ -1296,7 +1296,7 @@ void Material::RefreshMemoryUse()
 ShaderParameterAnimationInfo* Material::GetShaderParameterAnimationInfo(const String& name) const
 {
     StringHash nameHash(name);
-    HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo> >::ConstIterator i = shaderParameterAnimationInfos_.Find(nameHash);
+    HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo>>::ConstIterator i = shaderParameterAnimationInfos_.Find(nameHash);
     if (i == shaderParameterAnimationInfos_.End())
         return nullptr;
     return i->second_;
@@ -1329,7 +1329,7 @@ void Material::HandleAttributeAnimationUpdate(StringHash eventType, VariantMap&
     WeakPtr<Object> self(this);
 
     Vector<String> finishedNames;
-    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo> >::ConstIterator i = shaderParameterAnimationInfos_.Begin();
+    for (HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo>>::ConstIterator i = shaderParameterAnimationInfos_.Begin();
          i != shaderParameterAnimationInfos_.End(); ++i)
     {
         bool finished = i->second_->Update(timeStep);

Source/Urho3D/Graphics/Material.h

@@ -201,7 +201,7 @@ public:
     Texture* GetTexture(TextureUnit unit) const;
 
     /// Return all textures.
-    const HashMap<TextureUnit, SharedPtr<Texture> >& GetTextures() const { return textures_; }
+    const HashMap<TextureUnit, SharedPtr<Texture>>& GetTextures() const { return textures_; }
 
     /// Return additional vertex shader defines.
     /// @property
@@ -297,11 +297,11 @@ private:
     /// Techniques.
     Vector<TechniqueEntry> techniques_;
     /// Textures.
-    HashMap<TextureUnit, SharedPtr<Texture> > textures_;
+    HashMap<TextureUnit, SharedPtr<Texture>> textures_;
     /// %Shader parameters.
     HashMap<StringHash, MaterialShaderParameter> shaderParameters_;
     /// %Shader parameters animation infos.
-    HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo> > shaderParameterAnimationInfos_;
+    HashMap<StringHash, SharedPtr<ShaderParameterAnimationInfo>> shaderParameterAnimationInfos_;
     /// Vertex shader defines.
     String vertexShaderDefines_;
     /// Pixel shader defines.

Source/Urho3D/Graphics/Model.cpp

@@ -21,7 +21,7 @@
 namespace Urho3D
 {
 
-unsigned LookupVertexBuffer(VertexBuffer* buffer, const Vector<SharedPtr<VertexBuffer> >& buffers)
+unsigned LookupVertexBuffer(VertexBuffer* buffer, const Vector<SharedPtr<VertexBuffer>>& buffers)
 {
     for (unsigned i = 0; i < buffers.Size(); ++i)
     {
@@ -31,7 +31,7 @@ unsigned LookupVertexBuffer(VertexBuffer* buffer, const Vector<SharedPtr<VertexB
     return 0;
 }
 
-unsigned LookupIndexBuffer(IndexBuffer* buffer, const Vector<SharedPtr<IndexBuffer> >& buffers)
+unsigned LookupIndexBuffer(IndexBuffer* buffer, const Vector<SharedPtr<IndexBuffer>>& buffers)
 {
     for (unsigned i = 0; i < buffers.Size(); ++i)
     {
@@ -184,7 +184,7 @@ bool Model::BeginLoad(Deserializer& source)
         geometryBoneMappings_.Push(boneMapping);
 
         unsigned numLodLevels = source.ReadUInt();
-        Vector<SharedPtr<Geometry> > geometryLodLevels;
+        Vector<SharedPtr<Geometry>> geometryLodLevels;
         geometryLodLevels.Reserve(numLodLevels);
         loadGeometries_[i].Resize(numLodLevels);
 
@@ -469,7 +469,7 @@ void Model::SetBoundingBox(const BoundingBox& box)
     boundingBox_ = box;
 }
 
-bool Model::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers, const PODVector<unsigned>& morphRangeStarts,
+bool Model::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer>>& buffers, const PODVector<unsigned>& morphRangeStarts,
     const PODVector<unsigned>& morphRangeCounts)
 {
     for (unsigned i = 0; i < buffers.Size(); ++i)
@@ -500,7 +500,7 @@ bool Model::SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers, co
     return true;
 }
 
-bool Model::SetIndexBuffers(const Vector<SharedPtr<IndexBuffer> >& buffers)
+bool Model::SetIndexBuffers(const Vector<SharedPtr<IndexBuffer>>& buffers)
 {
     for (unsigned i = 0; i < buffers.Size(); ++i)
     {
@@ -585,7 +585,7 @@ void Model::SetSkeleton(const Skeleton& skeleton)
     skeleton_ = skeleton;
 }
 
-void Model::SetGeometryBoneMappings(const Vector<PODVector<unsigned> >& geometryBoneMappings)
+void Model::SetGeometryBoneMappings(const Vector<PODVector<unsigned>>& geometryBoneMappings)
 {
     geometryBoneMappings_ = geometryBoneMappings;
 }
@@ -610,7 +610,7 @@ SharedPtr<Model> Model::Clone(const String& cloneName) const
 
     // Deep copy vertex/index buffers
     HashMap<VertexBuffer*, VertexBuffer*> vbMapping;
-    for (Vector<SharedPtr<VertexBuffer> >::ConstIterator i = vertexBuffers_.Begin(); i != vertexBuffers_.End(); ++i)
+    for (Vector<SharedPtr<VertexBuffer>>::ConstIterator i = vertexBuffers_.Begin(); i != vertexBuffers_.End(); ++i)
     {
         VertexBuffer* origBuffer = *i;
         SharedPtr<VertexBuffer> cloneBuffer;
@@ -637,7 +637,7 @@ SharedPtr<Model> Model::Clone(const String& cloneName) const
     }
 
     HashMap<IndexBuffer*, IndexBuffer*> ibMapping;
-    for (Vector<SharedPtr<IndexBuffer> >::ConstIterator i = indexBuffers_.Begin(); i != indexBuffers_.End(); ++i)
+    for (Vector<SharedPtr<IndexBuffer>>::ConstIterator i = indexBuffers_.Begin(); i != indexBuffers_.End(); ++i)
     {
         IndexBuffer* origBuffer = *i;
         SharedPtr<IndexBuffer> cloneBuffer;

Source/Urho3D/Graphics/Model.h

@@ -110,10 +110,10 @@ public:
     /// @property
     void SetBoundingBox(const BoundingBox& box);
     /// Set vertex buffers and their morph ranges.
-    bool SetVertexBuffers(const Vector<SharedPtr<VertexBuffer> >& buffers, const PODVector<unsigned>& morphRangeStarts,
+    bool SetVertexBuffers(const Vector<SharedPtr<VertexBuffer>>& buffers, const PODVector<unsigned>& morphRangeStarts,
         const PODVector<unsigned>& morphRangeCounts);
     /// Set index buffers.
-    bool SetIndexBuffers(const Vector<SharedPtr<IndexBuffer> >& buffers);
+    bool SetIndexBuffers(const Vector<SharedPtr<IndexBuffer>>& buffers);
     /// Set number of geometries.
     /// @property
     void SetNumGeometries(unsigned num);
@@ -128,7 +128,7 @@ public:
     /// Set skeleton.
     void SetSkeleton(const Skeleton& skeleton);
     /// Set bone mappings when model has more bones than the skinning shader can handle.
-    void SetGeometryBoneMappings(const Vector<PODVector<unsigned> >& geometryBoneMappings);
+    void SetGeometryBoneMappings(const Vector<PODVector<unsigned>>& geometryBoneMappings);
     /// Set vertex morphs.
     void SetMorphs(const Vector<ModelMorph>& morphs);
     /// Clone the model. The geometry data is deep-copied and can be modified in the clone without affecting the original.
@@ -143,10 +143,10 @@ public:
     Skeleton& GetSkeleton() { return skeleton_; }
 
     /// Return vertex buffers.
-    const Vector<SharedPtr<VertexBuffer> >& GetVertexBuffers() const { return vertexBuffers_; }
+    const Vector<SharedPtr<VertexBuffer>>& GetVertexBuffers() const { return vertexBuffers_; }
 
     /// Return index buffers.
-    const Vector<SharedPtr<IndexBuffer> >& GetIndexBuffers() const { return indexBuffers_; }
+    const Vector<SharedPtr<IndexBuffer>>& GetIndexBuffers() const { return indexBuffers_; }
 
     /// Return number of geometries.
     /// @property
@@ -157,7 +157,7 @@ public:
     unsigned GetNumGeometryLodLevels(unsigned index) const;
 
     /// Return geometry pointers.
-    const Vector<Vector<SharedPtr<Geometry> > >& GetGeometries() const { return geometries_; }
+    const Vector<Vector<SharedPtr<Geometry>>>& GetGeometries() const { return geometries_; }
 
     /// Return geometry center points.
     const PODVector<Vector3>& GetGeometryCenters() const { return geometryCenters_; }
@@ -173,7 +173,7 @@ public:
     }
 
     /// Return geometery bone mappings.
-    const Vector<PODVector<unsigned> >& GetGeometryBoneMappings() const { return geometryBoneMappings_; }
+    const Vector<PODVector<unsigned>>& GetGeometryBoneMappings() const { return geometryBoneMappings_; }
 
     /// Return vertex morphs.
     const Vector<ModelMorph>& GetMorphs() const { return morphs_; }
@@ -199,13 +199,13 @@ private:
     /// Skeleton.
     Skeleton skeleton_;
     /// Vertex buffers.
-    Vector<SharedPtr<VertexBuffer> > vertexBuffers_;
+    Vector<SharedPtr<VertexBuffer>> vertexBuffers_;
     /// Index buffers.
-    Vector<SharedPtr<IndexBuffer> > indexBuffers_;
+    Vector<SharedPtr<IndexBuffer>> indexBuffers_;
     /// Geometries.
-    Vector<Vector<SharedPtr<Geometry> > > geometries_;
+    Vector<Vector<SharedPtr<Geometry>>> geometries_;
     /// Geometry bone mappings.
-    Vector<PODVector<unsigned> > geometryBoneMappings_;
+    Vector<PODVector<unsigned>> geometryBoneMappings_;
     /// Geometry centers.
     PODVector<Vector3> geometryCenters_;
     /// Vertex morphs.
@@ -219,7 +219,7 @@ private:
     /// Index buffer data for asynchronous loading.
     Vector<IndexBufferDesc> loadIBData_;
     /// Geometry definitions for asynchronous loading.
-    Vector<PODVector<GeometryDesc> > loadGeometries_;
+    Vector<PODVector<GeometryDesc>> loadGeometries_;
 };
 
 }

Source/Urho3D/Graphics/OcclusionBuffer.h

@@ -163,7 +163,7 @@ private:
     /// Highest-level buffer data per thread.
     Vector<OcclusionBufferData> buffers_;
     /// Reduced size depth buffers.
-    Vector<SharedArrayPtr<DepthValue> > mipBuffers_;
+    Vector<SharedArrayPtr<DepthValue>> mipBuffers_;
     /// Submitted render jobs.
     PODVector<OcclusionBatch> batches_;
     /// Buffer width.

Source/Urho3D/Graphics/RenderPath.h

@@ -152,7 +152,7 @@ struct URHO3D_API RenderPathCommand
     /// %Shader parameters.
     HashMap<StringHash, Variant> shaderParameters_;
     /// Output rendertarget names and faces.
-    Vector<Pair<String, CubeMapFace> > outputs_;
+    Vector<Pair<String, CubeMapFace>> outputs_;
     /// Depth-stencil output name.
     String depthStencilName_;
     /// Clear flags. Affects clear command only.

Source/Urho3D/Graphics/Renderer.cpp

@@ -430,7 +430,7 @@ void Renderer::SetMaxShadowMaps(int shadowMaps)
         return;
 
     maxShadowMaps_ = shadowMaps;
-    for (HashMap<int, Vector<SharedPtr<Texture2D> > >::Iterator i = shadowMaps_.Begin(); i != shadowMaps_.End(); ++i)
+    for (HashMap<int, Vector<SharedPtr<Texture2D>>>::Iterator i = shadowMaps_.Begin(); i != shadowMaps_.End(); ++i)
     {
         if ((int)i->second_.Size() > maxShadowMaps_)
             i->second_.Resize((unsigned)maxShadowMaps_);
@@ -785,7 +785,7 @@ void Renderer::QueueViewport(RenderSurface* renderTarget, Viewport* viewport)
 {
     if (viewport)
     {
-        Pair<WeakPtr<RenderSurface>, WeakPtr<Viewport> > newView =
+        Pair<WeakPtr<RenderSurface>, WeakPtr<Viewport>> newView =
             MakePair(WeakPtr<RenderSurface>(renderTarget), WeakPtr<Viewport>(viewport));
 
         // Prevent double add of the same rendertarget/viewport combination
@@ -1131,7 +1131,7 @@ void Renderer::StorePreparedView(View* view, Camera* camera)
 
 View* Renderer::GetPreparedView(Camera* camera)
 {
-    HashMap<Camera*, WeakPtr<View> >::Iterator i = preparedViews_.Find(camera);
+    HashMap<Camera*, WeakPtr<View>>::Iterator i = preparedViews_.Find(camera);
     return i != preparedViews_.End() ? i->second_ : nullptr;
 }
 
@@ -1151,8 +1151,8 @@ void Renderer::SetBatchShaders(Batch& batch, Technique* tech, bool allowShadows,
     if (pass->GetShadersLoadedFrameNumber() != shadersChangedFrameNumber_)
         pass->ReleaseShaders();
 
-    Vector<SharedPtr<ShaderVariation> >& vertexShaders = queue.hasExtraDefines_ ? pass->GetVertexShaders(queue.vsExtraDefinesHash_) : pass->GetVertexShaders();
-    Vector<SharedPtr<ShaderVariation> >& pixelShaders = queue.hasExtraDefines_ ? pass->GetPixelShaders(queue.psExtraDefinesHash_) : pass->GetPixelShaders();
+    Vector<SharedPtr<ShaderVariation>>& vertexShaders = queue.hasExtraDefines_ ? pass->GetVertexShaders(queue.vsExtraDefinesHash_) : pass->GetVertexShaders();
+    Vector<SharedPtr<ShaderVariation>>& pixelShaders = queue.hasExtraDefines_ ? pass->GetPixelShaders(queue.psExtraDefinesHash_) : pass->GetPixelShaders();
 
     // Load shaders now if necessary
     if (!vertexShaders.Size() || !pixelShaders.Size())
@@ -1525,10 +1525,10 @@ void Renderer::RemoveUnusedBuffers()
         }
     }
 
-    for (HashMap<unsigned long long, Vector<SharedPtr<Texture> > >::Iterator i = screenBuffers_.Begin(); i != screenBuffers_.End();)
+    for (HashMap<unsigned long long, Vector<SharedPtr<Texture>>>::Iterator i = screenBuffers_.Begin(); i != screenBuffers_.End();)
     {
-        HashMap<unsigned long long, Vector<SharedPtr<Texture> > >::Iterator current = i++;
-        Vector<SharedPtr<Texture> >& buffers = current->second_;
+        HashMap<unsigned long long, Vector<SharedPtr<Texture>>>::Iterator current = i++;
+        Vector<SharedPtr<Texture>>& buffers = current->second_;
         for (unsigned j = buffers.Size() - 1; j < buffers.Size(); --j)
         {
             Texture* buffer = buffers[j];
@@ -1549,7 +1549,7 @@ void Renderer::RemoveUnusedBuffers()
 
 void Renderer::ResetShadowMapAllocations()
 {
-    for (HashMap<int, PODVector<Light*> >::Iterator i = shadowMapAllocations_.Begin(); i != shadowMapAllocations_.End(); ++i)
+    for (HashMap<int, PODVector<Light*>>::Iterator i = shadowMapAllocations_.Begin(); i != shadowMapAllocations_.End(); ++i)
         i->second_.Clear();
 }
 
@@ -1620,7 +1620,7 @@ void Renderer::LoadShaders()
     shadersDirty_ = false;
 }
 
-void Renderer::LoadPassShaders(Pass* pass, Vector<SharedPtr<ShaderVariation> >& vertexShaders, Vector<SharedPtr<ShaderVariation> >& pixelShaders, const BatchQueue& queue)
+void Renderer::LoadPassShaders(Pass* pass, Vector<SharedPtr<ShaderVariation>>& vertexShaders, Vector<SharedPtr<ShaderVariation> >& pixelShaders, const BatchQueue& queue)
 {
     URHO3D_PROFILE(LoadPassShaders);
 

Source/Urho3D/Graphics/Renderer.h

@@ -486,7 +486,7 @@ private:
     /// Reload shaders.
     void LoadShaders();
     /// Reload shaders for a material pass. The related batch queue is provided in case it has extra shader compilation defines.
-    void LoadPassShaders(Pass* pass, Vector<SharedPtr<ShaderVariation> >& vertexShaders, Vector<SharedPtr<ShaderVariation> >& pixelShaders, const BatchQueue& queue);
+    void LoadPassShaders(Pass* pass, Vector<SharedPtr<ShaderVariation>>& vertexShaders, Vector<SharedPtr<ShaderVariation>>& pixelShaders, const BatchQueue& queue);
     /// Release shaders used in materials.
     void ReleaseMaterialShaders();
     /// Reload textures.
@@ -547,33 +547,33 @@ private:
     /// Indirection cube map for shadowed pointlights.
     SharedPtr<TextureCube> indirectionCubeMap_;
     /// Reusable scene nodes with shadow camera components.
-    Vector<SharedPtr<Node> > shadowCameraNodes_;
+    Vector<SharedPtr<Node>> shadowCameraNodes_;
     /// Reusable occlusion buffers.
-    Vector<SharedPtr<OcclusionBuffer> > occlusionBuffers_;
+    Vector<SharedPtr<OcclusionBuffer>> occlusionBuffers_;
     /// Shadow maps by resolution.
-    HashMap<int, Vector<SharedPtr<Texture2D> > > shadowMaps_;
+    HashMap<int, Vector<SharedPtr<Texture2D>>> shadowMaps_;
     /// Shadow map dummy color buffers by resolution.
-    HashMap<int, SharedPtr<Texture2D> > colorShadowMaps_;
+    HashMap<int, SharedPtr<Texture2D>> colorShadowMaps_;
     /// Shadow map allocations by resolution.
-    HashMap<int, PODVector<Light*> > shadowMapAllocations_;
+    HashMap<int, PODVector<Light*>> shadowMapAllocations_;
     /// Instance of shadow map filter.
     Object* shadowMapFilterInstance_{};
     /// Function pointer of shadow map filter.
     ShadowMapFilter shadowMapFilter_{};
     /// Screen buffers by resolution and format.
-    HashMap<unsigned long long, Vector<SharedPtr<Texture> > > screenBuffers_;
+    HashMap<unsigned long long, Vector<SharedPtr<Texture>>> screenBuffers_;
     /// Current screen buffer allocations by resolution and format.
     HashMap<unsigned long long, unsigned> screenBufferAllocations_;
     /// Cache for light scissor queries.
     HashMap<Pair<Light*, Camera*>, Rect> lightScissorCache_;
     /// Backbuffer viewports.
-    Vector<SharedPtr<Viewport> > viewports_;
+    Vector<SharedPtr<Viewport>> viewports_;
     /// Render surface viewports queued for update.
-    Vector<Pair<WeakPtr<RenderSurface>, WeakPtr<Viewport> > > queuedViewports_;
+    Vector<Pair<WeakPtr<RenderSurface>, WeakPtr<Viewport>>> queuedViewports_;
     /// Views that have been processed this frame.
-    Vector<WeakPtr<View> > views_;
+    Vector<WeakPtr<View>> views_;
     /// Prepared views by culling camera.
-    HashMap<Camera*, WeakPtr<View> > preparedViews_;
+    HashMap<Camera*, WeakPtr<View>> preparedViews_;
     /// Octrees that have been updated during the frame.
     HashSet<Octree*> updatedOctrees_;
     /// Techniques for which missing shader error has been displayed.

Source/Urho3D/Graphics/StaticModel.cpp

@@ -231,7 +231,7 @@ void StaticModel::SetModel(Model* model)
 
         // Copy the subgeometry & LOD level structure
         SetNumGeometries(model->GetNumGeometries());
-        const Vector<Vector<SharedPtr<Geometry> > >& geometries = model->GetGeometries();
+        const Vector<Vector<SharedPtr<Geometry>>>& geometries = model->GetGeometries();
         const PODVector<Vector3>& geometryCenters = model->GetGeometryCenters();
         const Matrix3x4* worldTransform = node_ ? &node_->GetWorldTransform() : nullptr;
         for (unsigned i = 0; i < geometries.Size(); ++i)
@@ -402,7 +402,7 @@ void StaticModel::CalculateLodLevels()
 {
     for (unsigned i = 0; i < batches_.Size(); ++i)
     {
-        const Vector<SharedPtr<Geometry> >& batchGeometries = geometries_[i];
+        const Vector<SharedPtr<Geometry>>& batchGeometries = geometries_[i];
         // If only one LOD geometry, no reason to go through the LOD calculation
         if (batchGeometries.Size() <= 1)
             continue;

Source/Urho3D/Graphics/StaticModel.h

@@ -107,7 +107,7 @@ protected:
     /// Extra per-geometry data.
     PODVector<StaticModelGeometryData> geometryData_;
     /// All geometries.
-    Vector<Vector<SharedPtr<Geometry> > > geometries_;
+    Vector<Vector<SharedPtr<Geometry>>> geometries_;
     /// Model.
     SharedPtr<Model> model_;
     /// Occlusion LOD level.

Source/Urho3D/Graphics/StaticModelGroup.cpp

@@ -272,7 +272,7 @@ void StaticModelGroup::RemoveInstanceNode(Node* node)
         return;
 
     WeakPtr<Node> instanceWeak(node);
-    Vector<WeakPtr<Node> >::Iterator i = instanceNodes_.Find(instanceWeak);
+    Vector<WeakPtr<Node>>::Iterator i = instanceNodes_.Find(instanceWeak);
     if (i == instanceNodes_.End())
         return;
 

Source/Urho3D/Graphics/StaticModelGroup.h

@@ -67,7 +67,7 @@ private:
     void UpdateNodeIDs() const;
 
     /// Instance nodes.
-    Vector<WeakPtr<Node> > instanceNodes_;
+    Vector<WeakPtr<Node>> instanceNodes_;
     /// World transforms of valid (existing and visible) instances.
     PODVector<Matrix3x4> worldTransforms_;
     /// IDs of instance nodes for serialization.

Source/Urho3D/Graphics/Technique.cpp

@@ -190,7 +190,7 @@ String Pass::GetEffectivePixelShaderDefines() const
     return String::Joined(psDefines, " ");
 }
 
-Vector<SharedPtr<ShaderVariation> >& Pass::GetVertexShaders(const StringHash& extraDefinesHash)
+Vector<SharedPtr<ShaderVariation>>& Pass::GetVertexShaders(const StringHash& extraDefinesHash)
 {
     // If empty hash, return the base shaders
     if (!extraDefinesHash.Value())
@@ -199,7 +199,7 @@ Vector<SharedPtr<ShaderVariation> >& Pass::GetVertexShaders(const StringHash& ex
         return extraVertexShaders_[extraDefinesHash];
 }
 
-Vector<SharedPtr<ShaderVariation> >& Pass::GetPixelShaders(const StringHash& extraDefinesHash)
+Vector<SharedPtr<ShaderVariation>>& Pass::GetPixelShaders(const StringHash& extraDefinesHash)
 {
     if (!extraDefinesHash.Value())
         return pixelShaders_;
@@ -346,7 +346,7 @@ void Technique::SetIsDesktop(bool enable)
 
 void Technique::ReleaseShaders()
 {
-    for (Vector<SharedPtr<Pass> >::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
+    for (Vector<SharedPtr<Pass>>::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
     {
         Pass* pass = i->Get();
         if (pass)
@@ -361,7 +361,7 @@ SharedPtr<Technique> Technique::Clone(const String& cloneName) const
     ret->SetName(cloneName);
 
     // Deep copy passes
-    for (Vector<SharedPtr<Pass> >::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
+    for (Vector<SharedPtr<Pass>>::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
     {
         Pass* srcPass = i->Get();
         if (!srcPass)
@@ -438,7 +438,7 @@ unsigned Technique::GetNumPasses() const
 {
     unsigned ret = 0;
 
-    for (Vector<SharedPtr<Pass> >::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
+    for (Vector<SharedPtr<Pass>>::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
     {
         if (i->Get())
             ++ret;
@@ -451,7 +451,7 @@ Vector<String> Technique::GetPassNames() const
 {
     Vector<String> ret;
 
-    for (Vector<SharedPtr<Pass> >::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
+    for (Vector<SharedPtr<Pass>>::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
     {
         Pass* pass = i->Get();
         if (pass)
@@ -465,7 +465,7 @@ PODVector<Pass*> Technique::GetPasses() const
 {
     PODVector<Pass*> ret;
 
-    for (Vector<SharedPtr<Pass> >::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
+    for (Vector<SharedPtr<Pass>>::ConstIterator i = passes_.Begin(); i != passes_.End(); ++i)
     {
         Pass* pass = i->Get();
         if (pass)
@@ -484,7 +484,7 @@ SharedPtr<Technique> Technique::CloneWithDefines(const String& vsDefines, const
     Pair<StringHash, StringHash> key = MakePair(StringHash(vsDefines), StringHash(psDefines));
 
     // Return existing if possible
-    HashMap<Pair<StringHash, StringHash>, SharedPtr<Technique> >::Iterator i = cloneTechniques_.Find(key);
+    HashMap<Pair<StringHash, StringHash>, SharedPtr<Technique>>::Iterator i = cloneTechniques_.Find(key);
     if (i != cloneTechniques_.End())
         return i->second_;
 
@@ -492,7 +492,7 @@ SharedPtr<Technique> Technique::CloneWithDefines(const String& vsDefines, const
     // since the clones are never stored to the resource cache
     i = cloneTechniques_.Insert(MakePair(key, Clone(GetName())));
 
-    for (Vector<SharedPtr<Pass> >::ConstIterator j = i->second_->passes_.Begin(); j != i->second_->passes_.End(); ++j)
+    for (Vector<SharedPtr<Pass>>::ConstIterator j = i->second_->passes_.Begin(); j != i->second_->passes_.End(); ++j)
     {
         Pass* pass = (*j);
         if (!pass)

Source/Urho3D/Graphics/Technique.h

@@ -136,15 +136,15 @@ public:
     const String& GetPixelShaderDefineExcludes() const { return pixelShaderDefineExcludes_; }
 
     /// Return vertex shaders.
-    Vector<SharedPtr<ShaderVariation> >& GetVertexShaders() { return vertexShaders_; }
+    Vector<SharedPtr<ShaderVariation>>& GetVertexShaders() { return vertexShaders_; }
 
     /// Return pixel shaders.
-    Vector<SharedPtr<ShaderVariation> >& GetPixelShaders() { return pixelShaders_; }
+    Vector<SharedPtr<ShaderVariation>>& GetPixelShaders() { return pixelShaders_; }
 
     /// Return vertex shaders with extra defines from the renderpath.
-    Vector<SharedPtr<ShaderVariation> >& GetVertexShaders(const StringHash& extraDefinesHash);
+    Vector<SharedPtr<ShaderVariation>>& GetVertexShaders(const StringHash& extraDefinesHash);
     /// Return pixel shaders with extra defines from the renderpath.
-    Vector<SharedPtr<ShaderVariation> >& GetPixelShaders(const StringHash& extraDefinesHash);
+    Vector<SharedPtr<ShaderVariation>>& GetPixelShaders(const StringHash& extraDefinesHash);
     /// Return the effective vertex shader defines, accounting for excludes. Called internally by Renderer.
     String GetEffectiveVertexShaderDefines() const;
     /// Return the effective pixel shader defines, accounting for excludes. Called internally by Renderer.
@@ -182,13 +182,13 @@ private:
     /// Pixel shader define excludes.
     String pixelShaderDefineExcludes_;
     /// Vertex shaders.
-    Vector<SharedPtr<ShaderVariation> > vertexShaders_;
+    Vector<SharedPtr<ShaderVariation>> vertexShaders_;
     /// Pixel shaders.
-    Vector<SharedPtr<ShaderVariation> > pixelShaders_;
+    Vector<SharedPtr<ShaderVariation>> pixelShaders_;
     /// Vertex shaders with extra defines from the renderpath.
-    HashMap<StringHash, Vector<SharedPtr<ShaderVariation> > > extraVertexShaders_;
+    HashMap<StringHash, Vector<SharedPtr<ShaderVariation>>> extraVertexShaders_;
     /// Pixel shaders with extra defines from the renderpath.
-    HashMap<StringHash, Vector<SharedPtr<ShaderVariation> > > extraPixelShaders_;
+    HashMap<StringHash, Vector<SharedPtr<ShaderVariation>>> extraPixelShaders_;
     /// Pass name.
     String name_;
 };
@@ -293,9 +293,9 @@ private:
     /// Cached desktop GPU support flag.
     bool desktopSupport_;
     /// Passes.
-    Vector<SharedPtr<Pass> > passes_;
+    Vector<SharedPtr<Pass>> passes_;
     /// Cached clones with added shader compilation defines.
-    HashMap<Pair<StringHash, StringHash>, SharedPtr<Technique> > cloneTechniques_;
+    HashMap<Pair<StringHash, StringHash>, SharedPtr<Technique>> cloneTechniques_;
 
     /// Pass index assignments.
     static HashMap<String, unsigned> passIndices;

Source/Urho3D/Graphics/Terrain.h

@@ -281,9 +281,9 @@ private:
     /// Material.
     SharedPtr<Material> material_;
     /// Terrain patches.
-    Vector<WeakPtr<TerrainPatch> > patches_;
+    Vector<WeakPtr<TerrainPatch>> patches_;
     /// Draw ranges for different LODs and stitching combinations.
-    PODVector<Pair<unsigned, unsigned> > drawRanges_;
+    PODVector<Pair<unsigned, unsigned>> drawRanges_;
     /// North neighbor terrain.
     WeakPtr<Terrain> north_;
     /// South neighbor terrain.

Source/Urho3D/Graphics/View.cpp

@@ -2842,9 +2842,9 @@ Technique* View::GetTechnique(Drawable* drawable, Material* material)
 
 void View::CheckMaterialForAuxView(Material* material)
 {
-    const HashMap<TextureUnit, SharedPtr<Texture> >& textures = material->GetTextures();
+    const HashMap<TextureUnit, SharedPtr<Texture>>& textures = material->GetTextures();
 
-    for (HashMap<TextureUnit, SharedPtr<Texture> >::ConstIterator i = textures.Begin(); i != textures.End(); ++i)
+    for (HashMap<TextureUnit, SharedPtr<Texture>>::ConstIterator i = textures.Begin(); i != textures.End(); ++i)
     {
         Texture* texture = i->second_.Get();
         if (texture && texture->GetUsage() == TEXTURE_RENDERTARGET)

Source/Urho3D/Graphics/View.h

@@ -365,7 +365,7 @@ private:
     /// Renderpath.
     RenderPath* renderPath_{};
     /// Per-thread octree query results.
-    Vector<PODVector<Drawable*> > tempDrawables_;
+    Vector<PODVector<Drawable*>> tempDrawables_;
     /// Per-thread geometries, lights and Z range collection results.
     Vector<PerThreadSceneResult> sceneResults_;
     /// Visible zones.

Source/Urho3D/GraphicsAPI/Direct3D11/D3D11Graphics.cpp

@@ -856,7 +856,7 @@ bool Graphics::SetVertexBuffers_D3D11(const PODVector<VertexBuffer*>& buffers, u
     return true;
 }
 
-bool Graphics::SetVertexBuffers_D3D11(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset)
+bool Graphics::SetVertexBuffers_D3D11(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset)
 {
     return SetVertexBuffers_D3D11(reinterpret_cast<const PODVector<VertexBuffer*>&>(buffers), instanceOffset);
 }

Source/Urho3D/GraphicsAPI/Direct3D11/D3D11GraphicsImpl.h

@@ -19,9 +19,9 @@ namespace Urho3D
 
 #define URHO3D_LOGD3DERROR(msg, hr) URHO3D_LOGERRORF("%s (HRESULT %x)", msg, (unsigned)hr)
 
-using ShaderProgramMap_D3D11 = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_D3D11> >;
-using VertexDeclarationMap_D3D11 = HashMap<unsigned long long, SharedPtr<VertexDeclaration_D3D11> >;
-using ConstantBufferMap = HashMap<unsigned, SharedPtr<ConstantBuffer> >;
+using ShaderProgramMap_D3D11 = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_D3D11>>;
+using VertexDeclarationMap_D3D11 = HashMap<unsigned long long, SharedPtr<VertexDeclaration_D3D11>>;
+using ConstantBufferMap = HashMap<unsigned, SharedPtr<ConstantBuffer>>;
 
 /// %Graphics implementation. Holds API-specific objects.
 class URHO3D_API GraphicsImpl_D3D11

Source/Urho3D/GraphicsAPI/Direct3D9/D3D9Graphics.cpp

@@ -1023,7 +1023,7 @@ bool Graphics::SetVertexBuffers_D3D9(const PODVector<VertexBuffer*>& buffers, un
     return true;
 }
 
-bool Graphics::SetVertexBuffers_D3D9(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset)
+bool Graphics::SetVertexBuffers_D3D9(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset)
 {
     return SetVertexBuffers_D3D9(reinterpret_cast<const PODVector<VertexBuffer*>&>(buffers), instanceOffset);
 }

Source/Urho3D/GraphicsAPI/Direct3D9/D3D9GraphicsImpl.h

@@ -16,8 +16,8 @@ namespace Urho3D
 
 #define URHO3D_LOGD3DERROR(msg, hr) URHO3D_LOGERRORF("%s (HRESULT %x)", msg, (unsigned)hr)
 
-using ShaderProgramMap_D3D9 = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_D3D9> >;
-using VertexDeclarationMap_D3D9 = HashMap<unsigned long long, SharedPtr<VertexDeclaration_D3D9> >;
+using ShaderProgramMap_D3D9 = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_D3D9>>;
+using VertexDeclarationMap_D3D9 = HashMap<unsigned long long, SharedPtr<VertexDeclaration_D3D9>>;
 
 /// %Graphics implementation. Holds API-specific objects.
 class URHO3D_API GraphicsImpl_D3D9

Source/Urho3D/GraphicsAPI/Direct3D9/D3D9VertexDeclaration.cpp

@@ -119,7 +119,7 @@ VertexDeclaration_D3D9::VertexDeclaration_D3D9(Graphics* graphics, const PODVect
     Create(graphics, elements);
 }
 
-VertexDeclaration_D3D9::VertexDeclaration_D3D9(Graphics* graphics, const Vector<SharedPtr<VertexBuffer> >& buffers) :
+VertexDeclaration_D3D9::VertexDeclaration_D3D9(Graphics* graphics, const Vector<SharedPtr<VertexBuffer>>& buffers) :
     declaration_(nullptr)
 {
     PODVector<VertexDeclarationElement_D3D9> elements;

Source/Urho3D/GraphicsAPI/Direct3D9/D3D9VertexDeclaration.h

@@ -39,7 +39,7 @@ public:
     /// Construct with vertex buffers to base declaration on. Higher index buffers will override semantics on lower indices.
     VertexDeclaration_D3D9(Graphics* graphics, const PODVector<VertexBuffer*>& buffers);
     /// Construct with vertex buffers (shared pointer vector) to base declaration on. Higher index buffers will override semantics on lower indices.
-    VertexDeclaration_D3D9(Graphics* graphics, const Vector<SharedPtr<VertexBuffer> >& buffers);
+    VertexDeclaration_D3D9(Graphics* graphics, const Vector<SharedPtr<VertexBuffer>>& buffers);
     /// Destruct.
     ~VertexDeclaration_D3D9();
 

Source/Urho3D/GraphicsAPI/OpenGL/OGLGraphics.cpp

@@ -982,7 +982,7 @@ bool Graphics::SetVertexBuffers_OGL(const PODVector<VertexBuffer*>& buffers, uns
     return true;
 }
 
-bool Graphics::SetVertexBuffers_OGL(const Vector<SharedPtr<VertexBuffer> >& buffers, unsigned instanceOffset)
+bool Graphics::SetVertexBuffers_OGL(const Vector<SharedPtr<VertexBuffer>>& buffers, unsigned instanceOffset)
 {
     return SetVertexBuffers_OGL(reinterpret_cast<const PODVector<VertexBuffer*>&>(buffers), instanceOffset);
 }
@@ -1709,7 +1709,7 @@ void Graphics::SetDepthStencil_OGL(RenderSurface* depthStencil)
         if (width <= width_ && height <= height_)
         {
             unsigned searchKey = (width << 16u) | height;
-            HashMap<unsigned, SharedPtr<Texture2D> >::Iterator i = impl->depthTextures_.Find(searchKey);
+            HashMap<unsigned, SharedPtr<Texture2D>>::Iterator i = impl->depthTextures_.Find(searchKey);
             if (i != impl->depthTextures_.End())
                 depthStencil = i->second_->GetRenderSurface();
             else
@@ -2365,7 +2365,7 @@ ConstantBuffer* Graphics::GetOrCreateConstantBuffer_OGL(ShaderType type,  unsign
     GraphicsImpl_OGL* impl = GetImpl_OGL();
 
     unsigned key = (index << 16u) | size;
-    HashMap<unsigned, SharedPtr<ConstantBuffer> >::Iterator i = impl->allConstantBuffers_.Find(key);
+    HashMap<unsigned, SharedPtr<ConstantBuffer>>::Iterator i = impl->allConstantBuffers_.Find(key);
     if (i == impl->allConstantBuffers_.End())
     {
         i = impl->allConstantBuffers_.Insert(MakePair(key, SharedPtr<ConstantBuffer>(new ConstantBuffer(context_))));

Source/Urho3D/GraphicsAPI/OpenGL/OGLGraphicsImpl.h

@@ -58,8 +58,8 @@ namespace Urho3D
 
 class Context;
 
-using ConstantBufferMap = HashMap<unsigned, SharedPtr<ConstantBuffer> >;
-using ShaderProgramMap_OGL = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_OGL> >;
+using ConstantBufferMap = HashMap<unsigned, SharedPtr<ConstantBuffer>>;
+using ShaderProgramMap_OGL = HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgram_OGL>>;
 
 /// Cached state of a frame buffer object.
 struct FrameBufferObject
@@ -128,7 +128,7 @@ private:
     /// Last used instance data offset.
     unsigned lastInstanceOffset_{};
     /// Map for additional depth textures, to emulate Direct3D9 ability to mix render texture and backbuffer rendering.
-    HashMap<unsigned, SharedPtr<Texture2D> > depthTextures_;
+    HashMap<unsigned, SharedPtr<Texture2D>> depthTextures_;
     /// Shader program in use.
     ShaderProgram_OGL* shaderProgram_{};
     /// Linked shader programs.

Source/Urho3D/GraphicsAPI/RenderSurface.h

@@ -169,7 +169,7 @@ private:
     };
 
     /// Viewports.
-    Vector<SharedPtr<Viewport> > viewports_;
+    Vector<SharedPtr<Viewport>> viewports_;
     /// Linked color buffer.
     WeakPtr<RenderSurface> linkedRenderTarget_;
     /// Linked depth buffer.

Source/Urho3D/GraphicsAPI/Shader.cpp

@@ -94,9 +94,9 @@ bool Shader::BeginLoad(Deserializer& source)
 bool Shader::EndLoad()
 {
     // If variations had already been created, release them and require recompile
-    for (HashMap<StringHash, SharedPtr<ShaderVariation> >::Iterator i = vsVariations_.Begin(); i != vsVariations_.End(); ++i)
+    for (HashMap<StringHash, SharedPtr<ShaderVariation>>::Iterator i = vsVariations_.Begin(); i != vsVariations_.End(); ++i)
         i->second_->Release();
-    for (HashMap<StringHash, SharedPtr<ShaderVariation> >::Iterator i = psVariations_.Begin(); i != psVariations_.End(); ++i)
+    for (HashMap<StringHash, SharedPtr<ShaderVariation>>::Iterator i = psVariations_.Begin(); i != psVariations_.End(); ++i)
         i->second_->Release();
 
     return true;
@@ -110,8 +110,8 @@ ShaderVariation* Shader::GetVariation(ShaderType type, const String& defines)
 ShaderVariation* Shader::GetVariation(ShaderType type, const char* defines)
 {
     StringHash definesHash(defines);
-    HashMap<StringHash, SharedPtr<ShaderVariation> >& variations(type == VS ? vsVariations_ : psVariations_);
-    HashMap<StringHash, SharedPtr<ShaderVariation> >::Iterator i = variations.Find(definesHash);
+    HashMap<StringHash, SharedPtr<ShaderVariation>>& variations(type == VS ? vsVariations_ : psVariations_);
+    HashMap<StringHash, SharedPtr<ShaderVariation>>::Iterator i = variations.Find(definesHash);
     if (i == variations.End())
     {
         // If shader not found, normalize the defines (to prevent duplicates) and check again. In that case make an alias

Source/Urho3D/GraphicsAPI/Shader.h

@@ -54,9 +54,9 @@ private:
     /// Source code adapted for pixel shader.
     String psSourceCode_;
     /// Vertex shader variations.
-    HashMap<StringHash, SharedPtr<ShaderVariation> > vsVariations_;
+    HashMap<StringHash, SharedPtr<ShaderVariation>> vsVariations_;
     /// Pixel shader variations.
-    HashMap<StringHash, SharedPtr<ShaderVariation> > psVariations_;
+    HashMap<StringHash, SharedPtr<ShaderVariation>> psVariations_;
     /// Source code timestamp.
     unsigned timeStamp_;
     /// Number of unique variations so far.

Source/Urho3D/GraphicsAPI/ShaderPrecache.h

@@ -36,7 +36,7 @@ private:
     /// XML file.
     XMLFile xmlFile_;
     /// Already encountered shader combinations, pointer version for fast queries.
-    HashSet<Pair<ShaderVariation*, ShaderVariation*> > usedPtrCombinations_;
+    HashSet<Pair<ShaderVariation*, ShaderVariation*>> usedPtrCombinations_;
     /// Already encountered shader combinations.
     HashSet<String> usedCombinations_;
 };

Source/Urho3D/GraphicsAPI/Texture2DArray.h

@@ -107,7 +107,7 @@ private:
     /// Memory use per layer.
     PODVector<unsigned> layerMemoryUse_;
     /// Layer image files acquired during BeginLoad.
-    Vector<SharedPtr<Image> > loadImages_;
+    Vector<SharedPtr<Image>> loadImages_;
     /// Parameter file acquired during BeginLoad.
     SharedPtr<XMLFile> loadParameters_;
 };

Source/Urho3D/GraphicsAPI/TextureCube.h

@@ -102,7 +102,7 @@ private:
     /// Memory use per face.
     unsigned faceMemoryUse_[MAX_CUBEMAP_FACES]{};
     /// Face image files acquired during BeginLoad.
-    Vector<SharedPtr<Image> > loadImages_;
+    Vector<SharedPtr<Image>> loadImages_;
     /// Parameter file acquired during BeginLoad.
     SharedPtr<XMLFile> loadParameters_;
 };

Source/Urho3D/Input/Input.cpp

@@ -1006,8 +1006,8 @@ SDL_JoystickID Input::AddScreenJoystick(XMLFile* layoutFile, XMLFile* styleFile)
     unsigned numButtons = 0;
     unsigned numAxes = 0;
     unsigned numHats = 0;
-    const Vector<SharedPtr<UIElement> >& children = state.screenJoystick_->GetChildren();
-    for (Vector<SharedPtr<UIElement> >::ConstIterator iter = children.Begin(); iter != children.End(); ++iter)
+    const Vector<SharedPtr<UIElement>>& children = state.screenJoystick_->GetChildren();
+    for (Vector<SharedPtr<UIElement>>::ConstIterator iter = children.Begin(); iter != children.End(); ++iter)
     {
         UIElement* element = iter->Get();
         String name = element->GetName();

Source/Urho3D/LuaScript/LuaScript.cpp

@@ -418,7 +418,7 @@ LuaFunction* LuaScript::GetFunction(int index)
     if (!functionPointer)
         return nullptr;
 
-    HashMap<const void*, SharedPtr<LuaFunction> >::Iterator i = functionPointerToFunctionMap_.Find(functionPointer);
+    HashMap<const void*, SharedPtr<LuaFunction>>::Iterator i = functionPointerToFunctionMap_.Find(functionPointer);
     if (i != functionPointerToFunctionMap_.End())
         return i->second_;
 
@@ -433,7 +433,7 @@ LuaFunction* LuaScript::GetFunction(const String& functionName, bool silentIfNot
     if (!luaState_)
         return nullptr;
 
-    HashMap<String, SharedPtr<LuaFunction> >::Iterator i = functionNameToFunctionMap_.Find(functionName);
+    HashMap<String, SharedPtr<LuaFunction>>::Iterator i = functionNameToFunctionMap_.Find(functionName);
     if (i != functionNameToFunctionMap_.End())
         return i->second_;
 

Source/Urho3D/LuaScript/LuaScript.h

@@ -105,9 +105,9 @@ private:
     /// Flag for executing engine console commands as script code. Default to true.
     bool executeConsoleCommands_;
     /// Function pointer to function map.
-    HashMap<const void*, SharedPtr<LuaFunction> > functionPointerToFunctionMap_;
+    HashMap<const void*, SharedPtr<LuaFunction>> functionPointerToFunctionMap_;
     /// Function name to function map.
-    HashMap<String, SharedPtr<LuaFunction> > functionNameToFunctionMap_;
+    HashMap<String, SharedPtr<LuaFunction>> functionNameToFunctionMap_;
 };
 
 /// Register Lua script library objects.

Source/Urho3D/LuaScript/ToluaUtils.cpp

@@ -112,13 +112,13 @@ template <> int ToluaPushPODVector<bool>(double /*overload*/, lua_State* L, void
     return 1;
 }
 
-// Explicit template specialization for Vector<SharedPtr<IndexBuffer> > and Vector<SharedPtr<VertexBuffer> >
+// Explicit template specialization for Vector<SharedPtr<IndexBuffer>> and Vector<SharedPtr<VertexBuffer>>
 
-template <> void* ToluaToVector<SharedPtr<IndexBuffer> >(lua_State* L, int narg, void* def)
+template <> void* ToluaToVector<SharedPtr<IndexBuffer>>(lua_State* L, int narg, void* def)
 {
     if (!lua_istable(L, narg))
         return nullptr;
-    static Vector<SharedPtr<IndexBuffer> > result;
+    static Vector<SharedPtr<IndexBuffer>> result;
     result.Clear();
     result.Resize((unsigned)lua_objlen(L, narg));
     for (unsigned i = 0; i < result.Size(); ++i)
@@ -130,11 +130,11 @@ template <> void* ToluaToVector<SharedPtr<IndexBuffer> >(lua_State* L, int narg,
     return &result;
 }
 
-template <> void* ToluaToVector<SharedPtr<VertexBuffer> >(lua_State* L, int narg, void* def)
+template <> void* ToluaToVector<SharedPtr<VertexBuffer>>(lua_State* L, int narg, void* def)
 {
     if (!lua_istable(L, narg))
         return nullptr;
-    static Vector<SharedPtr<VertexBuffer> > result;
+    static Vector<SharedPtr<VertexBuffer>> result;
     result.Clear();
     result.Resize((unsigned)lua_objlen(L, narg));
     for (unsigned i = 0; i < result.Size(); ++i)

Source/Urho3D/LuaScript/ToluaUtils.h

@@ -169,8 +169,8 @@ template <> int ToluaIsPODVector<bool>(double /*overload*/, lua_State* L, int lo
 template <> void* ToluaToPODVector<bool>(double /*overload*/, lua_State* L, int narg, void* def);
 template <> int ToluaPushPODVector<bool>(double /*overload*/, lua_State* L, void* data, const char* type);
 
-template <> void* ToluaToVector<SharedPtr<IndexBuffer> >(lua_State* L, int narg, void* def);
-template <> void* ToluaToVector<SharedPtr<VertexBuffer> >(lua_State* L, int narg, void* def);
+template <> void* ToluaToVector<SharedPtr<IndexBuffer>>(lua_State* L, int narg, void* def);
+template <> void* ToluaToVector<SharedPtr<VertexBuffer>>(lua_State* L, int narg, void* def);
 #endif
 
 /// Convert object at the given index and store it in Variant. This function is not thread-safe.

Source/Urho3D/Math/Polyhedron.h

@@ -30,7 +30,7 @@ public:
     }
 
     /// Construct from a list of faces.
-    explicit Polyhedron(const Vector<PODVector<Vector3> >& faces) :
+    explicit Polyhedron(const Vector<PODVector<Vector3>>& faces) :
         faces_(faces)
     {
     }
@@ -86,7 +86,7 @@ public:
     bool Empty() const { return faces_.Empty(); }
 
     /// Polygon faces.
-    Vector<PODVector<Vector3> > faces_;
+    Vector<PODVector<Vector3>> faces_;
 
 private:
     /// Set a triangle face by index.

Source/Urho3D/Navigation/NavigationMesh.cpp

@@ -1057,7 +1057,7 @@ void NavigationMesh::CollectGeometries(Vector<NavigationGeometryInfo>& geometryL
 
     if (recursive)
     {
-        const Vector<SharedPtr<Node> >& children = node->GetChildren();
+        const Vector<SharedPtr<Node>>& children = node->GetChildren();
         for (unsigned i = 0; i < children.Size(); ++i)
             CollectGeometries(geometryList, children[i], processedNodes, recursive);
     }

Source/Urho3D/Navigation/NavigationMesh.h

@@ -378,7 +378,7 @@ protected:
     /// Debug draw NavArea components.
     bool drawNavAreas_;
     /// NavAreas for this NavMesh.
-    Vector<WeakPtr<NavArea> > areas_;
+    Vector<WeakPtr<NavArea>> areas_;
 };
 
 /// Register Navigation library objects.

Source/Urho3D/Network/Connection.cpp

@@ -176,7 +176,7 @@ void Connection::SetScene(Scene* newScene)
         sceneState_.Clear();
 
         // When scene is assigned on the server, instruct the client to load it. This may require downloading packages
-        const Vector<SharedPtr<PackageFile> >& packages = scene_->GetRequiredPackageFiles();
+        const Vector<SharedPtr<PackageFile>>& packages = scene_->GetRequiredPackageFiles();
         unsigned numPackages = packages.Size();
         msg_.Clear();
         msg_.WriteString(scene_->GetFileName());
@@ -395,9 +395,9 @@ void Connection::ProcessPendingLatestData()
         return;
 
     // Iterate through pending node data and see if we can find the nodes now
-    for (HashMap<unsigned, PODVector<unsigned char> >::Iterator i = nodeLatestData_.Begin(); i != nodeLatestData_.End();)
+    for (HashMap<unsigned, PODVector<unsigned char>>::Iterator i = nodeLatestData_.Begin(); i != nodeLatestData_.End();)
     {
-        HashMap<unsigned, PODVector<unsigned char> >::Iterator current = i++;
+        HashMap<unsigned, PODVector<unsigned char>>::Iterator current = i++;
         Node* node = scene_->GetNode(current->first_);
         if (node)
         {
@@ -411,9 +411,9 @@ void Connection::ProcessPendingLatestData()
     }
 
     // Iterate through pending component data and see if we can find the components now
-    for (HashMap<unsigned, PODVector<unsigned char> >::Iterator i = componentLatestData_.Begin(); i != componentLatestData_.End();)
+    for (HashMap<unsigned, PODVector<unsigned char>>::Iterator i = componentLatestData_.Begin(); i != componentLatestData_.End();)
     {
-        HashMap<unsigned, PODVector<unsigned char> >::Iterator current = i++;
+        HashMap<unsigned, PODVector<unsigned char>>::Iterator current = i++;
         Component* component = scene_->GetComponent(current->first_);
         if (component)
         {
@@ -533,7 +533,7 @@ void Connection::ProcessLoadScene(int msgID, MemoryBuffer& msg)
     auto* cache = GetSubsystem<ResourceCache>();
     const String& packageCacheDir = GetSubsystem<Network>()->GetPackageCacheDir();
 
-    Vector<SharedPtr<PackageFile> > packages = cache->GetPackageFiles();
+    Vector<SharedPtr<PackageFile>> packages = cache->GetPackageFiles();
     for (unsigned i = 0; i < packages.Size(); ++i)
     {
         PackageFile* package = packages[i];
@@ -795,7 +795,7 @@ void Connection::ProcessPackageDownload(int msgID, MemoryBuffer& msg)
             }
 
             // The package must be one of those required by the scene
-            const Vector<SharedPtr<PackageFile> >& packages = scene_->GetRequiredPackageFiles();
+            const Vector<SharedPtr<PackageFile>>& packages = scene_->GetRequiredPackageFiles();
             for (unsigned i = 0; i < packages.Size(); ++i)
             {
                 PackageFile* package = packages[i];
@@ -1251,7 +1251,7 @@ void Connection::ProcessNewNode(Node* node)
 
     // Write node's components
     msg_.WriteVLE(node->GetNumNetworkComponents());
-    const Vector<SharedPtr<Component> >& components = node->GetComponents();
+    const Vector<SharedPtr<Component>>& components = node->GetComponents();
     for (unsigned i = 0; i < components.Size(); ++i)
     {
         Component* component = components[i];
@@ -1419,7 +1419,7 @@ void Connection::ProcessExistingNode(Node* node, NodeReplicationState& nodeState
     // Check for new components
     if (nodeState.componentStates_.Size() != node->GetNumNetworkComponents())
     {
-        const Vector<SharedPtr<Component> >& components = node->GetComponents();
+        const Vector<SharedPtr<Component>>& components = node->GetComponents();
         for (unsigned i = 0; i < components.Size(); ++i)
         {
             Component* component = components[i];
@@ -1457,7 +1457,7 @@ bool Connection::RequestNeededPackages(unsigned numPackages, MemoryBuffer& msg)
     auto* cache = GetSubsystem<ResourceCache>();
     const String& packageCacheDir = GetSubsystem<Network>()->GetPackageCacheDir();
 
-    Vector<SharedPtr<PackageFile> > packages = cache->GetPackageFiles();
+    Vector<SharedPtr<PackageFile>> packages = cache->GetPackageFiles();
     Vector<String> downloadedPackages;
     bool packagesScanned = false;
 

Source/Urho3D/Network/Connection.h

@@ -308,9 +308,9 @@ private:
     /// Ongoing package send transfers.
     HashMap<StringHash, PackageUpload> uploads_;
     /// Pending latest data for not yet received nodes.
-    HashMap<unsigned, PODVector<unsigned char> > nodeLatestData_;
+    HashMap<unsigned, PODVector<unsigned char>> nodeLatestData_;
     /// Pending latest data for not yet received components.
-    HashMap<unsigned, PODVector<unsigned char> > componentLatestData_;
+    HashMap<unsigned, PODVector<unsigned char>> componentLatestData_;
     /// Node ID's to process during a replication update.
     HashSet<unsigned> nodesToProcess_;
     /// Reusable message buffer.

Source/Urho3D/Network/Network.cpp

@@ -304,7 +304,7 @@ void Network::NewConnectionEstablished(const SLNet::AddressOrGUID& connection)
 void Network::ClientDisconnected(const SLNet::AddressOrGUID& connection)
 {
     // Remove the client connection that corresponds to this MessageConnection
-    HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Find(connection);
+    HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Find(connection);
     if (i != clientConnections_.End())
     {
         Connection* connection = i->second_;
@@ -515,13 +515,13 @@ void Network::BroadcastMessage(int msgID, bool reliable, bool inOrder, const uns
 
 void Network::BroadcastRemoteEvent(StringHash eventType, bool inOrder, const VariantMap& eventData)
 {
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin(); i != clientConnections_.End(); ++i)
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin(); i != clientConnections_.End(); ++i)
         i->second_->SendRemoteEvent(eventType, inOrder, eventData);
 }
 
 void Network::BroadcastRemoteEvent(Scene* scene, StringHash eventType, bool inOrder, const VariantMap& eventData)
 {
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
          i != clientConnections_.End(); ++i)
     {
         if (i->second_->GetScene() == scene)
@@ -543,7 +543,7 @@ void Network::BroadcastRemoteEvent(Node* node, StringHash eventType, bool inOrde
     }
 
     Scene* scene = node->GetScene();
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
          i != clientConnections_.End(); ++i)
     {
         if (i->second_->GetScene() == scene)
@@ -609,7 +609,7 @@ void Network::SendPackageToClients(Scene* scene, PackageFile* package)
         return;
     }
 
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
          i != clientConnections_.End(); ++i)
     {
         if (i->second_->GetScene() == scene)
@@ -638,7 +638,7 @@ Connection* Network::GetConnection(const SLNet::AddressOrGUID& connection) const
         return serverConnection_;
     else
     {
-        HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::ConstIterator i = clientConnections_.Find(connection);
+        HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::ConstIterator i = clientConnections_.Find(connection);
         if (i != clientConnections_.End())
             return i->second_;
         else
@@ -651,10 +651,10 @@ Connection* Network::GetServerConnection() const
     return serverConnection_;
 }
 
-Vector<SharedPtr<Connection> > Network::GetClientConnections() const
+Vector<SharedPtr<Connection>> Network::GetClientConnections() const
 {
-    Vector<SharedPtr<Connection> > ret;
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::ConstIterator i = clientConnections_.Begin();
+    Vector<SharedPtr<Connection>> ret;
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::ConstIterator i = clientConnections_.Begin();
          i != clientConnections_.End(); ++i)
         ret.Push(i->second_);
 
@@ -912,7 +912,7 @@ void Network::PostUpdate(float timeStep)
                 URHO3D_PROFILE(PrepareServerUpdate);
 
                 networkScenes_.Clear();
-                for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+                for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
                      i != clientConnections_.End(); ++i)
                 {
                     Scene* scene = i->second_->GetScene();
@@ -928,7 +928,7 @@ void Network::PostUpdate(float timeStep)
                 URHO3D_PROFILE(SendServerUpdate);
 
                 // Then send server updates for each client connection
-                for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+                for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
                      i != clientConnections_.End(); ++i)
                 {
                     i->second_->SendServerUpdate();
@@ -1008,7 +1008,7 @@ void Network::ConfigureNetworkSimulator()
     if (serverConnection_)
         serverConnection_->ConfigureNetworkSimulator(simulatedLatency_, simulatedPacketLoss_);
 
-    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> >::Iterator i = clientConnections_.Begin();
+    for (HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>>::Iterator i = clientConnections_.Begin();
          i != clientConnections_.End(); ++i)
         i->second_->ConfigureNetworkSimulator(simulatedLatency_, simulatedPacketLoss_);
 }

Source/Urho3D/Network/Network.h

@@ -109,7 +109,7 @@ public:
     Connection* GetServerConnection() const;
     /// Return all client connections.
     /// @property
-    Vector<SharedPtr<Connection> > GetClientConnections() const;
+    Vector<SharedPtr<Connection>> GetClientConnections() const;
     /// Return whether the server is running.
     /// @property
     bool IsServerRunning() const;
@@ -146,7 +146,7 @@ private:
     /// Client's server connection.
     SharedPtr<Connection> serverConnection_;
     /// Server's client connections.
-    HashMap<SLNet::AddressOrGUID, SharedPtr<Connection> > clientConnections_;
+    HashMap<SLNet::AddressOrGUID, SharedPtr<Connection>> clientConnections_;
     /// Allowed remote events.
     HashSet<StringHash> allowedRemoteEvents_;
     /// Remote event fixed blacklist.

Source/Urho3D/Physics/CollisionShape.cpp

@@ -126,7 +126,7 @@ public:
     explicit TriangleMeshInterface(CustomGeometry* custom) :
         btTriangleIndexVertexArray()
     {
-        const Vector<PODVector<CustomGeometryVertex> >& srcVertices = custom->GetVertices();
+        const Vector<PODVector<CustomGeometryVertex>>& srcVertices = custom->GetVertices();
         unsigned totalVertexCount = 0;
         unsigned totalTriangles = 0;
 
@@ -176,7 +176,7 @@ public:
 
 private:
     /// Shared vertex/index data used in the collision.
-    Vector<SharedArrayPtr<unsigned char> > dataArrays_;
+    Vector<SharedArrayPtr<unsigned char>> dataArrays_;
 };
 
 TriangleMeshData::TriangleMeshData(Model* model, unsigned lodLevel)
@@ -250,7 +250,7 @@ ConvexData::ConvexData(Model* model, unsigned lodLevel)
 
 ConvexData::ConvexData(CustomGeometry* custom)
 {
-    const Vector<PODVector<CustomGeometryVertex> >& srcVertices = custom->GetVertices();
+    const Vector<PODVector<CustomGeometryVertex>>& srcVertices = custom->GetVertices();
     PODVector<Vector3> vertices;
 
     for (unsigned i = 0; i < srcVertices.Size(); ++i)

Source/Urho3D/Physics/CollisionShape.h

@@ -53,7 +53,7 @@ struct CollisionGeometryData : public RefCounted
 
 /// Cache of collision geometry data.
 /// \todo Remove duplicate declaration
-using CollisionGeometryDataCache = HashMap<Pair<Model*, unsigned>, SharedPtr<CollisionGeometryData> >;
+using CollisionGeometryDataCache = HashMap<Pair<Model*, unsigned>, SharedPtr<CollisionGeometryData>>;
 
 /// Triangle mesh geometry data.
 struct TriangleMeshData : public CollisionGeometryData

Source/Urho3D/Physics/PhysicsWorld.cpp

@@ -667,7 +667,7 @@ void PhysicsWorld::GetCollidingBodies(PODVector<RigidBody*>& result, const Rigid
 
     result.Clear();
 
-    for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> >, ManifoldPair>::Iterator i = currentCollisions_.Begin();
+    for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>>, ManifoldPair>::Iterator i = currentCollisions_.Begin();
          i != currentCollisions_.End(); ++i)
     {
         if (i->first_.first_ == body)
@@ -861,7 +861,7 @@ void PhysicsWorld::SendCollisionEvents()
 
             // First only store the collision pair as weak pointers and the manifold pointer, so user code can safely destroy
             // objects during collision event handling
-            Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> > bodyPair;
+            Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>> bodyPair;
             if (bodyA < bodyB)
             {
                 bodyPair = MakePair(bodyWeakA, bodyWeakB);
@@ -874,7 +874,7 @@ void PhysicsWorld::SendCollisionEvents()
             }
         }
 
-        for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> >, ManifoldPair>::Iterator i = currentCollisions_.Begin();
+        for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>>, ManifoldPair>::Iterator i = currentCollisions_.Begin();
              i != currentCollisions_.End(); ++i)
         {
             RigidBody* bodyA = i->first_.first_;
@@ -1005,7 +1005,7 @@ void PhysicsWorld::SendCollisionEvents()
     {
         physicsCollisionData_[PhysicsCollisionEnd::P_WORLD] = this;
 
-        for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> >, ManifoldPair>::Iterator
+        for (HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>>, ManifoldPair>::Iterator
                  i = previousCollisions_.Begin(); i != previousCollisions_.End(); ++i)
         {
             if (!currentCollisions_.Contains(i->first_))

Source/Urho3D/Physics/PhysicsWorld.h

@@ -105,7 +105,7 @@ static const int DEFAULT_FPS = 60;
 static const float DEFAULT_MAX_NETWORK_ANGULAR_VELOCITY = 100.0f;
 
 /// Cache of collision geometry data.
-using CollisionGeometryDataCache = HashMap<Pair<Model*, unsigned>, SharedPtr<CollisionGeometryData> >;
+using CollisionGeometryDataCache = HashMap<Pair<Model*, unsigned>, SharedPtr<CollisionGeometryData>>;
 
 /// Physics simulation world component. Should be added only to the root scene node.
 class URHO3D_API PhysicsWorld : public Component, public btIDebugDraw
@@ -324,9 +324,9 @@ private:
     /// Constraints in the world.
     PODVector<Constraint*> constraints_;
     /// Collision pairs on this frame.
-    HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> >, ManifoldPair> currentCollisions_;
-    /// Collision pairs on the previous frame. Used to check if a collision is "new." Manifolds are not guaranteed to exist anymore.
-    HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody> >, ManifoldPair> previousCollisions_;
+    HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>>, ManifoldPair> currentCollisions_;
+    /// Collision pairs on the previous frame. Used to check if a collision is "new". Manifolds are not guaranteed to exist anymore.
+    HashMap<Pair<WeakPtr<RigidBody>, WeakPtr<RigidBody>>, ManifoldPair> previousCollisions_;
     /// Delayed (parented) world transform assignments.
     HashMap<RigidBody*, DelayedWorldTransform> delayedWorldTransforms_;
     /// Cache for trimesh geometry data by model and LOD level.

Source/Urho3D/Physics2D/PhysicsWorld2D.h

@@ -252,7 +252,7 @@ protected:
     /// Applying transforms.
     bool applyingTransforms_{};
     /// Rigid bodies.
-    Vector<WeakPtr<RigidBody2D> > rigidBodies_;
+    Vector<WeakPtr<RigidBody2D>> rigidBodies_;
     /// Delayed (parented) world transform assignments.
     HashMap<RigidBody2D*, DelayedWorldTransform2D> delayedWorldTransforms_;
 

Source/Urho3D/Physics2D/RigidBody2D.cpp

@@ -382,7 +382,7 @@ void RigidBody2D::ReleaseBody()
         return;
 
     // Make a copy for iteration
-    Vector<WeakPtr<Constraint2D> > constraints = constraints_;
+    Vector<WeakPtr<Constraint2D>> constraints = constraints_;
     for (unsigned i = 0; i < constraints.Size(); ++i)
     {
         if (constraints[i])

Source/Urho3D/Physics2D/RigidBody2D.h

@@ -186,9 +186,9 @@ private:
     /// Box2D body.
     b2Body* body_;
     /// Collision shapes.
-    Vector<WeakPtr<CollisionShape2D> > collisionShapes_;
+    Vector<WeakPtr<CollisionShape2D>> collisionShapes_;
     /// Constraints.
-    Vector<WeakPtr<Constraint2D> > constraints_;
+    Vector<WeakPtr<Constraint2D>> constraints_;
 };
 
 }

Source/Urho3D/Resource/BackgroundLoader.cpp

@@ -75,7 +75,7 @@ void BackgroundLoader::ThreadFunction()
             backgroundLoadMutex_.Acquire();
             if (item.dependents_.Size())
             {
-                for (HashSet<Pair<StringHash, StringHash> >::Iterator i = item.dependents_.Begin();
+                for (HashSet<Pair<StringHash, StringHash>>::Iterator i = item.dependents_.Begin();
                      i != item.dependents_.End(); ++i)
                 {
                     HashMap<Pair<StringHash, StringHash>, BackgroundLoadItem>::Iterator j = backgroundLoadQueue_.Find(*i);

Source/Urho3D/Resource/BackgroundLoader.h

@@ -23,9 +23,9 @@ struct BackgroundLoadItem
     /// Resource.
     SharedPtr<Resource> resource_;
     /// Resources depended on for loading.
-    HashSet<Pair<StringHash, StringHash> > dependencies_;
+    HashSet<Pair<StringHash, StringHash>> dependencies_;
     /// Resources that depend on this resource's loading.
-    HashSet<Pair<StringHash, StringHash> > dependents_;
+    HashSet<Pair<StringHash, StringHash>> dependents_;
     /// Whether to send failure event.
     bool sendEventOnFailure_;
 };