Fix warnings: zero as null pointer constant

Fix more warnings: zero as null pointer constant
QtExcel · Sep 21, 2023 · 4678450 · 4678450
1 parent 8c9e89d
commit 4678450
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 47 deletions.
diff --git a/QXlsx/header/xlsxchart.h b/QXlsx/header/xlsxchart.h
@@ -56,7 +56,7 @@ class QXLSX_EXPORT Chart : public AbstractOOXmlFile
 
 public:
     void addSeries(const CellRange &range,
-                   AbstractSheet *sheet = NULL,
+                   AbstractSheet *sheet = nullptr,
                    bool headerH         = false,
                    bool headerV         = false,
                    bool swapHeaders     = false);

diff --git a/QXlsx/header/xlsxconditionalformatting.h b/QXlsx/header/xlsxconditionalformatting.h
@@ -121,7 +121,7 @@ class QXLSX_EXPORT ConditionalFormatting
 
 private:
     bool saveToXml(QXmlStreamWriter &writer) const;
-    bool loadFromXml(QXmlStreamReader &reader, Styles *styles = NULL);
+    bool loadFromXml(QXmlStreamReader &reader, Styles *styles = nullptr);
 
     QSharedDataPointer<ConditionalFormattingPrivate> d;
 };

diff --git a/QXlsx/source/xlsxabstractsheet.cpp b/QXlsx/source/xlsxabstractsheet.cpp
@@ -16,7 +16,9 @@ AbstractSheetPrivate::AbstractSheetPrivate(AbstractSheet *p, AbstractSheet::Crea
     sheetState = AbstractSheet::SS_Visible;
 }
 
-AbstractSheetPrivate::~AbstractSheetPrivate() {}
+AbstractSheetPrivate::~AbstractSheetPrivate()
+{
+}
 
 /*!
   \class AbstractSheet

diff --git a/QXlsx/source/xlsxcell.cpp b/QXlsx/source/xlsxcell.cpp
@@ -85,7 +85,7 @@ Cell::Cell(const Cell *const cell)
  */
 Cell::~Cell()
 {
-    if (NULL != d_ptr)
+    if (nullptr != d_ptr)
         delete d_ptr;
 }
 

diff --git a/QXlsx/source/xlsxcellformula.cpp b/QXlsx/source/xlsxcellformula.cpp
@@ -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.

diff --git a/QXlsx/source/xlsxcellrange.cpp b/QXlsx/source/xlsxcellrange.cpp
@@ -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".

diff --git a/QXlsx/source/xlsxcellreference.cpp b/QXlsx/source/xlsxcellreference.cpp
@@ -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".

diff --git a/QXlsx/source/xlsxchart.cpp b/QXlsx/source/xlsxchart.cpp
@@ -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

diff --git a/QXlsx/source/xlsxchartsheet.cpp b/QXlsx/source/xlsxchartsheet.cpp
@@ -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.

diff --git a/QXlsx/source/xlsxconditionalformatting.cpp b/QXlsx/source/xlsxconditionalformatting.cpp
@@ -14,15 +14,19 @@
 
 QT_BEGIN_NAMESPACE_XLSX
 
-ConditionalFormattingPrivate::ConditionalFormattingPrivate() {}
+ConditionalFormattingPrivate::ConditionalFormattingPrivate()
+{
+}
 
 ConditionalFormattingPrivate::ConditionalFormattingPrivate(
     const ConditionalFormattingPrivate &other)
     : QSharedData(other)
 {
 }
 
-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,

diff --git a/QXlsx/source/xlsxdatavalidation.cpp b/QXlsx/source/xlsxdatavalidation.cpp
@@ -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.

diff --git a/QXlsx/source/xlsxdatetype.cpp b/QXlsx/source/xlsxdatetype.cpp
@@ -9,7 +9,9 @@
 
 QT_BEGIN_NAMESPACE_XLSX
 
-DateType::DateType() {}
+DateType::DateType()
+{
+}
 
 /*
 DateType::DateType(bool is1904)

diff --git a/QXlsx/source/xlsxdocument.cpp b/QXlsx/source/xlsxdocument.cpp
@@ -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;
 }
 
 /*!

diff --git a/QXlsx/source/xlsxdrawinganchor.cpp b/QXlsx/source/xlsxdrawinganchor.cpp
@@ -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"));

diff --git a/QXlsx/source/xlsxformat.cpp b/QXlsx/source/xlsxformat.cpp
@@ -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.

diff --git a/QXlsx/source/xlsxrelationships.cpp b/QXlsx/source/xlsxrelationships.cpp
@@ -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
 {

diff --git a/QXlsx/source/xlsxrichstring.cpp b/QXlsx/source/xlsxrichstring.cpp
@@ -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

diff --git a/QXlsx/source/xlsxstyles.cpp b/QXlsx/source/xlsxstyles.cpp
@@ -69,7 +69,9 @@ Styles::Styles(CreateFlag flag)
     }
 }
 
-Styles::~Styles() {}
+Styles::~Styles()
+{
+}
 
 Format Styles::xfFormat(int idx) const
 {