Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 7 insertions, 22 deletions

diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index b9257c3..5836c9c 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -29,12 +29,12 @@
 namespace FbTk {
 
 template <typename ItemType, typename Container = std::vector<ItemType *> >
-class Layer {
+class LayerBase {
 public:
     typedef Container ListType;
     typedef typename Container::iterator iterator;
     typedef typename Container::reverse_iterator reverse_iterator;
-    virtual ~Layer() { }
+    virtual ~LayerBase() { }
     /// insert in top by default
     virtual iterator insert(ItemType &item, unsigned int pos=0);
     /// remove item from list
@@ -43,8 +43,6 @@ public:
     virtual void raise(ItemType &item);
     /// move item to bottom
     virtual void lower(ItemType &item);
-    /// @return layer item on specific position, on failure 0
-    ItemType *getItem(unsigned int position);
     /// @return number of elements in layer
     size_t size() const { return m_list.size(); }
     /// @return layer list
@@ -58,7 +56,7 @@ private:
 };
 
 template <typename ItemType, typename Container>
-typename Container::iterator Layer<ItemType, Container>::insert(ItemType &item, unsigned int position) {
+typename Container::iterator LayerBase<ItemType, Container>::insert(ItemType &item, unsigned int position) {
     // make sure we don't alreay have it in the list
     if (std::find(itemList().begin(), itemList().end(), &item) != itemList().end())
         return m_list.end();
@@ -78,14 +76,14 @@ typename Container::iterator Layer<ItemType, Container>::insert(ItemType &item,
 
 
 template <typename ItemType, typename Container>
-void Layer<ItemType, Container>::remove(ItemType &item) {
+void LayerBase<ItemType, Container>::remove(ItemType &item) {
     iterator it = std::find(itemList().begin(), itemList().end(), &item);
     if (it != itemList().end())
         m_list.erase(it);
 }
 
 template <typename ItemType, typename Container>
-void Layer<ItemType, Container>::raise(ItemType &item) {
+void LayerBase<ItemType, Container>::raise(ItemType &item) {
     if (&item == itemList().front()) // already at the bottom
         return;
     remove(item);
@@ -94,7 +92,7 @@ void Layer<ItemType, Container>::raise(ItemType &item) {
 }
 
 template <typename ItemType, typename Container>
-void Layer<ItemType, Container>::lower(ItemType &item) {
+void LayerBase<ItemType, Container>::lower(ItemType &item) {
     if (&item == itemList().back()) // already at the bottom
         return;
     remove(item);
@@ -103,20 +101,7 @@ void Layer<ItemType, Container>::lower(ItemType &item) {
 }
 
 template <typename ItemType, typename Container>
-ItemType *Layer<ItemType, Container>::getItem(unsigned int position) {
-    if (position >= m_list.size())
-        return 0;
-    iterator it = m_list.begin();
-    iterator it_end = m_list.end();
-    for (unsigned int i=0; i < position && it != it_end; i++);
-        
-    if (it == it_end) return 0;
-    else 
-        return *it;
-}
-
-template <typename ItemType, typename Container>
-void Layer<ItemType, Container>::restack() {
+void LayerBase<ItemType, Container>::restack() {
 }