Modernize code

examples/browser/mainwindow.cpp

@@ -56,29 +56,29 @@ MainWindow::MainWindow()
     mAttributes = new QTableWidget;
     mAttributes->setSelectionBehavior(QAbstractItemView::SelectRows);
 
-    QVBoxLayout *rootLayout = new QVBoxLayout;
-    QWidget *widget = new QWidget;
+    auto *rootLayout = new QVBoxLayout;
+    auto *widget = new QWidget;
     widget->setLayout(rootLayout);
     setCentralWidget(widget);
 
-    QCheckBox *any = new QCheckBox(tr("Any"));
+    auto *any = new QCheckBox(tr("Any"));
 
-    QHBoxLayout *typeLayout = new QHBoxLayout;
+    auto *typeLayout = new QHBoxLayout;
     typeLayout->addWidget(mServiceType, 1);
     typeLayout->addWidget(any);
     typeLayout->addWidget(mStartStop);
     rootLayout->addLayout(typeLayout);
 
-    QSplitter *vSplitter = new QSplitter;
+    auto *vSplitter = new QSplitter;
     vSplitter->setOrientation(Qt::Vertical);
     vSplitter->addWidget(mAddresses);
     vSplitter->addWidget(mAttributes);
 
-    QSplitter *hSplitter = new QSplitter;
+    auto *hSplitter = new QSplitter;
     hSplitter->addWidget(mServices);
     hSplitter->addWidget(vSplitter);
 
-    QHBoxLayout *servicesLayout = new QHBoxLayout;
+    auto *servicesLayout = new QHBoxLayout;
     servicesLayout->addWidget(hSplitter);
     rootLayout->addLayout(servicesLayout);
 

examples/browser/servicemodel.h

@@ -41,8 +41,8 @@ class ServiceModel : public QAbstractListModel
 
     ServiceModel(QMdnsEngine::Server *server, const QByteArray &type);
 
-    virtual int rowCount(const QModelIndex &parent) const;
-    virtual QVariant data(const QModelIndex &index, int role) const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
 private Q_SLOTS:
 

examples/provider/mainwindow.cpp

@@ -40,7 +40,7 @@
 
 MainWindow::MainWindow()
     : mHostname(&mServer),
-      mProvider(0),
+      mProvider(nullptr),
       mServiceName(new QLineEdit(tr("Test Service"))),
       mServiceType(new QLineEdit(tr("_test._tcp.local."))),
       mServicePort(new QLineEdit("1234")),
@@ -55,17 +55,17 @@ MainWindow::MainWindow()
     mLog->setReadOnly(true);
 
     // Create the root layout
-    QVBoxLayout *rootLayout = new QVBoxLayout;
-    QWidget *widget = new QWidget;
+    auto *rootLayout = new QVBoxLayout;
+    auto *widget = new QWidget;
     widget->setLayout(rootLayout);
     setCentralWidget(widget);
 
     // Create the horizontal layout for the grid and buttons
-    QHBoxLayout *upperLayout = new QHBoxLayout;
+    auto *upperLayout = new QHBoxLayout;
     rootLayout->addLayout(upperLayout);
 
     // Create the grid layout for the line edits
-    QGridLayout *gridLayout = new QGridLayout;
+    auto *gridLayout = new QGridLayout;
     gridLayout->addWidget(new QLabel(tr("Service name:")), 0, 0);
     gridLayout->addWidget(mServiceName, 0, 1);
     gridLayout->addWidget(new QLabel(tr("Service type:")), 1, 0);
@@ -75,7 +75,7 @@ MainWindow::MainWindow()
     upperLayout->addLayout(gridLayout);
 
     // Create the layout for the buttons
-    QVBoxLayout *buttonLayout = new QVBoxLayout;
+    auto *buttonLayout = new QVBoxLayout;
     buttonLayout->addWidget(mButton);
     buttonLayout->addWidget(mShowQueries);
     buttonLayout->addWidget(new QWidget, 1);
