constructor cleanups in messages

Skycoder42 · Skycoder42 · commit 2b15562ebdc0 · 2018-06-12T18:58:52.000+02:00
diff --git a/src/messages/accessmessage.cpp b/src/messages/accessmessage.cpp
@@ -4,16 +4,16 @@ using namespace QtDataSync;
 AccessMessage::AccessMessage() = default;
 
 AccessMessage::AccessMessage(QString deviceName, QByteArray nonce, const QSharedPointer<CryptoPP::X509PublicKey> &signKey, const QSharedPointer<CryptoPP::X509PublicKey> &cryptKey, AsymmetricCrypto *crypto, QByteArray pNonce, QUuid partnerId, QByteArray macscheme, QByteArray cmac, QByteArray trustmac) :
-	RegisterBaseMessage(std::move(deviceName),
+	RegisterBaseMessage{std::move(deviceName),
 						std::move(nonce),
 						signKey,
 						cryptKey,
-						crypto),
-	pNonce(std::move(pNonce)),
-	partnerId(std::move(partnerId)),
-	macscheme(std::move(macscheme)),
-	cmac(std::move(cmac)),
-	trustmac(std::move(trustmac))
+						crypto},
+	pNonce{std::move(pNonce)},
+	partnerId{std::move(partnerId)},
+	macscheme{std::move(macscheme)},
+	cmac{std::move(cmac)},
+	trustmac{std::move(trustmac)}
 {}
 
 const QMetaObject *AccessMessage::getMetaObject() const
diff --git a/src/messages/accountmessage.cpp b/src/messages/accountmessage.cpp
@@ -2,7 +2,7 @@
 using namespace QtDataSync;
 
 AccountMessage::AccountMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId))
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *AccountMessage::getMetaObject() const
diff --git a/src/messages/changedmessage.cpp b/src/messages/changedmessage.cpp
@@ -9,8 +9,8 @@ const QMetaObject *ChangedMessage::getMetaObject() const
 
 
 ChangedInfoMessage::ChangedInfoMessage(quint32 changeEstimate) :
-	ChangedMessage(),
-	changeEstimate(changeEstimate)
+	ChangedMessage{},
+	changeEstimate{changeEstimate}
 {}
 
 const QMetaObject *ChangedInfoMessage::getMetaObject() const
@@ -28,7 +28,7 @@ const QMetaObject *LastChangedMessage::getMetaObject() const
 
 
 ChangedAckMessage::ChangedAckMessage(quint64 dataIndex) :
-	dataIndex(dataIndex)
+	dataIndex{dataIndex}
 {}
 
 const QMetaObject *ChangedAckMessage::getMetaObject() const
diff --git a/src/messages/changemessage.cpp b/src/messages/changemessage.cpp
@@ -2,10 +2,7 @@
 using namespace QtDataSync;
 
 ChangeMessage::ChangeMessage(QByteArray dataId) :
-	dataId(std::move(dataId)),
-	keyIndex(0),
-	salt(),
-	data()
+	dataId{std::move(dataId)}
 {}
 
 const QMetaObject *ChangeMessage::getMetaObject() const
@@ -16,7 +13,7 @@ const QMetaObject *ChangeMessage::getMetaObject() const
 
 
 ChangeAckMessage::ChangeAckMessage(const ChangeMessage &message) :
-	dataId(message.dataId)
+	dataId{message.dataId}
 {}
 
 const QMetaObject *ChangeAckMessage::getMetaObject() const
diff --git a/src/messages/changemessage_p.h b/src/messages/changemessage_p.h
@@ -18,7 +18,7 @@ class Q_DATASYNC_EXPORT ChangeMessage : public Message
 	ChangeMessage(QByteArray dataId = {});
 
 	QByteArray dataId;
-	quint32 keyIndex;
+	quint32 keyIndex = 0;
 	QByteArray salt;
 	QByteArray data;
 
diff --git a/src/messages/devicechangemessage.cpp b/src/messages/devicechangemessage.cpp
@@ -2,8 +2,8 @@
 using namespace QtDataSync;
 
 DeviceChangeMessage::DeviceChangeMessage(QByteArray dataId, QUuid deviceId) :
