various code cleanups

Skycoder42 · Skycoder42 · commit d10761f72a20 · 2018-10-21T14:52:34.000+02:00
diff --git a/src/datasync/accountmanager.cpp b/src/datasync/accountmanager.cpp
@@ -293,13 +293,13 @@ LoginRequest::LoginRequest(LoginRequestPrivate *d_ptr) :
 
 LoginRequest::LoginRequest(const LoginRequest &other) = default;
 
-LoginRequest::LoginRequest(LoginRequest &&other) = default;
+LoginRequest::LoginRequest(LoginRequest &&other) noexcept = default;
 
 LoginRequest::~LoginRequest() = default;
 
 LoginRequest &LoginRequest::operator=(const LoginRequest &other) = default;
 
-LoginRequest &LoginRequest::operator=(LoginRequest &&other) = default;
+LoginRequest &LoginRequest::operator=(LoginRequest &&other) noexcept = default;
 
 DeviceInfo LoginRequest::device() const
 {
@@ -354,13 +354,13 @@ DeviceInfo::DeviceInfo(const QUuid &deviceId, const QString &name, const QByteAr
 
 DeviceInfo::DeviceInfo(const DeviceInfo &other) = default;
 
-DeviceInfo::DeviceInfo(DeviceInfo &&other) = default;
+DeviceInfo::DeviceInfo(DeviceInfo &&other) noexcept = default;
 
 DeviceInfo::~DeviceInfo() = default;
 
 DeviceInfo &DeviceInfo::operator=(const DeviceInfo &other) = default;
 
-DeviceInfo &DeviceInfo::operator=(DeviceInfo &&other) = default;
+DeviceInfo &DeviceInfo::operator=(DeviceInfo &&other) noexcept = default;
 
 QUuid DeviceInfo::deviceId() const
 {
@@ -412,7 +412,7 @@ bool DeviceInfo::operator!=(const DeviceInfo &other) const
 
 DeviceInfoPrivate::DeviceInfoPrivate(QUuid deviceId, QString name, QByteArray fingerprint) :
 	QSharedData{},
-	deviceId{std::move(deviceId)},
+	deviceId{deviceId},
 	name{std::move(name)},
 	fingerprint{std::move(fingerprint)}
 {}
diff --git a/src/datasync/accountmanager.h b/src/datasync/accountmanager.h
@@ -40,13 +40,13 @@ class Q_DATASYNC_EXPORT DeviceInfo
 	//! Copy constructor
 	DeviceInfo(const DeviceInfo &other);
 	//! Move constructor
-	DeviceInfo(DeviceInfo &&other);
+	DeviceInfo(DeviceInfo &&other) noexcept;
 	~DeviceInfo();
 
 	//! Copy-Assignment operator
 	DeviceInfo &operator=(const DeviceInfo &other);
 	//! Move-Assignment operator
-	DeviceInfo &operator=(DeviceInfo &&other);
+	DeviceInfo &operator=(DeviceInfo &&other) noexcept;
 
 	//! @readAcFn{DeviceInfo::deviceId}
 	QUuid deviceId() const;
@@ -92,13 +92,13 @@ class Q_DATASYNC_EXPORT LoginRequest
 	//! Copy constructor
 	LoginRequest(const LoginRequest &other);
 	//! Move constructor
-	LoginRequest(LoginRequest &&other);
+	LoginRequest(LoginRequest &&other) noexcept;
 	~LoginRequest();
 
 	//! Copy-Assignment operator
 	LoginRequest &operator=(const LoginRequest &other);
 	//! Move-Assignment operator
-	LoginRequest &operator=(LoginRequest &&other);
+	LoginRequest &operator=(LoginRequest &&other) noexcept;
 
 	//! @readAcFn{LoginRequest::device}
 	DeviceInfo device() const;
diff --git a/src/datasync/changecontroller.cpp b/src/datasync/changecontroller.cpp
@@ -222,12 +222,12 @@ ChangeController::CachedObjectKey::CachedObjectKey() = default;
 
 ChangeController::CachedObjectKey::CachedObjectKey(ObjectKey other, QUuid deviceId) :
 	ObjectKey{std::move(other)},
-	optionalDevice{std::move(deviceId)}
+	optionalDevice{deviceId}
 {}
 
 ChangeController::CachedObjectKey::CachedObjectKey(QByteArray hash, QUuid deviceId) :
 	ObjectKey{},
-	optionalDevice{std::move(deviceId)},
+	optionalDevice{deviceId},
 	_hash{std::move(hash)}
 {}
 
diff --git a/src/datasync/cryptocontroller.cpp b/src/datasync/cryptocontroller.cpp
@@ -125,7 +125,7 @@ QStringList CryptoController::allKeystoreKeys()
 QStringList CryptoController::availableKeystoreKeys()
 {
 	QStringList keys;
-	for(const auto &key : factory->allKeys()) {
+	for(const auto &key : factory->allKeys()) { // clazy:exclude=range-loop
 		if(factory->isAvailable(key))
 			keys.append(key);
 	}
diff --git a/src/datasync/datastore.cpp b/src/datasync/datastore.cpp
@@ -146,7 +146,7 @@ QVariantList DataStore::search(int metaTypeId, const QString &query, SearchMode
 
 void DataStore::iterate(int metaTypeId, const function<bool (QVariant)> &iterator) const
 {
-	for(const auto &key : keys(metaTypeId)) {
+	for(const auto &key : keys(metaTypeId)) { // clazy:exclude=range-loop
 		if(!iterator(load(metaTypeId, key)))
 			break;
 	}
diff --git a/src/datasync/defaults.cpp b/src/datasync/defaults.cpp
@@ -29,11 +29,11 @@ Defaults::Defaults(const QSharedPointer<DefaultsPrivate> &d) : //MAJOR pass by m
 
 Defaults &Defaults::operator=(const Defaults &other) = default;
 
-Defaults &Defaults::operator=(Defaults &&other) = default;
+Defaults &Defaults::operator=(Defaults &&other) noexcept = default;
 
 Defaults::Defaults(const Defaults &other) = default;
 
-Defaults::Defaults(Defaults &&other) = default;
+Defaults::Defaults(Defaults &&other) noexcept = default;
 
 Defaults::~Defaults() = default;
 
@@ -151,13 +151,13 @@ DatabaseRef::DatabaseRef(DatabaseRefPrivate *d) :
 	d{d}
 {}
 
-DatabaseRef::DatabaseRef(DatabaseRef &&other) :
+DatabaseRef::DatabaseRef(DatabaseRef &&other) noexcept :
 	d{nullptr}
 {
 	d.swap(other.d);
 }
 
-DatabaseRef &DatabaseRef::operator=(DatabaseRef &&other)
+DatabaseRef &DatabaseRef::operator=(DatabaseRef &&other) noexcept
 {
 	d.reset();
 	d.swap(other.d);
diff --git a/src/datasync/defaults.h b/src/datasync/defaults.h
@@ -36,9 +36,9 @@ class Q_DATASYNC_EXPORT DatabaseRef
 	//! @private
 	DatabaseRef(DatabaseRefPrivate *d);
 	//! Move constructor
-	DatabaseRef(DatabaseRef &&other);
+	DatabaseRef(DatabaseRef &&other) noexcept;
 	//! Move assignment operator
-	DatabaseRef &operator=(DatabaseRef &&other);
+	DatabaseRef &operator=(DatabaseRef &&other) noexcept;
 
 	//! Returns true if this reference points to a valid database
 	bool isValid() const;
@@ -85,11 +85,11 @@ class Q_DATASYNC_EXPORT Defaults
 	//! Copy constructor
 	Defaults(const Defaults &other);
 	//! Move constructor
-	Defaults(Defaults &&other);
+	Defaults(Defaults &&other) noexcept;
 	//! Copy assignment operator
 	Defaults &operator=(const Defaults &other);
 	//! Move assignment operator
-	Defaults &operator=(Defaults &&other);
+	Defaults &operator=(Defaults &&other) noexcept;
 	~Defaults();
 
 	//! Create a new logger instance
diff --git a/src/datasync/localstore.cpp b/src/datasync/localstore.cpp
@@ -836,7 +836,7 @@ LocalStore::SyncScope::SyncScope(const Defaults &defaults, const ObjectKey &key,
 	}
 }
 
-LocalStore::SyncScope::SyncScope(LocalStore::SyncScope &&other) :
+LocalStore::SyncScope::SyncScope(LocalStore::SyncScope &&other) noexcept :
 	d()
 {
 	d.swap(other.d);
diff --git a/src/datasync/localstore_p.h b/src/datasync/localstore_p.h
@@ -37,7 +37,7 @@ class Q_DATASYNC_EXPORT LocalStore : public QObject
 		Q_DISABLE_COPY(SyncScope)
 
 	public:
-		SyncScope(SyncScope &&other);
+		SyncScope(SyncScope &&other) noexcept;
 		~SyncScope();
 
 	private:
diff --git a/src/datasync/migrationhelper.cpp b/src/datasync/migrationhelper.cpp
@@ -176,7 +176,7 @@ void MigrationRunnable::run()
 		//special: copy headers
 		oldSettings->beginGroup(QStringLiteral("RemoteConnector/headers"));
 		currentSettings->beginGroup(QStringLiteral("connector/") + RemoteConnector::keyRemoteHeaders);
-		for(const auto &key : oldSettings->childKeys()) {
+		for(const auto &key : oldSettings->childKeys()) { // clazy:exclude=range-loop
 			copyConf(oldSettings, key,
 					 currentSettings, key);
 		}
diff --git a/src/datasync/remoteconfig.cpp b/src/datasync/remoteconfig.cpp
@@ -9,13 +9,13 @@ RemoteConfig::RemoteConfig(const QUrl &url, const QString &accessKey, const Head
 
 RemoteConfig::RemoteConfig(const RemoteConfig &other) = default;
 
-RemoteConfig::RemoteConfig(RemoteConfig &&other) = default;
+RemoteConfig::RemoteConfig(RemoteConfig &&other) noexcept = default;
 
 RemoteConfig::~RemoteConfig() = default;
 
 RemoteConfig &RemoteConfig::operator=(const RemoteConfig &other) = default;
 
-RemoteConfig &RemoteConfig::operator=(RemoteConfig &&other) = default;
+RemoteConfig &RemoteConfig::operator=(RemoteConfig &&other) noexcept = default;
 
 QUrl RemoteConfig::url() const
 {
diff --git a/src/datasync/remoteconfig.h b/src/datasync/remoteconfig.h
@@ -37,13 +37,13 @@ class Q_DATASYNC_EXPORT RemoteConfig
 	//! Copy constructor
 	RemoteConfig(const RemoteConfig &other);
 	//! Move constructor
-	RemoteConfig(RemoteConfig &&other);
+	RemoteConfig(RemoteConfig &&other) noexcept;
 	~RemoteConfig();
 
 	//! Copy-Assignment operator
 	RemoteConfig &operator=(const RemoteConfig &other);
 	//! Move-Assignment operator
-	RemoteConfig &operator=(RemoteConfig &&other);
+	RemoteConfig &operator=(RemoteConfig &&other) noexcept;
 
 	//! @readAcFn{RemoteConfig::url}
 	QUrl url() const;
diff --git a/src/datasync/remoteconnector.cpp b/src/datasync/remoteconnector.cpp
@@ -675,7 +675,7 @@ void RemoteConnector::onEntryIdleState()
 	if(_expectChanges) {
 		_expectChanges = false;
 		logDebug() << "Server has changes. Reloading states";
-		remoteEvent(RemoteReadyWithChanges);
+		emit remoteEvent(RemoteReadyWithChanges);
 	} else
 		emit remoteEvent(RemoteReady);
 }
@@ -823,7 +823,7 @@ QVariant RemoteConnector::sValue(const QString &key) const
 		if(settings()->childGroups().contains(keyRemoteHeaders)) {
 			settings()->beginGroup(keyRemoteHeaders);
 			RemoteConfig::HeaderHash headers;
-			for(const auto &hKey : settings()->childKeys())
+			for(const auto &hKey : settings()->childKeys()) // clazy:exclude=range-loop
 				headers.insert(hKey.toUtf8(), settings()->value(hKey).toByteArray());
 			settings()->endGroup();
 			return QVariant::fromValue(headers);
diff --git a/src/datasync/synchelper.cpp b/src/datasync/synchelper.cpp
@@ -106,7 +106,7 @@ void hashNext(QCryptographicHash &hash, const QJsonValue &value)
 		hash.addData(value.toString().toUtf8());
 		break;
 	case QJsonValue::Array:
-		for(auto v : value.toArray())
+		for(auto v : value.toArray()) // clazy:exclude=range-loop
 			hashNext(hash, v);
 		break;
 	case QJsonValue::Object:
diff --git a/src/datasync/userexchangemanager.cpp b/src/datasync/userexchangemanager.cpp
@@ -206,7 +206,7 @@ void UserExchangeManager::readDatagram()
 
 		auto isSelf = false;
 		if(datagram.senderPort() == d->socket->localPort()) {
-			for(const auto &addr : QNetworkInterface::allAddresses()) {
+			for(const auto &addr : QNetworkInterface::allAddresses()) { // clazy:exclude=range-loop
 				if(addr.isEqual(datagram.senderAddress())) {
 					isSelf = true;
 					break;
@@ -254,7 +254,7 @@ void UserExchangeManager::readDatagram()
 
 			//try to find the already existing user info for that data
 			bool found = false;
-			for(const auto &key : d->devices.keys()) {
+			for(const auto &key : d->devices.keys()) { // clazy:exclude=range-loop
 				if(info == key) {
 					found = true;
 					if(isInfo) { //isInfo -> reset timeout, update name if neccessary
@@ -300,7 +300,7 @@ UserInfo::UserInfo() :
 
 UserInfo::UserInfo(const UserInfo &other) = default;
 
-UserInfo::UserInfo(UserInfo &&other) = default;
+UserInfo::UserInfo(UserInfo &&other) noexcept = default;
 
 UserInfo::UserInfo(UserInfoPrivate *data) :
 	d(data)
@@ -310,7 +310,7 @@ UserInfo::~UserInfo() = default;
 
 UserInfo &UserInfo::operator=(const UserInfo &other) = default;
 
-UserInfo &UserInfo::operator=(UserInfo &&other) = default;
+UserInfo &UserInfo::operator=(UserInfo &&other) noexcept = default;
 
 QString UserInfo::name() const
 {
diff --git a/src/datasync/userexchangemanager.h b/src/datasync/userexchangemanager.h
@@ -32,15 +32,15 @@ class Q_DATASYNC_EXPORT UserInfo
 	//! Copy Constructor
 	UserInfo(const UserInfo &other);
 	//! Move constructor
-	UserInfo(UserInfo &&other);
+	UserInfo(UserInfo &&other) noexcept;
 	//! @private
 	UserInfo(UserInfoPrivate *data);
 	~UserInfo();
 
 	//! Copy-Assignment operator
 	UserInfo &operator=(const UserInfo &other);
 	//! Move-Assignment operator
-	UserInfo &operator=(UserInfo &&other);
+	UserInfo &operator=(UserInfo &&other) noexcept;
 
 	//! @readAcFn{UserInfo::name}
 	QString name() const;
diff --git a/src/messages/accessmessage.cpp b/src/messages/accessmessage.cpp
@@ -10,7 +10,7 @@ AccessMessage::AccessMessage(QString deviceName, QByteArray nonce, const QShared
 						cryptKey,
 						crypto},
 	pNonce{std::move(pNonce)},
-	partnerId{std::move(partnerId)},
+	partnerId{partnerId},
 	macscheme{std::move(macscheme)},
 	cmac{std::move(cmac)},
 	trustmac{std::move(trustmac)}
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{deviceId}
 {}
 
 const QMetaObject *AccountMessage::getMetaObject() const
diff --git a/src/messages/devicechangemessage.cpp b/src/messages/devicechangemessage.cpp
@@ -3,7 +3,7 @@ using namespace QtDataSync;
 
 DeviceChangeMessage::DeviceChangeMessage(QByteArray dataId, QUuid deviceId) :
 	ChangeMessage{std::move(dataId)},
-	deviceId{std::move(deviceId)}
+	deviceId{deviceId}
 {}
 
 const QMetaObject *DeviceChangeMessage::getMetaObject() const
diff --git a/src/messages/loginmessage.cpp b/src/messages/loginmessage.cpp
@@ -3,7 +3,7 @@ using namespace QtDataSync;
 
 LoginMessage::LoginMessage(QUuid deviceId, QString deviceName, QByteArray nonce) :
 	InitMessage{std::move(nonce)},
-	deviceId{std::move(deviceId)},
+	deviceId{deviceId},
 	deviceName{std::move(deviceName)}
 {}
 
diff --git a/src/messages/message.cpp b/src/messages/message.cpp
@@ -209,7 +209,7 @@ Utf8String::Utf8String() = default;
 
 Utf8String::Utf8String(const Utf8String &other) = default;
 
-Utf8String::Utf8String(Utf8String &&other) = default;
+Utf8String::Utf8String(Utf8String &&other) noexcept = default;
 
 Utf8String::Utf8String(const QByteArray &data) :
 	QString(QString::fromUtf8(data))
@@ -219,13 +219,13 @@ Utf8String::Utf8String(const QString &other) :
 	QString(other)
 {}
 
-Utf8String::Utf8String(QString &&other) :
+Utf8String::Utf8String(QString &&other) noexcept :
 	QString(std::move(other))
 {}
 
 Utf8String &Utf8String::operator=(const Utf8String &other) = default;
 
-Utf8String &Utf8String::operator=(Utf8String &&other) = default;
+Utf8String &Utf8String::operator=(Utf8String &&other) noexcept = default;
 
 Utf8String &Utf8String::operator=(const QByteArray &other)
 {
@@ -239,7 +239,7 @@ Utf8String &Utf8String::operator=(const QString &other)
 	return *this;
 }
 
-Utf8String &Utf8String::operator=(QString &&other)
+Utf8String &Utf8String::operator=(QString &&other) noexcept
 {
 	swap(other);
 	return *this;
diff --git a/src/messages/message_p.h b/src/messages/message_p.h
@@ -41,16 +41,16 @@ class Q_DATASYNC_EXPORT Utf8String : public QString
 public:
 	Utf8String();
 	Utf8String(const Utf8String &other);
-	Utf8String(Utf8String &&other);
+	Utf8String(Utf8String &&other) noexcept;
 	Utf8String(const QByteArray &data);
 	Utf8String(const QString &other);
-	Utf8String(QString &&other);
+	Utf8String(QString &&other) noexcept;
 
 	Utf8String &operator=(const Utf8String &other);
-	Utf8String &operator=(Utf8String &&other);
+	Utf8String &operator=(Utf8String &&other) noexcept;
 	Utf8String &operator=(const QByteArray &other);
 	Utf8String &operator=(const QString &other);
-	Utf8String &operator=(QString &&other);
+	Utf8String &operator=(QString &&other) noexcept;
 };
 
 Q_DATASYNC_EXPORT QDataStream &operator<<(QDataStream &stream, const Utf8String &message);
diff --git a/src/messages/proofmessage.cpp b/src/messages/proofmessage.cpp
diff --git a/src/messages/removemessage.cpp b/src/messages/removemessage.cpp
diff --git a/tools/appserver/client.cpp b/tools/appserver/client.cpp

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ QStringList CryptoController::allKeystoreKeys()`
`125`	`125`	`QStringList CryptoController::availableKeystoreKeys()`
`126`	`126`	`{`
`127`	`127`	`QStringList keys;`
`128`		`- for(const auto &key : factory->allKeys()) {`
	`128`	`+ for(const auto &key : factory->allKeys()) { // clazy:exclude=range-loop`
`129`	`129`	`if(factory->isAvailable(key))`
`130`	`130`	`keys.append(key);`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ QVariantList DataStore::search(int metaTypeId, const QString &query, SearchMode`
`146`	`146`
`147`	`147`	`void DataStore::iterate(int metaTypeId, const function<bool (QVariant)> &iterator) const`
`148`	`148`	`{`
`149`		`- for(const auto &key : keys(metaTypeId)) {`
	`149`	`+ for(const auto &key : keys(metaTypeId)) { // clazy:exclude=range-loop`
`150`	`150`	`if(!iterator(load(metaTypeId, key)))`
`151`	`151`	`break;`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,7 @@ LocalStore::SyncScope::SyncScope(const Defaults &defaults, const ObjectKey &key,`
`836`	`836`	`}`
`837`	`837`	`}`
`838`	`838`
`839`		`-LocalStore::SyncScope::SyncScope(LocalStore::SyncScope &&other) :`
	`839`	`+LocalStore::SyncScope::SyncScope(LocalStore::SyncScope &&other) noexcept :`
`840`	`840`	`d()`
`841`	`841`	`{`
`842`	`842`	`d.swap(other.d);`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void MigrationRunnable::run()`
`176`	`176`	`//special: copy headers`
`177`	`177`	`oldSettings->beginGroup(QStringLiteral("RemoteConnector/headers"));`
`178`	`178`	`currentSettings->beginGroup(QStringLiteral("connector/") + RemoteConnector::keyRemoteHeaders);`
`179`		`- for(const auto &key : oldSettings->childKeys()) {`
	`179`	`+ for(const auto &key : oldSettings->childKeys()) { // clazy:exclude=range-loop`
`180`	`180`	`copyConf(oldSettings, key,`
`181`	`181`	`currentSettings, key);`
`182`	`182`	`}`