Make GetStringListIndex() signed

Source/Urho3D/AngelScript/Generated_GlobalFunctions.cpp

@@ -222,13 +222,13 @@ void ASRegisterGeneratedGlobalFunctions(asIScriptEngine* engine)
     // const char* GetRevision() | File: ../LibraryInfo.h
     // Error: type "const char*" can not automatically bind
 
-    // unsigned GetStringListIndex(const String& value, const String* strings, unsigned defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
+    // i32 GetStringListIndex(const String& value, const String* strings, i32 defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
     // Error: type "const String*" can not automatically bind
 
-    // unsigned GetStringListIndex(const char* value, const String* strings, unsigned defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
+    // i32 GetStringListIndex(const char* value, const String* strings, i32 defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
     // Error: type "const char*" can not automatically bind
 
-    // unsigned GetStringListIndex(const char* value, const char** strings, unsigned defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
+    // i32 GetStringListIndex(const char* value, const char** strings, i32 defaultIndex, bool caseSensitive = false) | File: ../Core/StringUtils.h
     // Error: type "const char*" can not automatically bind
 
     // unsigned long long GetTotalMemory() | File: ../Core/ProcessUtils.h

Source/Urho3D/Core/StringUtils.cpp

@@ -651,14 +651,14 @@ void StringToBuffer(Vector<unsigned char>& dest, const char* source)
         dest[index] = (unsigned char)value;
 }
 
-unsigned GetStringListIndex(const String& value, const String* strings, unsigned defaultIndex, bool caseSensitive)
+i32 GetStringListIndex(const String& value, const String* strings, i32 defaultIndex, bool caseSensitive)
 {
     return GetStringListIndex(value.CString(), strings, defaultIndex, caseSensitive);
 }
 
-unsigned GetStringListIndex(const char* value, const String* strings, unsigned defaultIndex, bool caseSensitive)
+i32 GetStringListIndex(const char* value, const String* strings, i32 defaultIndex, bool caseSensitive)
 {
-    unsigned i = 0;
+    i32 i = 0;
 
     while (!strings[i].Empty())
     {
@@ -670,9 +670,9 @@ unsigned GetStringListIndex(const char* value, const String* strings, unsigned d
     return defaultIndex;
 }
 
-unsigned GetStringListIndex(const char* value, const char** strings, unsigned defaultIndex, bool caseSensitive)
+i32 GetStringListIndex(const char* value, const char** strings, i32 defaultIndex, bool caseSensitive)
 {
-    unsigned i = 0;
+    i32 i = 0;
 
     while (strings[i])
     {

Source/Urho3D/Core/StringUtils.h

@@ -99,11 +99,11 @@ URHO3D_API void StringToBuffer(Vector<unsigned char>& dest, const String& source
 /// Convert a C string to a byte buffer.
 URHO3D_API void StringToBuffer(Vector<unsigned char>& dest, const char* source);
 /// Return an index to a string list corresponding to the given string, or a default value if not found. The string list must be empty-terminated.
-URHO3D_API unsigned GetStringListIndex(const String& value, const String* strings, unsigned defaultIndex, bool caseSensitive = false);
+URHO3D_API i32 GetStringListIndex(const String& value, const String* strings, i32 defaultIndex, bool caseSensitive = false);
 /// Return an index to a string list corresponding to the given C string, or a default value if not found. The string list must be empty-terminated.
-URHO3D_API unsigned GetStringListIndex(const char* value, const String* strings, unsigned defaultIndex, bool caseSensitive = false);
+URHO3D_API i32 GetStringListIndex(const char* value, const String* strings, i32 defaultIndex, bool caseSensitive = false);
 /// Return an index to a C string list corresponding to the given C string, or a default value if not found. The string list must be empty-terminated.
-URHO3D_API unsigned GetStringListIndex(const char* value, const char** strings, unsigned defaultIndex, bool caseSensitive = false);
+URHO3D_API i32 GetStringListIndex(const char* value, const char** strings, i32 defaultIndex, bool caseSensitive = false);
 /// Return a formatted string.
 URHO3D_API String ToString(const char* formatString, ...);
 /// Return whether a char is an alphabet letter.

Source/Urho3D/Engine/Engine.cpp

@@ -898,8 +898,8 @@ VariantMap Engine::ParseParameters(const Vector<String>& arguments)
                 ret[EP_LOG_QUIET] = true;
             else if (argument == "log" && !value.Empty())
             {
-                unsigned logLevel = GetStringListIndex(value.CString(), logLevelPrefixes, M_MAX_UNSIGNED);
-                if (logLevel != M_MAX_UNSIGNED)
+                i32 logLevel = GetStringListIndex(value.CString(), logLevelPrefixes, NINDEX);
+                if (logLevel != NINDEX)
                 {
                     ret[EP_LOG_LEVEL] = logLevel;
                     ++i;

Source/Urho3D/Graphics/Material.cpp

@@ -79,7 +79,7 @@ TextureUnit ParseTextureUnitName(String name)
 {
     name = name.ToLower().Trimmed();
 
-    auto unit = (TextureUnit)GetStringListIndex(name.CString(), textureUnitNames, MAX_TEXTURE_UNITS);
+    TextureUnit unit = (TextureUnit)GetStringListIndex(name.CString(), textureUnitNames, MAX_TEXTURE_UNITS);
     if (unit == MAX_TEXTURE_UNITS)
     {
         // Check also for shorthand names

Source/Urho3D/Scene/ValueAnimation.cpp

@@ -73,7 +73,7 @@ bool ValueAnimation::LoadXML(const XMLElement& source)
     eventFrames_.Clear();
 
     String interpMethodString = source.GetAttribute("interpolationmethod");
-    auto method = (InterpMethod)GetStringListIndex(interpMethodString.CString(), interpMethodNames, IM_LINEAR);
+    InterpMethod method = (InterpMethod)GetStringListIndex(interpMethodString.CString(), interpMethodNames, IM_LINEAR);
 
     SetInterpolationMethod(method);
     if (interpolationMethod_ == IM_SPLINE)
@@ -135,7 +135,7 @@ bool ValueAnimation::LoadJSON(const JSONValue& source)
     eventFrames_.Clear();
 
     String interpMethodString = source.Get("interpolationmethod").GetString();
-    auto method = (InterpMethod)GetStringListIndex(interpMethodString.CString(), interpMethodNames, IM_LINEAR);
+    InterpMethod method = (InterpMethod)GetStringListIndex(interpMethodString.CString(), interpMethodNames, IM_LINEAR);
 
     SetInterpolationMethod(method);
     if (interpolationMethod_ == IM_SPLINE)