Add stringlistmodel.hpp to simplify listmodel usage

CMakeLists.txt

@@ -53,6 +53,7 @@ SET(GUISAN_HEADERS
   include/guisan/rectangle.hpp
   include/guisan/selectionevent.hpp
   include/guisan/selectionlistener.hpp
+  include/guisan/stringlistmodel.hpp
   include/guisan/text.hpp
   include/guisan/widget.hpp
   include/guisan/widgetlistener.hpp

SConstruct

@@ -95,6 +95,7 @@ common_headers = [
     'include/guisan/sdl.hpp',
     'include/guisan/selectionevent.hpp',
     'include/guisan/selectionlistener.hpp',
+    'include/guisan/stringlistmodel.hpp',
     'include/guisan/text.hpp',
     'include/guisan/widget.hpp',
     'include/guisan/widgetlistener.hpp',

demo/ff/include/ffdemo.hpp

@@ -54,7 +54,6 @@
 #include "ffcontainer.hpp"
 #include "fflistbox.hpp"
 #include "ffscrollarea.hpp"
-#include "stringlistmodel.hpp"
 
 class FFDemo : public gcn::ActionListener, public gcn::KeyListener
 {
@@ -112,12 +111,12 @@ class FFDemo : public gcn::ActionListener, public gcn::KeyListener
     std::unique_ptr<FFListBox> mMagicSkillsList;
     std::unique_ptr<FFScrollArea> mMagicSkillsScroll;
 
-    std::unique_ptr<StringListModel> mPerSkills;
-    std::unique_ptr<StringListModel> mPerMagic;
-    std::unique_ptr<StringListModel> mOlofSkills;
-    std::unique_ptr<StringListModel> mOlofMagic;
-    std::unique_ptr<StringListModel> mTomasSkills;
-    std::unique_ptr<StringListModel> mTomasMagic;
+    gcn::StringListModel mPerSkills;
+    gcn::StringListModel mPerMagic;
+    gcn::StringListModel mOlofSkills;
+    gcn::StringListModel mOlofMagic;
+    gcn::StringListModel mTomasSkills;
+    gcn::StringListModel mTomasMagic;
 
     std::unique_ptr<gcn::TextBox> mPerInfo1;
     std::unique_ptr<gcn::TextBox> mOlofInfo1;
@@ -145,9 +144,9 @@ class FFDemo : public gcn::ActionListener, public gcn::KeyListener
 
     std::unique_ptr<FFListBox> mItemsList;
     std::unique_ptr<FFScrollArea> mItemsScrollArea;
-    std::unique_ptr<StringListModel> mItemsListModel;
-    std::unique_ptr<StringListModel> mItemsInfoListModel;
-    std::unique_ptr<StringListModel> mMenuListModel;
+    gcn::StringListModel mItemsListModel;
+    gcn::StringListModel mItemsInfoListModel;
+    gcn::StringListModel mMenuListModel;
 
     std::unique_ptr<FFCharacterChooser> mCharacterChooser;
 };