From 76bef3d87c43881f928faa48f7cdf59bdaaed112 Mon Sep 17 00:00:00 2001
From: Sandu Liviu Catalin <slc.universe@gmail.com>
Date: Mon, 25 Jul 2016 00:10:26 +0300
Subject: [PATCH] Improve Color4 method names to be more consistent with the
 rest of the basic types.

---
 source/Base/Color4.cpp | 38 +++++++++++++++++++-------------------
 source/Base/Color4.hpp | 20 ++++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/source/Base/Color4.cpp b/source/Base/Color4.cpp
index 642c0281..208ffb87 100644
--- a/source/Base/Color4.cpp
+++ b/source/Base/Color4.cpp
@@ -534,23 +534,6 @@ void Color4::SetScalar(Value ns)
     a = ns;
 }
 
-// ------------------------------------------------------------------------------------------------
-void Color4::SetColor3Ex(Value nr, Value ng, Value nb)
-{
-    r = nr;
-    g = ng;
-    b = nb;
-}
-
-// ------------------------------------------------------------------------------------------------
-void Color4::SetColor4Ex(Value nr, Value ng, Value nb, Value na)
-{
-    r = nr;
-    g = ng;
-    b = nb;
-    a = na;
-}
-
 // ------------------------------------------------------------------------------------------------
 void Color4::SetColor3(const Color3 & c)
 {
@@ -560,6 +543,14 @@ void Color4::SetColor3(const Color3 & c)
     a = 0;
 }
 
+// ------------------------------------------------------------------------------------------------
+void Color4::SetColor3Ex(Value nr, Value ng, Value nb)
+{
+    r = nr;
+    g = ng;
+    b = nb;
+}
+
 // ------------------------------------------------------------------------------------------------
 void Color4::SetColor4(const Color4 & c)
 {
@@ -569,6 +560,15 @@ void Color4::SetColor4(const Color4 & c)
     a = c.a;
 }
 
+// ------------------------------------------------------------------------------------------------
+void Color4::SetColor4Ex(Value nr, Value ng, Value nb, Value na)
+{
+    r = nr;
+    g = ng;
+    b = nb;
+    a = na;
+}
+
 // ------------------------------------------------------------------------------------------------
 void Color4::SetStr(CSStr str, SQChar delim)
 {
@@ -793,10 +793,10 @@ void Register_Color4(HSQUIRRELVM vm)
         .Prop(_SC("ARGB"), &Color4::GetARGB, &Color4::SetARGB)
         // Member Methods
         .Func(_SC("SetScalar"), &Color4::SetScalar)
-        .Func(_SC("SetColor3Ex"), &Color4::SetColor3Ex)
-        .Func(_SC("SetColor4Ex"), &Color4::SetColor4Ex)
         .Func(_SC("SetColor3"), &Color4::SetColor3)
+        .Func(_SC("SetColor3Ex"), &Color4::SetColor3Ex)
         .Func(_SC("SetColor4"), &Color4::SetColor4)
+        .Func(_SC("SetColor4Ex"), &Color4::SetColor4Ex)
         .Func(_SC("SetStr"), &Color4::SetStr)
         .Func(_SC("SetName"), &Color4::SetName)
         .Func(_SC("Clear"), &Color4::Clear)
diff --git a/source/Base/Color4.hpp b/source/Base/Color4.hpp
index f9866069..6568e9b8 100644
--- a/source/Base/Color4.hpp
+++ b/source/Base/Color4.hpp
@@ -384,26 +384,26 @@ struct Color4
     */
     void SetScalar(Value ns);
 
-    /* --------------------------------------------------------------------------------------------
-     * Set all components to the specified values.
-    */
-    void SetColor3Ex(Value nr, Value ng, Value nb);
-
-    /* --------------------------------------------------------------------------------------------
-     * Set all components to the specified values.
-    */
-    void SetColor4Ex(Value nr, Value ng, Value nb, Value na);
-
     /* --------------------------------------------------------------------------------------------
      * Copy the values from an opaque color.
     */
     void SetColor3(const Color3 & c);
 
+    /* --------------------------------------------------------------------------------------------
+     * Set all components to the specified values.
+    */
+    void SetColor3Ex(Value nr, Value ng, Value nb);
+
     /* --------------------------------------------------------------------------------------------
      * Copy the values from another instance of this type.
     */
     void SetColor4(const Color4 & c);
 
+    /* --------------------------------------------------------------------------------------------
+     * Set all components to the specified values.
+    */
+    void SetColor4Ex(Value nr, Value ng, Value nb, Value na);
+
     /* --------------------------------------------------------------------------------------------
      * Set the values extracted from the specified string using the specified delimiter.
     */