tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make stringtotokens use vector

Browse Source
This commit is contained in:
Jean-Francois Dockes
2010-09-13 14:17:22 +02:00
parent c4a818fc64
commit e327ea0b4e
10 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/guiutils.cpp
+2 -2
View File
@@ -208,9 +208,9 @@ void rwSettings(bool writing)
prefs.allExtraDbs = g_dynconf->getStringList(allEdbsSk);
const char *cp;
if ((cp = getenv("RECOLL_EXTRA_DBS")) != 0) {
list<string> dbl;
vector<string> dbl;
stringToTokens(cp, dbl, ":");
for (list<string>::iterator dit = dbl.begin(); dit != dbl.end();
for (vector<string>::iterator dit = dbl.begin(); dit != dbl.end();
dit++) {
string dbdir = path_canon(*dit);
path_catslash(dbdir);
src/qtgui/rclmain_w.cpp
+2 -2
View File
@@ -946,7 +946,7 @@ static bool lookForHtmlBrowser(string &exefile)
{
static const char *htmlbrowserlist =
"opera konqueror firefox mozilla netscape epiphany";
list<string> blist;
vector<string> blist;
stringToTokens(htmlbrowserlist, blist, " ");
const char *path = getenv("PATH");
@@ -954,7 +954,7 @@ static bool lookForHtmlBrowser(string &exefile)
path = "/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin";
// Look for each browser
for (list<string>::const_iterator bit = blist.begin();
for (vector<string>::const_iterator bit = blist.begin();
bit != blist.end(); bit++) {
if (ExecCmd::which(*bit, exefile, path))
return true;