QT/QXlsx
1
0
Fork 0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-01-16 04:42:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix warnings: zero as null pointer constant

Browse Source 
Fix more warnings: zero as null pointer constant
This commit is contained in:
Stefan Gerlach 2023-07-26 10:05:36 +02:00 committed by Daniel Nicoletti
parent 8c9e89d3f1
commit fbf2c37e64
22 changed files with 103 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QXlsx/header/xlsxchart.h
View File

@ -56,7 +56,7 @@ public:
public:
void addSeries(const CellRange &range,
AbstractSheet *sheet = NULL,
AbstractSheet *sheet = nullptr,
bool headerH = false,
bool headerV = false,
bool swapHeaders = false);

2
QXlsx/header/xlsxconditionalformatting.h
View File

@ -121,7 +121,7 @@ private:
private:
bool saveToXml(QXmlStreamWriter &writer) const;
bool loadFromXml(QXmlStreamReader &reader, Styles *styles = NULL);
bool loadFromXml(QXmlStreamReader &reader, Styles *styles = nullptr);
QSharedDataPointer<ConditionalFormattingPrivate> d;
};

4
QXlsx/source/xlsxabstractsheet.cpp
View File

@ -16,7 +16,9 @@ AbstractSheetPrivate::AbstractSheetPrivate(AbstractSheet *p, AbstractSheet::Crea
sheetState = AbstractSheet::SS_Visible;
}
AbstractSheetPrivate::~AbstractSheetPrivate() {}
AbstractSheetPrivate::~AbstractSheetPrivate()
{
}
/*!
\class AbstractSheet

2
QXlsx/source/xlsxcell.cpp
View File

@ -85,7 +85,7 @@ Cell::Cell(const Cell *const cell)
*/
Cell::~Cell()
{
if (NULL != d_ptr)
if (nullptr != d_ptr)
delete d_ptr;
}

8
QXlsx/source/xlsxcellformula.cpp
View File

