projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
common
/
signalproxy.h
diff --git
a/src/common/signalproxy.h
b/src/common/signalproxy.h
index
935df5e
..
a948617
100644
(file)
--- a/
src/common/signalproxy.h
+++ b/
src/common/signalproxy.h
@@
-195,12
+195,12
@@
private:
SignalRelay *_signalRelay;
// RPC function -> (object, slot ID)
SignalRelay *_signalRelay;
// RPC function -> (object, slot ID)
-
typedef QPair<QObject *, int> MethodId
;
-
typedef QMultiHash<QByteArray, MethodId> SlotHash
;
+
using MethodId = QPair<QObject *, int>
;
+
using SlotHash = QMultiHash<QByteArray, MethodId>
;
SlotHash _attachedSlots;
// slaves for sync
SlotHash _attachedSlots;
// slaves for sync
-
typedef QHash<QString, SyncableObject *> ObjectId
;
+
using ObjectId = QHash<QString, SyncableObject *>
;
QHash<QByteArray, ObjectId> _syncSlave;
ProxyMode _proxyMode;
QHash<QByteArray, ObjectId> _syncSlave;
ProxyMode _proxyMode;
@@
-232,7
+232,7
@@
class SignalProxy::ExtendedMetaObject
{
public:
MethodDescriptor(const QMetaMethod &method);
{
public:
MethodDescriptor(const QMetaMethod &method);
- MethodDescriptor()
: _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client)
{}
+ MethodDescriptor() {}
inline const QByteArray &methodName() const { return _methodName; }
inline const QList<int> &argTypes() const { return _argTypes; }
inline const QByteArray &methodName() const { return _methodName; }
inline const QList<int> &argTypes() const { return _argTypes; }
@@
-243,9
+243,9
@@
class SignalProxy::ExtendedMetaObject
private:
QByteArray _methodName;
QList<int> _argTypes;
private:
QByteArray _methodName;
QList<int> _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.
};
};