Non-functional code and comment cleanup.

Source/Urho3D/Container/FlagSet.h

@@ -29,19 +29,19 @@
 namespace Urho3D
 {
 
-/// Bitwise Type trait which enables against Enum value. For consumption by flagset class and it's global operators.
-template<typename T> struct IsFlagSet
+/// Type trait which enables Enum to be used as FlagSet template parameter. Bitwise operators (| & ^ ~) over enabled Enum will result in FlagSet<Enum>.
+template <typename T> struct IsFlagSet
 {
     constexpr static bool value_ = false;
 };
 
 /// Enable enum for using in FlagSet. Shall be called within Urho3D namespace.
 #define URHO3D_ENABLE_FLAGSET(enumName) \
-    template<> struct IsFlagSet<enumName> { constexpr static bool value_ = true; }; \
+    template<> struct IsFlagSet<enumName> { constexpr static bool value_ = true; } \
 
 /// Enable enum for using in FlagSet and declare FlagSet specialization. Shall be called within Urho3D namespace.
 #define URHO3D_FLAGSET(enumName, flagsetName) \
-    URHO3D_ENABLE_FLAGSET(enumName) \
+    URHO3D_ENABLE_FLAGSET(enumName); \
     using flagsetName = FlagSet<enumName>
 
 /// A set of flags defined by an Enum.
@@ -238,28 +238,28 @@ protected:
 
 }
 
-/// Bitwise Operator OR for against Enum value.s
+/// Bitwise Operator OR for against Enum values
 template <class Enum, class = typename std::enable_if<Urho3D::IsFlagSet<Enum>::value_>::type>
 Urho3D::FlagSet<Enum> operator |(const Enum lhs, const Enum rhs)
 {
     return Urho3D::FlagSet<Enum>(lhs) | rhs;
 }
 
-/// Bitwise Operator AND for against Enum value.s
+/// Bitwise Operator AND for against Enum values
 template <class Enum, class = typename std::enable_if<Urho3D::IsFlagSet<Enum>::value_>::type>
 Urho3D::FlagSet<Enum> operator & (const Enum lhs, const Enum rhs)
 {
     return Urho3D::FlagSet<Enum>(lhs) & rhs;
 }
 
-/// Bitwise Operator XOR for against Enum value.s
+/// Bitwise Operator XOR for against Enum values
 template <class Enum, class = typename std::enable_if<Urho3D::IsFlagSet<Enum>::value_>::type>
 Urho3D::FlagSet<Enum> operator ^ (const Enum lhs, const Enum rhs)
 {
     return Urho3D::FlagSet<Enum>(lhs) ^ rhs;
 }
 
