1 files changed, 15 insertions, 15 deletions

diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index cc230a5411..cda800ce35 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -74,7 +74,7 @@ public:
         CsConnectionRefused
     };
 
-    QFtpDTP(QFtpPI *p, QObject *parent = 0);
+    QFtpDTP(QFtpPI *p, QObject *parent = nullptr);
 
     void setData(QByteArray *);
     void setDevice(QIODevice *);
@@ -149,7 +149,7 @@ class QFtpPI : public QObject
     Q_OBJECT
 
 public:
-    QFtpPI(QObject *parent = 0);
+    QFtpPI(QObject *parent = nullptr);
 
     void connectToHost(const QString &host, quint16 port);
 
@@ -229,7 +229,7 @@ class QFtpCommand
 {
 public:
     QFtpCommand(QFtp::Command cmd, const QStringList &raw, const QByteArray &ba);
-    QFtpCommand(QFtp::Command cmd, const QStringList &raw, QIODevice *dev = 0);
+    QFtpCommand(QFtp::Command cmd, const QStringList &raw, QIODevice *dev = nullptr);
     ~QFtpCommand();
 
     int id;
@@ -279,7 +279,7 @@ QFtpCommand::~QFtpCommand()
  *********************************************************************/
 QFtpDTP::QFtpDTP(QFtpPI *p, QObject *parent) :
     QObject(parent),
-    socket(0),
+    socket(nullptr),
     listener(this),
     pi(p),
     callWriteData(false)
@@ -314,10 +314,10 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 
     if (socket) {
         delete socket;
-        socket = 0;
+        socket = nullptr;
     }
     socket = new QTcpSocket(this);
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
     //copy network session down to the socket
     socket->setProperty("_q_networksession", property("_q_networksession"));
 #endif
@@ -333,7 +333,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 
 int QFtpDTP::setupListener(const QHostAddress &address)
 {
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
     //copy network session down to the socket
     listener.setProperty("_q_networksession", property("_q_networksession"));
 #endif
@@ -427,7 +427,7 @@ void QFtpDTP::writeData()
         }
 
         // do we continue uploading?
-        callWriteData = data.dev != 0;
+        callWriteData = data.dev != nullptr;
     }
 }
 
@@ -779,7 +779,7 @@ void QFtpDTP::setupSocket()
 void QFtpDTP::clearData()
 {
     is_ba = false;
-    data.dev = 0;
+    data.dev = nullptr;
 }
 
 /**********************************************************************
@@ -792,7 +792,7 @@ QFtpPI::QFtpPI(QObject *parent) :
     rawCommand(false),
     transferConnectionExtended(true),
     dtp(this),
-    commandSocket(0),
+    commandSocket(nullptr),
     state(Begin), abortState(None),
     currentCmd(QString()),
     waitForDtpToConnect(false),
@@ -817,7 +817,7 @@ QFtpPI::QFtpPI(QObject *parent) :
 void QFtpPI::connectToHost(const QString &host, quint16 port)
 {
     emit connectState(QFtp::HostLookup);
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
     //copy network session down to the socket & DTP
     commandSocket.setProperty("_q_networksession", property("_q_networksession"));
     dtp.setProperty("_q_networksession", property("_q_networksession"));
@@ -1820,7 +1820,7 @@ int QFtp::cd(const QString &dir)
     \internal
     Downloads the file \a file from the server.
 
-    If \a dev is 0, then the readyRead() signal is emitted when there
+    If \a dev is \nullptr, then the readyRead() signal is emitted when there
     is data available to read. You can then read the data with the
     read() or readAll() functions.
 
@@ -2173,10 +2173,10 @@ QFtp::Command QFtp::currentCommand() const
 QIODevice* QFtp::currentDevice() const
 {
     if (d_func()->pending.isEmpty())
-        return 0;
+        return nullptr;
     QFtpCommand *c = d_func()->pending.first();
     if (c->is_ba)
-        return 0;
+        return nullptr;
     return c->data.dev;
 }
 
@@ -2287,7 +2287,7 @@ void QFtpPrivate::_q_startNextCommand()
         c->rawCmds.clear();
         _q_piFinished(QLatin1String("Proxy set to ") + proxyHost + QLatin1Char(':') + QString::number(proxyPort));
     } else if (c->command == QFtp::ConnectToHost) {
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
         //copy network session down to the PI
         pi.setProperty("_q_networksession", q->property("_q_networksession"));
 #endif