@ -40,7 +40,9 @@ CellFormulaPrivate::CellFormulaPrivate(const CellFormulaPrivate &other)
{
}
CellFormulaPrivate::~CellFormulaPrivate() {}
CellFormulaPrivate::~CellFormulaPrivate()
{
}
/*!
\class CellFormula
@ -110,7 +112,9 @@ CellFormula &CellFormula::operator=(const CellFormula &other)
/*!
* Destroys this formula.
*/
CellFormula::~CellFormula() {}
CellFormula::~CellFormula()
{
}
/*!
* Returns the type of the formula.

4
QXlsx/source/xlsxcellrange.cpp
View File

@ -106,7 +106,9 @@ CellRange::CellRange(const CellRange &other)
/*!
Destroys the range.
*/
CellRange::~CellRange() {}
CellRange::~CellRange()
{
}
/*!
Convert the range to string notation, such as "A1:B5".

4
QXlsx/source/xlsxcellreference.cpp
View File

@ -127,7 +127,9 @@ CellReference::CellReference(const CellReference &other)
/*!
Destroys the Reference.
*/
CellReference::~CellReference() {}
CellReference::~CellReference()
{
}
/*!
Convert the Reference to string notation, such as "A1" or "$A$1".

12
QXlsx/source/xlsxchart.cpp
View File

@ -20,7 +20,9 @@ ChartPrivate::ChartPrivate(Chart *q, Chart::CreateFlag flag)
{
}
ChartPrivate::~ChartPrivate() {}
ChartPrivate::~ChartPrivate()
{
}
/*!
* \internal
@ -42,7 +44,9 @@ Chart::Chart(AbstractSheet *parent, CreateFlag flag)
/*!
* Destroys the chart.
*/
Chart::~Chart() {}
Chart::~Chart()
{
}
/*!
* Add the data series which is in the range \a range of the \a sheet.
@ -1320,7 +1324,7 @@ bool ChartPrivate::loadXmlAxisValAx(QXmlStreamReader &reader)
*/
bool ChartPrivate::loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis *axis)
{
Q_ASSERT(NULL != axis);
Q_ASSERT(nullptr != axis);
Q_ASSERT(reader.name().endsWith(QLatin1String("Ax")));
QString name = reader.name().toString(); //
@ -1999,7 +2003,7 @@ QString ChartPrivate::GetAxisPosString(XlsxAxis::AxisPos axisPos) const
QString ChartPrivate::GetAxisName(XlsxAxis *axis) const
{
QString strAxisName;
if (NULL == axis)
if (nullptr == axis)
return strAxisName;
QString pos = GetAxisPosString(axis->axisPos); // l, t, r, b

12
QXlsx/source/xlsxchartsheet.cpp
View File

@ -18,11 +18,13 @@ QT_BEGIN_NAMESPACE_XLSX
ChartsheetPrivate::ChartsheetPrivate(Chartsheet *p, Chartsheet::CreateFlag flag)
: AbstractSheetPrivate(p, flag)
, chart(0)
, chart(nullptr)
{
}
ChartsheetPrivate::~ChartsheetPrivate() {}
ChartsheetPrivate::~ChartsheetPrivate()
{
}
/*!
\class Chartsheet
@ -66,13 +68,15 @@ Chartsheet *Chartsheet::copy(const QString &distName, int distId) const
//: Todo
Q_UNUSED(distName)
Q_UNUSED(distId)
return 0;
return nullptr;
}
/*!
* Destroys this workssheet.
*/
Chartsheet::~Chartsheet() {}
Chartsheet::~Chartsheet()
{
}
/*!
* Returns the chart object of the sheet.

12
QXlsx/source/xlsxconditionalformatting.cpp
View File

@ -14,7 +14,9 @@
QT_BEGIN_NAMESPACE_XLSX
ConditionalFormattingPrivate::ConditionalFormattingPrivate() {}
ConditionalFormattingPrivate::ConditionalFormattingPrivate()
{
}
ConditionalFormattingPrivate::ConditionalFormattingPrivate(
const ConditionalFormattingPrivate &other)
@ -22,7 +24,9 @@ ConditionalFormattingPrivate::ConditionalFormattingPrivate(
{
}
ConditionalFormattingPrivate::~ConditionalFormattingPrivate() {}
ConditionalFormattingPrivate::~ConditionalFormattingPrivate()
{
}
void ConditionalFormattingPrivate::writeCfVo(QXmlStreamWriter &writer,
const XlsxCfVoData &cfvo) const
@ -151,7 +155,9 @@ ConditionalFormatting &ConditionalFormatting::operator=(const ConditionalFormatt
/*!
* Destroy the object.
*/
ConditionalFormatting::~ConditionalFormatting() {}
ConditionalFormatting::~ConditionalFormatting()
{
}
/*!
* Add a hightlight rule with the given \a type, \a formula1, \a formula2,

8
QXlsx/source/xlsxdatavalidation.cpp
View File

@ -49,7 +49,9 @@ DataValidationPrivate::DataValidationPrivate(const DataValidationPrivate &other)
{
}
DataValidationPrivate::~DataValidationPrivate() {}
DataValidationPrivate::~DataValidationPrivate()
{
}
/*!
* \class DataValidation
@ -143,7 +145,9 @@ DataValidation &DataValidation::operator=(const DataValidation &other)
/*!
* Destroy the object.
*/
DataValidation::~DataValidation() {}
DataValidation::~DataValidation()
{
}
/*!
Returns the validation type.

4
QXlsx/source/xlsxdatetype.cpp
View File

@ -9,7 +9,9 @@
QT_BEGIN_NAMESPACE_XLSX
DateType::DateType() {}
DateType::DateType()
{
}
/*
DateType::DateType(bool is1904)

8
QXlsx/source/xlsxdocument.cpp
View File

@ -699,7 +699,7 @@ Chart *Document::insertChart(int row, int col, const QSize &size)
{
if (Worksheet *sheet = currentWorksheet())
return sheet->insertChart(row, col, size);
return 0;
return nullptr;
}
/*!
@ -1012,7 +1012,7 @@ Cell *Document::cellAt(const CellReference &pos) const
{
if (Worksheet *sheet = currentWorksheet())
return sheet->cellAt(pos);
return 0;
return nullptr;
}
/*!
@ -1025,7 +1025,7 @@ Cell *Document::cellAt(int row, int col) const
{
if (Worksheet *sheet = currentWorksheet())
return sheet->cellAt(row, col);
return 0;
return nullptr;
}
/*!
@ -1209,7 +1209,7 @@ Worksheet *Document::currentWorksheet() const
if (st && st->sheetType() == AbstractSheet::ST_WorkSheet)
return static_cast<Worksheet *>(st);
else
return 0;
return nullptr;
}
/*!

12
QXlsx/source/xlsxdrawinganchor.cpp
View File

@ -57,7 +57,9 @@ DrawingAnchor::DrawingAnchor(Drawing *drawing, ObjectType objectType)
m_id = m_drawing->anchors.size(); // must be unique in one drawing{x}.xml file.
}
DrawingAnchor::~DrawingAnchor() {}
DrawingAnchor::~DrawingAnchor()
{
}
void DrawingAnchor::setObjectPicture(const QImage &img)
{
@ -898,9 +900,11 @@ void DrawingAnchor::saveXmlObjectShape(QXmlStreamWriter &writer) const
writer.writeStartElement(QStringLiteral("a:blip"));
writer.writeAttribute(
QStringLiteral("r:embed"),
QStringLiteral("rId%1").arg(m_drawing->relationships()->count())); // sp_blip_rembed
// QStringLiteral("rId%1").arg(m_drawing->relationships()->count())
// can't made new pic
QStringLiteral("rId%1").arg(
m_drawing->relationships()
->count())); // sp_blip_rembed
// QStringLiteral("rId%1").arg(m_drawing->relationships()->count())
// can't made new pic
writer.writeAttribute(
QStringLiteral("xmlns:r"),
QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));

8
QXlsx/source/xlsxformat.cpp
View File

@ -58,7 +58,9 @@ FormatPrivate::FormatPrivate(const FormatPrivate &other)
{
}
FormatPrivate::~FormatPrivate() {}
FormatPrivate::~FormatPrivate()
{
}
/*!
* \class Format
@ -202,7 +204,9 @@ Format &Format::operator=(const Format &other)
/*!
* Destroys this format.
*/
Format::~Format() {}
Format::~Format()
{
}
/*!
* Returns the number format identifier.

4
QXlsx/source/xlsxrelationships.cpp
View File

@ -17,7 +17,9 @@ const QLatin1String schema_msPackage("http://schemas.microsoft.com/office/2006/r
const QLatin1String schema_package("http://schemas.openxmlformats.org/package/2006/relationships");
// const QString schema_worksheet =
// QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
Relationships::Relationships() {}
Relationships::Relationships()
{
}
QList<XlsxRelationship> Relationships::documentRelationships(const QString &relativeType) const
{

8
QXlsx/source/xlsxrichstring.cpp
View File

@ -26,7 +26,9 @@ RichStringPrivate::RichStringPrivate(const RichStringPrivate &other)
{
}
RichStringPrivate::~RichStringPrivate() {}
RichStringPrivate::~RichStringPrivate()
{
}
/*!
\class RichString
@ -62,7 +64,9 @@ RichString::RichString(const RichString &other)
/*!
Destructs the string.
*/
RichString::~RichString() {}
RichString::~RichString()
{
}
/*!
Assigns \a other to this string and returns a reference to this string

4
QXlsx/source/xlsxstyles.cpp
View File

@ -69,7 +69,9 @@ Styles::Styles(CreateFlag flag)
}
}
Styles::~Styles() {}
Styles::~Styles()
{
}
Format Styles::xfFormat(int idx) const
{

16
QXlsx/source/xlsxworkbook.cpp
View File

@ -55,7 +55,9 @@ Workbook::Workbook(CreateFlag flag)
{
}
Workbook::~Workbook() {}
Workbook::~Workbook()
{
}
bool Workbook::isDate1904() const
{
@ -193,7 +195,7 @@ AbstractSheet *Workbook::addSheet(const QString &name, int sheetId, AbstractShee
if (sheetId > d->last_sheet_id)
d->last_sheet_id = sheetId;
AbstractSheet *sheet = NULL;
AbstractSheet *sheet = nullptr;
if (type == AbstractSheet::ST_WorkSheet) {
// create work sheet (value sheet)
sheet = new Worksheet(name, sheetId, this, F_LoadFromExists);
@ -217,12 +219,12 @@ AbstractSheet *Workbook::insertSheet(int index, const QString &name, AbstractShe
QString sheetName = createSafeSheetName(name);
if (index > d->last_sheet_id) {
// User tries to insert, where no sheet has gone before.
return 0;
return nullptr;
}
if (!sheetName.isEmpty()) {
// If user given an already in-used name, we should not continue any more!
if (d->sheetNames.contains(sheetName))
return 0;
return nullptr;
} else {
if (type == AbstractSheet::ST_WorkSheet) {
do {
@ -236,13 +238,13 @@ AbstractSheet *Workbook::insertSheet(int index, const QString &name, AbstractShe
} while (d->sheetNames.contains(sheetName));
} else {
qWarning("unsupported sheet type.");
return 0;
return nullptr;
}
}
++d->last_sheet_id;
AbstractSheet *sheet = NULL;
AbstractSheet *sheet = nullptr;
if (type == AbstractSheet::ST_WorkSheet) {
sheet = new Worksheet(sheetName, d->last_sheet_id, this, F_NewFromScratch);
} else if (type == AbstractSheet::ST_ChartSheet) {
@ -385,7 +387,7 @@ AbstractSheet *Workbook::sheet(int index) const
{
Q_D(const Workbook);
if (index < 0 || index >= d->sheets.size())
return 0;
return nullptr;
return d->sheets.at(index).data();
}

8
QXlsx/source/xlsxworksheet.cpp
View File

@ -59,7 +59,9 @@ WorksheetPrivate::WorksheetPrivate(Worksheet *p, Worksheet::CreateFlag flag)
{
}
WorksheetPrivate::~WorksheetPrivate() {}
WorksheetPrivate::~WorksheetPrivate()
{
}
/*
Calculate the "spans" attribute of the <row> tag. This is an
@ -220,7 +222,9 @@ Worksheet *Worksheet::copy(const QString &distName, int distId) const
/*!
* Destroys this workssheet.
*/
Worksheet::~Worksheet() {}
Worksheet::~Worksheet()
{
}
/*!
* Returns whether sheet is protected.

4
QXlsx/source/xlsxzipreader.cpp
View File

@ -18,7 +18,9 @@ ZipReader::ZipReader(QIODevice *device)
init();
}
ZipReader::~ZipReader() {}
ZipReader::~ZipReader()
{
}
void ZipReader::init()
{

4
chartsquestions/sat_calc.cpp
View File

@ -13,7 +13,9 @@ sat_calc::sat_calc()
: output_line_count(5)
{
}
sat_calc::~sat_calc() {}
sat_calc::~sat_calc()
{
}
void sat_calc::get_chromatogram(const QString &chromatogram)
{