nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fixes for sun compiler 5.10: class Layer conflicts with class FbTk/Layer .. so just a little renaming

Browse source
This commit is contained in:
Mathias Gumz 2009-10-03 13:53:00 +02:00
parent a973154c66
commit 69bf3965b7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/FbTk/Layer.hh
View file

@ -29,12 +29,12 @@
namespace FbTk { namespace FbTk {
template <typename ItemType, typename Container = std::vector<ItemType *> > template <typename ItemType, typename Container = std::vector<ItemType *> >
class Layer { class LayerBase {
public: public:
typedef Container ListType; typedef Container ListType;
typedef typename Container::iterator iterator; typedef typename Container::iterator iterator;
typedef typename Container::reverse_iterator reverse_iterator; typedef typename Container::reverse_iterator reverse_iterator;
virtual ~Layer() { } virtual ~LayerBase() { }
/// insert in top by default /// insert in top by default
virtual iterator insert(ItemType &item, unsigned int pos=0); virtual iterator insert(ItemType &item, unsigned int pos=0);
/// remove item from list /// remove item from list
@ -56,7 +56,7 @@ private:
}; };
template <typename ItemType, typename Container> 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 // make sure we don't alreay have it in the list
if (std::find(itemList().begin(), itemList().end(), &item) != itemList().end()) if (std::find(itemList().begin(), itemList().end(), &item) != itemList().end())
return m_list.end(); return m_list.end();
@ -76,14 +76,14 @@ typename Container::iterator Layer<ItemType, Container>::insert(ItemType &item,
template <typename ItemType, typename Container> 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); iterator it = std::find(itemList().begin(), itemList().end(), &item);
if (it != itemList().end()) if (it != itemList().end())
m_list.erase(it); m_list.erase(it);
} }
template <typename ItemType, typename Container> 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 if (&item == itemList().front()) // already at the bottom
return; return;
remove(item); remove(item);
@ -92,7 +92,7 @@ void Layer<ItemType, Container>::raise(ItemType &item) {
} }
template <typename ItemType, typename Container> 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 if (&item == itemList().back()) // already at the bottom
return; return;
remove(item); remove(item);
@ -101,7 +101,7 @@ void Layer<ItemType, Container>::lower(ItemType &item) {
} }
template <typename ItemType, typename Container> template <typename ItemType, typename Container>
void Layer<ItemType, Container>::restack() { void LayerBase<ItemType, Container>::restack() {
} }

2
src/FbTk/XLayer.hh
View file

@ -31,7 +31,7 @@ namespace FbTk {
class MultLayers; class MultLayers;
class XLayerItem; class XLayerItem;
class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > { class XLayer : public FbTk::LayerBase<XLayerItem, std::list<XLayerItem *> > {
public: public:
XLayer(MultLayers &manager, int layernum); XLayer(MultLayers &manager, int layernum);