@@ -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 @@ *06/02/20:
    * 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 

@@ -50,7 +50,7 @@ #include <typeinfo>
 
 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;

@@ -636,6 +636,8 @@ Fluxbox::instance()->updateFocusedWindow(screen, old_screen);
 }
 
 ////////////////////// FocusControl RESOURCES
+namespace FbTk {
+
 template<>
 std::string FbTk::Resource<FocusControl::FocusModel>::getString() const {
     switch (m_value) {
@@ -682,4 +684,4 @@ m_value = FocusControl::CLICKTABFOCUS;
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk

@@ -51,6 +51,8 @@ #include <string>
 #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 @@ }
     // default string
     return string("Icons");
 }
+} // end namespace FbTk
 
 namespace {
 

@@ -26,6 +26,8 @@ #include "StringUtil.hh"
 #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 @@ places |= Shape::BOTTOMRIGHT;
 
     *(*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;

@@ -39,6 +39,7 @@ 
 //-----------------------------------------------------------------
 //---- accessors for int, bool, and some enums with Resource ------
 //-----------------------------------------------------------------
+namespace FbTk {
 
 template<>
 void FbTk::Resource<int>::
@@ -254,3 +255,4 @@ char tmpstr[128];
     sprintf(tmpstr, "%ld", m_value);
     return string(tmpstr);
 }
+} // end namespace FbTk

@@ -129,6 +129,8 @@ 
 
 
 ////////////////////// Placement Resources
+namespace FbTk {
+    
 template <>
 void FbTk::Resource<ScreenPlacement::PlacementPolicy>::setFromString(const char *str) {
     if (strcasecmp("RowSmartPlacement", str) == 0)
@@ -205,3 +207,4 @@ }
 
     return "TopToBottom";
 }
+} // end namespace FbTk

@@ -29,6 +29,7 @@ #include "Screen.hh"
 #include <string>
 using namespace std;
 
+namespace FbTk {
 
 template <>
 string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() const {
@@ -199,4 +200,4 @@ m_value = FbTk::GContext::CAPBUTT;
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk

@@ -85,6 +85,8 @@ #include <iostream>
 #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 @@ }
     // default string
     return string("Vertical");
 }
-
+} // end namespace FbTk
 namespace { 
 
 class SlitClientMenuItem: public FbTk::MenuItem{

@@ -78,6 +78,8 @@ #include <typeinfo>
 
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Toolbar::Placement>::
 setFromString(const char *strval) {
@@ -153,7 +155,7 @@ }
     //default string
     return string("BottomCenter");
 }
-
+} // end namespace FbTk
 
 namespace {
 class SetToolbarPlacementCmd: public FbTk::Command {