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, 76 insertions, 75 deletions

diff --git a/src/Resources.cc b/src/Resources.cc
index 60c7461..734cd75 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -49,6 +49,14 @@ using namespace FbTk;
 namespace FbTk {
 
 template<>
+string FbTk::Resource<int>::
+getString() const {
+    char strval[256];
+    sprintf(strval, "%d", **this);
+    return string(strval);
+}
+
+template<>
 void FbTk::Resource<int>::
 setFromString(const char* strval) {
     int val;
@@ -57,70 +65,16 @@ setFromString(const char* strval) {
 }
 
 template<>
-void FbTk::Resource<string>::
-setFromString(const char *strval) {
-    *this = strval;
-}
-
-template<>
-void FbTk::Resource<bool>::
-setFromString(char const *strval) {
-    *this = (bool)!strcasecmp(strval, "true");
-}
-
-template<>
-void FbTk::Resource<vector<WinButton::Type> >::
-setFromString(char const *strval) {
-    vector<string> val;
-    StringUtil::stringtok(val, strval);
-    //clear old values
-    m_value.clear();
-
-    std::string v;
-    for (size_t i = 0; i < val.size(); i++) {
-        v = FbTk::StringUtil::toLower(val[i]);
-        if (v == "maximize")
-            m_value.push_back(WinButton::MAXIMIZE);
-        else if (v == "minimize")
-            m_value.push_back(WinButton::MINIMIZE);
-        else if (v == "shade")
-            m_value.push_back(WinButton::SHADE);
-        else if (v == "stick")
-            m_value.push_back(WinButton::STICK);
-        else if (v == "menuIcon")
-            m_value.push_back(WinButton::MENUICON);
-        else if (v == "close")
-            m_value.push_back(WinButton::CLOSE);
-    }
-}
-
-template<>
-void FbTk::Resource<Fluxbox::TabsAttachArea>::
-setFromString(char const *strval) {
-    if (strcasecmp(strval, "Titlebar")==0)
-        m_value= Fluxbox::ATTACH_AREA_TITLEBAR;
-    else
-        m_value= Fluxbox::ATTACH_AREA_WINDOW;
-}
-
-template<>
-void FbTk::Resource<unsigned int>::
-setFromString(const char *strval) {
-    if (sscanf(strval, "%ul", &m_value) != 1)
-        setDefaultValue();
-}
+string FbTk::Resource<string>::
+getString() const { return **this; }
 
 template<>
-void FbTk::Resource<long long>::
+void FbTk::Resource<string>::
 setFromString(const char *strval) {
-    if (sscanf(strval, "%lld", &m_value) != 1)
-        setDefaultValue();
+    *this = strval;
 }
 
 
-//-----------------------------------------------------------------
-//---- manipulators for int, bool, and some enums with Resource ---
-//-----------------------------------------------------------------
 template<>
 string FbTk::Resource<bool>::
 getString() const {
@@ -128,17 +82,11 @@ getString() const {
 }
 
 template<>
-string FbTk::Resource<int>::
-getString() const {
-    char strval[256];
-    sprintf(strval, "%d", **this);
-    return string(strval);
+void FbTk::Resource<bool>::
+setFromString(char const *strval) {
+    *this = (bool)!strcasecmp(strval, "true");
 }
 
-template<>
-string FbTk::Resource<string>::
-getString() const { return **this; }
-
 
 template<>
 string FbTk::Resource<vector<WinButton::Type> >::
@@ -173,6 +121,34 @@ getString() const {
     return retval;
 }
 
+
+
+template<>
+void FbTk::Resource<vector<WinButton::Type> >::
+setFromString(char const *strval) {
+    vector<string> val;
+    StringUtil::stringtok(val, strval);
+    //clear old values
+    m_value.clear();
+
+    std::string v;
+    for (size_t i = 0; i < val.size(); i++) {
+        v = FbTk::StringUtil::toLower(val[i]);
+        if (v == "maximize")
+            m_value.push_back(WinButton::MAXIMIZE);
+        else if (v == "minimize")
+            m_value.push_back(WinButton::MINIMIZE);
+        else if (v == "shade")
+            m_value.push_back(WinButton::SHADE);
+        else if (v == "stick")
+            m_value.push_back(WinButton::STICK);
+        else if (v == "menuIcon")
+            m_value.push_back(WinButton::MENUICON);
+        else if (v == "close")
+            m_value.push_back(WinButton::CLOSE);
+    }
+}
+
 template<>
 string FbTk::Resource<Fluxbox::TabsAttachArea>::
 getString() const {
@@ -183,6 +159,15 @@ getString() const {
 }
 
 template<>
+void FbTk::Resource<Fluxbox::TabsAttachArea>::
+setFromString(char const *strval) {
+    if (strcasecmp(strval, "Titlebar")==0)
+        m_value= Fluxbox::ATTACH_AREA_TITLEBAR;
+    else
+        m_value= Fluxbox::ATTACH_AREA_WINDOW;
+}
+
+template<>
 string FbTk::Resource<unsigned int>::
 getString() const {
     char tmpstr[128];
@@ -191,6 +176,14 @@ getString() const {
 }
 
 template<>
+void FbTk::Resource<unsigned int>::
+setFromString(const char *strval) {
+    if (sscanf(strval, "%ul", &m_value) != 1)
+        setDefaultValue();
+}
+
+
+template<>
 string FbTk::Resource<long long>::
 getString() const {
     char tmpstr[128];
@@ -199,13 +192,9 @@ getString() const {
 }
 
 template<>
-void FbTk::Resource<Layer>::
+void FbTk::Resource<long long>::
 setFromString(const char *strval) {
-    string str(strval);
-    int tempnum = ::Layer::getNumFromString(str);
-    if (tempnum >= 0 && tempnum < ::Layer::NUM_LAYERS)
-        m_value = tempnum;
-    else
+    if (sscanf(strval, "%lld", &m_value) != 1)
         setDefaultValue();
 }
 
@@ -217,9 +206,13 @@ getString() const {
 }
 
 template<>
-void FbTk::Resource<long>::
+void FbTk::Resource<Layer>::
 setFromString(const char *strval) {
-    if (sscanf(strval, "%ld", &m_value) != 1)
+    string str(strval);
+    int tempnum = ::Layer::getNumFromString(str);
+    if (tempnum >= 0 && tempnum < ::Layer::NUM_LAYERS)
+        m_value = tempnum;
+    else
         setDefaultValue();
 }
 
@@ -230,4 +223,12 @@ getString() const {
     sprintf(tmpstr, "%ld", m_value);
     return string(tmpstr);
 }
+
+template<>
+void FbTk::Resource<long>::
+setFromString(const char *strval) {
+    if (sscanf(strval, "%ld", &m_value) != 1)
+        setDefaultValue();
+}
+
 } // end namespace FbTk