-/// Bitwise Operator INVERSION for against Enum value.s
+/// Bitwise Operator INVERSION for against Enum values
 template <class Enum, class = typename std::enable_if<Urho3D::IsFlagSet<Enum>::value_>::type>
 Urho3D::FlagSet<Enum> operator ~ (const Enum rhs)
 {

Source/Urho3D/Graphics/AnimatedModel.cpp

@@ -1386,7 +1386,7 @@ void AnimatedModel::UpdateMorphs()
 void AnimatedModel::ApplyMorph(VertexBuffer* buffer, void* destVertexData, unsigned morphRangeStart, const VertexBufferMorph& morph,
     float weight)
 {
-    auto elementMask = morph.elementMask_ & buffer->GetElementMask();
+    const VertexMaskFlags elementMask = morph.elementMask_ & buffer->GetElementMask();
     unsigned vertexCount = morph.vertexCount_;
     unsigned normalOffset = buffer->GetElementOffset(SEM_NORMAL);
     unsigned tangentOffset = buffer->GetElementOffset(SEM_TANGENT);

Source/Urho3D/Graphics/AnimationState.cpp

@@ -500,7 +500,7 @@ void AnimationState::ApplyTrack(AnimationStateTrack& stateTrack, float weight, b
     }
 
     const AnimationKeyFrame* keyFrame = &track->keyFrames_[frame];
-    auto channelMask = track->channelMask_;
+    const AnimationChannelFlags channelMask = track->channelMask_;
 
     Vector3 newPosition;
     Quaternion newRotation;

Source/Urho3D/Graphics/DecalSet.cpp

@@ -1010,7 +1010,7 @@ void DecalSet::CalculateBoundingBox()
 
 void DecalSet::UpdateBuffers()
 {
-    auto newElementMask = skinned_ ? SKINNED_ELEMENT_MASK : STATIC_ELEMENT_MASK;
+    const VertexMaskFlags newElementMask = skinned_ ? SKINNED_ELEMENT_MASK : STATIC_ELEMENT_MASK;
     unsigned newVBSize = optimizeBufferSize_ ? numVertices_ : maxVertices_;
     unsigned newIBSize = optimizeBufferSize_ ? numIndices_ : maxIndices_;
 

Source/Urho3D/Graphics/Direct3D11/D3D11Texture2D.cpp

@@ -168,7 +168,7 @@ bool Texture2D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture2D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D11/D3D11Texture2DArray.cpp

@@ -198,7 +198,7 @@ bool Texture2DArray::SetData(unsigned layer, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D11/D3D11Texture3D.cpp

@@ -176,7 +176,7 @@ bool Texture3D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture3D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D11/D3D11TextureCube.cpp

@@ -184,7 +184,7 @@ bool TextureCube::SetData(CubeMapFace face, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D9/D3D9Texture2D.cpp

@@ -216,7 +216,7 @@ bool Texture2D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture2D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D9/D3D9Texture2DArray.cpp

@@ -121,7 +121,7 @@ bool Texture2DArray::SetData(unsigned layer, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D9/D3D9Texture3D.cpp

@@ -227,7 +227,7 @@ bool Texture3D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture3D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/Direct3D9/D3D9TextureCube.cpp

@@ -233,7 +233,7 @@ bool TextureCube::SetData(CubeMapFace face, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     Renderer* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/OpenGL/OGLTexture2D.cpp

@@ -177,7 +177,7 @@ bool Texture2D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture2D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     auto* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/OpenGL/OGLTexture2DArray.cpp

@@ -204,7 +204,7 @@ bool Texture2DArray::SetData(unsigned layer, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     auto* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/OpenGL/OGLTexture3D.cpp

@@ -164,7 +164,7 @@ bool Texture3D::SetData(Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = sizeof(Texture3D);
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     auto* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/Graphics/OpenGL/OGLTextureCube.cpp

@@ -195,7 +195,7 @@ bool TextureCube::SetData(CubeMapFace face, Image* image, bool useAlpha)
     // Use a shared ptr for managing the temporary mip images created during this function
     SharedPtr<Image> mipImage;
     unsigned memoryUse = 0;
-    auto quality = QUALITY_HIGH;
+    MaterialQuality quality = QUALITY_HIGH;
     auto* renderer = GetSubsystem<Renderer>();
     if (renderer)
         quality = renderer->GetTextureQuality();

Source/Urho3D/UI/ListView.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-
 #include "../Input/InputConstants.h"
 #include "../UI/ScrollView.h"
 

Source/Urho3D/UI/UI.cpp

@@ -1821,7 +1821,7 @@ void UI::HandleTouchBegin(StringHash eventType, VariantMap& eventData)
     pos.y_ = int(pos.y_ / uiScale_);
     usingTouchInput_ = true;
 
-    auto touchId = MakeTouchIDMask(eventData[P_TOUCHID].GetInt());
+    const MouseButton touchId = MakeTouchIDMask(eventData[P_TOUCHID].GetInt());
     WeakPtr<UIElement> element(GetElementAt(pos));
 
     if (element)
@@ -1875,7 +1875,7 @@ void UI::HandleTouchMove(StringHash eventType, VariantMap& eventData)
     deltaPos.y_ = int(deltaPos.y_ / uiScale_);
     usingTouchInput_ = true;
 
-    auto touchId = MakeTouchIDMask(eventData[P_TOUCHID].GetInt());
+    const MouseButton touchId = MakeTouchIDMask(eventData[P_TOUCHID].GetInt());
 
     ProcessMove(pos, deltaPos, touchId, QUAL_NONE, nullptr, true);
 }