@@ -304,7 +304,7 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
304
304
QXmlStreamReader::TokenType lastToken{xmlStreamReader.tokenType ()};
305
305
QStringList columnNames;
306
306
QString currentColType;
307
- while (!xmlStreamReader.atEnd () && xmlStreamReader.name () != ROW_TAG)
307
+ while (( !xmlStreamReader.atEnd ()) && ( xmlStreamReader.name () != ROW_TAG) )
308
308
{
309
309
if (isCellStart (xmlStreamReader))
310
310
{
@@ -320,12 +320,12 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
320
320
xmlStreamReader.attributes ().value (T_TAG).toString ();
321
321
}
322
322
323
- if (!xmlStreamReader.atEnd () && isVTagStart (xmlStreamReader))
323
+ if (( !xmlStreamReader.atEnd () ) && isVTagStart (xmlStreamReader))
324
324
columnNames.append (getColumnName (xmlStreamReader, currentColType));
325
325
326
326
// If we encounter empty cell than add it to list.
327
327
if (isCellEnd (xmlStreamReader) &&
328
- lastToken == QXmlStreamReader::StartElement)
328
+ ( lastToken == QXmlStreamReader::StartElement) )
329
329
columnNames << emptyColName_;
330
330
lastToken = xmlStreamReader.tokenType ();
331
331
xmlStreamReader.readNext ();
@@ -353,7 +353,8 @@ ImportXlsx::retrieveRowCountAndColumnTypes(const QString& sheetName)
353
353
int maxColumnIndex{NOT_SET_COLUMN};
354
354
int rowCounter{0 };
355
355
int rowCountDigitsInXlsx{0 };
356
- while (!xmlStreamReader.atEnd () && xmlStreamReader.name () != SHEET_DATA_TAG)
356
+ while ((!xmlStreamReader.atEnd ()) &&
357
+ (xmlStreamReader.name () != SHEET_DATA_TAG))
357
358
{
358
359
if (isRowStart (xmlStreamReader))
359
360
{
@@ -402,7 +403,8 @@ QString ImportXlsx::getColumnName(QXmlStreamReader& xmlStreamReader,
402
403
403
404
void ImportXlsx::skipToFirstRow (QXmlStreamReader& xmlStreamReader) const
404
405
{
405
- while (!xmlStreamReader.atEnd () && xmlStreamReader.name () != SHEET_DATA_TAG)
406
+ while ((!xmlStreamReader.atEnd ()) &&
407
+ (xmlStreamReader.name () != SHEET_DATA_TAG))
406
408
xmlStreamReader.readNext ();
407
409
xmlStreamReader.readNext ();
408
410
xmlStreamReader.readNext ();
@@ -424,7 +426,7 @@ ColumnType ImportXlsx::recognizeColumnType(
424
426
425
427
const QXmlStreamAttributes attributes{xmlStreamReader.attributes ()};
426
428
if (const QString value{attributes.value (T_TAG).toString ()};
427
- value == S_TAG || value == STR_TAG)
429
+ ( value == S_TAG) || ( value == STR_TAG) )
428
430
return ColumnType::STRING;
429
431
430
432
ColumnType detectedType{currentType};
@@ -565,19 +567,19 @@ QDate ImportXlsx::getDateFromString(const QString& dateAsString)
565
567
566
568
bool ImportXlsx::isDateStyle (const QString& sTagValue ) const
567
569
{
568
- return !sTagValue .isEmpty () &&
570
+ return ( !sTagValue .isEmpty () ) &&
569
571
dateStyles_->contains (allStyles_->at (sTagValue .toInt ()));
570
572
}
571
573
572
574
bool ImportXlsx::isCommonDataOk ()
573
575
{
574
- if (!sheets_ && !getSheetNames ().first )
576
+ if (( !sheets_) && ( !getSheetNames ().first ) )
575
577
return false ;
576
578
577
- if (!sharedStrings_ && !getSharedStrings ().first )
579
+ if (( !sharedStrings_) && ( !getSharedStrings ().first ) )
578
580
return false ;
579
581
580
- if (!getDateStyles ().first && !getAllStyles ().first )
582
+ if (( !getDateStyles ().first ) && ( !getAllStyles ().first ) )
581
583
return false ;
582
584
583
585
return true ;
@@ -622,8 +624,9 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
622
624
unsigned int rowCounter{0 };
623
625
unsigned int lastEmittedPercent{0 };
624
626
int rowCountDigitsInXlsx{0 };
625
- while (!xmlStreamReader.atEnd () &&
626
- xmlStreamReader.name () != SHEET_DATA_TAG && rowCounter <= rowLimit)
627
+ while ((!xmlStreamReader.atEnd ()) &&
628
+ (xmlStreamReader.name () != SHEET_DATA_TAG) &&
629
+ (rowCounter <= rowLimit))
627
630
{
628
631
if (isRowStart (xmlStreamReader))
629
632
{
@@ -650,7 +653,7 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
650
653
xmlStreamReader.attributes ().value (S_TAG).toString ();
651
654
}
652
655
653
- if (!xmlStreamReader.atEnd () && isVTagStart (xmlStreamReader) &&
656
+ if (( !xmlStreamReader.atEnd () ) && isVTagStart (xmlStreamReader) &&
654
657
(!excludedColumns.contains (static_cast <unsigned int >(column))))
655
658
{
656
659
const ColumnType format{columnTypes.at (column)};
0 commit comments