diff options
author | fluxgen <fluxgen> | 2005-11-22 21:09:14 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2005-11-22 21:09:14 (GMT) |
commit | f7cfa81bbb1f488899905731f9b72a9cce7d8c83 (patch) | |
tree | c56d23e938814dcdf917197f09bd22e5cf4094e3 | |
parent | be1cbd46909e678bbd71f3a590e36c3077cb2960 (diff) | |
download | fluxbox-f7cfa81bbb1f488899905731f9b72a9cce7d8c83.zip fluxbox-f7cfa81bbb1f488899905731f9b72a9cce7d8c83.tar.bz2 |
const function Resource getString
-rw-r--r-- | src/IconbarTool.cc | 12 | ||||
-rw-r--r-- | src/Resources.cc | 18 | ||||
-rw-r--r-- | src/Slit.cc | 4 | ||||
-rw-r--r-- | src/Toolbar.cc | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index c9de74c..6aab114 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -87,7 +87,7 @@ void FbTk::Resource<IconbarTool::DeiconifyMode>::setFromString(const char* strva | |||
87 | } | 87 | } |
88 | 88 | ||
89 | template<> | 89 | template<> |
90 | std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() { | 90 | std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() const { |
91 | switch (m_value) { | 91 | switch (m_value) { |
92 | case IconbarTool::SEMIFOLLOW: | 92 | case IconbarTool::SEMIFOLLOW: |
93 | return std::string("SemiFollow"); | 93 | return std::string("SemiFollow"); |
@@ -119,7 +119,7 @@ void FbTk::Resource<IconbarTool::WheelMode>::setFromString(const char* strval) { | |||
119 | 119 | ||
120 | 120 | ||
121 | template<> | 121 | template<> |
122 | std::string FbTk::Resource<IconbarTool::WheelMode>::getString() { | 122 | std::string FbTk::Resource<IconbarTool::WheelMode>::getString() const { |
123 | switch(m_value) { | 123 | switch(m_value) { |
124 | case IconbarTool::ON: | 124 | case IconbarTool::ON: |
125 | return std::string("On"); | 125 | return std::string("On"); |
@@ -137,7 +137,7 @@ void FbTk::Resource<Container::Alignment>::setDefaultValue() { | |||
137 | } | 137 | } |
138 | 138 | ||
139 | template<> | 139 | template<> |
140 | string FbTk::Resource<Container::Alignment>::getString() { | 140 | string FbTk::Resource<Container::Alignment>::getString() const { |
141 | switch (m_value) { | 141 | switch (m_value) { |
142 | case Container::LEFT: | 142 | case Container::LEFT: |
143 | return string("Left"); | 143 | return string("Left"); |
@@ -162,7 +162,7 @@ void FbTk::Resource<Container::Alignment>::setFromString(const char *str) { | |||
162 | } | 162 | } |
163 | 163 | ||
164 | template<> | 164 | template<> |
165 | string FbTk::Resource<IconbarTool::Mode>::getString() { | 165 | string FbTk::Resource<IconbarTool::Mode>::getString() const { |
166 | 166 | ||
167 | switch (m_value) { | 167 | switch (m_value) { |
168 | case IconbarTool::NONE: | 168 | case IconbarTool::NONE: |
@@ -721,8 +721,8 @@ void IconbarTool::renderTheme() { | |||
721 | m_icon_container.height(), | 721 | m_icon_container.height(), |
722 | m_theme.unfocusedTexture()); | 722 | m_theme.unfocusedTexture()); |
723 | m_unfocused_err_pm = m_screen.imageControl().renderImage(icon_width+1, | 723 | m_unfocused_err_pm = m_screen.imageControl().renderImage(icon_width+1, |
724 | m_icon_container.height(), | 724 | m_icon_container.height(), |
725 | m_theme.unfocusedTexture()); | 725 | m_theme.unfocusedTexture()); |
726 | } | 726 | } |
727 | if (tmp) | 727 | if (tmp) |
728 | m_screen.imageControl().removeImage(tmp); | 728 | m_screen.imageControl().removeImage(tmp); |
diff --git a/src/Resources.cc b/src/Resources.cc index ae0d72a..ff4f3f2 100644 --- a/src/Resources.cc +++ b/src/Resources.cc | |||
@@ -111,13 +111,13 @@ setFromString(const char *strval) { | |||
111 | //----------------------------------------------------------------- | 111 | //----------------------------------------------------------------- |
112 | template<> | 112 | template<> |
113 | std::string FbTk::Resource<bool>:: | 113 | std::string FbTk::Resource<bool>:: |
114 | getString() { | 114 | getString() const { |
115 | return std::string(**this == true ? "true" : "false"); | 115 | return std::string(**this == true ? "true" : "false"); |
116 | } | 116 | } |
117 | 117 | ||
118 | template<> | 118 | template<> |
119 | std::string FbTk::Resource<int>:: | 119 | std::string FbTk::Resource<int>:: |
120 | getString() { | 120 | getString() const { |
121 | char strval[256]; | 121 | char strval[256]; |
122 | sprintf(strval, "%d", **this); | 122 | sprintf(strval, "%d", **this); |
123 | return std::string(strval); | 123 | return std::string(strval); |
@@ -125,12 +125,12 @@ getString() { | |||
125 | 125 | ||
126 | template<> | 126 | template<> |
127 | std::string FbTk::Resource<std::string>:: | 127 | std::string FbTk::Resource<std::string>:: |
128 | getString() { return **this; } | 128 | getString() const { return **this; } |
129 | 129 | ||
130 | 130 | ||
131 | template<> | 131 | template<> |
132 | std::string FbTk::Resource<Fluxbox::TitlebarList>:: | 132 | std::string FbTk::Resource<Fluxbox::TitlebarList>:: |
133 | getString() { | 133 | getString() const { |
134 | string retval; | 134 | string retval; |
135 | int size=m_value.size(); | 135 | int size=m_value.size(); |
136 | for (int i=0; i<size; i++) { | 136 | for (int i=0; i<size; i++) { |
@@ -164,7 +164,7 @@ getString() { | |||
164 | 164 | ||
165 | template<> | 165 | template<> |
166 | std::string FbTk::Resource<Fluxbox::TabsAttachArea>:: | 166 | std::string FbTk::Resource<Fluxbox::TabsAttachArea>:: |
167 | getString() { | 167 | getString() const { |
168 | if (m_value == Fluxbox::ATTACH_AREA_TITLEBAR) | 168 | if (m_value == Fluxbox::ATTACH_AREA_TITLEBAR) |
169 | return "Titlebar"; | 169 | return "Titlebar"; |
170 | else | 170 | else |
@@ -173,7 +173,7 @@ getString() { | |||
173 | 173 | ||
174 | template<> | 174 | template<> |
175 | string FbTk::Resource<unsigned int>:: | 175 | string FbTk::Resource<unsigned int>:: |
176 | getString() { | 176 | getString() const { |
177 | char tmpstr[128]; | 177 | char tmpstr[128]; |
178 | sprintf(tmpstr, "%ul", m_value); | 178 | sprintf(tmpstr, "%ul", m_value); |
179 | return string(tmpstr); | 179 | return string(tmpstr); |
@@ -181,7 +181,7 @@ getString() { | |||
181 | 181 | ||
182 | template<> | 182 | template<> |
183 | string FbTk::Resource<long long>:: | 183 | string FbTk::Resource<long long>:: |
184 | getString() { | 184 | getString() const { |
185 | char tmpstr[128]; | 185 | char tmpstr[128]; |
186 | sprintf(tmpstr, "%llu", (unsigned long long) m_value); | 186 | sprintf(tmpstr, "%llu", (unsigned long long) m_value); |
187 | return string(tmpstr); | 187 | return string(tmpstr); |
@@ -214,7 +214,7 @@ setFromString(const char *strval) { | |||
214 | 214 | ||
215 | template<> | 215 | template<> |
216 | string FbTk::Resource<Fluxbox::Layer>:: | 216 | string FbTk::Resource<Fluxbox::Layer>:: |
217 | getString() { | 217 | getString() const { |
218 | 218 | ||
219 | if (m_value.getNum() == Fluxbox::instance()->getMenuLayer()) | 219 | if (m_value.getNum() == Fluxbox::instance()->getMenuLayer()) |
220 | return string("Menu"); | 220 | return string("Menu"); |
@@ -245,7 +245,7 @@ setFromString(const char *strval) { | |||
245 | 245 | ||
246 | template<> | 246 | template<> |
247 | string FbTk::Resource<long>:: | 247 | string FbTk::Resource<long>:: |
248 | getString() { | 248 | getString() const { |
249 | char tmpstr[128]; | 249 | char tmpstr[128]; |
250 | sprintf(tmpstr, "%ld", m_value); | 250 | sprintf(tmpstr, "%ld", m_value); |
251 | return string(tmpstr); | 251 | return string(tmpstr); |
diff --git a/src/Slit.cc b/src/Slit.cc index 6656dec..a5840e6 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -115,7 +115,7 @@ void FbTk::Resource<Slit::Direction>::setFromString(const char *strval) { | |||
115 | } | 115 | } |
116 | 116 | ||
117 | template<> | 117 | template<> |
118 | string FbTk::Resource<Slit::Placement>::getString() { | 118 | string FbTk::Resource<Slit::Placement>::getString() const { |
119 | switch (m_value) { | 119 | switch (m_value) { |
120 | case Slit::TOPLEFT: | 120 | case Slit::TOPLEFT: |
121 | return string("TopLeft"); | 121 | return string("TopLeft"); |
@@ -147,7 +147,7 @@ string FbTk::Resource<Slit::Placement>::getString() { | |||
147 | } | 147 | } |
148 | 148 | ||
149 | template<> | 149 | template<> |
150 | string FbTk::Resource<Slit::Direction>::getString() { | 150 | string FbTk::Resource<Slit::Direction>::getString() const { |
151 | switch (m_value) { | 151 | switch (m_value) { |
152 | case Slit::VERTICAL: | 152 | case Slit::VERTICAL: |
153 | return string("Vertical"); | 153 | return string("Vertical"); |
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 9361a4c..882857b 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -106,7 +106,7 @@ setFromString(const char *strval) { | |||
106 | 106 | ||
107 | template<> | 107 | template<> |
108 | string FbTk::Resource<Toolbar::Placement>:: | 108 | string FbTk::Resource<Toolbar::Placement>:: |
109 | getString() { | 109 | getString() const { |
110 | switch (m_value) { | 110 | switch (m_value) { |
111 | case Toolbar::TOPLEFT: | 111 | case Toolbar::TOPLEFT: |
112 | return string("TopLeft"); | 112 | return string("TopLeft"); |