X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTexRow.cpp;h=9c20f25df9f6151b2ec103275c6677b0786b7efa;hb=77f0fbdc9a186f9e544077e2288f48ceabfc11ab;hp=968245bb68d738e6da1e5a378ebbd4c1a10b495e;hpb=10272e474790d25ae9b5f3d272423959422ddfbd;p=features.git diff --git a/src/TexRow.cpp b/src/TexRow.cpp index 968245bb68..9c20f25df9 100644 --- a/src/TexRow.cpp +++ b/src/TexRow.cpp @@ -38,14 +38,14 @@ namespace lyx { TexString::TexString(docstring s) - : str(move(s)), texrow(TexRow()) + : str(std::move(s)), texrow(TexRow()) { texrow.setRows(1 + count(str.begin(), str.end(), '\n')); } TexString::TexString(docstring s, TexRow t) - : str(move(s)), texrow(move(t)) + : str(std::move(s)), texrow(std::move(t)) { validate(); } @@ -235,7 +235,7 @@ void TexRow::append(TexRow other) RowList::iterator it = other.rowlist_.begin(); RowList::iterator const end = other.rowlist_.end(); LASSERT(it != end, return); - currentRow().append(move(*it++)); + currentRow().append(std::move(*it++)); move(it, end, back_inserter(rowlist_)); } @@ -251,7 +251,7 @@ TexRow::getEntriesFromRow(int const row) const // correspond to no output by delaying their addition, at the level // of otexrowstream, until a character is actually output. // - LYXERR(Debug::LATEX, "getEntriesFromRow: row " << row << " requested"); + LYXERR(Debug::OUTFILE, "getEntriesFromRow: row " << row << " requested"); // check bounds for row - 1, our target index if (row <= 0) @@ -360,7 +360,7 @@ FuncRequest TexRow::goToFuncFromRow(int const row) const { TextEntry start, end; tie(start,end) = getEntriesFromRow(row); - LYXERR(Debug::LATEX, + LYXERR(Debug::OUTFILE, "goToFuncFromRow: for row " << row << ", TexRow has found " "start (id=" << start.id << ",pos=" << start.pos << "), " "end (id=" << end.id << ",pos=" << end.pos << ")");