Commit 4dd16b34 authored by EXT Arnaud Clère's avatar EXT Arnaud Clère

More precise numbers handling (avoid overflow) at the expense of

performance, even write :(
parent fd881f91
......@@ -252,7 +252,7 @@ protected:
row++; col=0;
return true;
}
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem));
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem))
return false;
}
return true;
......@@ -267,7 +267,7 @@ protected:
row=0; col++;
return true;
}
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem));
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem))
return false;
}
return true;
......@@ -297,7 +297,7 @@ protected:
else {
col=columnNames.indexOf(n.utf8());
// TODO if (max(dimension())<=col) col=-1;
if (col<0 && !isErrorFiltered(qBindUnexpectedItem)) {
if (col<0 && !isErrorFiltered(qBindUnexpectedItem, n.latin1())) {
return false;
}
}
......@@ -315,7 +315,7 @@ protected:
}
else {
// TODO if (rowNames...
return isErrorFiltered(qBindUnexpectedItem);
return isErrorFiltered(qBindUnexpectedItem, n.latin1());
}
}
else { Q_ASSERT(I<=d);
......@@ -452,7 +452,7 @@ protected:
if (col < m->columnCount()) {
return true;
}
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem));
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem))
return false;
}
return true;
......@@ -470,7 +470,7 @@ protected:
row=0; col++;
return true;
}
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem));
Q_UNUSED(isErrorFiltered(qBindUnexpectedItem))
return false;
}
return true;
......
This diff is collapsed.
......@@ -267,7 +267,8 @@ struct QTransmogrifier<QColor> {
do {
v=v.meta(n, m);
if (n==qmDataStreamVersion) {
if (m.utf8().toInt()<7) { v->isErrorFiltered("UnsupportedQDataStreamVersion");
if (m.utf8().toInt()<7) {
Q_UNUSED(v->isErrorFiltered("UnsupportedQDataStreamVersion"))
return v.null();
}
QRgba64 c64 = c.rgba64();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment