aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects/qtftp
diff options
context:
space:
mode:
authorGravatar Alexey Sokolov2016-04-30 18:23:42 +0100
committerGravatar Alexey Sokolov2016-04-30 18:50:44 +0100
commit505d0768f8392e3c4775425dd97f41e1c829ef44 (patch)
tree55dfa35f2e180b4186baf00ffbfd2ee38c0f1c18 /src/modules/objects/qtftp
parentUpdate my clang-format to 3.8.0 (diff)
downloadKVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.gz
KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.bz2
KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.zip
Apply clang-tidy: modernize-use-nullptr
Diffstat (limited to 'src/modules/objects/qtftp')
-rw-r--r--src/modules/objects/qtftp/qftp.cpp16
-rw-r--r--src/modules/objects/qtftp/qurlinfo.cpp10
2 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 2f048985e..565172619 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -69,7 +69,7 @@ class QFtpCommand
{
public:
QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba);
- QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = 0);
+ QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = nullptr);
~QFtpCommand();
int id;
@@ -115,7 +115,7 @@ QFtpCommand::~QFtpCommand()
*
*********************************************************************/
QFtpDTP::QFtpDTP(QFtpPI * p, QObject * parent) : QObject(parent),
- socket(0),
+ socket(nullptr),
listener(this),
pi(p),
callWriteData(false)
@@ -151,7 +151,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
if(socket)
{
delete socket;
- socket = 0;
+ socket = nullptr;
}
socket = new QTcpSocket(this);
#ifndef QT_NO_BEARERMANAGEMENT
@@ -276,7 +276,7 @@ void QFtpDTP::writeData()
}
// do we continue uploading?
- callWriteData = data.dev != 0;
+ callWriteData = data.dev != nullptr;
}
}
@@ -657,7 +657,7 @@ void QFtpDTP::setupSocket()
void QFtpDTP::clearData()
{
is_ba = false;
- data.dev = 0;
+ data.dev = nullptr;
}
/**********************************************************************
@@ -669,7 +669,7 @@ QFtpPI::QFtpPI(QObject * parent) : QObject(parent),
rawCommand(false),
transferConnectionExtended(true),
dtp(this),
- commandSocket(0),
+ commandSocket(nullptr),
state(Begin), abortState(None),
currentCmd(QString()),
waitForDtpToConnect(false),
@@ -2067,10 +2067,10 @@ QFtp::Command QFtp::currentCommand() const
QIODevice * QFtp::currentDevice() const
{
if(d->pending.isEmpty())
- return 0;
+ return nullptr;
QFtpCommand * c = d->pending.first();
if(c->is_ba)
- return 0;
+ return nullptr;
return c->data.dev;
}
diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp
index 9e7849354..2df6adfdb 100644
--- a/src/modules/objects/qtftp/qurlinfo.cpp
+++ b/src/modules/objects/qtftp/qurlinfo.cpp
@@ -126,7 +126,7 @@ public:
QUrlInfo::QUrlInfo()
{
- d = 0;
+ d = nullptr;
}
/*!
@@ -142,7 +142,7 @@ QUrlInfo::QUrlInfo(const QUrlInfo & ui)
}
else
{
- d = 0;
+ d = nullptr;
}
}
@@ -442,7 +442,7 @@ QUrlInfo & QUrlInfo::operator=(const QUrlInfo & ui)
else
{
delete d;
- d = 0;
+ d = nullptr;
}
return *this;
}
@@ -684,7 +684,7 @@ bool QUrlInfo::equal(const QUrlInfo & i1, const QUrlInfo & i2,
bool QUrlInfo::operator==(const QUrlInfo & other) const
{
if(!d)
- return other.d == 0;
+ return other.d == nullptr;
if(!other.d)
return false;
@@ -710,7 +710,7 @@ bool QUrlInfo::operator==(const QUrlInfo & other) const
*/
bool QUrlInfo::isValid() const
{
- return d != 0;
+ return d != nullptr;
}
QT_END_NAMESPACE