Skip to content

Commit da67a52

Browse files
przemek83przemek83
committed
Rename constant fields in ImportXlsx for consistency and clarity.
1 parent fa770f5 commit da67a52

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎include/eible/ImportXlsx.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ class EIBLE_EXPORT ImportXlsx : public ImportSpreadsheet
118118
std::optional<QList<int>> allStyles_{std::nullopt};
119119
const QHash<QByteArray, int> excelColNames_;
120120

121-
static constexpr int DECIMAL_BASE{10};
122-
const QString ROW_TAG{QStringLiteral("row")};
123-
const QString CELL_TAG{QStringLiteral("c")};
124-
const QString SHEET_DATA_TAG{QStringLiteral("sheetData")};
125-
const QString S_TAG{QStringLiteral("s")};
126-
const QString V_TAG{QStringLiteral("v")};
127-
const QString R_TAG{QStringLiteral("r")};
128-
const QString T_TAG{QStringLiteral("t")};
129-
const QString STR_TAG{QStringLiteral("str")};
121+
static constexpr int decimalBase_{10};
122+
const QString rowTag_{QStringLiteral("row")};
123+
const QString cellTag_{QStringLiteral("c")};
124+
const QString sheetDataTag_{QStringLiteral("sheetData")};
125+
const QString sTag_{QStringLiteral("s")};
126+
const QString vTag_{QStringLiteral("v")};
127+
const QString rTag_{QStringLiteral("r")};
128+
const QString tTag_{QStringLiteral("t")};
129+
const QString strTag_{QStringLiteral("str")};
130130
};

‎src/ImportXlsx.cpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ std::pair<bool, QStringList> ImportXlsx::getSharedStrings()
164164
while (!reader.atEnd())
165165
{
166166
reader.readNext();
167-
if (reader.name() == T_TAG)
167+
if (reader.name() == tTag_)
168168
sharedStrings.append(reader.readElementText());
169169
}
170170

