aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:31:28 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:10:41 (GMT)
commitfadff675a5163dea6f78c53d7b157faed42f02ec (patch)
tree3ea24f6ca29427d1a8c745b78d61f5d1c5df2df0
parent7376858970d89e034af50c75f752d2cdde1b80f9 (diff)
downloadfluxbox_paul-fadff675a5163dea6f78c53d7b157faed42f02ec.zip
fluxbox_paul-fadff675a5163dea6f78c53d7b157faed42f02ec.tar.bz2
Vector resources can now specify which char to use as delimiters
when saving/loading to/from string representation. This is needed for the next commit.
-rw-r--r--src/FbTk/ResTraits.hh4
-rw-r--r--src/Window.cc3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/FbTk/ResTraits.hh b/src/FbTk/ResTraits.hh
index 3ee4464..3284801 100644
--- a/src/FbTk/ResTraits.hh
+++ b/src/FbTk/ResTraits.hh
@@ -160,7 +160,7 @@ struct EnumTraits {
160 } 160 }
161}; 161};
162 162
163template<typename Traits> 163template<typename Traits, const char *delim>
164struct VectorTraits { 164struct VectorTraits {
165 typedef std::vector<typename Traits::Type> Type; 165 typedef std::vector<typename Traits::Type> Type;
166 static std::string toString(const Type &x) { 166 static std::string toString(const Type &x) {
@@ -186,7 +186,7 @@ struct VectorTraits {
186 186
187 static Type fromString(const std::string &x) { 187 static Type fromString(const std::string &x) {
188 std::vector<std::string> val; 188 std::vector<std::string> val;
189 StringUtil::stringtok(val, x); 189 StringUtil::stringtok(val, x, delim);
190 Type retval; 190 Type retval;
191 191
192 for(size_t i = 0; i < val.size(); i++) { 192 for(size_t i = 0; i < val.size(); i++) {
diff --git a/src/Window.cc b/src/Window.cc
index 64f2fce..19f6fae 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -251,9 +251,10 @@ private:
251 int m_mode; 251 int m_mode;
252}; 252};
253 253
254extern const char win_buttons_delim[] = " \t\n";
254typedef FbTk::Resource< 255typedef FbTk::Resource<
255 vector<WinButton::Type>, 256 vector<WinButton::Type>,
256 FbTk::VectorTraits<FbTk::EnumTraits<WinButton::Type> > 257 FbTk::VectorTraits<FbTk::EnumTraits<WinButton::Type>, win_buttons_delim>
257> WinButtonsResource; 258> WinButtonsResource;
258 259
259} 260}