diff options
Diffstat (limited to 'src/Remember.cc')
-rw-r--r-- | src/Remember.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Remember.cc b/src/Remember.cc index 9783c17..d92b4ec 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: Remember.cc,v 1.7 2003/04/26 14:36:21 rathnor Exp $ | 23 | // $Id: Remember.cc,v 1.8 2003/04/26 18:56:39 fluxgen Exp $ |
24 | 24 | ||
25 | #include "Remember.hh" | 25 | #include "Remember.hh" |
26 | #include "StringUtil.hh" | 26 | #include "StringUtil.hh" |
@@ -207,10 +207,12 @@ int Remember::parseApp(ifstream &file, Application *a) { | |||
207 | if (line[0] != '#') { //the line is commented | 207 | if (line[0] != '#') { //the line is commented |
208 | int parse_pos = 0, err = 0; | 208 | int parse_pos = 0, err = 0; |
209 | string str_key, str_label; | 209 | string str_key, str_label; |
210 | err = StringUtil::getStringBetween(str_key, line.c_str(), '[', ']'); | 210 | err = FbTk::StringUtil::getStringBetween(str_key, |
211 | line.c_str(), | ||
212 | '[', ']'); | ||
211 | if (err > 0 ) { | 213 | if (err > 0 ) { |
212 | parse_pos += err; | 214 | parse_pos += err; |
213 | err = StringUtil::getStringBetween(str_label, | 215 | err = FbTk::StringUtil::getStringBetween(str_label, |
214 | line.c_str() + parse_pos, | 216 | line.c_str() + parse_pos, |
215 | '{', '}'); | 217 | '{', '}'); |
216 | if (err>0) { | 218 | if (err>0) { |
@@ -308,12 +310,16 @@ void Remember::load() { | |||
308 | continue; | 310 | continue; |
309 | string key; | 311 | string key; |
310 | int pos=0; | 312 | int pos=0; |
311 | int err = StringUtil::getStringBetween(key, line.c_str(), '[', ']'); | 313 | int err = FbTk::StringUtil::getStringBetween(key, |
314 | line.c_str(), | ||
315 | '[', ']'); | ||
312 | 316 | ||
313 | if (err >0 && key == "app") { | 317 | if (err >0 && key == "app") { |
314 | pos += err; | 318 | pos += err; |
315 | string label; | 319 | string label; |
316 | err = StringUtil::getStringBetween(label, line.c_str()+pos, '(', ')'); | 320 | err = FbTk::StringUtil::getStringBetween(label, |
321 | line.c_str()+pos, | ||
322 | '(', ')'); | ||
317 | if (err>0) { | 323 | if (err>0) { |
318 | Application *a; | 324 | Application *a; |
319 | Apps::iterator i = apps.find(label); | 325 | Apps::iterator i = apps.find(label); |