Simplify FbTk::Resource template class

by outsourcing the conversion from string/lua to the specific type (and back) to a separate
class. This change touches a lot of files because the interface of FbTk::Resource changed
slightly. However, the changes are minor.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 9f737b4..eca379b 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -184,14 +184,14 @@ private:
     Strut *m_strut; ///< created and destroyed by BScreen
 
     // resources
-    FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over, m_rc_visible;
-    FbTk::Resource<int> m_rc_width_percent;
-    FbTk::Resource<int> m_rc_alpha;
-    FbTk::Resource<class ResourceLayer> m_rc_layernum;
-    FbTk::Resource<int> m_rc_on_head;
-    FbTk::Resource<Placement> m_rc_placement;
-    FbTk::Resource<int> m_rc_height;
-    FbTk::Resource<std::string> m_rc_tools;
+    FbTk::BoolResource m_rc_auto_hide, m_rc_maximize_over, m_rc_visible;
+    FbTk::IntResource m_rc_width_percent;
+    FbTk::IntResource m_rc_alpha;
+    FbTk::Resource<ResourceLayer::Type, FbTk::EnumTraits<ResourceLayer::Type> > m_rc_layernum;
+    FbTk::IntResource m_rc_on_head;
+    FbTk::Resource<Placement, FbTk::EnumTraits<Placement> > m_rc_placement;
+    FbTk::IntResource m_rc_height;
+    FbTk::StringResource m_rc_tools;
     std::auto_ptr<FbTk::Shape> m_shape;
     typedef std::list<std::string> StringList;
     StringList m_tools;