aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorJonah BrĂ¼chert <jbb.prv@gmx.de>2019-05-10 22:31:48 +0200
committerLNJ <lnj@kaidan.im>2019-09-08 14:07:00 +0200
commitb18a57daa33f0fefa5f4c63aa7f448b48d302e0d (patch)
tree8682c7ea44b834a2910035049238e8628db552a0 /src/server
parent35256b7d95374717905f8ac8d4d524c4b691389e (diff)
Modernize codebase using clang-tidy
Using the following checks: * modernize-use-nullptr * modernize-use-override * modernize-use-using * modernize-use-bool-literals
Diffstat (limited to 'src/server')
-rw-r--r--src/server/QXmppDialback.h4
-rw-r--r--src/server/QXmppIncomingClient.cpp10
-rw-r--r--src/server/QXmppIncomingClient.h10
-rw-r--r--src/server/QXmppIncomingServer.h8
-rw-r--r--src/server/QXmppOutgoingServer.h10
-rw-r--r--src/server/QXmppPasswordChecker.h2
-rw-r--r--src/server/QXmppServer.cpp6
-rw-r--r--src/server/QXmppServer.h8
-rw-r--r--src/server/QXmppServerExtension.cpp2
-rw-r--r--src/server/QXmppServerExtension.h2
-rw-r--r--src/server/QXmppServerPlugin.h4
11 files changed, 33 insertions, 33 deletions
diff --git a/src/server/QXmppDialback.h b/src/server/QXmppDialback.h
index f8da6aeb..5166df51 100644
--- a/src/server/QXmppDialback.h
+++ b/src/server/QXmppDialback.h
@@ -54,8 +54,8 @@ public:
void setType(const QString &type);
/// \cond
- void parse(const QDomElement &element);
- void toXml(QXmlStreamWriter *writer) const;
+ void parse(const QDomElement &element) override;
+ void toXml(QXmlStreamWriter *writer) const override;
static bool isDialback(const QDomElement &element);
/// \endcond
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index b1b95ec5..e563ef1c 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -58,9 +58,9 @@ private:
};
QXmppIncomingClientPrivate::QXmppIncomingClientPrivate(QXmppIncomingClient *qq)
- : idleTimer(0)
- , passwordChecker(0)
- , saslServer(0)
+ : idleTimer(nullptr)
+ , passwordChecker(nullptr)
+ , saslServer(nullptr)
, q(qq)
{
}
@@ -184,9 +184,9 @@ void QXmppIncomingClient::handleStream(const QDomElement &streamElement)
{
if (d->idleTimer->interval())
d->idleTimer->start();
- if (d->saslServer != 0) {
+ if (d->saslServer != nullptr) {
delete d->saslServer;
- d->saslServer = 0;
+ d->saslServer = nullptr;
}
// start stream
diff --git a/src/server/QXmppIncomingClient.h b/src/server/QXmppIncomingClient.h
index 9c1e4afd..374fabd4 100644
--- a/src/server/QXmppIncomingClient.h
+++ b/src/server/QXmppIncomingClient.h
@@ -41,10 +41,10 @@ class QXMPP_EXPORT QXmppIncomingClient : public QXmppStream
Q_OBJECT
public:
- QXmppIncomingClient(QSslSocket *socket, const QString &domain, QObject *parent = 0);
- ~QXmppIncomingClient();
+ QXmppIncomingClient(QSslSocket *socket, const QString &domain, QObject *parent = nullptr);
+ ~QXmppIncomingClient() override;
- bool isConnected() const;
+ bool isConnected() const override;
QString jid() const;
void setInactivityTimeout(int secs);
@@ -56,8 +56,8 @@ signals:
protected:
/// \cond
- void handleStream(const QDomElement &element);
- void handleStanza(const QDomElement &element);
+ void handleStream(const QDomElement &element) override;
+ void handleStanza(const QDomElement &element) override;
/// \endcond
private slots:
diff --git a/src/server/QXmppIncomingServer.h b/src/server/QXmppIncomingServer.h
index f0d1a54a..883d9f01 100644
--- a/src/server/QXmppIncomingServer.h
+++ b/src/server/QXmppIncomingServer.h
@@ -40,9 +40,9 @@ class QXMPP_EXPORT QXmppIncomingServer : public QXmppStream
public:
QXmppIncomingServer(QSslSocket *socket, const QString &domain, QObject *parent);
- ~QXmppIncomingServer();
+ ~QXmppIncomingServer() override;
- bool isConnected() const;
+ bool isConnected() const override;
QString localStreamId() const;
signals:
@@ -54,8 +54,8 @@ signals:
protected:
/// \cond
- void handleStanza(const QDomElement &stanzaElement);
- void handleStream(const QDomElement &streamElement);
+ void handleStanza(const QDomElement &stanzaElement) override;
+ void handleStream(const QDomElement &streamElement) override;
/// \endcond
private slots:
diff --git a/src/server/QXmppOutgoingServer.h b/src/server/QXmppOutgoingServer.h
index 690dff1a..139a2f22 100644
--- a/src/server/QXmppOutgoingServer.h
+++ b/src/server/QXmppOutgoingServer.h
@@ -43,9 +43,9 @@ class QXMPP_EXPORT QXmppOutgoingServer : public QXmppStream
public:
QXmppOutgoingServer(const QString &domain, QObject *parent);
- ~QXmppOutgoingServer();
+ ~QXmppOutgoingServer() override;
- bool isConnected() const;
+ bool isConnected() const override;
QString localStreamKey() const;
void setLocalStreamKey(const QString &key);
@@ -59,9 +59,9 @@ signals:
protected:
/// \cond
- void handleStart();
- void handleStream(const QDomElement &streamElement);
- void handleStanza(const QDomElement &stanzaElement);
+ void handleStart() override;
+ void handleStream(const QDomElement &streamElement) override;
+ void handleStanza(const QDomElement &stanzaElement) override;
/// \endcond
public slots:
diff --git a/src/server/QXmppPasswordChecker.h b/src/server/QXmppPasswordChecker.h
index f8cf16ef..2bdbc9c5 100644
--- a/src/server/QXmppPasswordChecker.h
+++ b/src/server/QXmppPasswordChecker.h
@@ -67,7 +67,7 @@ public:
TemporaryError
};
- QXmppPasswordReply(QObject *parent = 0);
+ QXmppPasswordReply(QObject *parent = nullptr);
QByteArray digest() const;
void setDigest(const QByteArray &digest);
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 511b32a4..82bc5d37 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -111,8 +111,8 @@ private:
};
QXmppServerPrivate::QXmppServerPrivate(QXmppServer *qq)
- : logger(0),
- passwordChecker(0),
+ : logger(nullptr),
+ passwordChecker(nullptr),
loaded(false),
started(false),
q(qq)
@@ -166,7 +166,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
// if we did not find an outgoing server,
// we need to establish the S2S connection
- QXmppOutgoingServer *conn = new QXmppOutgoingServer(domain, 0);
+ QXmppOutgoingServer *conn = new QXmppOutgoingServer(domain, nullptr);
conn->setLocalStreamKey(QXmppUtils::generateStanzaHash().toLatin1());
conn->moveToThread(q->thread());
conn->setParent(q);
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index ef4f5a6e..2f9bca8e 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -62,8 +62,8 @@ class QXMPP_EXPORT QXmppServer : public QXmppLoggable
Q_PROPERTY(QXmppLogger* logger READ logger WRITE setLogger NOTIFY loggerChanged)
public:
- QXmppServer(QObject *parent = 0);
- ~QXmppServer();
+ QXmppServer(QObject *parent = nullptr);
+ ~QXmppServer() override;
void addExtension(QXmppServerExtension *extension);
QList<QXmppServerExtension*> extensions();
@@ -131,8 +131,8 @@ class QXMPP_EXPORT QXmppSslServer : public QTcpServer
Q_OBJECT
public:
- QXmppSslServer(QObject *parent = 0);
- ~QXmppSslServer();
+ QXmppSslServer(QObject *parent = nullptr);
+ ~QXmppSslServer() override;
void addCaCertificates(const QList<QSslCertificate> &certificates);
void setLocalCertificate(const QSslCertificate &certificate);
diff --git a/src/server/QXmppServerExtension.cpp b/src/server/QXmppServerExtension.cpp
index 3629f590..81a23b12 100644
--- a/src/server/QXmppServerExtension.cpp
+++ b/src/server/QXmppServerExtension.cpp
@@ -38,7 +38,7 @@ public:
QXmppServerExtension::QXmppServerExtension()
: d(new QXmppServerExtensionPrivate)
{
- d->server = 0;
+ d->server = nullptr;
}
QXmppServerExtension::~QXmppServerExtension()
diff --git a/src/server/QXmppServerExtension.h b/src/server/QXmppServerExtension.h
index ec9edb2a..bfdde5d8 100644
--- a/src/server/QXmppServerExtension.h
+++ b/src/server/QXmppServerExtension.h
@@ -51,7 +51,7 @@ class QXMPP_EXPORT QXmppServerExtension : public QXmppLoggable
public:
QXmppServerExtension();
- ~QXmppServerExtension();
+ ~QXmppServerExtension() override;
virtual QString extensionName() const;
virtual int extensionPriority() const;
diff --git a/src/server/QXmppServerPlugin.h b/src/server/QXmppServerPlugin.h
index a07e7ca8..73b10631 100644
--- a/src/server/QXmppServerPlugin.h
+++ b/src/server/QXmppServerPlugin.h
@@ -55,11 +55,11 @@ public:
/// Creates and returns the specified QXmppServerExtension.
///
/// \param key The key for the QXmppServerExtension.
- virtual QXmppServerExtension *create(const QString &key) = 0;
+ QXmppServerExtension *create(const QString &key) override = 0;
/// Returns the list of keys supported by this plugin.
///
- virtual QStringList keys() const = 0;
+ QStringList keys() const override = 0;
};
#endif