aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-03-02 07:49:13 (GMT)
committermathias <mathias>2006-03-02 07:49:13 (GMT)
commita21d42da3709f5dc5b5510297be134507153ef2c (patch)
treeb40b05154c33f8a05191c9b46ece0ed6737e6506
parente742a830adaef45950a12c901ce245d67cc3fdcb (diff)
downloadfluxbox_pavel-a21d42da3709f5dc5b5510297be134507153ef2c.zip
fluxbox_pavel-a21d42da3709f5dc5b5510297be134507153ef2c.tar.bz2
fixed gcc4.1 problems, patch from Andreas Bierfert <andreas dot bierfert at lowlatency dot de>
-rw-r--r--ChangeLog7
-rw-r--r--src/ClockTool.cc2
-rw-r--r--src/FocusControl.cc4
-rw-r--r--src/IconbarTool.cc3
-rw-r--r--src/MenuTheme.cc4
-rw-r--r--src/Resources.cc2
-rw-r--r--src/ScreenPlacement.cc3
-rw-r--r--src/ScreenResources.cc3
-rw-r--r--src/Slit.cc4
-rw-r--r--src/Toolbar.cc4
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*06/01/03: 3*06/03/02:
4 * closed bug #1409775, gcc4.1 problems (thanx to Andreas Bierfert)
5 Slit.cc MenuTheme.cc Resources.cc ClockTool.cc FocusControl.cc
6 ScreenPlacement.cc ScreenResources.cc Toolbar.cc IconbarTool.cc
7*06/03/01:
4 * corrections for translation files (thanx php-coder) 8 * corrections for translation files (thanx php-coder)
5*06/02/27: 9*06/02/27:
6 * minor cosmetic issues (thanx php-coder) 10 * minor cosmetic issues (thanx php-coder)
@@ -11,7 +15,6 @@ Changes for 0.9.15:
11 * Moved resource helper class Layer out from 15 * Moved resource helper class Layer out from
12 class Fluxbox. Reduced some dependencies. 16 class Fluxbox. Reduced some dependencies.
13 (Henrik) 17 (Henrik)
14
15*06/02/19: 18*06/02/19:
16 * Added new resize mode: Center 19 * Added new resize mode: Center
17 This mode will move all corners at the same time with 20 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 @@
50 50
51class ClockMenuItem: public FbTk::MenuItem { 51class ClockMenuItem: public FbTk::MenuItem {
52public: 52public:
53 explicit ClockMenuItem::ClockMenuItem(ClockTool &tool): 53 explicit ClockMenuItem(ClockTool &tool):
54 FbTk::MenuItem(""), m_tool(tool) { 54 FbTk::MenuItem(""), m_tool(tool) {
55 // determine 12/24 hour format 55 // determine 12/24 hour format
56 _FB_USES_NLS; 56 _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) {
636} 636}
637 637
638////////////////////// FocusControl RESOURCES 638////////////////////// FocusControl RESOURCES
639namespace FbTk {
640
639template<> 641template<>
640std::string FbTk::Resource<FocusControl::FocusModel>::getString() const { 642std::string FbTk::Resource<FocusControl::FocusModel>::getString() const {
641 switch (m_value) { 643 switch (m_value) {
@@ -682,4 +684,4 @@ setFromString(char const *strval) {
682 else 684 else
683 setDefaultValue(); 685 setDefaultValue();
684} 686}
685 687} // 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 @@
51#include <iterator> 51#include <iterator>
52using namespace std; 52using namespace std;
53 53
54namespace FbTk {
55
54template<> 56template<>
55void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) { 57void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {
56 if (strcasecmp(strval, "None") == 0) 58 if (strcasecmp(strval, "None") == 0)
@@ -192,6 +194,7 @@ string FbTk::Resource<IconbarTool::Mode>::getString() const {
192 // default string 194 // default string
193 return string("Icons"); 195 return string("Icons");
194} 196}
197} // end namespace FbTk
195 198
196namespace { 199namespace {
197 200
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 @@
26#include <iostream> 26#include <iostream>
27using namespace std; 27using namespace std;
28 28
29namespace FbTk {
30
29template <> 31template <>
30void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string *name, const std::string *altname) { } 32void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string *name, const std::string *altname) { }
31 33
@@ -49,7 +51,7 @@ void FbTk::ThemeItem<Shape::ShapePlace>::setFromString(const char *str) {
49 51
50 *(*this) = static_cast<Shape::ShapePlace>(places); 52 *(*this) = static_cast<Shape::ShapePlace>(places);
51} 53}
52 54} // end namespace FbTk
53MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num), 55MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),
54 m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") { 56 m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {
55 *m_shapeplace = Shape::NONE; 57 *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;
39//----------------------------------------------------------------- 39//-----------------------------------------------------------------
40//---- accessors for int, bool, and some enums with Resource ------ 40//---- accessors for int, bool, and some enums with Resource ------
41//----------------------------------------------------------------- 41//-----------------------------------------------------------------
42namespace FbTk {
42 43
43template<> 44template<>
44void FbTk::Resource<int>:: 45void FbTk::Resource<int>::
@@ -254,3 +255,4 @@ getString() const {
254 sprintf(tmpstr, "%ld", m_value); 255 sprintf(tmpstr, "%ld", m_value);
255 return string(tmpstr); 256 return string(tmpstr);
256} 257}
258} // 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
129 129
130 130
131////////////////////// Placement Resources 131////////////////////// Placement Resources
132namespace FbTk {
133
132template <> 134template <>
133void FbTk::Resource<ScreenPlacement::PlacementPolicy>::setFromString(const char *str) { 135void FbTk::Resource<ScreenPlacement::PlacementPolicy>::setFromString(const char *str) {
134 if (strcasecmp("RowSmartPlacement", str) == 0) 136 if (strcasecmp("RowSmartPlacement", str) == 0)
@@ -205,3 +207,4 @@ std::string FbTk::Resource<ScreenPlacement::ColumnDirection>::getString() const
205 207
206 return "TopToBottom"; 208 return "TopToBottom";
207} 209}
210} // 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 @@
29#include <string> 29#include <string>
30using namespace std; 30using namespace std;
31 31
32namespace FbTk {
32 33
33template <> 34template <>
34string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() const { 35string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() const {
@@ -199,4 +200,4 @@ void FbTk::Resource<FbTk::GContext::CapStyle>
199 else 200 else
200 setDefaultValue(); 201 setDefaultValue();
201} 202}
202 203} // 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 @@
85#include <algorithm> 85#include <algorithm>
86using namespace std; 86using namespace std;
87 87
88namespace FbTk {
89
88template<> 90template<>
89void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) { 91void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
90 if (strcasecmp(strval, "TopLeft")==0) 92 if (strcasecmp(strval, "TopLeft")==0)
@@ -164,7 +166,7 @@ string FbTk::Resource<Slit::Direction>::getString() const {
164 // default string 166 // default string
165 return string("Vertical"); 167 return string("Vertical");
166} 168}
167 169} // end namespace FbTk
168namespace { 170namespace {
169 171
170class SlitClientMenuItem: public FbTk::MenuItem{ 172class 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 @@
78 78
79using namespace std; 79using namespace std;
80 80
81namespace FbTk {
82
81template<> 83template<>
82void FbTk::Resource<Toolbar::Placement>:: 84void FbTk::Resource<Toolbar::Placement>::
83setFromString(const char *strval) { 85setFromString(const char *strval) {
@@ -153,7 +155,7 @@ getString() const {
153 //default string 155 //default string
154 return string("BottomCenter"); 156 return string("BottomCenter");
155} 157}
156 158} // end namespace FbTk
157 159
158namespace { 160namespace {
159class SetToolbarPlacementCmd: public FbTk::Command { 161class SetToolbarPlacementCmd: public FbTk::Command {