X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=935df5e9cd0810dbb5a46ef58c785f4faaefa3a5;hp=a3d7703eb3c20ad25557279f9406b5834dd7b515;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=fb80dab2044d302eb8ccacd0b34d4cbaf5fe904c diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index a3d7703e..935df5e9 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -20,6 +20,8 @@ #pragma once +#include "common-export.h" + #include #include @@ -34,7 +36,7 @@ class QIODevice; class Peer; class SyncableObject; -class SignalProxy : public QObject +class COMMON_EXPORT SignalProxy : public QObject { Q_OBJECT @@ -52,7 +54,7 @@ public: SignalProxy(QObject *parent); SignalProxy(ProxyMode mode, QObject *parent); - virtual ~SignalProxy(); + ~SignalProxy() override; void setProxyMode(ProxyMode mode); inline ProxyMode proxyMode() const { return _proxyMode; } @@ -126,7 +128,7 @@ public slots: void detachSlots(QObject *receiver); protected: - void customEvent(QEvent *event); + void customEvent(QEvent *event) override; void sync_call__(const SyncableObject *obj, ProxyMode modeType, const char *funcname, va_list ap); void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname); @@ -175,8 +177,8 @@ private: template void handle(Peer *, T) { Q_ASSERT(0); } - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = 0); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = 0); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = nullptr); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = nullptr); void requestInit(SyncableObject *obj); QVariantMap initData(SyncableObject *obj) const;