nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid code duplication

Browse source
This commit is contained in:
Mathias Gumz 2010-09-08 21:43:38 +02:00
parent b76be98227
commit 48cc67965b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Remember.cc
View file

@ -360,7 +360,7 @@ bool handleStartupItem(const string &line, int offset) {
if (pos > 0) { if (pos > 0) {
option = str.substr(0, pos); option = str.substr(0, pos);
if (strcasecmp(option.c_str(), "screen") == 0) { if (strcasecmp(option.c_str(), "screen") == 0) {
error = !getuint(str.c_str() + pos + 1, screen); error = !FbTk::StringUtil::extractNumber(str.c_str() + pos + 1, screen);
} else { } else {
error = true; error = true;
} }
@ -453,13 +453,13 @@ int parseApp(ifstream &file, Application &app, string *first_line = 0) {
if (str_key == "workspace") { if (str_key == "workspace") {
unsigned int w; unsigned int w;
if (getuint(str_label.c_str(), w)) if (FbTk::StringUtil::extractNumber(str_label, w))
app.rememberWorkspace(w); app.rememberWorkspace(w);
else else
had_error = true; had_error = true;
} else if (str_key == "head") { } else if (str_key == "head") {
unsigned int h; unsigned int h;
if (getuint(str_label.c_str(), h)) if (FbTk::StringUtil::extractNumber(str_label, h))
app.rememberHead(h); app.rememberHead(h);
else else
had_error = true; had_error = true;