all repos — fluxbox @ 69bf3965b74a4d0435179f0e1095339384e81b2c

custom fork of the fluxbox windowmanager 

compile fixes for sun compiler 5.10: class Layer conflicts with class FbTk/Layer .. so just a little renaming
Mathias Gumz akira at fluxbox dot org
commit

69bf3965b74a4d0435179f0e1095339384e81b2c

parent

a973154c668bd4d3267de6edcafa1a3adcfd3e9b

2 files changed, 8 insertions(+), 8 deletions(-)

jump to
M src/FbTk/Layer.hh → 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

@@ -56,7 +56,7 @@ ListType m_list;
 };
 
 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();

@@ -76,14 +76,14 @@ }
 
 
 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);

@@ -92,7 +92,7 @@ restack();
 }
 
 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);

@@ -101,7 +101,7 @@ restack();
 }
 
 template <typename ItemType, typename Container>
-void Layer<ItemType, Container>::restack() {
+void LayerBase<ItemType, Container>::restack() {
 }
M src/FbTk/XLayer.hh → src/FbTk/XLayer.hh 
@@ -31,7 +31,7 @@ 
 class MultLayers;
 class XLayerItem;
 
-class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > {
+class XLayer : public FbTk::LayerBase<XLayerItem, std::list<XLayerItem *> > {
 public:
 
     XLayer(MultLayers &manager, int layernum);