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

Fix clang warning: comparison of two values with different enumeration types

Browse Source
This commit is contained in:
Debao Zhang
2013-10-26 01:08:38 +08:00
parent a1861db66e
commit a5182caf2a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+4 -4
View File
@@ -302,20 +302,20 @@ int Worksheet::write(int row, int column, const QVariant &value, Format *format)
if (value.isNull()) { //blank if (value.isNull()) { //blank
ret = writeBlank(row, column, format); ret = writeBlank(row, column, format);
} else if (value.type() == QMetaType::Bool) { //Bool } else if (value.userType() == QMetaType::Bool) { //Bool
ret = writeBool(row,column, value.toBool(), format); ret = writeBool(row,column, value.toBool(), format);
} else if (value.toDateTime().isValid()) { //DateTime } else if (value.toDateTime().isValid()) { //DateTime
ret = writeDateTime(row, column, value.toDateTime(), format); ret = writeDateTime(row, column, value.toDateTime(), format);
} else if (value.toDouble(&ok), ok) { //Number } else if (value.toDouble(&ok), ok) { //Number
if (!d->workbook->isStringsToNumbersEnabled() && value.type() == QMetaType::QString) { if (!d->workbook->isStringsToNumbersEnabled() && value.userType() == QMetaType::QString) {
//Don't convert string to number if the flag not enabled. //Don't convert string to number if the flag not enabled.
ret = writeString(row, column, value.toString(), format); ret = writeString(row, column, value.toString(), format);
} else { } else {
ret = writeNumeric(row, column, value.toDouble(), format); ret = writeNumeric(row, column, value.toDouble(), format);
} }
} else if (value.type() == QMetaType::QUrl) { //url } else if (value.userType() == QMetaType::QUrl) { //url
ret = writeHyperlink(row, column, value.toUrl(), format); ret = writeHyperlink(row, column, value.toUrl(), format);
} else if (value.type() == QMetaType::QString) { //string } else if (value.userType() == QMetaType::QString) { //string
QString token = value.toString(); QString token = value.toString();
QRegularExpression urlPattern(QStringLiteral("^([fh]tt?ps?://)|(mailto:)|(file://)")); QRegularExpression urlPattern(QStringLiteral("^([fh]tt?ps?://)|(mailto:)|(file://)"));
if (token.startsWith(QLatin1String("="))) { if (token.startsWith(QLatin1String("="))) {