Shorten long long int to long long.

Source/Urho3D/AngelScript/CoreAPI.cpp

@@ -183,12 +183,12 @@ static void ConstructVariantUInt(unsigned value, Variant* ptr)
     new(ptr) Variant(value);
 }
 
-static void ConstructVariantInt64(long long int value, Variant* ptr)
+static void ConstructVariantInt64(long long value, Variant* ptr)
 {
     new(ptr) Variant(value);
 }
 
-static void ConstructVariantUInt64(unsigned long long int value, Variant* ptr)
+static void ConstructVariantUInt64(unsigned long long value, Variant* ptr)
 {
     new(ptr) Variant(value);
 }
@@ -545,8 +545,8 @@ static void RegisterVariant(asIScriptEngine* engine)
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(const Variant&in)", asMETHODPR(Variant, operator =, (const Variant&), Variant&), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(int)", asMETHODPR(Variant, operator =, (int), Variant&), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(uint)", asMETHODPR(Variant, operator =, (unsigned), Variant&), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Variant", "Variant& opAssign(int64)", asMETHODPR(Variant, operator =, (long long int), Variant&), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Variant", "Variant& opAssign(uint64)", asMETHODPR(Variant, operator =, (unsigned long long int), Variant&), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Variant", "Variant& opAssign(int64)", asMETHODPR(Variant, operator =, (long long), Variant&), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Variant", "Variant& opAssign(uint64)", asMETHODPR(Variant, operator =, (unsigned long long), Variant&), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(const StringHash&in)", asMETHODPR(Variant, operator =, (const StringHash&), Variant&), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(bool)", asMETHODPR(Variant, operator =, (bool), Variant&), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "Variant& opAssign(float)", asMETHODPR(Variant, operator =, (float), Variant&), asCALL_THISCALL);
@@ -574,8 +574,8 @@ static void RegisterVariant(asIScriptEngine* engine)
     engine->RegisterObjectMethod("Variant", "bool opEquals(const Variant&in) const", asMETHODPR(Variant, operator ==, (const Variant&) const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "bool opEquals(int) const", asMETHODPR(Variant, operator ==, (int) const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "bool opEquals(uint) const", asMETHODPR(Variant, operator ==, (unsigned) const, bool), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Variant", "bool opEquals(int64) const", asMETHODPR(Variant, operator ==, (long long int) const, bool), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Variant", "bool opEquals(uint64) const", asMETHODPR(Variant, operator ==, (unsigned long long int) const, bool), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Variant", "bool opEquals(int64) const", asMETHODPR(Variant, operator ==, (long long) const, bool), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Variant", "bool opEquals(uint64) const", asMETHODPR(Variant, operator ==, (unsigned long long) const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "bool opEquals(const StringHash&in) const", asMETHODPR(Variant, operator ==, (const StringHash&) const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "bool opEquals(bool) const", asMETHODPR(Variant, operator ==, (bool) const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("Variant", "bool opEquals(float) const", asMETHODPR(Variant, operator ==, (float) const, bool), asCALL_THISCALL);
@@ -748,8 +748,8 @@ static void RegisterStringUtils(asIScriptEngine* engine)
     engine->RegisterObjectMethod("String", "double ToDouble() const", asFUNCTIONPR(ToDouble, (const String&), double), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("String", "int ToInt(int base = 10) const", asFUNCTIONPR(ToInt, (const String&, int), int), asCALL_CDECL_OBJFIRST);
     engine->RegisterObjectMethod("String", "uint ToUInt(int base = 10) const", asFUNCTIONPR(ToUInt, (const String&, int), unsigned), asCALL_CDECL_OBJFIRST);
-    engine->RegisterObjectMethod("String", "int64 ToInt64(int base = 10) const", asFUNCTIONPR(ToInt64, (const String&, int), long long int), asCALL_CDECL_OBJFIRST);
-    engine->RegisterObjectMethod("String", "uint64 ToUInt64(int base = 10) const", asFUNCTIONPR(ToUInt64, (const String&, int), unsigned long long int), asCALL_CDECL_OBJFIRST);
+    engine->RegisterObjectMethod("String", "int64 ToInt64(int base = 10) const", asFUNCTIONPR(ToInt64, (const String&, int), long long), asCALL_CDECL_OBJFIRST);
+    engine->RegisterObjectMethod("String", "uint64 ToUInt64(int base = 10) const", asFUNCTIONPR(ToUInt64, (const String&, int), unsigned long long), asCALL_CDECL_OBJFIRST);
     engine->RegisterObjectMethod("String", "Color ToColor() const", asFUNCTIONPR(ToColor, (const String&), Color), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("String", "IntRect ToIntRect() const", asFUNCTIONPR(ToIntRect, (const String&), IntRect), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("String", "IntVector2 ToIntVector2() const", asFUNCTIONPR(ToIntVector2, (const String&), IntVector2), asCALL_CDECL_OBJLAST);

Source/Urho3D/Core/StringUtils.cpp

@@ -120,7 +120,7 @@ int ToInt(const char* source, int base)
     return (int)strtol(source, 0, base);
 }
 
-long long int ToInt64(const char* source, int base)
+long long ToInt64(const char* source, int base)
 {
     if (!source)
         return 0;
@@ -132,7 +132,7 @@ long long int ToInt64(const char* source, int base)
     return strtoll(source, 0, base);
 }
 
-long long int ToInt64(const String& source, int base)
+long long ToInt64(const String& source, int base)
 {
     return ToInt64(source.CString(), base);
 }
@@ -142,7 +142,7 @@ unsigned ToUInt(const String& source, int base)
     return ToUInt(source.CString(), base);
 }
 
-unsigned long long int ToUInt64(const char* source, int base)
+unsigned long long ToUInt64(const char* source, int base)
 {
     if (!source)
         return 0;
@@ -154,7 +154,7 @@ unsigned long long int ToUInt64(const char* source, int base)
     return strtoull(source, 0, base);
 }
 
-unsigned long long int ToUInt64(const String& source, int base)
+unsigned long long ToUInt64(const String& source, int base)
 {
     return ToUInt64(source.CString(), base);
 }

Source/Urho3D/Core/StringUtils.h

@@ -48,13 +48,13 @@ URHO3D_API unsigned ToUInt(const String& source, int base = 10);
 /// Parse an unsigned integer from a C string. Assumed to be decimal by default (base 10). Use base 0 to autodetect from string.
 URHO3D_API unsigned ToUInt(const char* source, int base = 10);
 /// Parse an 64 bit integer from a string. Assumed to be decimal by default (base 10). Use base 0 to autodetect from string.
-URHO3D_API long long int ToInt64(const String& source, int base = 10);
+URHO3D_API long long ToInt64(const String& source, int base = 10);
 /// Parse an 64 bit integer from a C string. Assumed to be decimal by default (base 10). Use base 0 to autodetect from string.
-URHO3D_API long long int ToInt64(const char* source, int base = 10);
+URHO3D_API long long ToInt64(const char* source, int base = 10);
 /// Parse an unsigned 64 bit integer from a string. Assumed to be decimal by default (base 10). Use base 0 to autodetect from string.
-URHO3D_API unsigned long long int ToUInt64(const String& source, int base = 10);
+URHO3D_API unsigned long long ToUInt64(const String& source, int base = 10);
 /// Parse an unsigned 64 bit integer from a C string. Assumed to be decimal by default (base 10). Use base 0 to autodetect from string.
-URHO3D_API unsigned long long int ToUInt64(const char* source, int base = 10);
+URHO3D_API unsigned long long ToUInt64(const char* source, int base = 10);
 /// Parse a Color from a string.
 URHO3D_API Color ToColor(const String& source);
 /// Parse a Color from a C string.

Source/Urho3D/Core/Variant.cpp

@@ -67,7 +67,7 @@ static const char* typeNames[] =
     "Rect",
     "IntVector3",
     "Int64",
-	0
+    0
 };
 
 Variant& Variant::operator =(const Variant& rhs)
@@ -148,7 +148,7 @@ bool Variant::operator ==(const Variant& rhs) const
         return value_.int_ == rhs.value_.int_;
 
     case VAR_INT64:
-        return *reinterpret_cast<const long long int*>(&value_.int_) == *reinterpret_cast<const long long int*>(&rhs.value_.int_);
+        return *reinterpret_cast<const long long*>(&value_.int_) == *reinterpret_cast<const long long*>(&rhs.value_.int_);
 
     case VAR_BOOL:
         return value_.bool_ == rhs.value_.bool_;
@@ -408,7 +408,7 @@ String Variant::ToString() const
         return String(value_.int_);
 
     case VAR_INT64:
-        return String(*reinterpret_cast<const long long int*>(&value_.int_));
+        return String(*reinterpret_cast<const long long*>(&value_.int_));
 
     case VAR_BOOL:
         return String(value_.bool_);
@@ -487,7 +487,7 @@ bool Variant::IsZero() const
         return value_.int_ == 0;
 
     case VAR_INT64:
-        return *reinterpret_cast<const long long int*>(&value_.int_) == 0;
+        return *reinterpret_cast<const long long*>(&value_.int_) == 0;
 
     case VAR_BOOL:
         return value_.bool_ == false;
@@ -693,12 +693,12 @@ template <> unsigned Variant::Get<unsigned>() const
     return GetUInt();
 }
 
-template <> long long int Variant::Get<long long int>() const
+template <> long long Variant::Get<long long>() const
 {
     return GetInt64();
 }
 
-template <> unsigned long long int Variant::Get<unsigned long long int>() const
+template <> unsigned long long Variant::Get<unsigned long long>() const
 {
     return GetUInt64();
 }

Source/Urho3D/Core/Variant.h

@@ -216,7 +216,7 @@ public:
     }
 
     /// Construct from 64 bit integer.
-    Variant(long long int value) :
+    Variant(long long value) :
         type_(VAR_NONE)
     {
         *this = value;
@@ -230,10 +230,10 @@ public:
     }
 
     /// Construct from unsigned integer.
-    Variant(unsigned long long int value) :
+    Variant(unsigned long long value) :
         type_(VAR_NONE)
     {
-        *this = (long long int)value;
+        *this = (long long)value;
     }
 
     /// Construct from a string hash (convert to integer).
@@ -484,18 +484,18 @@ public:
     }
 
     /// Assign from 64 bit integer.
-    Variant& operator =(long long int rhs)
+    Variant& operator =(long long rhs)
     {
         SetType(VAR_INT64);
-        *reinterpret_cast<long long int*>(&value_) = rhs;
+        *reinterpret_cast<long long*>(&value_) = rhs;
         return *this;
     }
 
     /// Assign from unsigned 64 bit integer.
-    Variant& operator =(unsigned long long int rhs)
+    Variant& operator =(unsigned long long rhs)
     {
         SetType(VAR_INT64);
-        *reinterpret_cast<long long int*>(&value_) = (long long int)rhs;
+        *reinterpret_cast<long long*>(&value_) = (long long)rhs;
         return *this;
     }
 
@@ -728,10 +728,10 @@ public:
     bool operator ==(unsigned rhs) const { return type_ == VAR_INT ? value_.int_ == (int)rhs : false; }
 
     /// Test for equality with an 64 bit integer. To return true, both the type and value must match.
-    bool operator ==(long long int rhs) const { return type_ == VAR_INT64 ? *reinterpret_cast<const long long int*>(&value_.int_) == rhs : false; }
+    bool operator ==(long long rhs) const { return type_ == VAR_INT64 ? *reinterpret_cast<const long long*>(&value_.int_) == rhs : false; }
 
     /// Test for equality with an unsigned integer. To return true, both the type and value must match.
-    bool operator ==(unsigned long long int rhs) const { return type_ == VAR_INT64 ? *reinterpret_cast<const unsigned long long int*>(&value_.int_) == (int)rhs : false; }
+    bool operator ==(unsigned long long rhs) const { return type_ == VAR_INT64 ? *reinterpret_cast<const unsigned long long*>(&value_.int_) == (int)rhs : false; }
 
     /// Test for equality with a bool. To return true, both the type and value must match.
     bool operator ==(bool rhs) const { return type_ == VAR_BOOL ? value_.bool_ == rhs : false; }
@@ -890,10 +890,10 @@ public:
     bool operator !=(unsigned rhs) const { return !(*this == rhs); }
 
     /// Test for inequality with an 64 bit integer.
-    bool operator !=(long long int rhs) const { return !(*this == rhs); }
+    bool operator !=(long long rhs) const { return !(*this == rhs); }
 
     /// Test for inequality with an unsigned 64 bit integer.
-    bool operator !=(unsigned long long int rhs) const { return !(*this == rhs); }
+    bool operator !=(unsigned long long rhs) const { return !(*this == rhs); }
 
     /// Test for inequality with a bool.
     bool operator !=(bool rhs) const { return !(*this == rhs); }
@@ -995,31 +995,31 @@ public:
     }
 
     /// Return 64 bit int or zero on type mismatch. Floats and doubles are converted.
-    long long int GetInt64() const
+    long long GetInt64() const
     {
         if (type_ == VAR_INT64)
-            return *(reinterpret_cast<const long long int*>(&value_));
+            return *(reinterpret_cast<const long long*>(&value_));
         else if (type_ == VAR_INT)
             return value_.int_;
         else if (type_ == VAR_FLOAT)
-            return (long long int)value_.float_;
+            return (long long)value_.float_;
         else if (type_ == VAR_DOUBLE)
-            return (long long int)*reinterpret_cast<const double*>(&value_);
+            return (long long)*reinterpret_cast<const double*>(&value_);
         else
             return 0;
     }
 
     /// Return unsigned 64 bit int or zero on type mismatch. Floats and doubles are converted.
-    unsigned long long int GetUInt64() const
+    unsigned long long GetUInt64() const
     {
         if (type_ == VAR_INT64)
-            return *(reinterpret_cast<const unsigned long long int*>(&value_));
+            return *(reinterpret_cast<const unsigned long long*>(&value_));
         else if (type_ == VAR_INT)
-            return static_cast<unsigned long long int>(value_.int_);
+            return static_cast<unsigned long long>(value_.int_);
         else if (type_ == VAR_FLOAT)
-            return (unsigned long long int)value_.float_;
+            return (unsigned long long)value_.float_;
         else if (type_ == VAR_DOUBLE)
-            return (unsigned long long int)*reinterpret_cast<const double*>(&value_);
+            return (unsigned long long)*reinterpret_cast<const double*>(&value_);
         else
             return 0;
     }
@@ -1253,9 +1253,9 @@ template <> inline VariantType GetVariantType<int>() { return VAR_INT; }
 
 template <> inline VariantType GetVariantType<unsigned>() { return VAR_INT; }
 
-template <> inline VariantType GetVariantType<long long int>() { return VAR_INT64; }
+template <> inline VariantType GetVariantType<long long>() { return VAR_INT64; }
 
-template <> inline VariantType GetVariantType<unsigned long long int>() { return VAR_INT64; }
+template <> inline VariantType GetVariantType<unsigned long long>() { return VAR_INT64; }
 
 template <> inline VariantType GetVariantType<bool>() { return VAR_BOOL; }
 
@@ -1308,9 +1308,9 @@ template <> URHO3D_API int Variant::Get<int>() const;
 
 template <> URHO3D_API unsigned Variant::Get<unsigned>() const;
 
-template <> URHO3D_API long long int Variant::Get<long long int>() const;
+template <> URHO3D_API long long Variant::Get<long long>() const;
 
-template <> URHO3D_API unsigned long long int Variant::Get<unsigned long long int>() const;
+template <> URHO3D_API unsigned long long Variant::Get<unsigned long long>() const;
 
 template <> URHO3D_API StringHash Variant::Get<StringHash>() const;
 

Source/Urho3D/LuaScript/ToluaUtils.cpp

@@ -199,7 +199,7 @@ void ToluaToVariant(lua_State* L, int narg, void* def, Variant& variant)
                 break;
 
             case VAR_INT64:
-                variant = (long long int)value;
+                variant = (long long)value;
                 break;
 
             case VAR_BOOL:

Source/Urho3D/Resource/XMLElement.cpp

@@ -349,12 +349,12 @@ bool XMLElement::SetInt(const String& name, int value)
     return SetAttribute(name, String(value));
 }
 
-bool XMLElement::SetUInt64(const String& name, unsigned long long int value)
+bool XMLElement::SetUInt64(const String& name, unsigned long long value)
 {
     return SetAttribute(name, String(value));
 }
 
-bool XMLElement::SetInt64(const String& name, long long int value)
+bool XMLElement::SetInt64(const String& name, long long value)
 {
     return SetAttribute(name, String(value));
 }

Source/Urho3D/Resource/XMLElement.h

@@ -125,9 +125,9 @@ public:
     /// Set an integer attribute.
     bool SetInt(const String& name, int value);
     /// Set an unsigned integer attribute.
-    bool SetUInt64(const String& name, unsigned long long int value);
+    bool SetUInt64(const String& name, unsigned long long value);
     /// Set an integer attribute.
-    bool SetInt64(const String& name, long long int value);
+    bool SetInt64(const String& name, long long value);
     /// Set an IntRect attribute.
     bool SetIntRect(const String& name, const IntRect& value);
     /// Set an IntVector2 attribute.