TianZD/QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 17: Using std::numeric_limits instead of macros INTn_MAX/MIN

Browse Source
This commit is contained in:
Debao Zhang
2014-01-02 17:27:22 +08:00
parent c6e959291c
commit f14b38ffe4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+10 -10
View File
@@ -48,7 +48,7 @@
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <stdint.h> #include <limits>
#include <math.h> #include <math.h>
QT_BEGIN_NAMESPACE_XLSX QT_BEGIN_NAMESPACE_XLSX
@@ -87,14 +87,14 @@ WorksheetPrivate::~WorksheetPrivate()
void WorksheetPrivate::calculateSpans() void WorksheetPrivate::calculateSpans()
{ {
row_spans.clear(); row_spans.clear();
int span_min = INT32_MAX; int span_min = std::numeric_limits<int>::max();
int span_max = INT32_MIN; int span_max = std::numeric_limits<int>::min();
for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) { for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
if (cellTable.contains(row_num)) { if (cellTable.contains(row_num)) {
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (cellTable[row_num].contains(col_num)) { if (cellTable[row_num].contains(col_num)) {
if (span_max == INT32_MIN) { if (span_max == std::numeric_limits<int>::min()) {
span_min = col_num; span_min = col_num;
span_max = col_num; span_max = col_num;
} else { } else {
@@ -109,7 +109,7 @@ void WorksheetPrivate::calculateSpans()
if (comments.contains(row_num)) { if (comments.contains(row_num)) {
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (comments[row_num].contains(col_num)) { if (comments[row_num].contains(col_num)) {
if (span_max == INT32_MIN) { if (span_max == std::numeric_limits<int>::min()) {
span_min = col_num; span_min = col_num;
span_max = col_num; span_max = col_num;
} else { } else {
@@ -122,11 +122,11 @@ void WorksheetPrivate::calculateSpans()
} }
} }
if ((row_num)%16 == 0 || row_num == dimension.lastRow()) { if (row_num%16 == 0 || row_num == dimension.lastRow()) {
int span_index = row_num / 16; if (span_max != std::numeric_limits<int>::min()) {
if (span_max != INT32_MIN) { row_spans[row_num / 16] = QStringLiteral("%1:%2").arg(span_min).arg(span_max);
row_spans[span_index] = QStringLiteral("%1:%2").arg(span_min).arg(span_max); span_min = std::numeric_limits<int>::max();
span_max = INT32_MIN; span_max = std::numeric_limits<int>::min();
} }
} }
} }