anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kill warning: string::npos was the wrong type, and does not reflect what

Browse Source 
max is supposed to be.

JMarc: I assume you are intending to use this new method, getLongArg()?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32770 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-01-05 15:01:32 +00:00
parent dabac3c61f
commit 1ba5857f26
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/FuncRequest.cpp
View File

@ -15,6 +15,7 @@
#include "support/lstrings.h"
#include <climits>
#include <iostream>
#include <sstream>
#include <vector>
@ -76,7 +77,12 @@ mouse_button::state FuncRequest::button() const
namespace {
void splitArg(vector<string> & args, string const & str, unsigned int max)
// Extracts arguments from str into args. Arguments are delimted by
// whitespace or by double quotes.
// We extract at most max arguments, treating the last argument as
// continuing to eol.
void splitArg(vector<string> & args, string const & str,
unsigned int max = UINT_MAX)
{
istringstream is(str);
while (is) {
@ -92,8 +98,10 @@ void splitArg(vector<string> & args, string const & str, unsigned int max)
is >> c;
if (is) {
if (c == '"')
// get quote delimited argument
getline(is, s, '"');
else {
// get whitespace delimited argument
is.putback(c);
is >> s;
}
@ -107,7 +115,7 @@ void splitArg(vector<string> & args, string const & str, unsigned int max)
string FuncRequest::getArg(unsigned int i) const
{
vector<string> args;
splitArg(args, to_utf8(argument_), string::npos);
splitArg(args, to_utf8(argument_));
return i < args.size() ? args[i] : string();
}