X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=a94861713387f5dc2435b7f8c49ef7c59df473b5;hp=935df5e9cd0810dbb5a46ef58c785f4faaefa3a5;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 935df5e9..a9486171 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -195,12 +195,12 @@ private: SignalRelay *_signalRelay; // RPC function -> (object, slot ID) - typedef QPair MethodId; - typedef QMultiHash SlotHash; + using MethodId = QPair; + using SlotHash = QMultiHash; SlotHash _attachedSlots; // slaves for sync - typedef QHash ObjectId; + using ObjectId = QHash; QHash _syncSlave; ProxyMode _proxyMode; @@ -232,7 +232,7 @@ class SignalProxy::ExtendedMetaObject { public: MethodDescriptor(const QMetaMethod &method); - MethodDescriptor() : _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client) {} + MethodDescriptor() {} inline const QByteArray &methodName() const { return _methodName; } inline const QList &argTypes() const { return _argTypes; } @@ -243,9 +243,9 @@ class SignalProxy::ExtendedMetaObject private: QByteArray _methodName; QList _argTypes; - int _returnType; - int _minArgCount; - SignalProxy::ProxyMode _receiverMode; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode. + int _returnType{-1}; + int _minArgCount{-1}; + SignalProxy::ProxyMode _receiverMode{SignalProxy::Client}; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode. };