diff options
author | mathias <mathias> | 2006-10-30 19:31:15 (GMT) |
---|---|---|
committer | mathias <mathias> | 2006-10-30 19:31:15 (GMT) |
commit | e5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5 (patch) | |
tree | c84838a84802805e9b1463045e86200b7cef917f /src/ScreenResources.cc | |
parent | 426c12c25c2ef095a882619ad7424684b88465b8 (diff) | |
download | fluxbox-e5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5.zip fluxbox-e5e76e7761f52ba7c0deca75bcecae4fbd3e2ff5.tar.bz2 |
Cosmetic patch from Slava Semushin
Diffstat (limited to 'src/ScreenResources.cc')
-rw-r--r-- | src/ScreenResources.cc | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc index 83bd7c9..0f17c2a 100644 --- a/src/ScreenResources.cc +++ b/src/ScreenResources.cc | |||
@@ -27,7 +27,8 @@ | |||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
29 | #include <string> | 29 | #include <string> |
30 | using namespace std; | 30 | |
31 | using std::string; | ||
31 | 32 | ||
32 | namespace FbTk { | 33 | namespace FbTk { |
33 | 34 | ||
@@ -53,17 +54,17 @@ void FbTk::Resource<FbTk::MenuTheme::MenuMode>::setFromString(const char *str) { | |||
53 | } | 54 | } |
54 | 55 | ||
55 | template <> | 56 | template <> |
56 | std::string FbTk::Resource<BScreen::ResizeModel>::getString() const { | 57 | string FbTk::Resource<BScreen::ResizeModel>::getString() const { |
57 | switch (m_value) { | 58 | switch (m_value) { |
58 | case BScreen::QUADRANTRESIZE: | 59 | case BScreen::QUADRANTRESIZE: |
59 | return std::string("Quadrant"); | 60 | return string("Quadrant"); |
60 | case BScreen::BOTTOMRESIZE: | 61 | case BScreen::BOTTOMRESIZE: |
61 | return std::string("Bottom"); | 62 | return string("Bottom"); |
62 | case BScreen::CENTERRESIZE: | 63 | case BScreen::CENTERRESIZE: |
63 | return std::string("Center"); | 64 | return string("Center"); |
64 | } | 65 | } |
65 | 66 | ||
66 | return std::string("Default"); | 67 | return string("Default"); |
67 | } | 68 | } |
68 | 69 | ||
69 | template<> | 70 | template<> |
@@ -75,25 +76,25 @@ setFromString(char const *strval) { | |||
75 | m_value = BScreen::QUADRANTRESIZE; | 76 | m_value = BScreen::QUADRANTRESIZE; |
76 | } else if (strcasecmp(strval, "Center") == 0) { | 77 | } else if (strcasecmp(strval, "Center") == 0) { |
77 | m_value = BScreen::CENTERRESIZE; | 78 | m_value = BScreen::CENTERRESIZE; |
78 | } else | 79 | } else |
79 | m_value = BScreen::DEFAULTRESIZE; | 80 | m_value = BScreen::DEFAULTRESIZE; |
80 | } | 81 | } |
81 | 82 | ||
82 | template<> | 83 | template<> |
83 | std::string FbTk::Resource<BScreen::FollowModel>::getString() const { | 84 | string FbTk::Resource<BScreen::FollowModel>::getString() const { |
84 | switch (m_value) { | 85 | switch (m_value) { |
85 | case BScreen::FOLLOW_ACTIVE_WINDOW: | 86 | case BScreen::FOLLOW_ACTIVE_WINDOW: |
86 | return std::string("Follow"); | 87 | return string("Follow"); |
87 | break; | 88 | break; |
88 | case BScreen::FETCH_ACTIVE_WINDOW: | 89 | case BScreen::FETCH_ACTIVE_WINDOW: |
89 | return std::string("Current"); | 90 | return string("Current"); |
90 | break; | 91 | break; |
91 | case BScreen::SEMIFOLLOW_ACTIVE_WINDOW: | 92 | case BScreen::SEMIFOLLOW_ACTIVE_WINDOW: |
92 | return std::string("SemiFollow"); | 93 | return string("SemiFollow"); |
93 | break; | 94 | break; |
94 | case BScreen::IGNORE_OTHER_WORKSPACES: | 95 | case BScreen::IGNORE_OTHER_WORKSPACES: |
95 | default: | 96 | default: |
96 | return std::string("Ignore"); | 97 | return string("Ignore"); |
97 | break; | 98 | break; |
98 | } | 99 | } |
99 | 100 | ||
@@ -104,7 +105,7 @@ void FbTk::Resource<BScreen::FollowModel>:: | |||
104 | setFromString(char const *strval) { | 105 | setFromString(char const *strval) { |
105 | if (strcasecmp(strval, "Follow") == 0) | 106 | if (strcasecmp(strval, "Follow") == 0) |
106 | m_value = BScreen::FOLLOW_ACTIVE_WINDOW; | 107 | m_value = BScreen::FOLLOW_ACTIVE_WINDOW; |
107 | else if (strcasecmp(strval, "Current") == 0 || | 108 | else if (strcasecmp(strval, "Current") == 0 || |
108 | strcasecmp(strval, "CurrentWorkspace") == 0 || | 109 | strcasecmp(strval, "CurrentWorkspace") == 0 || |
109 | strcasecmp(strval, "Fetch") == 0) | 110 | strcasecmp(strval, "Fetch") == 0) |
110 | m_value = BScreen::FETCH_ACTIVE_WINDOW; | 111 | m_value = BScreen::FETCH_ACTIVE_WINDOW; |
@@ -115,7 +116,7 @@ setFromString(char const *strval) { | |||
115 | } | 116 | } |
116 | 117 | ||
117 | template<> | 118 | template<> |
118 | std::string FbTk::Resource<FbTk::GContext::LineStyle>::getString() const { | 119 | string FbTk::Resource<FbTk::GContext::LineStyle>::getString() const { |
119 | switch(m_value) { | 120 | switch(m_value) { |
120 | case FbTk::GContext::LINESOLID: | 121 | case FbTk::GContext::LINESOLID: |
121 | return "LineSolid"; | 122 | return "LineSolid"; |
@@ -132,20 +133,20 @@ std::string FbTk::Resource<FbTk::GContext::LineStyle>::getString() const { | |||
132 | 133 | ||
133 | template<> | 134 | template<> |
134 | void FbTk::Resource<FbTk::GContext::LineStyle> | 135 | void FbTk::Resource<FbTk::GContext::LineStyle> |
135 | ::setFromString(char const *strval) { | 136 | ::setFromString(char const *strval) { |
136 | 137 | ||
137 | if (strcasecmp(strval, "LineSolid") == 0 ) | 138 | if (strcasecmp(strval, "LineSolid") == 0 ) |
138 | m_value = FbTk::GContext::LINESOLID; | 139 | m_value = FbTk::GContext::LINESOLID; |
139 | else if (strcasecmp(strval, "LineOnOffDash") == 0 ) | 140 | else if (strcasecmp(strval, "LineOnOffDash") == 0 ) |
140 | m_value = FbTk::GContext::LINEONOFFDASH; | 141 | m_value = FbTk::GContext::LINEONOFFDASH; |
141 | else if (strcasecmp(strval, "LineDoubleDash") == 0) | 142 | else if (strcasecmp(strval, "LineDoubleDash") == 0) |
142 | m_value = FbTk::GContext::LINEDOUBLEDASH; | 143 | m_value = FbTk::GContext::LINEDOUBLEDASH; |
143 | else | 144 | else |
144 | setDefaultValue(); | 145 | setDefaultValue(); |
145 | } | 146 | } |
146 | 147 | ||
147 | template<> | 148 | template<> |
148 | std::string FbTk::Resource<FbTk::GContext::JoinStyle>::getString() const { | 149 | string FbTk::Resource<FbTk::GContext::JoinStyle>::getString() const { |
149 | switch(m_value) { | 150 | switch(m_value) { |
150 | case FbTk::GContext::JOINMITER: | 151 | case FbTk::GContext::JOINMITER: |
151 | return "JoinMiter"; | 152 | return "JoinMiter"; |
@@ -162,20 +163,20 @@ std::string FbTk::Resource<FbTk::GContext::JoinStyle>::getString() const { | |||
162 | 163 | ||
163 | template<> | 164 | template<> |
164 | void FbTk::Resource<FbTk::GContext::JoinStyle> | 165 | void FbTk::Resource<FbTk::GContext::JoinStyle> |
165 | ::setFromString(char const *strval) { | 166 | ::setFromString(char const *strval) { |
166 | 167 | ||
167 | if (strcasecmp(strval, "JoinRound") == 0 ) | 168 | if (strcasecmp(strval, "JoinRound") == 0 ) |
168 | m_value = FbTk::GContext::JOINROUND; | 169 | m_value = FbTk::GContext::JOINROUND; |
169 | else if (strcasecmp(strval, "JoinMiter") == 0 ) | 170 | else if (strcasecmp(strval, "JoinMiter") == 0 ) |
170 | m_value = FbTk::GContext::JOINMITER; | 171 | m_value = FbTk::GContext::JOINMITER; |
171 | else if (strcasecmp(strval, "JoinBevel") == 0) | 172 | else if (strcasecmp(strval, "JoinBevel") == 0) |
172 | m_value = FbTk::GContext::JOINBEVEL; | 173 | m_value = FbTk::GContext::JOINBEVEL; |
173 | else | 174 | else |
174 | setDefaultValue(); | 175 | setDefaultValue(); |
175 | } | 176 | } |
176 | 177 | ||
177 | template<> | 178 | template<> |
178 | std::string FbTk::Resource<FbTk::GContext::CapStyle>::getString() const { | 179 | string FbTk::Resource<FbTk::GContext::CapStyle>::getString() const { |
179 | switch(m_value) { | 180 | switch(m_value) { |
180 | case FbTk::GContext::CAPNOTLAST: | 181 | case FbTk::GContext::CAPNOTLAST: |
181 | return "CapNotLast"; | 182 | return "CapNotLast"; |
@@ -195,13 +196,13 @@ std::string FbTk::Resource<FbTk::GContext::CapStyle>::getString() const { | |||
195 | 196 | ||
196 | template<> | 197 | template<> |
197 | void FbTk::Resource<FbTk::GContext::CapStyle> | 198 | void FbTk::Resource<FbTk::GContext::CapStyle> |
198 | ::setFromString(char const *strval) { | 199 | ::setFromString(char const *strval) { |
199 | 200 | ||
200 | if (strcasecmp(strval, "CapNotLast") == 0 ) | 201 | if (strcasecmp(strval, "CapNotLast") == 0 ) |
201 | m_value = FbTk::GContext::CAPNOTLAST; | 202 | m_value = FbTk::GContext::CAPNOTLAST; |
202 | else if (strcasecmp(strval, "CapProjecting") == 0 ) | 203 | else if (strcasecmp(strval, "CapProjecting") == 0 ) |
203 | m_value = FbTk::GContext::CAPPROJECTING; | 204 | m_value = FbTk::GContext::CAPPROJECTING; |
204 | else if (strcasecmp(strval, "CapRound") == 0) | 205 | else if (strcasecmp(strval, "CapRound") == 0) |
205 | m_value = FbTk::GContext::CAPROUND; | 206 | m_value = FbTk::GContext::CAPROUND; |
206 | else if (strcasecmp(strval, "CapButt" ) == 0) | 207 | else if (strcasecmp(strval, "CapButt" ) == 0) |
207 | m_value = FbTk::GContext::CAPBUTT; | 208 | m_value = FbTk::GContext::CAPBUTT; |