-	ChangeMessage(std::move(dataId)),
-	deviceId(std::move(deviceId))
+	ChangeMessage{std::move(dataId)},
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *DeviceChangeMessage::getMetaObject() const
@@ -14,8 +14,8 @@ const QMetaObject *DeviceChangeMessage::getMetaObject() const
 
 
 DeviceChangeAckMessage::DeviceChangeAckMessage(const DeviceChangeMessage &message) :
-	ChangeAckMessage(message),
-	deviceId(message.deviceId)
+	ChangeAckMessage{message},
+	deviceId{message.deviceId}
 {}
 
 const QMetaObject *DeviceChangeAckMessage::getMetaObject() const
diff --git a/src/messages/devicekeysmessage.cpp b/src/messages/devicekeysmessage.cpp
@@ -2,14 +2,14 @@
 using namespace QtDataSync;
 
 DeviceKeysMessage::DeviceKeysMessage(quint32 keyIndex) :
-	keyIndex(keyIndex),
-	duplicated(true)
+	keyIndex{keyIndex},
+	duplicated{true}
 {}
 
 DeviceKeysMessage::DeviceKeysMessage(quint32 keyIndex, QList<DeviceKey> devices) :
-	keyIndex(keyIndex),
-	duplicated(false),
-	devices(std::move(devices))
+	keyIndex{keyIndex},
+	duplicated{false},
+	devices{std::move(devices)}
 {}
 
 const QMetaObject *DeviceKeysMessage::getMetaObject() const
diff --git a/src/messages/errormessage.cpp b/src/messages/errormessage.cpp
@@ -5,9 +5,9 @@
 using namespace QtDataSync;
 
 ErrorMessage::ErrorMessage(ErrorMessage::ErrorType type, QString message, bool canRecover) :
-	type(type),
-	message(std::move(message)),
-	canRecover(canRecover)
+	type{type},
+	message{std::move(message)},
+	canRecover{canRecover}
 {}
 
 const QMetaObject *ErrorMessage::getMetaObject() const
diff --git a/src/messages/grantmessage.cpp b/src/messages/grantmessage.cpp
@@ -4,10 +4,10 @@ using namespace QtDataSync;
 GrantMessage::GrantMessage() = default;
 
 GrantMessage::GrantMessage(const AcceptMessage &message) :
-	AccountMessage(message.deviceId),
-	index(message.index),
-	scheme(message.scheme),
-	secret(message.secret)
+	AccountMessage{message.deviceId},
+	index{message.index},
+	scheme{message.scheme},
+	secret{message.secret}
 {}
 
 const QMetaObject *GrantMessage::getMetaObject() const
diff --git a/src/messages/identifymessage.cpp b/src/messages/identifymessage.cpp
@@ -8,13 +8,10 @@ using byte = CryptoPP::byte;
 const QVersionNumber InitMessage::CurrentVersion(1); //NOTE update accordingly
 const QVersionNumber InitMessage::CompatVersion(1);
 
-InitMessage::InitMessage() :
-	InitMessage(QByteArray{})
-{}
+InitMessage::InitMessage() = default;
 
 InitMessage::InitMessage(QByteArray nonce) :
-	protocolVersion(CurrentVersion),
-	nonce(std::move(nonce))
+	nonce{std::move(nonce)}
 {}
 
 const QMetaObject *InitMessage::getMetaObject() const
@@ -32,8 +29,8 @@ bool InitMessage::validate()
 
 
 IdentifyMessage::IdentifyMessage(quint32 uploadLimit) :
-	InitMessage(),
-	uploadLimit(uploadLimit)
+	InitMessage{},
+	uploadLimit{uploadLimit}
 {}
 
 IdentifyMessage IdentifyMessage::createRandom(quint32 uploadLimit, CryptoPP::RandomNumberGenerator &rng)
diff --git a/src/messages/identifymessage_p.h b/src/messages/identifymessage_p.h
@@ -39,7 +39,7 @@ class Q_DATASYNC_EXPORT InitMessage : public Message
 	static const int NonceSize = 16;
 	InitMessage();
 
