Skip to content

Commit

Permalink
Modernize codebase using clang-tidy
Browse files Browse the repository at this point in the history 
Using the following checks:
 * modernize-use-nullptr
 * modernize-use-override
 * modernize-use-using
 * modernize-use-bool-literals
  • Loading branch information
@jbruechert @lnjX
jbruechert authored and lnjX committed Sep 8, 2019
1 parent 35256b7 commit b18a57d
Show file tree
Hide file tree
Showing 90 changed files with 359 additions and 359 deletions.
4 changes: 2 additions & 2 deletions examples/example_1_echoClient/example_1_echoClient.h
View file
Expand Up @@ -32,8 +32,8 @@ class echoClient : public QXmppClient
Q_OBJECT

public:
echoClient(QObject *parent = 0);
~echoClient();
echoClient(QObject *parent = nullptr);
~echoClient() override;

public slots:
void messageReceived(const QXmppMessage&);
Expand Down
4 changes: 2 additions & 2 deletions examples/example_2_rosterHandling/example_2_rosterHandling.h
View file
Expand Up @@ -32,8 +32,8 @@ class xmppClient : public QXmppClient
Q_OBJECT

public:
xmppClient(QObject *parent = 0);
~xmppClient();
xmppClient(QObject *parent = nullptr);
~xmppClient() override;

public slots:
void clientConnected();
Expand Down
2 changes: 1 addition & 1 deletion examples/example_3_transferHandling/example_3_transferHandling.cpp
View file
Expand Up @@ -35,7 +35,7 @@
#include "example_3_transferHandling.h"