@@ -94,7 +94,7 @@ void MainWindow::onClicked()
     if (mProvider) {
         mLog->append(tr("Destroying provider"));
         delete mProvider;
-        mProvider = 0;
+        mProvider = nullptr;
     } else {
         mLog->append(tr("Creating provider"));
         QMdnsEngine::Service service;

src/include/qmdnsengine/abstractserver.h

@@ -51,7 +51,7 @@ class QMDNSENGINE_EXPORT AbstractServer : public QObject
     /**
      * @brief Abstract constructor
      */
-    explicit AbstractServer(QObject *parent = 0);
+    explicit AbstractServer(QObject *parent = nullptr);
 
     /**
      * @brief Send a message to its provided destination

src/include/qmdnsengine/browser.h

@@ -82,7 +82,7 @@ class QMDNSENGINE_EXPORT Browser : public QObject
      * @param cache DNS cache to use or null to create one
      * @param parent QObject
      */
-    Browser(AbstractServer *server, const QByteArray &type, Cache *cache = 0, QObject *parent = 0);
+    Browser(AbstractServer *server, const QByteArray &type, Cache *cache = nullptr, QObject *parent = nullptr);
 
 Q_SIGNALS:
 

src/include/qmdnsengine/cache.h

@@ -71,7 +71,7 @@ class QMDNSENGINE_EXPORT Cache : public QObject
     /**
      * @brief Create an empty cache.
      */
-    explicit Cache(QObject *parent = 0);
+    explicit Cache(QObject *parent = nullptr);
 
     /**
      * @brief Add a record to the cache

src/include/qmdnsengine/dns.h

@@ -107,9 +107,9 @@ QMDNSENGINE_EXPORT bool fromPacket(const QByteArray &packet, Message &message);
 /**
  * @brief Create a raw DNS packet from a Message
  * @param message Message to create the packet from
- * @param packet storage for raw DNS packet
+ * @return packet storage for raw DNS packet
  */
-QMDNSENGINE_EXPORT void toPacket(const Message &message, QByteArray &packet);
+QMDNSENGINE_EXPORT QByteArray toPacket(const Message &message);
 
 /**
  * @brief Retrieve the string representation of a DNS type

src/include/qmdnsengine/hostname.h

@@ -60,7 +60,7 @@ class QMDNSENGINE_EXPORT Hostname : public QObject
     /**
      * @brief Create a new hostname
      */
-    Hostname(AbstractServer *server, QObject *parent = 0);
+    explicit Hostname(AbstractServer *server, QObject *parent = nullptr);
 
     /**
      * @brief Determine if a hostname has been registered

src/include/qmdnsengine/prober.h

@@ -68,7 +68,7 @@ class QMDNSENGINE_EXPORT Prober : public QObject
     /**
      * @brief Create a new prober
      */
-    Prober(AbstractServer *server, const Record &record, QObject *parent = 0);
+    Prober(AbstractServer *server, const Record &record, QObject *parent = nullptr);
 
 Q_SIGNALS:
 

src/include/qmdnsengine/provider.h

@@ -69,7 +69,7 @@ class QMDNSENGINE_EXPORT Provider : public QObject
     /**
      * @brief Create a new service provider
      */
-    Provider(AbstractServer *server, Hostname *hostname, QObject *parent = 0);
+    Provider(AbstractServer *server, Hostname *hostname, QObject *parent = nullptr);
 
     /**
      * @brief Update the service with the provided information

src/include/qmdnsengine/resolver.h

@@ -64,7 +64,7 @@ class QMDNSENGINE_EXPORT Resolver : public QObject
     /**
      * @brief Create a new resolver
      */
-    Resolver(AbstractServer *server, const QByteArray &name, Cache *cache = 0, QObject *parent = 0);
+    Resolver(AbstractServer *server, const QByteArray &name, Cache *cache = nullptr, QObject *parent = nullptr);
 
 Q_SIGNALS:
 

src/include/qmdnsengine/server.h

@@ -56,17 +56,17 @@ class QMDNSENGINE_EXPORT Server : public AbstractServer
     /**
      * @brief Create a new server
      */
-    explicit Server(QObject *parent = 0);
+    explicit Server(QObject *parent = nullptr);
 
     /**
      * @brief Implementation of AbstractServer::sendMessage()
      */
-    virtual void sendMessage(const Message &message);
+    void sendMessage(const Message &message) override;
 
     /**
      * @brief Implementation of AbstractServer::sendMessageToAll()
      */
-    virtual void sendMessageToAll(const Message &message);
+    void sendMessageToAll(const Message &message) override;
 
 private:
 

src/src/bitmap.cpp

@@ -41,9 +41,7 @@ BitmapPrivate::~BitmapPrivate()
 
 void BitmapPrivate::free()
 {
-    if (data) {
-        delete[] data;
-    }
+    delete[] data;
 }
 
 void BitmapPrivate::fromData(quint8 newLength, const quint8 *newData)

src/src/browser.cpp

@@ -31,15 +31,17 @@
 #include <qmdnsengine/query.h>
 #include <qmdnsengine/record.h>
 
+#include <utility>
+
 #include "browser_p.h"
 
 using namespace QMdnsEngine;
 
-BrowserPrivate::BrowserPrivate(Browser *browser, AbstractServer *server, const QByteArray &type, Cache *existingCache)
+BrowserPrivate::BrowserPrivate(Browser *browser, AbstractServer *server, QByteArray type, Cache *existingCache)
     : QObject(browser),
       q(browser),
       server(server),
-      type(type),
+      type(std::move(type)),
       cache(existingCache ? existingCache : new Cache(this))
 {
     connect(server, &AbstractServer::messageReceived, this, &BrowserPrivate::onMessageReceived);

src/src/browser_p.h

@@ -48,7 +48,7 @@ class BrowserPrivate : public QObject
 
 public:
 
-    explicit BrowserPrivate(Browser *browser, AbstractServer *server, const QByteArray &type, Cache *existingCache);
+    explicit BrowserPrivate(Browser *browser, AbstractServer *server, QByteArray type, Cache *existingCache);
 
     bool updateService(const QByteArray &fqName);
 

src/src/cache_p.h

@@ -49,7 +49,7 @@ class CachePrivate : public QObject
         QList<QDateTime> triggers;
     };
 
-    CachePrivate(Cache *cache);
+    explicit CachePrivate(Cache *cache);
 
     QTimer timer;
     QList<Entry> entries;

src/src/dns.cpp

@@ -335,8 +335,9 @@ bool fromPacket(const QByteArray &packet, Message &message)
     return true;
 }
 