@@ -242,22 +242,22 @@ std::pair<bool, QDomNodeList> ImportXlsx::getSheetNodes(
242242

243243
bool ImportXlsx::isRowStart(const QXmlStreamReader& reader) const
244244
{
245-
return (reader.name() == ROW_TAG) && reader.isStartElement();
245+
return (reader.name() == rowTag_) && reader.isStartElement();
246246
}
247247

248248
bool ImportXlsx::isCellStart(const QXmlStreamReader& reader) const
249249
{
250-
return (reader.name() == CELL_TAG) && reader.isStartElement();
250+
return (reader.name() == cellTag_) && reader.isStartElement();
251251
}
252252

253253
bool ImportXlsx::isCellEnd(const QXmlStreamReader& reader) const
254254
{
255-
return (reader.name() == CELL_TAG) && reader.isEndElement();
255+
return (reader.name() == cellTag_) && reader.isEndElement();
256256
}
257257

258258
bool ImportXlsx::isVTagStart(const QXmlStreamReader& reader) const
259259
{
260-
return (reader.name() == V_TAG) && reader.isStartElement();
260+
return (reader.name() == vTag_) && reader.isStartElement();
261261
}
262262

263263
std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
@@ -279,7 +279,7 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
279279
QXmlStreamReader::TokenType lastToken{reader.tokenType()};
280280
QStringList columnNames;
281281
QString currentColType;
282-
while ((!reader.atEnd()) && (reader.name() != ROW_TAG))
282+
while ((!reader.atEnd()) && (reader.name() != rowTag_))
283283
{
284284
if (isCellStart(reader))
285285
{
@@ -290,7 +290,7 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
290290
columnNames << emptyColName_;
291291
++columnIndex;
292292
}
293-
currentColType = reader.attributes().value(T_TAG).toString();
293+
currentColType = reader.attributes().value(tTag_).toString();
294294
}
295295

296296
if ((!reader.atEnd()) && isVTagStart(reader))
@@ -324,12 +324,12 @@ ImportXlsx::retrieveRowCountAndColumnTypes(const QString& sheetName)
324324
int maxColumnIndex{NOT_SET_COLUMN};
325325
int rowCounter{0};
326326
int rowCountDigitsInXlsx{0};
327-
while ((!reader.atEnd()) && (reader.name() != SHEET_DATA_TAG))
327+
while ((!reader.atEnd()) && (reader.name() != sheetDataTag_))
328328
{
329329
if (isRowStart(reader))
330330
{
331331
rowCountDigitsInXlsx =
332-
static_cast<int>(reader.attributes().value(R_TAG).size());
332+
static_cast<int>(reader.attributes().value(rTag_).size());
333333
++rowCounter;
334334
}
335335

@@ -354,7 +354,7 @@ ImportXlsx::retrieveRowCountAndColumnTypes(const QString& sheetName)
354354
QString ImportXlsx::getColumnName(QXmlStreamReader& reader,
355355
const QString& currentColType) const
356356
{
357-
if (currentColType != S_TAG)
357+
if (currentColType != sTag_)
358358
return reader.readElementText();
359359

360360
const int value{reader.readElementText().toInt()};
@@ -363,7 +363,7 @@ QString ImportXlsx::getColumnName(QXmlStreamReader& reader,
363363

364364
void ImportXlsx::skipToFirstRow(QXmlStreamReader& reader) const
365365
{
366-
while ((!reader.atEnd()) && (reader.name() != SHEET_DATA_TAG))
366+
while ((!reader.atEnd()) && (reader.name() != sheetDataTag_))
367367
reader.readNext();
368368
reader.readNext();
369369
reader.readNext();
@@ -372,7 +372,7 @@ void ImportXlsx::skipToFirstRow(QXmlStreamReader& reader) const
372372
int ImportXlsx::getCurrentColumnNumber(const QXmlStreamReader& reader,
373373
int rowCountDigitsInXlsx) const
374374
{
375-
QString rowNumber{reader.attributes().value(R_TAG).toString()};
375+
QString rowNumber{reader.attributes().value(rTag_).toString()};
376376
rowNumber.chop(rowCountDigitsInXlsx);
377377
return excelColNames_[rowNumber.toUtf8()];
378378
}
@@ -384,12 +384,12 @@ ColumnType ImportXlsx::recognizeColumnType(ColumnType currentType,
384384
return currentType;
385385

386386
const QXmlStreamAttributes attributes{reader.attributes()};
387-
if (const QString value{attributes.value(T_TAG).toString()};
388-
(value == S_TAG) || (value == STR_TAG))
387+
if (const QString value{attributes.value(tTag_).toString()};
388+
(value == sTag_) || (value == strTag_))
389389
return ColumnType::STRING;
390390

391391
ColumnType detectedType{currentType};
392-
if (const QString sTagValue{attributes.value(S_TAG).toString()};
392+
if (const QString sTagValue{attributes.value(sTag_).toString()};
393393
isDateStyle(sTagValue))
394394
{
395395
if (currentType == ColumnType::UNKNOWN)
@@ -481,7 +481,7 @@ QVariant ImportXlsx::getCurrentValueForStringColumn(
481481
const QString& currentColType, const QString& actualSTagValue,
482482
const QString& valueAsString) const
483483
{
484-
if (currentColType == S_TAG)
484+
if (currentColType == sTag_)
485485
return valueAsString.toInt();
486486

487487
if (isDateStyle(actualSTagValue))
@@ -584,12 +584,12 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
584584

585585
QVector<QVariant> currentDataRow(templateDataRow);
586586
int column{NOT_SET_COLUMN};
587-
QString currentColType{S_TAG};
587+
QString currentColType{sTag_};
588588
QString actualSTagValue;
589589
int rowCounter{0};
590590
int lastEmittedPercent{0};
591591
int rowCountDigitsInXlsx{0};
592-
while ((!reader.atEnd()) && (reader.name() != SHEET_DATA_TAG) &&
592+
while ((!reader.atEnd()) && (reader.name() != sheetDataTag_) &&
593593
(rowCounter <= rowLimit))
594594
{
595595
if (isRowStart(reader))
@@ -601,16 +601,16 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
601601
currentDataRow = QVector<QVariant>(templateDataRow);
602602
}
603603
rowCountDigitsInXlsx =
604-
static_cast<int>(reader.attributes().value(R_TAG).size());
604+
static_cast<int>(reader.attributes().value(rTag_).size());
605605
++rowCounter;
606606
updateProgress(rowCounter, rowLimit, lastEmittedPercent);
607607
}
608608

609609
if (isCellStart(reader))
610610
{
611611
column = getCurrentColumnNumber(reader, rowCountDigitsInXlsx);
612-
currentColType = reader.attributes().value(T_TAG).toString();
613-
actualSTagValue = reader.attributes().value(S_TAG).toString();
612+
currentColType = reader.attributes().value(tTag_).toString();
613+
actualSTagValue = reader.attributes().value(sTag_).toString();
614614
}
615615

616616
if ((!reader.atEnd()) && isVTagStart(reader) &&

0 commit comments

Comments
 (0)