xmppClient::xmppClient(QObject *parent)
: QXmppClient(parent), transferManager(0)
: QXmppClient(parent), transferManager(nullptr)
{
bool check;
Q_UNUSED(check);
Expand Down
2 changes: 1 addition & 1 deletion examples/example_3_transferHandling/example_3_transferHandling.h
View file
Expand Up @@ -33,7 +33,7 @@ class xmppClient : public QXmppClient
Q_OBJECT

public:
xmppClient(QObject *parent = 0);
xmppClient(QObject *parent = nullptr);
void setRecipient(const QString &recipient);

private slots:
Expand Down
4 changes: 2 additions & 2 deletions examples/example_5_rpcInterface/remoteinterface.h
View file
Expand Up @@ -7,9 +7,9 @@ class RemoteInterface : public QXmppInvokable
{
Q_OBJECT
public:
RemoteInterface(QObject *parent = 0);
RemoteInterface(QObject *parent = nullptr);

bool isAuthorized( const QString &jid ) const;
bool isAuthorized( const QString &jid ) const override;

// RPC Interface
public slots:
Expand Down
4 changes: 2 additions & 2 deletions examples/example_6_rpcClient/rpcClient.h
View file
Expand Up @@ -35,8 +35,8 @@ class rpcClient : public QXmppClient
Q_OBJECT

public:
rpcClient(QObject *parent = 0);
~rpcClient();
rpcClient(QObject *parent = nullptr);
~rpcClient() override;

private slots:
void slotInvokeRemoteMethod();
Expand Down
4 changes: 2 additions & 2 deletions examples/example_7_archiveHandling/example_7_archiveHandling.h
View file
Expand Up @@ -43,8 +43,8 @@ class xmppClient : public QXmppClient
PageBackwards
};

xmppClient(QObject *parent = 0);
~xmppClient();
xmppClient(QObject *parent = nullptr);
~xmppClient() override;

void setPageDirection(PageDirection direction);
void setPageSize(int size);
Expand Down
4 changes: 2 additions & 2 deletions examples/example_8_server/example_8_server.cpp
View file
Expand Up @@ -33,7 +33,7 @@
class passwordChecker : public QXmppPasswordChecker
{
/// Retrieves the password for the given username.
QXmppPasswordReply::Error getPassword(const QXmppPasswordRequest &request, QString &password)
QXmppPasswordReply::Error getPassword(const QXmppPasswordRequest &request, QString &password) override
{
if (request.username() == USERNAME)
{
Expand All @@ -45,7 +45,7 @@ class passwordChecker : public QXmppPasswordChecker
};

/// Returns true as we implemented getPassword().
bool hasGetPassword() const
bool hasGetPassword() const override
{
return true;
};
Expand Down
4 changes: 2 additions & 2 deletions examples/example_9_vCard/example_9_vCard.h
View file
Expand Up @@ -34,8 +34,8 @@ class xmppClient : public QXmppClient
Q_OBJECT

public:
xmppClient(QObject *parent = 0);
~xmppClient();
xmppClient(QObject *parent = nullptr);
~xmppClient() override;

public slots:
void clientConnected();
Expand Down
20 changes: 10 additions & 10 deletions src/base/QXmppArchiveIq.h
View file
Expand Up @@ -111,8 +111,8 @@ class QXMPP_EXPORT QXmppArchiveChatIq : public QXmppIq
static bool isArchiveChatIq(const QDomElement &element);

protected:
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down Expand Up @@ -153,8 +153,8 @@ class QXMPP_EXPORT QXmppArchiveListIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down Expand Up @@ -186,8 +186,8 @@ class QXMPP_EXPORT QXmppArchiveRemoveIq : public QXmppIq
static bool isArchiveRemoveIq(const QDomElement &element);

protected:
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down Expand Up @@ -218,8 +218,8 @@ class QXMPP_EXPORT QXmppArchiveRetrieveIq : public QXmppIq
static bool isArchiveRetrieveIq(const QDomElement &element);

protected:
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand All @@ -239,8 +239,8 @@ class QXMPP_EXPORT QXmppArchivePrefIq : public QXmppIq
static bool isArchivePrefIq(const QDomElement &element);

protected:
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond
};

Expand Down
4 changes: 2 additions & 2 deletions src/base/QXmppBindIq.h
View file
Expand Up @@ -48,8 +48,8 @@ class QXMPP_EXPORT QXmppBindIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
4 changes: 2 additions & 2 deletions src/base/QXmppByteStreamIq.h
View file
Expand Up @@ -78,8 +78,8 @@ class QXMPP_EXPORT QXmppByteStreamIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
8 changes: 4 additions & 4 deletions src/base/QXmppCodec_p.h
View file
Expand Up @@ -60,8 +60,8 @@ class QXmppG711aCodec : public QXmppCodec
public:
QXmppG711aCodec(int clockrate);

qint64 encode(QDataStream &input, QDataStream &output);
qint64 decode(QDataStream &input, QDataStream &output);
qint64 encode(QDataStream &input, QDataStream &output) override;
qint64 decode(QDataStream &input, QDataStream &output) override;

private:
int m_frequency;
Expand All @@ -76,8 +76,8 @@ class QXmppG711uCodec : public QXmppCodec
public:
QXmppG711uCodec(int clockrate);

qint64 encode(QDataStream &input, QDataStream &output);
qint64 decode(QDataStream &input, QDataStream &output);
qint64 encode(QDataStream &input, QDataStream &output) override;
qint64 decode(QDataStream &input, QDataStream &output) override;

private:
int m_frequency;
Expand Down
2 changes: 1 addition & 1 deletion src/base/QXmppDataForm.cpp
View file
Expand Up @@ -46,7 +46,7 @@ static field_type field_types[] = {
{QXmppDataForm::Field::TextMultiField, "text-multi"},
{QXmppDataForm::Field::TextPrivateField, "text-private"},
{QXmppDataForm::Field::TextSingleField, "text-single"},
{static_cast<QXmppDataForm::Field::Type>(-1), NULL},
{static_cast<QXmppDataForm::Field::Type>(-1), nullptr},
};

class QXmppDataFormMediaPrivate : public QSharedData
Expand Down
4 changes: 2 additions & 2 deletions src/base/QXmppDiscoveryIq.h
View file
Expand Up @@ -99,8 +99,8 @@ class QXMPP_EXPORT QXmppDiscoveryIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
6 changes: 3 additions & 3 deletions src/base/QXmppElement.cpp
View file
Expand Up @@ -46,12 +46,12 @@ class QXmppElementPrivate
};

QXmppElementPrivate::QXmppElementPrivate()
: counter(1), parent(NULL)
: counter(1), parent(nullptr)
{
}

QXmppElementPrivate::QXmppElementPrivate(const QDomElement &element)
: counter(1), parent(NULL)
: counter(1), parent(nullptr)
{
if (element.isNull())
return;
Expand Down Expand Up @@ -207,7 +207,7 @@ void QXmppElement::removeChild(const QXmppElement &child)

d->children.removeAll(child.d);
child.d->counter.deref();
child.d->parent = NULL;
child.d->parent = nullptr;
}

QString QXmppElement::tagName() const
Expand Down
2 changes: 1 addition & 1 deletion src/base/QXmppElement.h
View file
Expand Up @@ -34,7 +34,7 @@ class QDomElement;
class QXmppElement;
class QXmppElementPrivate;

typedef QList<QXmppElement> QXmppElementList;
using QXmppElementList = QList<QXmppElement>;
class QXMPP_EXPORT QXmppElement
{
public:
Expand Down
4 changes: 2 additions & 2 deletions src/base/QXmppEntityTimeIq.h
View file
Expand Up @@ -44,8 +44,8 @@ class QXMPP_EXPORT QXmppEntityTimeIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
12 changes: 6 additions & 6 deletions src/base/QXmppHttpUploadIq.h
View file
Expand Up @@ -42,7 +42,7 @@ class QXMPP_EXPORT QXmppHttpUploadRequestIq : public QXmppIq
{
public:
QXmppHttpUploadRequestIq();
~QXmppHttpUploadRequestIq();
~QXmppHttpUploadRequestIq() override;

QString fileName() const;
void setFileName(const QString &filename);
Expand All @@ -57,8 +57,8 @@ class QXMPP_EXPORT QXmppHttpUploadRequestIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand All @@ -74,7 +74,7 @@ class QXMPP_EXPORT QXmppHttpUploadSlotIq : public QXmppIq
{
public:
QXmppHttpUploadSlotIq();
~QXmppHttpUploadSlotIq();
~QXmppHttpUploadSlotIq() override;

QUrl putUrl() const;
void setPutUrl(const QUrl &putUrl);
Expand All @@ -89,8 +89,8 @@ class QXMPP_EXPORT QXmppHttpUploadSlotIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
12 changes: 6 additions & 6 deletions src/base/QXmppIbbIq.h
View file
Expand Up @@ -42,8 +42,8 @@ class QXmppIbbOpenIq: public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand All @@ -63,8 +63,8 @@ class QXmppIbbCloseIq: public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand All @@ -89,8 +89,8 @@ class QXMPP_EXPORT QXmppIbbDataIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down
8 changes: 4 additions & 4 deletions src/base/QXmppIq.h
View file
Expand Up @@ -53,18 +53,18 @@ class QXMPP_EXPORT QXmppIq : public QXmppStanza

QXmppIq(QXmppIq::Type type = QXmppIq::Get);
QXmppIq(const QXmppIq &other);
~QXmppIq();
~QXmppIq() override;

QXmppIq& operator=(const QXmppIq &other);

QXmppIq::Type type() const;
void setType(QXmppIq::Type);

bool isXmppStanza() const;
bool isXmppStanza() const override;

/// \cond
void parse(const QDomElement &element);
void toXml(QXmlStreamWriter *writer) const;
void parse(const QDomElement &element) override;
void toXml(QXmlStreamWriter *writer) const override;

protected:
virtual void parseElementFromChild(const QDomElement &element);
Expand Down
8 changes: 4 additions & 4 deletions src/base/QXmppJingleIq.h
View file
Expand Up @@ -138,7 +138,7 @@ class QXMPP_EXPORT QXmppJingleCandidate
void parse(const QDomElement &element);
void toXml(QXmlStreamWriter *writer) const;

static QXmppJingleCandidate::Type typeFromString(const QString &typeStr, bool *ok = 0);
static QXmppJingleCandidate::Type typeFromString(const QString &typeStr, bool *ok = nullptr);
static QString typeToString(QXmppJingleCandidate::Type type);
/// \endcond

Expand Down Expand Up @@ -289,7 +289,7 @@ class QXMPP_EXPORT QXmppJingleIq : public QXmppIq

QXmppJingleIq();
QXmppJingleIq(const QXmppJingleIq &other);
~QXmppJingleIq();
~QXmppJingleIq() override;

QXmppJingleIq& operator=(const QXmppJingleIq &other);

Expand Down Expand Up @@ -322,8 +322,8 @@ class QXMPP_EXPORT QXmppJingleIq : public QXmppIq

protected:
/// \cond
void parseElementFromChild(const QDomElement &element);
void toXmlElementFromChild(QXmlStreamWriter *writer) const;
void parseElementFromChild(const QDomElement &element) override;
void toXmlElementFromChild(QXmlStreamWriter *writer) const override;
/// \endcond

private:
Expand Down

0 comments on commit b18a57d

Please sign in to comment.