mostly cosmetic fixes, mainly discovered by 'clang --analyze'

reordering of Resource-related stuff was because of

   "error: explicit specialization of 'getString' after instantiation"

complaints.

1 files changed, 30 insertions, 30 deletions

diff --git a/src/Slit.cc b/src/Slit.cc
index fb3da30..7aaa096 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -90,36 +90,6 @@ using std::dec;
 namespace FbTk {
 
 template<>
-void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
-    if (strcasecmp(strval, "TopLeft")==0)
-        m_value = Slit::TOPLEFT;
-    else if (strcasecmp(strval, "LeftCenter")==0)
-        m_value = Slit::LEFTCENTER;
-    else if (strcasecmp(strval, "BottomLeft")==0)
-        m_value = Slit::BOTTOMLEFT;
-    else if (strcasecmp(strval, "TopCenter")==0)
-        m_value = Slit::TOPCENTER;
-    else if (strcasecmp(strval, "BottomCenter")==0)
-        m_value = Slit::BOTTOMCENTER;
-    else if (strcasecmp(strval, "TopRight")==0)
-        m_value = Slit::TOPRIGHT;
-    else if (strcasecmp(strval, "RightCenter")==0)
-        m_value = Slit::RIGHTCENTER;
-    else if (strcasecmp(strval, "BottomRight")==0)
-        m_value = Slit::BOTTOMRIGHT;
-    else if (strcasecmp(strval, "LeftTop")==0)
-        m_value = Slit::LEFTTOP;
-    else if (strcasecmp(strval, "LeftBottom")==0)
-        m_value = Slit::LEFTBOTTOM;
-    else if (strcasecmp(strval, "RightTop")==0)
-        m_value = Slit::RIGHTTOP;
-    else if (strcasecmp(strval, "RightBottom")==0)
-        m_value = Slit::RIGHTBOTTOM;
-    else
-        setDefaultValue();
-}
-
-template<>
 string FbTk::Resource<Slit::Placement>::getString() const {
     switch (m_value) {
     case Slit::TOPLEFT:
@@ -163,6 +133,36 @@ string FbTk::Resource<Slit::Placement>::getString() const {
     return string("RightBottom");
 }
 
+template<>
+void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
+    if (strcasecmp(strval, "TopLeft")==0)
+        m_value = Slit::TOPLEFT;
+    else if (strcasecmp(strval, "LeftCenter")==0)
+        m_value = Slit::LEFTCENTER;
+    else if (strcasecmp(strval, "BottomLeft")==0)
+        m_value = Slit::BOTTOMLEFT;
+    else if (strcasecmp(strval, "TopCenter")==0)
+        m_value = Slit::TOPCENTER;
+    else if (strcasecmp(strval, "BottomCenter")==0)
+        m_value = Slit::BOTTOMCENTER;
+    else if (strcasecmp(strval, "TopRight")==0)
+        m_value = Slit::TOPRIGHT;
+    else if (strcasecmp(strval, "RightCenter")==0)
+        m_value = Slit::RIGHTCENTER;
+    else if (strcasecmp(strval, "BottomRight")==0)
+        m_value = Slit::BOTTOMRIGHT;
+    else if (strcasecmp(strval, "LeftTop")==0)
+        m_value = Slit::LEFTTOP;
+    else if (strcasecmp(strval, "LeftBottom")==0)
+        m_value = Slit::LEFTBOTTOM;
+    else if (strcasecmp(strval, "RightTop")==0)
+        m_value = Slit::RIGHTTOP;
+    else if (strcasecmp(strval, "RightBottom")==0)
+        m_value = Slit::RIGHTBOTTOM;
+    else
+        setDefaultValue();
+}
+
 } // end namespace FbTk
 namespace {