Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 0e8666565f..408e3ec167 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -70,7 +70,7 @@ static QString pixelToPoint(qreal pixels)
 // strategies
 class QOutputStrategy {
 public:
-    QOutputStrategy() : contentStream(0), counter(1) { }
+    QOutputStrategy() : contentStream(nullptr), counter(1) { }
     virtual ~QOutputStrategy() {}
     virtual void addFile(const QString &fileName, const QString &mimeType, const QByteArray &bytes) = 0;
 
@@ -240,7 +240,7 @@ void QTextOdfWriter::writeFrame(QXmlStreamWriter &writer, const QTextFrame *fram
     }
 
     QTextFrame::iterator iterator = frame->begin();
-    QTextFrame *child = 0;
+    QTextFrame *child = nullptr;
 
     int tableRow = -1;
     while (! iterator.atEnd()) {
@@ -437,7 +437,7 @@ static bool probeImageData(QIODevice *device, QImage *image, QString *mimeType,
 void QTextOdfWriter::writeInlineCharacter(QXmlStreamWriter &writer, const QTextFragment &fragment) const
 {
     writer.writeStartElement(drawNS, QString::fromLatin1("frame"));
-    if (m_strategy == 0) {
+    if (m_strategy == nullptr) {
         // don't do anything.
     }
     else if (fragment.charFormat().isImageFormat()) {
@@ -997,8 +997,8 @@ QTextOdfWriter::QTextOdfWriter(const QTextDocument &document, QIODevice *device)
     svgNS (QLatin1String("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0")),
     m_document(&document),
     m_device(device),
-    m_strategy(0),
-    m_codec(0),
+    m_strategy(nullptr),
+    m_codec(nullptr),
     m_createArchive(true)
 {
 }
@@ -1093,7 +1093,7 @@ bool QTextOdfWriter::writeAll()
     writer.writeEndElement(); // document-content
     writer.writeEndDocument();
     delete m_strategy;
-    m_strategy = 0;
+    m_strategy = nullptr;
 
     return true;
 }