using std::istringstream;
using std::ostream;
using std::ostringstream;
+using std::swap;
+using std::vector;
ostream & operator<<(ostream & os, MathArray const & ar)
void extractStrings(MathArray & ar)
{
//lyxerr << "\nStrings from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
string s = charSequence(ar.begin() + i, ar.end());
{
//lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asDelimInset())
continue;
MathArray const & arr = ar[i]->asDelimInset()->cell(0);
}
// second pass for AMS "pmatrix" etc
- for (MathArray::size_type i = 0; i < ar.size(); ++i)
+ for (size_t i = 0; i < ar.size(); ++i)
if (ar[i]->asAMSArrayInset())
ar[i] = MathAtom(new MathMatrixInset(*(ar[i]->asGridInset())));
//lyxerr << "\nMatrices to: " << ar << endl;
{
// use indices rather than iterators for the loop because we are going
// to modify the array.
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// check whether this is the begin of the sequence
if (!testOpen(ar[i]))
continue;
void splitScripts(MathArray & ar)
{
//lyxerr << "\nScripts from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// is this script inset?
if (!ar[i]->asScriptInset())
continue;
// create extra script inset and move superscript over
MathScriptInset * p = ar[i].nucleus()->asScriptInset();
auto_ptr<MathScriptInset> q(new MathScriptInset(true));
- std::swap(q->up(), p->up());
+ swap(q->up(), p->up());
p->removeScript(true);
// insert new inset behind
void extractExps(MathArray & ar)
{
//lyxerr << "\nExps from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
// is this 'e'?
if (ar[i]->getChar() != 'e')
continue;
void extractNumbers(MathArray & ar)
{
//lyxerr << "\nNumbers from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
if (!isDigitOrSimilar(ar[i]->asCharInset()->getChar()))
return;
//lyxerr << "\nFunctions from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = it + 1;
return;
//lyxerr << "\nIntegrals from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// search 'd'
return;
//lyxerr << "\nSums from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a sum name?
void extractDiff(MathArray & ar)
{
//lyxerr << "\nDiffs from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a "differential fraction"?
return;
//lyxerr << "\nLimits from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) {
+ for (size_t i = 0; i + 2 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a limit function?
expr.insert(pos, "*");
}
- std::vector<string> tmp = getVectorFromString(out, "$$");
+ vector<string> tmp = getVectorFromString(out, "$$");
if (tmp.size() < 2)
return MathArray();