-	QVersionNumber protocolVersion;
+	QVersionNumber protocolVersion = CurrentVersion;
 	QByteArray nonce;
 
 protected:
diff --git a/src/messages/keychangemessage.cpp b/src/messages/keychangemessage.cpp
@@ -2,7 +2,7 @@
 using namespace QtDataSync;
 
 KeyChangeMessage::KeyChangeMessage(quint32 nextIndex) :
-	nextIndex(nextIndex)
+	nextIndex{nextIndex}
 {}
 
 const QMetaObject *KeyChangeMessage::getMetaObject() const
diff --git a/src/messages/loginmessage.cpp b/src/messages/loginmessage.cpp
@@ -2,9 +2,9 @@
 using namespace QtDataSync;
 
 LoginMessage::LoginMessage(QUuid deviceId, QString deviceName, QByteArray nonce) :
-	InitMessage(std::move(nonce)),
-	deviceId(std::move(deviceId)),
-	deviceName(std::move(deviceName))
+	InitMessage{std::move(nonce)},
+	deviceId{std::move(deviceId)},
+	deviceName{std::move(deviceName)}
 {}
 
 const QMetaObject *LoginMessage::getMetaObject() const
diff --git a/src/messages/macupdatemessage.cpp b/src/messages/macupdatemessage.cpp
@@ -2,8 +2,8 @@
 using namespace QtDataSync;
 
 MacUpdateMessage::MacUpdateMessage(quint32 keyIndex, QByteArray cmac) :
-	keyIndex(keyIndex),
-	cmac(std::move(cmac))
+	keyIndex{keyIndex},
+	cmac{std::move(cmac)}
 {}
 
 const QMetaObject *MacUpdateMessage::getMetaObject() const
diff --git a/src/messages/newkeymessage.cpp b/src/messages/newkeymessage.cpp
@@ -19,8 +19,8 @@ const QMetaObject *NewKeyMessage::getMetaObject() const
 
 
 NewKeyAckMessage::NewKeyAckMessage(const NewKeyMessage &message) :
-	MacUpdateAckMessage(),
-	keyIndex(message.keyIndex)
+	MacUpdateAckMessage{},
+	keyIndex{message.keyIndex}
 {}
 
 const QMetaObject *NewKeyAckMessage::getMetaObject() const
diff --git a/src/messages/proofmessage.cpp b/src/messages/proofmessage.cpp
@@ -4,16 +4,16 @@ using namespace QtDataSync;
 ProofMessage::ProofMessage() = default;
 
 ProofMessage::ProofMessage(const AccessMessage &access, QUuid deviceId) :
-	pNonce(access.pNonce),
-	deviceId(std::move(deviceId)),
-	deviceName(access.deviceName),
-	signAlgorithm(access.signAlgorithm),
-	signKey(access.signKey),
-	cryptAlgorithm(access.cryptAlgorithm),
-	cryptKey(access.cryptKey),
-	macscheme(access.macscheme),
-	cmac(access.cmac),
-	trustmac(access.trustmac)
+	pNonce{access.pNonce},
+	deviceId{std::move(deviceId)},
+	deviceName{access.deviceName},
+	signAlgorithm{access.signAlgorithm},
+	signKey{access.signKey},
+	cryptAlgorithm{access.cryptAlgorithm},
+	cryptKey{access.cryptKey},
+	macscheme{access.macscheme},
+	cmac{access.cmac},
+	trustmac{access.trustmac}
 {}
 
 const QMetaObject *ProofMessage::getMetaObject() const
@@ -24,7 +24,7 @@ const QMetaObject *ProofMessage::getMetaObject() const
 
 
 DenyMessage::DenyMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId))
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *DenyMessage::getMetaObject() const
@@ -35,10 +35,7 @@ const QMetaObject *DenyMessage::getMetaObject() const
 
 
 AcceptMessage::AcceptMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId)),
-	index(0),
-	scheme(),
-	secret()
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *AcceptMessage::getMetaObject() const
@@ -49,7 +46,7 @@ const QMetaObject *AcceptMessage::getMetaObject() const
 
 
 AcceptAckMessage::AcceptAckMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId))
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *AcceptAckMessage::getMetaObject() const
diff --git a/src/messages/proofmessage_p.h b/src/messages/proofmessage_p.h
@@ -68,7 +68,7 @@ class Q_DATASYNC_EXPORT AcceptMessage : public Message
 	AcceptMessage(QUuid deviceId = {});
 
 	QUuid deviceId;
