From a21d42da3709f5dc5b5510297be134507153ef2c Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Thu, 2 Mar 2006 07:49:13 +0000
Subject: fixed gcc4.1 problems, patch from Andreas Bierfert <andreas dot
 bierfert at lowlatency dot de>

---
 ChangeLog              | 7 +++++--
 src/ClockTool.cc       | 2 +-
 src/FocusControl.cc    | 4 +++-
 src/IconbarTool.cc     | 3 +++
 src/MenuTheme.cc       | 4 +++-
 src/Resources.cc       | 2 ++
 src/ScreenPlacement.cc | 3 +++
 src/ScreenResources.cc | 3 ++-
 src/Slit.cc            | 4 +++-
 src/Toolbar.cc         | 4 +++-
 10 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6b4832..b5dbc03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 (Format: Year/Month/Day)
 Changes for 0.9.15:
-*06/01/03:
+*06/03/02:
+   * closed bug #1409775, gcc4.1 problems (thanx to Andreas Bierfert)
+     Slit.cc MenuTheme.cc Resources.cc ClockTool.cc FocusControl.cc
+     ScreenPlacement.cc ScreenResources.cc Toolbar.cc IconbarTool.cc
+*06/03/01:
    * corrections for translation files (thanx php-coder)
 *06/02/27:
    * minor cosmetic issues (thanx php-coder)
@@ -11,7 +15,6 @@ Changes for 0.9.15:
    * Moved resource helper class Layer out from 
      class Fluxbox. Reduced some dependencies.
      (Henrik)
-     
 *06/02/19:
    * Added new resize mode: Center
      This mode will move all corners at the same time with 
diff --git a/src/ClockTool.cc b/src/ClockTool.cc
index 8c6d244..a8348ed 100644
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@@ -50,7 +50,7 @@
 
 class ClockMenuItem: public FbTk::MenuItem {
 public:
-    explicit ClockMenuItem::ClockMenuItem(ClockTool &tool):
+    explicit ClockMenuItem(ClockTool &tool):
         FbTk::MenuItem(""), m_tool(tool) { 
         // determine 12/24 hour format
         _FB_USES_NLS;
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index b98c29c..a31270b 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -636,6 +636,8 @@ void FocusControl::setFocusedWindow(WinClient *client) {
 }
 
 ////////////////////// FocusControl RESOURCES
+namespace FbTk {
+
 template<>
 std::string FbTk::Resource<FocusControl::FocusModel>::getString() const {
     switch (m_value) {
@@ -682,4 +684,4 @@ setFromString(char const *strval) {
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index e860ce2..cbd42c4 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -51,6 +51,8 @@
 #include <iterator>
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {
     if (strcasecmp(strval, "None") == 0) 
@@ -192,6 +194,7 @@ string FbTk::Resource<IconbarTool::Mode>::getString() const {
     // default string
     return string("Icons");
 }
+} // end namespace FbTk
 
 namespace {
 
diff --git a/src/MenuTheme.cc b/src/MenuTheme.cc
index fe452da..2bcbf10 100644
--- a/src/MenuTheme.cc
+++ b/src/MenuTheme.cc
@@ -26,6 +26,8 @@
 #include <iostream>
 using namespace std;
 
+namespace FbTk {
+
 template <>
 void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string *name, const std::string *altname) { }
 
@@ -49,7 +51,7 @@ void FbTk::ThemeItem<Shape::ShapePlace>::setFromString(const char *str) {
 
     *(*this) = static_cast<Shape::ShapePlace>(places);
 }
-
+} // end namespace FbTk
 MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),
                                      m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {
     *m_shapeplace = Shape::NONE;
diff --git a/src/Resources.cc b/src/Resources.cc
index fbf6a24..1c9b456 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -39,6 +39,7 @@ using namespace FbTk;
 //-----------------------------------------------------------------
 //---- accessors for int, bool, and some enums with Resource ------
 //-----------------------------------------------------------------
+namespace FbTk {
 
 template<>
 void FbTk::Resource<int>::
@@ -254,3 +255,4 @@ getString() const {
     sprintf(tmpstr, "%ld", m_value);
     return string(tmpstr);
 }
+} // end namespace FbTk
diff --git a/src/ScreenPlacement.cc b/src/ScreenPlacement.cc
index b455fc7..51ade90 100644
--- a/src/ScreenPlacement.cc
+++ b/src/ScreenPlacement.cc
@@ -129,6 +129,8 @@ bool ScreenPlacement::placeWindow(const std::vector<FluxboxWindow *> &windowlist
 
 
 ////////////////////// Placement Resources
+namespace FbTk {
+    
 template <>
 void FbTk::Resource<ScreenPlacement::PlacementPolicy>::setFromString(const char *str) {
     if (strcasecmp("RowSmartPlacement", str) == 0)
@@ -205,3 +207,4 @@ std::string FbTk::Resource<ScreenPlacement::ColumnDirection>::getString() const
 
     return "TopToBottom";
 }
+} // end namespace FbTk
diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc
index 7a58914..533266a 100644
--- a/src/ScreenResources.cc
+++ b/src/ScreenResources.cc
@@ -29,6 +29,7 @@
 #include <string>
 using namespace std;
 
+namespace FbTk {
 
 template <>
 string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() const {
@@ -199,4 +200,4 @@ void FbTk::Resource<FbTk::GContext::CapStyle>
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk
diff --git a/src/Slit.cc b/src/Slit.cc
index fd4e2cf..d2fbcd5 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -85,6 +85,8 @@
 #include <algorithm>
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
     if (strcasecmp(strval, "TopLeft")==0)
@@ -164,7 +166,7 @@ string FbTk::Resource<Slit::Direction>::getString() const {
     // default string
     return string("Vertical");
 }
-
+} // end namespace FbTk
 namespace { 
 
 class SlitClientMenuItem: public FbTk::MenuItem{
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 2a9eb8b..6ca42c1 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -78,6 +78,8 @@
 
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Toolbar::Placement>::
 setFromString(const char *strval) {
@@ -153,7 +155,7 @@ getString() const {
     //default string
     return string("BottomCenter");
 }
-
+} // end namespace FbTk
 
 namespace {
 class SetToolbarPlacementCmd: public FbTk::Command {
-- 
cgit v0.11.2