Skip to content

Commit 8038544

Browse files
committed
Add parentheses around complex operands.
1 parent 909bdb4 commit 8038544

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

src/ImportXlsx.cpp

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
304304
QXmlStreamReader::TokenType lastToken{xmlStreamReader.tokenType()};
305305
QStringList columnNames;
306306
QString currentColType;
307-
while (!xmlStreamReader.atEnd() && xmlStreamReader.name() != ROW_TAG)
307+
while ((!xmlStreamReader.atEnd()) && (xmlStreamReader.name() != ROW_TAG))
308308
{
309309
if (isCellStart(xmlStreamReader))
310310
{
@@ -320,12 +320,12 @@ std::pair<bool, QStringList> ImportXlsx::retrieveColumnNames(
320320
xmlStreamReader.attributes().value(T_TAG).toString();
321321
}
322322

323-
if (!xmlStreamReader.atEnd() && isVTagStart(xmlStreamReader))
323+
if ((!xmlStreamReader.atEnd()) && isVTagStart(xmlStreamReader))
324324
columnNames.append(getColumnName(xmlStreamReader, currentColType));
325325

326326
// If we encounter empty cell than add it to list.
327327
if (isCellEnd(xmlStreamReader) &&
328-
lastToken == QXmlStreamReader::StartElement)
328+
(lastToken == QXmlStreamReader::StartElement))
329329
columnNames << emptyColName_;
330330
lastToken = xmlStreamReader.tokenType();
331331
xmlStreamReader.readNext();
@@ -353,7 +353,8 @@ ImportXlsx::retrieveRowCountAndColumnTypes(const QString& sheetName)
353353
int maxColumnIndex{NOT_SET_COLUMN};
354354
int rowCounter{0};
355355
int rowCountDigitsInXlsx{0};
356-
while (!xmlStreamReader.atEnd() && xmlStreamReader.name() != SHEET_DATA_TAG)
356+
while ((!xmlStreamReader.atEnd()) &&
357+
(xmlStreamReader.name() != SHEET_DATA_TAG))
357358
{
358359
if (isRowStart(xmlStreamReader))
359360
{
@@ -402,7 +403,8 @@ QString ImportXlsx::getColumnName(QXmlStreamReader& xmlStreamReader,
402403

403404
void ImportXlsx::skipToFirstRow(QXmlStreamReader& xmlStreamReader) const
404405
{
405-
while (!xmlStreamReader.atEnd() && xmlStreamReader.name() != SHEET_DATA_TAG)
406+
while ((!xmlStreamReader.atEnd()) &&
407+
(xmlStreamReader.name() != SHEET_DATA_TAG))
406408
xmlStreamReader.readNext();
407409
xmlStreamReader.readNext();
408410
xmlStreamReader.readNext();
@@ -424,7 +426,7 @@ ColumnType ImportXlsx::recognizeColumnType(
424426

425427
const QXmlStreamAttributes attributes{xmlStreamReader.attributes()};
426428
if (const QString value{attributes.value(T_TAG).toString()};
427-
value == S_TAG || value == STR_TAG)
429+
(value == S_TAG) || (value == STR_TAG))
428430
return ColumnType::STRING;
429431

430432
ColumnType detectedType{currentType};
@@ -565,19 +567,19 @@ QDate ImportXlsx::getDateFromString(const QString& dateAsString)
565567

566568
bool ImportXlsx::isDateStyle(const QString& sTagValue) const
567569
{
568-
return !sTagValue.isEmpty() &&
570+
return (!sTagValue.isEmpty()) &&
569571
dateStyles_->contains(allStyles_->at(sTagValue.toInt()));
570572
}
571573

572574
bool ImportXlsx::isCommonDataOk()
573575
{
574-
if (!sheets_ && !getSheetNames().first)
576+
if ((!sheets_) && (!getSheetNames().first))
575577
return false;
576578

577-
if (!sharedStrings_ && !getSharedStrings().first)
579+
if ((!sharedStrings_) && (!getSharedStrings().first))
578580
return false;
579581

580-
if (!getDateStyles().first && !getAllStyles().first)
582+
if ((!getDateStyles().first) && (!getAllStyles().first))
581583
return false;
582584

583585
return true;
@@ -622,8 +624,9 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
622624
unsigned int rowCounter{0};
623625
unsigned int lastEmittedPercent{0};
624626
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))
627630
{
628631
if (isRowStart(xmlStreamReader))
629632
{
@@ -650,7 +653,7 @@ std::pair<bool, QVector<QVector<QVariant>>> ImportXlsx::getLimitedData(
650653
xmlStreamReader.attributes().value(S_TAG).toString();
651654
}
652655

653-
if (!xmlStreamReader.atEnd() && isVTagStart(xmlStreamReader) &&
656+
if ((!xmlStreamReader.atEnd()) && isVTagStart(xmlStreamReader) &&
654657
(!excludedColumns.contains(static_cast<unsigned int>(column))))
655658
{
656659
const ColumnType format{columnTypes.at(column)};

0 commit comments

Comments
 (0)