X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=8935538370348d5dbe1661cbfd7de05288cb2721;hp=f0711f16dfda7585be4192bc4651c8d35839e335;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index f0711f16..89355383 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include #include @@ -66,11 +68,11 @@ public: private: struct Signal { - QObject *sender; - int signalId; + QObject *sender{nullptr}; + int signalId{-1}; QByteArray signature; - Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {} - Signal() : sender(nullptr), signalId(-1) {} + Signal(QObject *sender, int sigId, QByteArray signature) : sender(sender), signalId(sigId), signature(std::move(signature)) {} + Signal() = default; }; SignalProxy *_proxy; @@ -386,7 +388,7 @@ void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newn const QMetaObject *SignalProxy::metaObject(const QObject *obj) { - if (const SyncableObject *syncObject = qobject_cast(obj)) + if (const auto *syncObject = qobject_cast(obj)) return syncObject->syncMetaObject(); else return obj->metaObject(); @@ -738,7 +740,7 @@ void SignalProxy::customEvent(QEvent *event) { switch ((int)event->type()) { case RemovePeerEvent: { - ::RemovePeerEvent *e = static_cast< ::RemovePeerEvent *>(event); + auto *e = static_cast< ::RemovePeerEvent *>(event); removePeer(e->peer); event->accept(); break; @@ -786,7 +788,7 @@ void SignalProxy::disconnectDevice(QIODevice *dev, const QString &reason) { if (!reason.isEmpty()) qWarning() << qPrintable(reason); - QAbstractSocket *sock = qobject_cast(dev); + auto *sock = qobject_cast(dev); if (sock) qWarning() << qPrintable(tr("Disconnecting")) << qPrintable(sock->peerAddress().toString()); dev->close();