-void toPacket(const Message &message, QByteArray &packet)
+QByteArray toPacket(const Message &message)
 {
+    QByteArray packet;
     quint16 offset = 0;
     quint16 flags = (message.isResponse() ? 0x8400 : 0) |
         (message.isTruncated() ? 0x200 : 0);
@@ -357,6 +358,7 @@ void toPacket(const Message &message, QByteArray &packet)
     for (Record record : records) {
         writeRecord(packet, offset, record, nameMap);
     }
+    return packet;
 }
 
 QString typeName(quint16 type)

src/src/message.cpp

@@ -31,14 +31,6 @@
 
 using namespace QMdnsEngine;
 
-MessagePrivate::MessagePrivate()
-    : port(0),
-      transactionId(0),
-      isResponse(false),
-      isTruncated(false)
-{
-}
-
 Message::Message()
     : d(new MessagePrivate)
 {

src/src/message_p.h

@@ -34,17 +34,13 @@ namespace QMdnsEngine
 class Query;
 class Record;
 
-class MessagePrivate
+struct MessagePrivate
 {
-public:
-
-    MessagePrivate();
-
     QHostAddress address;
-    quint16 port;
-    quint16 transactionId;
-    bool isResponse;
-    bool isTruncated;
+    quint16 port = 0;
+    quint16 transactionId = 0;
+    bool isResponse = false;
+    bool isTruncated = false;
     QList<Query> queries;
     QList<Record> records;
 };

src/src/provider.cpp

@@ -76,9 +76,7 @@ void ProviderPrivate::confirm()
 {
     // Confirm that the desired name is unique through probing
 
-    if (prober) {
-        delete prober;
-    }
+    delete prober;
     prober = new Prober(server, srvProposed, this);
     connect(prober, &Prober::nameConfirmed, [this](const QByteArray &name) {
 

src/src/query.cpp

@@ -31,12 +31,6 @@
 
 using namespace QMdnsEngine;
 
-QueryPrivate::QueryPrivate()
-    : type(0),
-      unicastResponse(false)
-{
-}
-
 Query::Query()
     : d(new QueryPrivate)
 {

src/src/query_p.h

@@ -30,15 +30,11 @@
 namespace QMdnsEngine
 {
 
-class QueryPrivate
+struct QueryPrivate
 {
-public:
-
-    QueryPrivate();
-
     QByteArray name;
-    quint16 type;
-    bool unicastResponse;
+    quint16 type = 0;
+    bool unicastResponse = false;
 };
 
 }

src/src/record.cpp

@@ -31,16 +31,6 @@
 
 using namespace QMdnsEngine;
 
-RecordPrivate::RecordPrivate()
-    : type(0),
-      flushCache(false),
-      ttl(3600),
-      priority(0),
-      weight(0),
-      port(0)
-{
-}
-
 Record::Record()
     : d(new RecordPrivate)
 {

src/src/record_p.h

@@ -33,23 +33,19 @@
 
 namespace QMdnsEngine {
 
-class RecordPrivate
+struct RecordPrivate
 {
-public:
-
-    RecordPrivate();
-
     QByteArray name;
-    quint16 type;
-    bool flushCache;
-    quint32 ttl;
+    quint16 type = 0;
+    bool flushCache = false;
+    quint32 ttl = 3600;
 
     QHostAddress address;
     QByteArray target;
     QByteArray nextDomainName;
-    quint16 priority;
-    quint16 weight;
-    quint16 port;
+    quint16 priority = 0;
+    quint16 weight = 0;
+    quint16 port = 0;
     QMap<QByteArray, QByteArray> attributes;
     Bitmap bitmap;
 };