-	quint32 index;
+	quint32 index = 0;
 	QByteArray scheme;
 	QByteArray secret;
 
diff --git a/src/messages/registermessage.cpp b/src/messages/registermessage.cpp
@@ -5,12 +5,12 @@ using namespace QtDataSync;
 RegisterBaseMessage::RegisterBaseMessage() = default;
 
 RegisterBaseMessage::RegisterBaseMessage(QString deviceName, QByteArray nonce, const QSharedPointer<CryptoPP::X509PublicKey> &signKey, const QSharedPointer<CryptoPP::X509PublicKey> &cryptKey, AsymmetricCrypto *crypto) :
-	InitMessage(std::move(nonce)),
-	signAlgorithm(crypto->signatureScheme()),
-	signKey(crypto->writeKey(signKey)),
-	cryptAlgorithm(crypto->encryptionScheme()),
-	cryptKey(crypto->writeKey(cryptKey)),
-	deviceName(std::move(deviceName))
+	InitMessage{std::move(nonce)},
+	signAlgorithm{crypto->signatureScheme()},
+	signKey{crypto->writeKey(signKey)},
+	cryptAlgorithm{crypto->encryptionScheme()},
+	cryptKey{crypto->writeKey(cryptKey)},
+	deviceName{std::move(deviceName)}
 {}
 
 AsymmetricCryptoInfo *RegisterBaseMessage::createCryptoInfo(CryptoPP::RandomNumberGenerator &rng, QObject *parent) const
@@ -33,12 +33,12 @@ const QMetaObject *RegisterBaseMessage::getMetaObject() const
 RegisterMessage::RegisterMessage() = default;
 
 RegisterMessage::RegisterMessage(QString deviceName, QByteArray nonce, const QSharedPointer<CryptoPP::X509PublicKey> &signKey, const QSharedPointer<CryptoPP::X509PublicKey> &cryptKey, AsymmetricCrypto *crypto, QByteArray cmac) :
-	RegisterBaseMessage(std::move(deviceName),
+	RegisterBaseMessage{std::move(deviceName),
 						std::move(nonce),
 						signKey,
 						cryptKey,
-						crypto),
-	cmac(std::move(cmac))
+						crypto},
+	cmac{std::move(cmac)}
 {}
 
 const QMetaObject *RegisterMessage::getMetaObject() const
diff --git a/src/messages/removemessage.cpp b/src/messages/removemessage.cpp
@@ -2,7 +2,7 @@
 using namespace QtDataSync;
 
 RemoveMessage::RemoveMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId))
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *RemoveMessage::getMetaObject() const
@@ -13,7 +13,7 @@ const QMetaObject *RemoveMessage::getMetaObject() const
 
 
 RemoveAckMessage::RemoveAckMessage(QUuid deviceId) :
-	deviceId(std::move(deviceId))
+	deviceId{std::move(deviceId)}
 {}
 
 const QMetaObject *RemoveAckMessage::getMetaObject() const
diff --git a/src/messages/welcomemessage.cpp b/src/messages/welcomemessage.cpp
@@ -2,11 +2,7 @@
 using namespace QtDataSync;
 
 WelcomeMessage::WelcomeMessage(bool hasChanges) :
-	hasChanges(hasChanges),
-	keyIndex(0),
-	scheme(),
-	key(),
-	cmac()
+	hasChanges{hasChanges}
 {}
 
 bool WelcomeMessage::hasKeyUpdate() const
diff --git a/src/messages/welcomemessage_p.h b/src/messages/welcomemessage_p.h
@@ -21,7 +21,7 @@ class Q_DATASYNC_EXPORT WelcomeMessage : public Message
 	WelcomeMessage(bool hasChanges = false);
 
 	bool hasChanges;
-	quint32 keyIndex;
+	quint32 keyIndex = 0;
 	QByteArray scheme;
 	QByteArray key;
 	QByteArray cmac;
