X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTexRow.cpp;h=9c20f25df9f6151b2ec103275c6677b0786b7efa;hb=31a197d88c5521a3ff566597d22b7877d3e151c2;hp=460a141600194adccca48685bab7af85cac7ef2d;hpb=67ddc246fd153718d87755c1885a84306732d07f;p=lyx.git diff --git a/src/TexRow.cpp b/src/TexRow.cpp index 460a141600..9c20f25df9 100644 --- a/src/TexRow.cpp +++ b/src/TexRow.cpp @@ -13,11 +13,12 @@ #include +#include "TexRow.h" + #include "Buffer.h" #include "Cursor.h" #include "FuncRequest.h" #include "Paragraph.h" -#include "TexRow.h" #include "mathed/InsetMath.h" @@ -37,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(); } @@ -234,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_)); } @@ -250,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) @@ -359,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 << ")");