compile fix: sunCC 5.11 (sunstudio 12) compiles and links again

biggest change: renaming of 'class Layer' to 'class ResourceLayer' in
Layer.hh to handle complaints about 'ambiguous Layer: Layer or FbTk::Layer'.
'ResourceLayer' sounds crappy, but that was the best I could come
up with right now.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 107f4d2..1b58231 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -489,7 +489,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     changeWorkspaceID(first_desktop);
 
 #ifdef SLIT
-    m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP),
+    m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP),
                  fluxbox->getSlitlistFilename().c_str()));
 #endif // SLIT
 
@@ -598,7 +598,7 @@ void BScreen::initWindows() {
 
 #ifdef USE_TOOLBAR
     m_toolbar.reset(new Toolbar(*this,
-                                *layerManager().getLayer(::Layer::NORMAL)));
+                                *layerManager().getLayer(::ResourceLayer::NORMAL)));
 #endif // USE_TOOLBAR
 
     unsigned int nchild;
@@ -858,7 +858,7 @@ void BScreen::cycleFocus(int options, const ClientPattern *pat, bool reverse) {
 FbMenu *BScreen::createMenu(const string &label) {
     FbMenu *menu = new FbMenu(menuTheme(),
                                   imageControl(),
-                                  *layerManager().getLayer(Layer::MENU));
+                                  *layerManager().getLayer(ResourceLayer::MENU));
     if (!label.empty())
         menu->setLabel(label);
 
@@ -868,7 +868,7 @@ FbMenu *BScreen::createMenu(const string &label) {
 FbMenu *BScreen::createToggleMenu(const string &label) {
     FbMenu *menu = new ToggleMenu(menuTheme(),
                                       imageControl(),
-                                      *layerManager().getLayer(Layer::MENU));
+                                      *layerManager().getLayer(ResourceLayer::MENU));
     if (!label.empty())
         menu->setLabel(label);