mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Get rid of lyxstring, remove usage of STRCONV.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7751 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
5c4bfd0354
commit
cd03e2b7db
@ -185,6 +185,7 @@ src/mathed/ref_inset.C
|
||||
src/paragraph.C
|
||||
src/paragraph_funcs.C
|
||||
src/rowpainter.C
|
||||
src/support/path_defines.C
|
||||
src/text.C
|
||||
src/text2.C
|
||||
src/text3.C
|
||||
|
||||
@ -1,3 +1,24 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* Chktex.C
|
||||
* LaTeX.C
|
||||
* LaTeXFeatures.C
|
||||
* ParagraphParameters.C
|
||||
* Spacing.C
|
||||
* buffer.C
|
||||
* bufferparams.C
|
||||
* bufferview_funcs.C
|
||||
* chset.C
|
||||
* counters.C
|
||||
* funcrequest.C
|
||||
* lyxfont.C
|
||||
* lyxgluelength.C
|
||||
* lyxlength.C
|
||||
* paragraph.C
|
||||
* paragraph_funcs.C
|
||||
* text3.C
|
||||
* vc-backend.C: remove usage of STRCONV
|
||||
|
||||
2003-09-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* rowpainter.C (paintLengthMarker, paintPageBreak, paintAppendixStart):
|
||||
|
||||
@ -64,7 +64,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
|
||||
string const tmp = OnlyFilename(ChangeExtension(file, ".log"));
|
||||
|
||||
#if USE_BOOST_FORMAT
|
||||
boost::format msg(STRCONV(_("ChkTeX warning id # %1$d")));
|
||||
boost::format msg(_("ChkTeX warning id # %1$d"));
|
||||
#else
|
||||
string const msg(_("ChkTeX warning id # "));
|
||||
#endif
|
||||
@ -85,7 +85,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
|
||||
|
||||
#if USE_BOOST_FORMAT
|
||||
msg % warno;
|
||||
terr.insertError(lineno, STRCONV(msg.str()), warning);
|
||||
terr.insertError(lineno, msg.str(), warning);
|
||||
msg.clear();
|
||||
#else
|
||||
terr.insertError(lineno, msg + warno, warning);
|
||||
|
||||
60
src/LaTeX.C
60
src/LaTeX.C
@ -48,6 +48,10 @@ using lyx::support::suffixIs;
|
||||
using lyx::support::Systemcall;
|
||||
using lyx::support::unlink;
|
||||
|
||||
using boost::regex;
|
||||
using boost::smatch;
|
||||
|
||||
|
||||
#ifndef CXX_GLOBAL_CSTD
|
||||
using std::sscanf;
|
||||
#endif
|
||||
@ -59,15 +63,6 @@ using std::ifstream;
|
||||
using std::set;
|
||||
using std::vector;
|
||||
|
||||
using boost::regex;
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
using boost::smatch;
|
||||
#else
|
||||
using boost::cmatch;
|
||||
#endif
|
||||
|
||||
|
||||
// TODO: in no particular order
|
||||
// - get rid of the extern BufferList and the call to
|
||||
// BufferList::updateIncludedTeXfiles, this should either
|
||||
@ -456,13 +451,9 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
|
||||
|
||||
while (getline(ifs, token)) {
|
||||
token = rtrim(token, "\r");
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
smatch sub;
|
||||
#else
|
||||
cmatch sub;
|
||||
#endif
|
||||
if (regex_match(STRCONV(token), sub, reg1)) {
|
||||
string data = STRCONV(sub.str(1));
|
||||
if (regex_match(token, sub, reg1)) {
|
||||
string data = sub.str(1);
|
||||
while (!data.empty()) {
|
||||
string citation;
|
||||
data = split(data, citation, ',');
|
||||
@ -470,8 +461,8 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
|
||||
<< citation << endl;
|
||||
aux_info.citations.insert(citation);
|
||||
}
|
||||
} else if (regex_match(STRCONV(token), sub, reg2)) {
|
||||
string data = sub.STRCONV(str(1));
|
||||
} else if (regex_match(token, sub, reg2)) {
|
||||
string data = sub.str(1);
|
||||
// data is now all the bib files separated by ','
|
||||
// get them one by one and pass them to the helper
|
||||
while (!data.empty()) {
|
||||
@ -482,16 +473,16 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
|
||||
<< database << '\'' << endl;
|
||||
aux_info.databases.insert(database);
|
||||
}
|
||||
} else if (regex_match(STRCONV(token), sub, reg3)) {
|
||||
string style = STRCONV(sub.str(1));
|
||||
} else if (regex_match(token, sub, reg3)) {
|
||||
string style = sub.str(1);
|
||||
// token is now the style file
|
||||
// pass it to the helper
|
||||
style = ChangeExtension(style, "bst");
|
||||
lyxerr[Debug::LATEX] << "BibTeX style: `"
|
||||
<< style << '\'' << endl;
|
||||
aux_info.styles.insert(style);
|
||||
} else if (regex_match(STRCONV(token), sub, reg4)) {
|
||||
string const file2 = STRCONV(sub.str(1));
|
||||
} else if (regex_match(token, sub, reg4)) {
|
||||
string const file2 = sub.str(1);
|
||||
scanAuxFile(file2, aux_info);
|
||||
}
|
||||
}
|
||||
@ -711,21 +702,18 @@ void LaTeX::deplog(DepTable & head)
|
||||
token = rtrim(token, "\r");
|
||||
if (token.empty()) continue;
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
smatch sub;
|
||||
#else
|
||||
cmatch sub;
|
||||
#endif
|
||||
if (regex_match(STRCONV(token), sub, reg1)) {
|
||||
foundfile = STRCONV(sub.str(1));
|
||||
} else if (regex_match(STRCONV(token), sub, reg2)) {
|
||||
foundfile = STRCONV(sub.str(1));
|
||||
} else if (regex_match(STRCONV(token), sub, reg3)) {
|
||||
foundfile = STRCONV(sub.str(1));
|
||||
} else if (regex_match(STRCONV(token), sub, reg4)) {
|
||||
foundfile = STRCONV(sub.str(1));
|
||||
} else if (regex_match(STRCONV(token), sub, reg5)) {
|
||||
foundfile = STRCONV(sub.str(1));
|
||||
|
||||
if (regex_match(token, sub, reg1)) {
|
||||
foundfile = sub.str(1);
|
||||
} else if (regex_match(token, sub, reg2)) {
|
||||
foundfile = sub.str(1);
|
||||
} else if (regex_match(token, sub, reg3)) {
|
||||
foundfile = sub.str(1);
|
||||
} else if (regex_match(token, sub, reg4)) {
|
||||
foundfile = sub.str(1);
|
||||
} else if (regex_match(token, sub, reg5)) {
|
||||
foundfile = sub.str(1);
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
@ -758,7 +746,7 @@ void LaTeX::deplog(DepTable & head)
|
||||
// (2) foundfile is in the tmpdir
|
||||
// insert it into head
|
||||
else if (FileInfo(OnlyFilename(foundfile)).exist()) {
|
||||
if (regex_match(STRCONV(foundfile), unwanted)) {
|
||||
if (regex_match(foundfile, unwanted)) {
|
||||
lyxerr[Debug::DEPEND]
|
||||
<< "We don't want "
|
||||
<< OnlyFilename(foundfile)
|
||||
|
||||
@ -159,7 +159,7 @@ string LaTeXFeatures::getLanguages() const
|
||||
++cit)
|
||||
languages << (*cit)->babel() << ',';
|
||||
|
||||
return STRCONV(languages.str());
|
||||
return languages.str();
|
||||
}
|
||||
|
||||
|
||||
@ -304,7 +304,7 @@ string const LaTeXFeatures::getPackages() const
|
||||
packages << "]{natbib}\n";
|
||||
}
|
||||
|
||||
return STRCONV(packages.str());
|
||||
return packages.str();
|
||||
}
|
||||
|
||||
|
||||
@ -373,7 +373,7 @@ string const LaTeXFeatures::getMacros() const
|
||||
// floats
|
||||
getFloatDefinitions(macros);
|
||||
|
||||
return STRCONV(macros.str());
|
||||
return macros.str();
|
||||
}
|
||||
|
||||
|
||||
@ -388,7 +388,7 @@ string const LaTeXFeatures::getBabelOptions() const
|
||||
if (!params.language->latex_options().empty())
|
||||
tmp << params.language->latex_options() << '\n';
|
||||
|
||||
return STRCONV(tmp.str());
|
||||
return tmp.str();
|
||||
}
|
||||
|
||||
|
||||
@ -406,7 +406,7 @@ string const LaTeXFeatures::getTClassPreamble() const
|
||||
tcpreamble << tclass[*cit]->preamble();
|
||||
}
|
||||
|
||||
return STRCONV(tcpreamble.str());
|
||||
return tcpreamble.str();
|
||||
}
|
||||
|
||||
|
||||
@ -419,7 +419,7 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
|
||||
entities << "<!ENTITY lyxarrow \"->\">" << '\n';
|
||||
}
|
||||
|
||||
return STRCONV(entities.str());
|
||||
return entities.str();
|
||||
}
|
||||
|
||||
|
||||
@ -435,7 +435,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
|
||||
<< (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
|
||||
<< MakeRelPath(fi->second, basename) << "\">";
|
||||
|
||||
return STRCONV(sgmlpreamble.str());
|
||||
return sgmlpreamble.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -446,7 +446,7 @@ void ParagraphParameters::write(ostream & os) const
|
||||
|
||||
void setParagraphParams(BufferView & bv, string const & data)
|
||||
{
|
||||
istringstream is(STRCONV(data));
|
||||
istringstream is(data);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(is);
|
||||
|
||||
@ -495,5 +495,5 @@ void params2string(Paragraph const & par, string & data)
|
||||
/// is paragraph in inset
|
||||
os << "\\ininset " << (par.inInset()?1:0) << '\n';
|
||||
|
||||
data = STRCONV(os.str());
|
||||
data = os.str();
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ string const Spacing::writeEnvirBegin() const
|
||||
ostringstream ost;
|
||||
ost << "\\begin{spacing}{"
|
||||
<< getValue() << '}';
|
||||
return STRCONV(ost.str());
|
||||
return ost.str();
|
||||
}
|
||||
}
|
||||
return string();
|
||||
|
||||
@ -1053,7 +1053,7 @@ string const Buffer::asciiParagraph(Paragraph const & par,
|
||||
}
|
||||
}
|
||||
buffer << word;
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -337,7 +337,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
|
||||
}
|
||||
} else if (token == "\\author") {
|
||||
lex.nextToken();
|
||||
istringstream ss(STRCONV(lex.getString()));
|
||||
istringstream ss(lex.getString());
|
||||
Author a;
|
||||
ss >> a;
|
||||
author_map.push_back(pimpl_->authorlist.record(a));
|
||||
@ -700,7 +700,7 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features,
|
||||
clsoptions << options << ',';
|
||||
}
|
||||
|
||||
string strOptions(STRCONV(clsoptions.str()));
|
||||
string strOptions(clsoptions.str());
|
||||
if (!strOptions.empty()) {
|
||||
strOptions = rtrim(strOptions, ",");
|
||||
os << '[' << strOptions << ']';
|
||||
@ -977,7 +977,7 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features,
|
||||
if (!lyxrc.language_global_options
|
||||
&& tmp == "\\usepackage{babel}")
|
||||
tmp = string("\\usepackage[") +
|
||||
STRCONV(language_options.str()) +
|
||||
language_options.str() +
|
||||
"]{babel}";
|
||||
lyxpreamble += tmp + "\n";
|
||||
lyxpreamble += features.getBabelOptions();
|
||||
|
||||
@ -72,7 +72,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
|
||||
<< "color " << font.color() << '\n'
|
||||
<< "language " << lang << '\n'
|
||||
<< "toggleall " << tostr(toggle);
|
||||
data = STRCONV(os.str());
|
||||
data = os.str();
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -81,7 +81,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
|
||||
// If successful, returns true
|
||||
bool string2font(string const & data, LyXFont & font, bool & toggle)
|
||||
{
|
||||
istringstream is(STRCONV(data));
|
||||
istringstream is(data);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(is);
|
||||
|
||||
@ -370,7 +370,7 @@ string const currentState(BufferView * bv)
|
||||
state << _(", Inset: ") <<
|
||||
(text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1);
|
||||
#endif
|
||||
return STRCONV(state.str());
|
||||
return state.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
20
src/chset.C
20
src/chset.C
@ -25,6 +25,9 @@
|
||||
using lyx::support::atoi;
|
||||
using lyx::support::LibFileSearch;
|
||||
|
||||
using boost::regex;
|
||||
using boost::smatch;
|
||||
|
||||
using std::endl;
|
||||
using std::getline;
|
||||
using std::make_pair;
|
||||
@ -32,13 +35,6 @@ using std::make_pair;
|
||||
using std::ifstream;
|
||||
using std::pair;
|
||||
|
||||
using boost::regex;
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
using boost::smatch;
|
||||
#else
|
||||
using boost::cmatch;
|
||||
#endif
|
||||
|
||||
|
||||
bool CharacterSet::loadFile(string const & fname)
|
||||
@ -68,14 +64,10 @@ bool CharacterSet::loadFile(string const & fname)
|
||||
// without the use of a keyword table.
|
||||
regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
|
||||
while (getline(ifs, line)) {
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
smatch sub;
|
||||
#else
|
||||
cmatch sub;
|
||||
#endif
|
||||
if (regex_match(STRCONV(line), sub, reg)) {
|
||||
int const n = atoi(STRCONV(sub.str(1)));
|
||||
string const str = STRCONV(sub.str(2));
|
||||
if (regex_match(line, sub, reg)) {
|
||||
int const n = atoi(sub.str(1));
|
||||
string const str = sub.str(2);
|
||||
if (lyxerr.debugging(Debug::KBMAP))
|
||||
lyxerr << "Chardef: " << n
|
||||
<< " to [" << str << ']' << endl;
|
||||
|
||||
@ -198,7 +198,7 @@ namespace {
|
||||
|
||||
char loweralphaCounter(int n)
|
||||
{
|
||||
if (n < 1 || n > 26)
|
||||
if (n < 1 || n > 26)
|
||||
return '?';
|
||||
return 'a' + n - 1;
|
||||
}
|
||||
@ -288,6 +288,8 @@ string Counters::counterLabel(string const & format)
|
||||
{
|
||||
string label = format;
|
||||
while (true) {
|
||||
#warning Using boost::regex would make this code a lot simpler... (Lgb)
|
||||
|
||||
size_t const i = label.find('\\', 0);
|
||||
if (i == string::npos)
|
||||
break;
|
||||
@ -333,5 +335,5 @@ string Counters::enumLabel(string const & ctr, string const & langtype)
|
||||
os << alphaCounter(value("enumiv")) << '.';
|
||||
}
|
||||
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* ControlAboutlyx.C
|
||||
* ControlParagraph.C
|
||||
* biblio.C
|
||||
* tex_helpers.C: remove usage of STRCONV
|
||||
|
||||
2003-09-09 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* several files: change Assert to BOOST_ASSERT
|
||||
|
||||
@ -89,5 +89,5 @@ string const ControlAboutlyx::getVersion() const
|
||||
<< _("User directory: ")
|
||||
<< MakeDisplayPath(user_lyxdir());
|
||||
|
||||
return STRCONV(ss.str());
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ ControlParagraph::ControlParagraph(Dialog & parent)
|
||||
|
||||
bool ControlParagraph::initialiseParams(string const & data)
|
||||
{
|
||||
istringstream is(STRCONV(data));
|
||||
istringstream is(data);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(is);
|
||||
|
||||
@ -120,7 +120,7 @@ void ControlParagraph::dispatchParams()
|
||||
{
|
||||
ostringstream data;
|
||||
params().write(data);
|
||||
FuncRequest const fr(LFUN_PARAGRAPH_APPLY, STRCONV(data.str()));
|
||||
FuncRequest const fr(LFUN_PARAGRAPH_APPLY, data.str());
|
||||
kernel().dispatch(fr);
|
||||
}
|
||||
|
||||
|
||||
@ -239,7 +239,7 @@ string const getInfo(InfoMap const & map, string const & key)
|
||||
if (!year.empty())
|
||||
result << ", " << year;
|
||||
|
||||
string const result_str = rtrim(STRCONV(result.str()));
|
||||
string const result_str = rtrim(result.str());
|
||||
if (!result_str.empty())
|
||||
return result_str;
|
||||
|
||||
@ -265,7 +265,7 @@ string const escape_special_chars(string const & expr)
|
||||
// The '$' must be prefixed with the escape character '\' for
|
||||
// boost to treat it as a literal.
|
||||
// Thus, to prefix a matched expression with '\', we use:
|
||||
return STRCONV(reg.Merge(STRCONV(expr), "\\\\$&"));
|
||||
return reg.Merge(expr, "\\\\$&");
|
||||
}
|
||||
|
||||
|
||||
@ -276,7 +276,7 @@ struct RegexMatch
|
||||
// re and icase are used to construct an instance of boost::RegEx.
|
||||
// if icase is true, then matching is insensitive to case
|
||||
RegexMatch(InfoMap const & m, string const & re, bool icase)
|
||||
: map_(m), regex_(STRCONV(re), icase) {}
|
||||
: map_(m), regex_(re, icase) {}
|
||||
|
||||
bool operator()(string const & key) {
|
||||
if (!validRE())
|
||||
@ -291,7 +291,7 @@ struct RegexMatch
|
||||
|
||||
// Attempts to find a match for the current RE
|
||||
// somewhere in data.
|
||||
return regex_.Search(STRCONV(data));
|
||||
return regex_.Search(data);
|
||||
}
|
||||
|
||||
bool validRE() const { return regex_.error_code() == 0; }
|
||||
|
||||
@ -76,7 +76,7 @@ void getTexFileList(string const & filename, std::vector<string> & list)
|
||||
std::vector<string>::iterator it = list.begin();
|
||||
std::vector<string>::iterator end = list.end();
|
||||
for (; it != end; ++it) {
|
||||
*it = STRCONV(regex.Merge(STRCONV((*it)), "/"));
|
||||
*it = regex.Merge((*it), "/");
|
||||
}
|
||||
|
||||
lyx::eliminate_duplicates(list);
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* Color.C
|
||||
* FormMathsDelim.C
|
||||
* FormMathsMatrix.C
|
||||
* lyx_gui.C: remove usage of STRCONV
|
||||
|
||||
2003-09-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* xforms_helpers.C:
|
||||
|
||||
@ -79,7 +79,7 @@ string const X11hexname(RGBColor const & col)
|
||||
<< setw(2) << col.g
|
||||
<< setw(2) << col.b;
|
||||
|
||||
return STRCONV(ostr.str());
|
||||
return ostr.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ void FormMathsDelim::apply()
|
||||
|
||||
ostringstream os;
|
||||
os << delim_values[left] << ' ' << delim_values[right];
|
||||
controller().dispatchDelim(STRCONV(os.str()));
|
||||
controller().dispatchDelim(os.str());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ void FormMathsMatrix::apply()
|
||||
|
||||
ostringstream os;
|
||||
os << nx << ' ' << ny << ' ' << c << ' ' << sh;
|
||||
controller().dispatchMatrix(STRCONV(os.str()));
|
||||
controller().dispatchMatrix(os.str());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -347,7 +347,7 @@ string const hexname(LColor::color col)
|
||||
<< setw(2) << g
|
||||
<< setw(2) << b;
|
||||
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -111,7 +111,7 @@ void FuncRequest::errorMessage(string const & msg) const
|
||||
|
||||
void split(vector<string> & args, string str)
|
||||
{
|
||||
istringstream is(STRCONV(str));
|
||||
istringstream is(str);
|
||||
while (is) {
|
||||
char c;
|
||||
string s;
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* GraphicsConverter.C
|
||||
* PreviewLoader.C: remove usage of STRCONV
|
||||
|
||||
2003-09-14 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* PreviewLoader.C (remove): consider all InProgressProcesses when
|
||||
|
||||
@ -177,7 +177,7 @@ Converter::Impl::Impl(string const & from_file, string const & to_file_base,
|
||||
|
||||
lyxerr[Debug::GRAPHICS] << "\tConversion script:"
|
||||
<< "\n--------------------------------------\n"
|
||||
<< STRCONV(script.str())
|
||||
<< script.str()
|
||||
<< "\n--------------------------------------\n";
|
||||
|
||||
// Output the script to file.
|
||||
@ -189,7 +189,7 @@ Converter::Impl::Impl(string const & from_file, string const & to_file_base,
|
||||
if (!fs.good())
|
||||
return;
|
||||
|
||||
fs << STRCONV(script.str());
|
||||
fs << script.str();
|
||||
fs.close();
|
||||
|
||||
// The command needed to run the conversion process
|
||||
@ -259,7 +259,7 @@ string const move_file(string const & from_file, string const & to_file)
|
||||
<< "\t'rm' -f ${fromfile}\n"
|
||||
<< "}\n";
|
||||
|
||||
return STRCONV(command.str());
|
||||
return command.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -255,7 +255,7 @@ struct IncrementedFileName {
|
||||
{
|
||||
ostringstream os;
|
||||
os << base_ << counter_++ << '.' << to_format_;
|
||||
string const file = STRCONV(os.str());
|
||||
string const file = os.str();
|
||||
|
||||
return make_pair(snippet, file);
|
||||
}
|
||||
@ -480,7 +480,7 @@ void PreviewLoader::Impl::startLoading()
|
||||
cs << pconverter_->command << ' ' << latexfile << ' '
|
||||
<< int(font_scaling_factor_) << ' ' << pconverter_->to;
|
||||
|
||||
string const command = "sh " + support::LibScriptSearch(STRCONV(cs.str()));
|
||||
string const command = "sh " + support::LibScriptSearch(cs.str());
|
||||
|
||||
// Initiate the conversion from LaTeX to bitmap images files.
|
||||
support::Forkedcall::SignalTypePtr
|
||||
|
||||
@ -1,7 +1,20 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* insetcommand.C
|
||||
* insetexternal.C
|
||||
* insetfloat.C
|
||||
* insetgraphics.C
|
||||
* insetinclude.C
|
||||
* insetminipage.C
|
||||
* insetnote.C
|
||||
* insettabular.C
|
||||
* insetwrap.C: remove usage of STRCONV
|
||||
|
||||
2003-09-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* renderers.C (draw):
|
||||
* insetlatexaccent.C (draw): explicitly define the color passed to the painter.
|
||||
* insetlatexaccent.C (draw): explicitly define the color passed to
|
||||
the painter.
|
||||
|
||||
2003-09-10 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
|
||||
@ -213,7 +213,7 @@ string const InsetBranchMailer::params2string(string const & name,
|
||||
params.write(data);
|
||||
// Add all_branches parameter to data:
|
||||
data << params.branchlist.allBranches() << "\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
|
||||
@ -225,7 +225,7 @@ void InsetBranchMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
params.read(lex);
|
||||
|
||||
@ -140,7 +140,7 @@ void InsetCommandMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -170,5 +170,5 @@ string const InsetCommandMailer::params2string(string const & name,
|
||||
data << name << ' ';
|
||||
params.write(data);
|
||||
data << "\\end_inset\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -633,7 +633,7 @@ void InsetExternalMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -671,5 +671,5 @@ InsetExternalMailer::params2string(InsetExternal::Params const & params,
|
||||
data << name_ << ' ';
|
||||
inset.write(buffer, data);
|
||||
data << "\\end_inset\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -432,7 +432,7 @@ void InsetFloatMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -463,5 +463,5 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params)
|
||||
ostringstream data;
|
||||
data << name_ << ' ';
|
||||
params.write(data);
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -335,7 +335,7 @@ string const InsetGraphics::createLatexOptions() const
|
||||
if (!params().special.empty())
|
||||
options << params().special << ",\n";
|
||||
|
||||
string opts = STRCONV(options.str());
|
||||
string opts = options.str();
|
||||
// delete last ",\n"
|
||||
return opts.substr(0, opts.size() - 2);
|
||||
}
|
||||
@ -707,7 +707,7 @@ void InsetGraphicsMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -734,5 +734,5 @@ InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
|
||||
data << name_ << ' ';
|
||||
params.Write(data, buffer.filePath());
|
||||
data << "\\end_inset\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -608,7 +608,7 @@ string const InsetInclude::PreviewImpl::latexString() const
|
||||
runparams.flavor = LatexRunParams::LATEX;
|
||||
parent().latex(*view()->buffer(), os, runparams);
|
||||
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
@ -651,7 +651,7 @@ void InsetIncludeMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -688,5 +688,5 @@ InsetIncludeMailer::params2string(InsetInclude::Params const & params)
|
||||
data << name_ << ' ';
|
||||
inset.write(data);
|
||||
data << "\\end_inset\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -315,7 +315,7 @@ void InsetMinipageMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0, 0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -347,5 +347,5 @@ InsetMinipageMailer::params2string(InsetMinipage::Params const & params)
|
||||
ostringstream data;
|
||||
data << name_ << ' ';
|
||||
params.write(data);
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -275,7 +275,7 @@ string const InsetNoteMailer::params2string(string const & name,
|
||||
ostringstream data;
|
||||
data << name << ' ';
|
||||
params.write(data);
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
|
||||
@ -287,7 +287,7 @@ void InsetNoteMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
params.read(lex);
|
||||
|
||||
@ -2237,7 +2237,7 @@ bool InsetTabular::copySelection(BufferView * bv)
|
||||
ostringstream os;
|
||||
paste_tabular->ascii(*bv->buffer(), os,
|
||||
ownerPar(*bv->buffer(), this).params().depth(), true, '\t');
|
||||
bv->stuffClipboard(STRCONV(os.str()));
|
||||
bv->stuffClipboard(os.str());
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -2665,7 +2665,7 @@ string const InsetTabularMailer::inset2string(Buffer const &) const
|
||||
|
||||
int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
|
||||
{
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -2719,5 +2719,5 @@ string const InsetTabularMailer::params2string(InsetTabular const & inset)
|
||||
data << name_ << " \\active_cell " << inset.getActCell() << '\n';
|
||||
inset.write(buffer, data);
|
||||
data << "\\end_inset\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -272,7 +272,7 @@ void InsetWrapMailer::string2params(string const & in,
|
||||
if (in.empty())
|
||||
return;
|
||||
|
||||
istringstream data(STRCONV(in));
|
||||
istringstream data(in);
|
||||
LyXLex lex(0,0);
|
||||
lex.setStream(data);
|
||||
|
||||
@ -303,5 +303,5 @@ string const InsetWrapMailer::params2string(InsetWrapParams const & params)
|
||||
ostringstream data;
|
||||
data << name_ << ' ';
|
||||
params.write(data);
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -544,7 +544,7 @@ string const LyXFont::stateText(BufferParams * params) const
|
||||
os << bformat(_("Language: %1$s, "), _(language()->display()));
|
||||
if (number() != OFF)
|
||||
os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()]));
|
||||
return rtrim(STRCONV(os.str()), ", ");
|
||||
return rtrim(os.str(), ", ");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ string const LyXGlueLength::asString() const
|
||||
|
||||
if (plus_.zero() && minus_.zero()) {
|
||||
buffer << unit_name[len_.unit()];
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
// just len and plus
|
||||
@ -54,7 +54,7 @@ string const LyXGlueLength::asString() const
|
||||
buffer << unit_name[len_.unit()];
|
||||
buffer << '+' << plus_.value();
|
||||
buffer << unit_name[plus_.unit()];
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
// just len and minus
|
||||
@ -63,7 +63,7 @@ string const LyXGlueLength::asString() const
|
||||
buffer << unit_name[len_.unit()];
|
||||
buffer << '-' << minus_.value();
|
||||
buffer << unit_name[minus_.unit()];
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
// ok, len, plus AND minus
|
||||
@ -74,7 +74,7 @@ string const LyXGlueLength::asString() const
|
||||
buffer << unit_name[len_.unit()];
|
||||
buffer << "+-" << minus_.value();
|
||||
buffer << unit_name[minus_.unit()];
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
// this is so rare a case, why bother minimising units ?
|
||||
@ -83,7 +83,7 @@ string const LyXGlueLength::asString() const
|
||||
buffer << '+' << plus_.value() << unit_name[plus_.unit()];
|
||||
buffer << '-' << minus_.value() << unit_name[minus_.unit()];
|
||||
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ string const LyXGlueLength::asLatexString() const
|
||||
buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
|
||||
if (!minus_.zero())
|
||||
buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ string const LyXLength::asString() const
|
||||
{
|
||||
ostringstream buffer;
|
||||
buffer << val_ << unit_name[unit_]; // setw?
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
|
||||
@ -89,7 +89,7 @@ string const LyXLength::asLatexString() const
|
||||
buffer << val_ << unit_name[unit_]; // setw?
|
||||
break;
|
||||
}
|
||||
return STRCONV(buffer.str());
|
||||
return buffer.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,21 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* command_inset.C
|
||||
* formula.C
|
||||
* formulabase.C
|
||||
* formulamacro.C
|
||||
* math_arrayinset.C
|
||||
* math_autocorrect.C
|
||||
* math_cursor.C
|
||||
* math_extern.C
|
||||
* math_factory.C
|
||||
* math_gridinset.C
|
||||
* math_support.C: remove usage of STRCONV
|
||||
|
||||
2003-09-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* math_gridinset.C (draw): explicitly define the color to draw the line.
|
||||
* math_gridinset.C (draw): explicitly define the color to draw the
|
||||
line.
|
||||
|
||||
2003-09-12 André Pönitz <poenitz@gmx.net>
|
||||
|
||||
|
||||
@ -83,5 +83,5 @@ string const CommandInset::createDialogStr(string const & name) const
|
||||
WriteStream wsdata(data);
|
||||
write(wsdata);
|
||||
wsdata << "\n\\end_inset\n\n";
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
@ -317,5 +317,5 @@ string const InsetFormula::PreviewImpl::latexString() const
|
||||
ostringstream ls;
|
||||
WriteStream wi(ls, false, false);
|
||||
parent().par_->write(wi);
|
||||
return STRCONV(ls.str());
|
||||
return ls.str();
|
||||
}
|
||||
|
||||
@ -571,7 +571,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
|
||||
unsigned int n = 1;
|
||||
string v_align;
|
||||
string h_align;
|
||||
istringstream is(STRCONV(argument));
|
||||
istringstream is(argument);
|
||||
is >> m >> n >> v_align >> h_align;
|
||||
m = max(1u, m);
|
||||
n = max(1u, n);
|
||||
|
||||
@ -50,7 +50,7 @@ InsetFormulaMacro::InsetFormulaMacro
|
||||
|
||||
InsetFormulaMacro::InsetFormulaMacro(string const & s)
|
||||
{
|
||||
std::istringstream is(STRCONV(s));
|
||||
std::istringstream is(s);
|
||||
read(is);
|
||||
}
|
||||
|
||||
|
||||
@ -48,10 +48,10 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
|
||||
: MathGridInset(1, 1), name_(name)
|
||||
{
|
||||
vector< vector<string> > dat;
|
||||
istringstream is(STRCONV(str));
|
||||
istringstream is(str);
|
||||
string line;
|
||||
while (getline(is, line)) {
|
||||
istringstream ls(STRCONV(line));
|
||||
istringstream ls(line);
|
||||
typedef istream_iterator<string> iter;
|
||||
vector<string> v = vector<string>(iter(ls), iter());
|
||||
if (v.size())
|
||||
|
||||
@ -153,7 +153,7 @@ void initAutoCorrect()
|
||||
//lyxerr[Debug::MATHED] << "ignoring line '" << line << '\'' << endl;
|
||||
continue;
|
||||
}
|
||||
istringstream il(STRCONV(line));
|
||||
istringstream il(line);
|
||||
|
||||
//lyxerr[Debug::MATHED] << "line '" << line << '\'' << endl;
|
||||
Correction corr;
|
||||
|
||||
@ -1288,7 +1288,7 @@ string MathCursor::info() const
|
||||
if (hasPrevAtom())
|
||||
prevAtom()->infoize2(os);
|
||||
os << " ";
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -938,7 +938,7 @@ namespace {
|
||||
ostringstream os;
|
||||
MaximaStream ms(os);
|
||||
ms << ar;
|
||||
string expr = STRCONV(os.str());
|
||||
string expr = os.str();
|
||||
string const header = "SIMPSUM:true;";
|
||||
|
||||
string out;
|
||||
@ -1061,7 +1061,7 @@ namespace {
|
||||
ostringstream os;
|
||||
MapleStream ms(os);
|
||||
ms << ar;
|
||||
string expr = STRCONV(os.str());
|
||||
string expr = os.str();
|
||||
lyxerr << "ar: '" << ar << "'\n"
|
||||
<< "ms: '" << os.str() << "'" << endl;
|
||||
|
||||
@ -1109,7 +1109,7 @@ namespace {
|
||||
ostringstream os;
|
||||
OctaveStream vs(os);
|
||||
vs << ar;
|
||||
string expr = STRCONV(os.str());
|
||||
string expr = os.str();
|
||||
string out;
|
||||
|
||||
lyxerr << "pipe: ar: '" << ar << "'\n"
|
||||
@ -1193,7 +1193,7 @@ MathArray pipeThroughExtern(string const & lang, string const & extra,
|
||||
os << '[' << extra << ' ';
|
||||
ns << ar;
|
||||
os << ']';
|
||||
string data = STRCONV(os.str());
|
||||
string data = os.str();
|
||||
|
||||
// search external script
|
||||
string file = LibFileSearch("mathed", "extern_" + lang);
|
||||
|
||||
@ -118,7 +118,7 @@ void initSymbols()
|
||||
|
||||
// special case of iffont/else/endif
|
||||
if (line.size() >= 7 && line.substr(0, 6) == "iffont") {
|
||||
istringstream is(STRCONV(line));
|
||||
istringstream is(line);
|
||||
string tmp;
|
||||
is >> tmp;
|
||||
is >> tmp;
|
||||
@ -135,12 +135,12 @@ void initSymbols()
|
||||
// special case of pre-defined macros
|
||||
if (line.size() > 8 && line.substr(0, 5) == "\\def\\") {
|
||||
//lyxerr << "defining: '" << line << '\'' << endl;
|
||||
istringstream is(STRCONV(line));
|
||||
istringstream is(line);
|
||||
MathMacroTable::create(MathAtom(new MathMacroTemplate(is)));
|
||||
continue;
|
||||
}
|
||||
|
||||
istringstream is(STRCONV(line));
|
||||
istringstream is(line);
|
||||
latexkeys tmp;
|
||||
is >> tmp.name >> tmp.inset;
|
||||
if (isFontName(tmp.inset))
|
||||
|
||||
@ -50,7 +50,7 @@ public:
|
||||
data << name() << " active_cell " << 0 << '\n';
|
||||
WriteStream ws(data);
|
||||
inset_.write(ws);
|
||||
return STRCONV(data.str());
|
||||
return data.str();
|
||||
}
|
||||
|
||||
protected:
|
||||
@ -1098,7 +1098,7 @@ dispatch_result MathGridInset::dispatch
|
||||
|
||||
case LFUN_TABULAR_FEATURE: {
|
||||
//lyxerr << "handling tabular-feature " << cmd.argument << endl;
|
||||
istringstream is(STRCONV(cmd.argument));
|
||||
istringstream is(cmd.argument);
|
||||
string s;
|
||||
is >> s;
|
||||
if (s == "valign-top")
|
||||
|
||||
@ -697,7 +697,7 @@ string asString(MathArray const & ar)
|
||||
std::ostringstream os;
|
||||
WriteStream ws(os);
|
||||
ws << ar;
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1160,7 +1160,7 @@ string const Paragraph::asString(Buffer const & buffer,
|
||||
getInset(i)->ascii(buffer, os);
|
||||
}
|
||||
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -968,14 +968,14 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
|
||||
change = Change(Change::UNCHANGED);
|
||||
} else if (token == "\\change_inserted") {
|
||||
lex.nextToken();
|
||||
istringstream is(STRCONV(lex.getString()));
|
||||
istringstream is(lex.getString());
|
||||
int aid;
|
||||
lyx::time_type ct;
|
||||
is >> aid >> ct;
|
||||
change = Change(Change::INSERTED, bp.author_map[aid], ct);
|
||||
} else if (token == "\\change_deleted") {
|
||||
lex.nextToken();
|
||||
istringstream is(STRCONV(lex.getString()));
|
||||
istringstream is(lex.getString());
|
||||
int aid;
|
||||
lyx::time_type ct;
|
||||
is >> aid >> ct;
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
2003-09-15 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* tostr.C:
|
||||
* lstrings.C:
|
||||
* filetools.C: Remove usage of STRCONV
|
||||
|
||||
* Makefile.am (libsupport_la_SOURCES): remove lyxstring.C and
|
||||
lyxstring.h
|
||||
|
||||
* std_string.h: modify to always work with std::string, but if
|
||||
with-included-string then use it through namespace lyx. Remove
|
||||
STRCONV.
|
||||
|
||||
* lyxstring.[Ch]: remove files
|
||||
|
||||
2003-09-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* translator.h: add #include <boost/assert.hpp>, so that the template is
|
||||
@ -5,7 +20,7 @@
|
||||
|
||||
2003-09-11 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* cow_ptr.h:
|
||||
* cow_ptr.h:
|
||||
* copied_ptr.h: added to the repository. Maybe temporarily.
|
||||
|
||||
2003-09-09 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
@ -6,12 +6,7 @@ CLEANFILES = path_defines.C
|
||||
|
||||
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
|
||||
|
||||
EXTRA_DIST = path_defines.C.in lyxstring.C lyxstring.h \
|
||||
os_unix.C os_win32.C os_os2.C
|
||||
|
||||
if USE_LYXSTRING
|
||||
LYXSTRING = lyxstring.C lyxstring.h
|
||||
endif
|
||||
EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
|
||||
|
||||
if USE_COMPRESSION
|
||||
COMPRESSION = gzstream.C gzstream.h
|
||||
@ -55,7 +50,7 @@ libsupport_la_SOURCES = \
|
||||
lyxmanip.h \
|
||||
lyxtime.C \
|
||||
lyxtime.h \
|
||||
$(LYXSTRING) lyxsum.C \
|
||||
lyxsum.C \
|
||||
mkdir.C \
|
||||
nt_defines.h \
|
||||
os.C \
|
||||
|
||||
@ -693,7 +693,7 @@ string const NormalizePath(string const & path)
|
||||
|
||||
// Normalise paths like /foo//bar ==> /foo/bar
|
||||
boost::RegEx regex("/{2,}");
|
||||
RTemp = STRCONV(regex.Merge(STRCONV(RTemp), "/"));
|
||||
RTemp = regex.Merge(RTemp, "/");
|
||||
|
||||
while (!RTemp.empty()) {
|
||||
// Split by next /
|
||||
@ -729,7 +729,7 @@ string const GetFileContents(string const & fname)
|
||||
if (ifs && ofs) {
|
||||
ofs << ifs.rdbuf();
|
||||
ifs.close();
|
||||
return STRCONV(ofs.str());
|
||||
return ofs.str();
|
||||
}
|
||||
}
|
||||
lyxerr << "LyX was not able to read file '" << fname << '\'' << endl;
|
||||
|
||||
@ -399,8 +399,8 @@ bool regexMatch(string const & a, string const & pattern)
|
||||
string regex(pattern);
|
||||
regex = subst(regex, ".", "\\.");
|
||||
regex = subst(regex, "*", ".*");
|
||||
boost::regex reg(STRCONV(regex));
|
||||
return boost::regex_match(STRCONV(a), reg);
|
||||
boost::regex reg(regex);
|
||||
return boost::regex_match(a, reg);
|
||||
}
|
||||
|
||||
|
||||
@ -616,45 +616,40 @@ string const getStringFromVector(vector<string> const & vec,
|
||||
|
||||
string bformat(string const & fmt, string const & arg1)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)).str());
|
||||
return (boost::format(fmt) % arg1).str();
|
||||
}
|
||||
|
||||
|
||||
string bformat(string const & fmt, string const & arg1, string const & arg2)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
|
||||
% STRCONV(arg2)).str());
|
||||
return (boost::format(fmt) % arg1 % arg2).str();
|
||||
}
|
||||
|
||||
|
||||
string bformat(string const & fmt, int arg1, int arg2)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % arg1 % arg2).str());
|
||||
return (boost::format(fmt) % arg1 % arg2).str();
|
||||
}
|
||||
|
||||
|
||||
string bformat(string const & fmt, string const & arg1, string const & arg2,
|
||||
string const & arg3)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
|
||||
% STRCONV(arg2) % STRCONV(arg3)).str());
|
||||
return (boost::format(fmt) % arg1 % arg2 % arg3).str();
|
||||
}
|
||||
|
||||
|
||||
string bformat(string const & fmt, string const & arg1, string const & arg2,
|
||||
string const & arg3, string const & arg4)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
|
||||
% STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)).str());
|
||||
return (boost::format(fmt) % arg1 % arg2 % arg3 % arg4).str();
|
||||
}
|
||||
|
||||
|
||||
string bformat(string const & fmt, string const & arg1, string const & arg2,
|
||||
string const & arg3, string const & arg4, string const & arg5)
|
||||
{
|
||||
return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
|
||||
% STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)
|
||||
% STRCONV(arg5)).str());
|
||||
return (boost::format(fmt) % arg1 % arg2 % arg3 % arg4 % arg5).str();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,605 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/**
|
||||
* \file lyxstring.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author Lars Gullik Bjønnes
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
// This one is heavily based on the string class in The C++
|
||||
// Programming Language by Bjarne Stroustrup
|
||||
|
||||
// This class is supposed to be functionaly equivalent to a
|
||||
// standard conformant string. This mean among others that we
|
||||
// are useing the same requirements. Before you change anything
|
||||
// in this file consult me and/or the standard to discover the
|
||||
// right behavior.
|
||||
|
||||
#ifndef LYXSTRING_H
|
||||
#define LYXSTRING_H
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
#if 0
|
||||
#include <iterator>
|
||||
#endif
|
||||
|
||||
#include <cstring> // for size_t
|
||||
|
||||
namespace lyx {
|
||||
|
||||
/** A string class for LyX
|
||||
|
||||
This is a permanent String class. It is modeled closely after the C++ STL
|
||||
string class. In comparison with STL string lyxstring lack support for
|
||||
reverse iterators and allocators, also char_traits is not used. In most
|
||||
other senses it is written to be a drop in replacement for STL string
|
||||
(or as a transition tool). So documentation for STL string should be
|
||||
valid for lyxstring too.
|
||||
|
||||
Notes for usage:
|
||||
|
||||
When you declare an lyxstring, it is initially empty. There is no need to
|
||||
do things like #lyxstring a= "";#, especially not in constructors.
|
||||
|
||||
If you want to use a default empty lyxstring as a parameter, use
|
||||
|
||||
#void foo(lyxstring par = lyxstring()); // Correct#
|
||||
|
||||
rather than
|
||||
|
||||
#void foo(lyxstring par = ""); // WRONG!#
|
||||
#void foo(lyxstring par = 0); // WRONG!#
|
||||
|
||||
(The last one is only wrong because some compilers can't handle it.)
|
||||
|
||||
Methods that take an index as parameter all follow this rule: Valid indexes
|
||||
go from 0 to length()-1.
|
||||
\begin{tabular}{rl}
|
||||
Correct: & #foo.substring(0, length()-1);# \\
|
||||
Wrong: & #bar.substring(0, length());#
|
||||
\end{tabular}
|
||||
|
||||
It is important that you declare lyxstring as const if possible, because
|
||||
some methods are much more efficient in const versions.
|
||||
|
||||
If you want to check whether a string is empty, do
|
||||
|
||||
#if (foo.empty()) something right#
|
||||
|
||||
rather than something along the lines of
|
||||
|
||||
#if (!foo) completely wrong#
|
||||
|
||||
When you want to copy an lyxstring, just do
|
||||
|
||||
#lyxstring a, b = "String";#
|
||||
#a = b; // That's it!#
|
||||
|
||||
not something like
|
||||
|
||||
#lyxstring a, b = "String";#
|
||||
#a = b.copy(); // This leaks. // and does not work either. #
|
||||
|
||||
The class automatically handles deep copying when required.
|
||||
*/
|
||||
class string {
|
||||
public:
|
||||
/* Typedefs */
|
||||
|
||||
///
|
||||
typedef char value_type;
|
||||
|
||||
///
|
||||
typedef value_type * pointer;
|
||||
|
||||
///
|
||||
typedef value_type & reference;
|
||||
|
||||
///
|
||||
typedef value_type const & const_reference;
|
||||
|
||||
///
|
||||
typedef size_t size_type;
|
||||
|
||||
///
|
||||
typedef int difference_type;
|
||||
|
||||
///
|
||||
typedef value_type * iterator;
|
||||
///
|
||||
typedef const value_type * const_iterator;
|
||||
#if 0
|
||||
///
|
||||
typedef reverse_iterator<iterator, value_type, reference>
|
||||
reverse_iterator;
|
||||
///
|
||||
typedef reverse_iterator<const_iterator, const value_type,
|
||||
const_reference> const_reverse_iterator;
|
||||
|
||||
#endif
|
||||
|
||||
///
|
||||
iterator begin();
|
||||
///
|
||||
const_iterator begin() const;
|
||||
///
|
||||
iterator end();
|
||||
///
|
||||
const_iterator end() const;
|
||||
#if 0
|
||||
///
|
||||
reverse_iterator rbegin();
|
||||
///
|
||||
const_reverse_iterator rbegin() const;
|
||||
///
|
||||
reverse_iterator rend();
|
||||
///
|
||||
const_reverse_iterator rend() const;
|
||||
#endif
|
||||
/* Constructors and Deconstructors. lyxstring has the same
|
||||
constructors as STL, except the one using iterators, one other
|
||||
difference is that lyxstring, do not allow the optional allocator
|
||||
parameter. */
|
||||
|
||||
/// "all characters" marker
|
||||
static const size_type npos;
|
||||
|
||||
/// #string x;#
|
||||
string();
|
||||
|
||||
/// #string x(string ...)#
|
||||
string(string const &, size_type pos = 0, size_type n = npos);
|
||||
|
||||
/// #string x("abc", 2) -> "ab"#
|
||||
string(value_type const *, size_type n);
|
||||
|
||||
// #string x("abc")#
|
||||
string(value_type const *);
|
||||
|
||||
/// string(5, 'n') -> "nnnnn"
|
||||
string(size_type n, value_type c);
|
||||
|
||||
#if 0
|
||||
///
|
||||
string(const_iterator first, const_iterator last);
|
||||
#else
|
||||
///
|
||||
template<class InputIterator>
|
||||
string(InputIterator begin, InputIterator end) {
|
||||
while (begin != end) {
|
||||
push_back(*begin);
|
||||
++begin;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
///
|
||||
~string();
|
||||
|
||||
/// number of characters
|
||||
size_type size() const;
|
||||
|
||||
/// largest possible string
|
||||
size_type max_size() const { return npos - 1; }
|
||||
|
||||
///
|
||||
size_type length() const { return size(); }
|
||||
|
||||
///
|
||||
bool empty() const { return size() == 0; }
|
||||
|
||||
///
|
||||
void resize(size_type n, value_type c);
|
||||
|
||||
///
|
||||
void resize(size_type n) { resize(n, ' '); }
|
||||
|
||||
/// size of the memory (in number of elements) allocated.
|
||||
size_type capacity() const;
|
||||
|
||||
///
|
||||
void reserve(size_type res_arg = 0);
|
||||
|
||||
///
|
||||
string & operator=(string const &);
|
||||
|
||||
///
|
||||
string & operator=(value_type const *);
|
||||
|
||||
///
|
||||
string & operator=(value_type);
|
||||
|
||||
///
|
||||
string & assign(string const &);
|
||||
|
||||
///
|
||||
string & assign(string const &, size_type pos, size_type n);
|
||||
|
||||
///
|
||||
string & assign(value_type const * p, size_type n);
|
||||
|
||||
///
|
||||
string & assign(value_type const * p);
|
||||
|
||||
///
|
||||
string & assign(size_type n, value_type c);
|
||||
|
||||
#if 1
|
||||
///
|
||||
string & assign(const_iterator first, const_iterator last);
|
||||
#else
|
||||
///
|
||||
template<class InputIterator>
|
||||
string & assign(InputIterator begin, InputIterator end) {
|
||||
clear;
|
||||
while (begin != end) {
|
||||
push_back((*begin));
|
||||
++begin;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/// unchecked access
|
||||
const_reference operator[](size_type) const;
|
||||
|
||||
/// unchecked access
|
||||
reference operator[](size_type);
|
||||
|
||||
/// checked access
|
||||
const_reference at(size_type) const;
|
||||
|
||||
/// checked access
|
||||
reference at(size_type);
|
||||
|
||||
// add characters after (*this)[length()-1]:
|
||||
|
||||
///
|
||||
string & operator+=(string const &);
|
||||
|
||||
///
|
||||
string & operator+=(value_type const *);
|
||||
|
||||
///
|
||||
string & operator+=(value_type);
|
||||
|
||||
///
|
||||
void push_back(value_type);
|
||||
|
||||
///
|
||||
string & append(string const &);
|
||||
|
||||
///
|
||||
string & append(string const &, size_type pos, size_type n);
|
||||
|
||||
///
|
||||
string & append(value_type const *, size_type n);
|
||||
|
||||
///
|
||||
string & append(value_type const *);
|
||||
|
||||
///
|
||||
string & append(size_type n, value_type);
|
||||
|
||||
#if 1
|
||||
///
|
||||
string & append(iterator first, iterator last);
|
||||
#else
|
||||
///
|
||||
template<class InputIterator>
|
||||
string & append(InputIterator begin, InputIterator end) {
|
||||
while (begin != end) {
|
||||
push_back((*begin));
|
||||
++begin;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
// insert characters before (*this)[pos]:
|
||||
|
||||
///
|
||||
string & insert(size_type pos, string const &);
|
||||
|
||||
///
|
||||
string & insert(size_type pos, string const &,
|
||||
size_type pos2, size_type n);
|
||||
|
||||
///
|
||||
string & insert(size_type pos, value_type const * p,
|
||||
size_type n);
|
||||
|
||||
///
|
||||
string & insert(size_type pos, value_type const * p);
|
||||
|
||||
///
|
||||
string & insert(size_type pos, size_type n, value_type c);
|
||||
|
||||
// insert characters before p
|
||||
|
||||
///
|
||||
iterator insert(iterator p, value_type c);
|
||||
|
||||
///
|
||||
void insert(iterator p, size_type n , value_type c);
|
||||
|
||||
#if 1
|
||||
///
|
||||
void insert(iterator p, iterator first, iterator last);
|
||||
#else
|
||||
///
|
||||
template<class InputIterator>
|
||||
void insert(iterator p, InputIterator begin, InputIterator end) {
|
||||
iterator it;
|
||||
while (begin != end) {
|
||||
it = insert(p, (*begin));
|
||||
++begin;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
///
|
||||
size_type find(string const &, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find(value_type const * p,
|
||||
size_type i, size_type n) const;
|
||||
|
||||
///
|
||||
size_type find(value_type const * p, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find(value_type c, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type rfind(string const &, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type rfind(value_type const * p, size_type i, size_type n) const;
|
||||
|
||||
///
|
||||
size_type rfind(value_type const * p, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type rfind(value_type c, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_first_of(string const &, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_first_of(value_type const * p, size_type i,
|
||||
size_type n) const;
|
||||
|
||||
///
|
||||
size_type find_first_of(value_type const * p, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_first_of(value_type c, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_last_of(string const &, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_last_of(value_type const * p, size_type i,
|
||||
size_type n) const;
|
||||
|
||||
///
|
||||
size_type find_last_of(value_type const * p, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_last_of(value_type c, size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_first_not_of(string const &, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_first_not_of(value_type const * p, size_type i,
|
||||
size_type n) const;
|
||||
|
||||
///
|
||||
size_type find_first_not_of(value_type const * p,
|
||||
size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_first_not_of(value_type c, size_type i = 0) const;
|
||||
|
||||
///
|
||||
size_type find_last_not_of(string const &,
|
||||
size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_last_not_of(value_type const * p, size_type i,
|
||||
size_type n) const;
|
||||
|
||||
///
|
||||
size_type find_last_not_of(value_type const * p,
|
||||
size_type i = npos) const;
|
||||
|
||||
///
|
||||
size_type find_last_not_of(value_type c, size_type i = npos) const;
|
||||
|
||||
// replace [(*this)[i], (*this)[i+n]] with other characters:
|
||||
|
||||
///
|
||||
string & replace(size_type i, size_type n, string const & str);
|
||||
|
||||
///
|
||||
string & replace(size_type i, size_type n, string const & s,
|
||||
size_type i2, size_type n2);
|
||||
|
||||
///
|
||||
string & replace(size_type i, size_type n, value_type const * p,
|
||||
size_type n2);
|
||||
|
||||
///
|
||||
string & replace(size_type i, size_type n, value_type const * p);
|
||||
|
||||
///
|
||||
string & replace(size_type i, size_type n,
|
||||
size_type n2, value_type c);
|
||||
|
||||
/// FY! FY! FY! go away !
|
||||
string & replace(size_type i, size_type n,
|
||||
value_type c);
|
||||
|
||||
///
|
||||
string & replace(iterator i, iterator i2, const string & str);
|
||||
|
||||
///
|
||||
string & replace(iterator i, iterator i2,
|
||||
value_type const * p, size_type n);
|
||||
|
||||
///
|
||||
string & replace(iterator i, iterator i2, value_type const * p);
|
||||
|
||||
///
|
||||
string & replace(iterator i, iterator i2,
|
||||
size_type n , value_type c);
|
||||
|
||||
///
|
||||
string & replace(iterator i, iterator i2, iterator j, iterator j2);
|
||||
|
||||
///
|
||||
void swap(string & str);
|
||||
|
||||
/// Erase n chars from position i.
|
||||
string & erase(size_type i = 0, size_type n = npos);
|
||||
|
||||
///
|
||||
string & clear() {
|
||||
return erase(0, npos);
|
||||
}
|
||||
|
||||
///
|
||||
iterator erase(iterator i);
|
||||
|
||||
///
|
||||
iterator erase(iterator first, iterator last);
|
||||
|
||||
///
|
||||
value_type const * c_str() const;
|
||||
|
||||
/* Note that this is STL compilant, so you can not assume
|
||||
that the returned array has a trailing '\0'. */
|
||||
value_type const * data() const;
|
||||
|
||||
/* This one returns a verbatim copy. Not the trailing '\0'
|
||||
The caller must provide a buffer with engough room.
|
||||
*/
|
||||
size_type copy(value_type * buf, size_type len,
|
||||
size_type pos = 0) const;
|
||||
|
||||
|
||||
///
|
||||
int compare(string const & str) const;
|
||||
|
||||
///
|
||||
int compare(value_type const * p) const;
|
||||
|
||||
///
|
||||
int compare(size_type pos, size_type n, string const & str) const;
|
||||
|
||||
///
|
||||
int compare(size_type pos, size_type n, string const & str,
|
||||
size_type pos2, size_type n2) const;
|
||||
|
||||
///
|
||||
int compare(size_type pos, size_type n, value_type const * p,
|
||||
size_type n2 = npos) const;
|
||||
|
||||
|
||||
///
|
||||
string substr(size_type i = 0, size_type n = npos) const;
|
||||
|
||||
private:
|
||||
// These three operators can be used to discover erronous use of
|
||||
// ints and strings. However a conforming C++ compiler will flag
|
||||
// a lot of char operations as ambigous when they are compiled
|
||||
// in. Use them for debugging only (or perhaps not even then.)
|
||||
// Lgb.
|
||||
//
|
||||
//string & operator+(int);
|
||||
//
|
||||
//string & operator=(int);
|
||||
//
|
||||
//string & operator+=(int);
|
||||
|
||||
/// Compare this with s. works with embedded '\0' chars also.
|
||||
int internal_compare(size_type pos, size_type n,
|
||||
value_type const * s,
|
||||
size_type slen, size_type n2) const;
|
||||
|
||||
/// Forward declaration of the string representation
|
||||
struct Srep;
|
||||
// DEC cxx requires this.
|
||||
friend struct Srep;
|
||||
|
||||
/// A string is a pointer to it's representation
|
||||
Srep * rep;
|
||||
|
||||
/* Note: The empty_rep is a local static in each function that
|
||||
benefits from one. There is no "global" empty srep but string
|
||||
doesn't need one (no code actually relies upon a single
|
||||
empty srep).
|
||||
This overcomes *all* "static initialization" problems,
|
||||
at maximum speed, with a small overhead of a few local static
|
||||
empty_reps.
|
||||
*/
|
||||
|
||||
#ifdef ENABLE_ASSERTIONS
|
||||
/// lyxstringInvariant is used to test the lyxstring Invariant
|
||||
friend class stringInvariant;
|
||||
#endif
|
||||
};
|
||||
|
||||
// The usual comparison operators ==, !=, >, <, >=, <= are
|
||||
// provided for lyxstrings
|
||||
|
||||
bool operator==(string const &, string const &);
|
||||
bool operator==(string::value_type const *, string const &);
|
||||
bool operator==(string const &, string::value_type const *);
|
||||
|
||||
|
||||
bool operator!=(string const &, string const &);
|
||||
bool operator!=(string::value_type const *, string const &);
|
||||
bool operator!=(string const &, string::value_type const *);
|
||||
|
||||
|
||||
bool operator>(string const &, string const &);
|
||||
bool operator>(string::value_type const *, string const &);
|
||||
bool operator>(string const &, string::value_type const *);
|
||||
|
||||
|
||||
bool operator<(string const &, string const &);
|
||||
bool operator<(string::value_type const *, string const &);
|
||||
bool operator<(string const &, string::value_type const *);
|
||||
|
||||
|
||||
bool operator>=(string const &, string const &);
|
||||
bool operator>=(string::value_type const *, string const &);
|
||||
bool operator>=(string const &, string::value_type const *);
|
||||
|
||||
|
||||
bool operator<=(string const &, string const &);
|
||||
bool operator<=(string::value_type const *, string const &);
|
||||
bool operator<=(string const &, string::value_type const *);
|
||||
|
||||
|
||||
// Concatenation
|
||||
|
||||
string operator+(string const & a, string const & b);
|
||||
string operator+(char const * a, string const & b);
|
||||
string operator+(string::value_type a, string const & b);
|
||||
string operator+(string const & a, string::value_type const * b);
|
||||
string operator+(string const & a, string::value_type b);
|
||||
|
||||
void swap(string & s1, string & s2);
|
||||
|
||||
std::istream & operator>>(std::istream &, string &);
|
||||
std::ostream & operator<<(std::ostream &, string const &);
|
||||
std::istream & getline(std::istream &, string &, string::value_type delim = '\n');
|
||||
|
||||
} // namespace lyx
|
||||
|
||||
#endif
|
||||
@ -13,27 +13,23 @@
|
||||
#ifndef STD_STRING_H
|
||||
#define STD_STRING_H
|
||||
|
||||
#if 0
|
||||
#ifndef _CONFIG_H
|
||||
#error The <config.h> header should always be included before std_string.h
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
|
||||
#include <string>
|
||||
|
||||
#ifdef USE_INCLUDED_STRING
|
||||
|
||||
using std::string;
|
||||
#define STRCONV(STR) STR
|
||||
|
||||
#else
|
||||
|
||||
#ifdef __STRING__
|
||||
#error The <string> header has been included before std_string.h
|
||||
#else
|
||||
#define __STRING__
|
||||
#endif
|
||||
#include "support/lyxstring.h"
|
||||
namespace lyx {
|
||||
|
||||
using std::string;
|
||||
|
||||
}
|
||||
|
||||
using lyx::string;
|
||||
#define STRCONV(STR) STR.c_str()
|
||||
|
||||
#endif
|
||||
|
||||
#endif // NOT STD_STRING_H
|
||||
|
||||
@ -26,7 +26,7 @@ string const tostr(unsigned int i)
|
||||
{
|
||||
ostringstream os;
|
||||
os << i;
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ string const tostr(long int i)
|
||||
{
|
||||
ostringstream os;
|
||||
os << i;
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ string const tostr(double d)
|
||||
{
|
||||
ostringstream os;
|
||||
os << d;
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ string const tostr(int i)
|
||||
{
|
||||
ostringstream os;
|
||||
os << i;
|
||||
return STRCONV(os.str());
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
||||
@ -58,4 +58,3 @@ string const tostr(string const & s)
|
||||
{
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
@ -846,7 +846,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
|
||||
if (cur_spacing == Spacing::Other)
|
||||
cur_value = pit->params().spacing().getValue();
|
||||
|
||||
istringstream is(STRCONV(cmd.argument));
|
||||
istringstream is(cmd.argument);
|
||||
string tmp;
|
||||
is >> tmp;
|
||||
Spacing::Space new_spacing = cur_spacing;
|
||||
@ -1018,7 +1018,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
|
||||
case LFUN_SETXY: {
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
istringstream is(STRCONV(cmd.argument));
|
||||
istringstream is(cmd.argument);
|
||||
is >> x >> y;
|
||||
if (!is)
|
||||
lyxerr << "SETXY: Could not parse coordinates in '"
|
||||
|
||||
@ -35,6 +35,10 @@ using lyx::support::rtrim;
|
||||
using lyx::support::split;
|
||||
using lyx::support::Systemcall;
|
||||
|
||||
using boost::regex;
|
||||
using boost::regex_match;
|
||||
using boost::smatch;
|
||||
|
||||
#ifndef CXX_GLOBAL_CSTD
|
||||
using std::asctime;
|
||||
using std::gmtime;
|
||||
@ -45,15 +49,6 @@ using std::getline;
|
||||
|
||||
using std::ifstream;
|
||||
|
||||
using boost::regex;
|
||||
using boost::regex_match;
|
||||
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
using boost::smatch;
|
||||
#else
|
||||
using boost::cmatch;
|
||||
#endif
|
||||
|
||||
|
||||
int VCS::doVCCommand(string const & cmd, string const & path)
|
||||
{
|
||||
@ -274,17 +269,14 @@ void CVS::scanMaster()
|
||||
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
|
||||
if (contains(line, tmpf)) {
|
||||
// Ok extract the fields.
|
||||
#ifndef USE_INCLUDED_STRING
|
||||
smatch sm;
|
||||
#else
|
||||
cmatch sm;
|
||||
#endif
|
||||
regex_match(STRCONV(line), sm, reg);
|
||||
|
||||
regex_match(line, sm, reg);
|
||||
|
||||
//sm[0]; // whole matched string
|
||||
//sm[1]; // filename
|
||||
version_ = STRCONV(sm.str(2));
|
||||
string const file_date = STRCONV(sm.str(3));
|
||||
version_ = sm.str(2);
|
||||
string const file_date = sm.str(3);
|
||||
|
||||
//sm[4]; // options
|
||||
//sm[5]; // tag or tagdate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user