M src/FbTk/Layer.hh → src/FbTk/Layer.hh

@@ -43,8 +43,6 @@ /// move item to top
     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
@@ -100,19 +98,6 @@ return;
     remove(item);
     insert(item, size());
     restack();
-}
-
-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>

M src/FbTk/MultLayers.cc → src/FbTk/MultLayers.cc

@@ -55,36 +55,6 @@ return item;
 
 }
 
-XLayerItem *MultLayers::getItemBelow(XLayerItem &item) {
-    XLayer &curr_layer = item.getLayer();
-
-    // assume that the LayerItem does exist in a layer.
-    XLayerItem *ret = curr_layer.getItemBelow(item);
-
-    if (ret == 0) {
-        int num = curr_layer.getLayerNum()-1;
-        while (num >= 0 && !ret) {
-            ret = m_layers[num]->getItemBelow(item);
-            num--;
-        }
-    }
-
-    return ret;
-}
-
-XLayerItem *MultLayers::getItemAbove(XLayerItem &item) {
-    XLayer &curr_layer = item.getLayer();
-
-    // assume that the LayerItem does exist in a layer.
-    XLayerItem *ret = curr_layer.getItemAbove(item);
-
-    if (!ret) {
-        ret = getLowestItemAboveLayer(curr_layer.getLayerNum());
-    }
-
-    return ret;
-}
-
 void MultLayers::addToTop(XLayerItem &item, int layernum) {
     if (layernum < 0)
         layernum = 0;

M src/FbTk/XLayer.cc → src/FbTk/XLayer.cc

@@ -314,28 +314,3 @@ else
         return itemList().back();
 }
 
-XLayerItem *XLayer::getItemBelow(XLayerItem &item) {
-    // get our iterator
-    iterator it = find(itemList().begin(), itemList().end(), &item);
-
-    // go one lower
-    it++;
-
-    // if one lower is the end, there is no item below, otherwise we've got it
-    if (it == itemList().end())
-        return 0;
-    else
-        return *it;
-}
-
-XLayerItem *XLayer::getItemAbove(XLayerItem &item) {
-    // get our iterator
-    iterator it = find(itemList().begin(), itemList().end(), &item);
-
-    // if this is the beginning (top-most item), do nothing, otherwise give the next one up
-    // the list (which must be there since we aren't the beginning)
-    if (it == itemList().begin())
-        return 0;
-    else
-        return *(--it);
-}

M src/FbTk/XLayer.hh → src/FbTk/XLayer.hh

@@ -49,9 +49,6 @@ void alignItem(XLayerItem &item);
     int countWindows();
     void stackBelowItem(XLayerItem &item, XLayerItem *above);
     XLayerItem *getLowestItem();
-    XLayerItem *getItemBelow(XLayerItem &item);
-    XLayerItem *getItemAbove(XLayerItem &item);
-
     const ItemList &getItemList() const { return itemList(); }
     ItemList &getItemList() { return itemList(); }