complete main lib code cleanup stage 1

Author: Skycoder42

src/datasync/cryptocontroller.cpp

@@ -52,7 +52,7 @@ template <template<class> class TScheme, class TCipher>
 class StandardCipherScheme : public CryptoController::CipherScheme
 {
 public:
-	typedef TScheme<TCipher> Scheme;
+	using Scheme = TScheme<TCipher>;
 
 	QByteArray name() const override;
 	quint32 defaultKeyLength() const override;
@@ -130,7 +130,7 @@ QStringList CryptoController::allKeystoreKeys()
 QStringList CryptoController::availableKeystoreKeys()
 {
 	QStringList keys;
-	for(auto key : factory->allKeys()) {
+	for(const auto &key : factory->allKeys()) {
 		if(factory->isAvailable(key))
 			keys.append(key);
 	}
@@ -211,7 +211,7 @@ void CryptoController::acquireStore(bool existing)
 	logDebug() << "Created keystore instance of type" << provider;
 }
 
-void CryptoController::loadKeyMaterial(const QUuid &deviceId)
+void CryptoController::loadKeyMaterial(QUuid deviceId)
 {
 	try {
 		ensureStoreOpen();
@@ -259,7 +259,7 @@ void CryptoController::clearKeyMaterial()
 	emit fingerprintChanged(QByteArray());
 }
 
-void CryptoController::deleteKeyMaterial(const QUuid &deviceId)
+void CryptoController::deleteKeyMaterial(QUuid deviceId)
 {
 	//remove all saved keys
 	auto keyDir = keysDir();
@@ -291,7 +291,8 @@ void CryptoController::createPrivateKeys(const QByteArray &nonce)
 {
 	try {
 		if(_asymCrypto->rng().CanIncorporateEntropy())
-			_asymCrypto->rng().IncorporateEntropy(reinterpret_cast<const byte*>(nonce.constData()), nonce.size());
+			_asymCrypto->rng().IncorporateEntropy(reinterpret_cast<const byte*>(nonce.constData()),
+												  static_cast<size_t>(nonce.size()));
 
 		//generate private signature and encryption keys
 		_asymCrypto->generate(static_cast<Setup::SignatureScheme>(defaults().property(Defaults::SignScheme).toInt()),
@@ -315,7 +316,7 @@ void CryptoController::createPrivateKeys(const QByteArray &nonce)
 	}
 }
 
-void CryptoController::storePrivateKeys(const QUuid &deviceId) const
+void CryptoController::storePrivateKeys(QUuid deviceId) const
 {
 	try {
 		ensureStoreOpen();
@@ -364,8 +365,9 @@ tuple<quint32, QByteArray, QByteArray> CryptoController::encryptData(const QByte
 {
 	try {
 		auto info = getInfo(_localCipher);
-		QByteArray salt(info.scheme->ivLength(), Qt::Uninitialized);
-		_asymCrypto->rng().GenerateBlock(reinterpret_cast<byte*>(salt.data()), salt.size());
+		QByteArray salt(static_cast<int>(info.scheme->ivLength()), Qt::Uninitialized);
+		_asymCrypto->rng().GenerateBlock(reinterpret_cast<byte*>(salt.data()),
+										 static_cast<size_t>(salt.size()));
 
 		auto cipher = encryptImpl(info, salt, plain);
 
@@ -457,7 +459,8 @@ void CryptoController::decryptSecretKey(quint32 keyIndex, const QByteArray &sche
 
 		CipherInfo info;
 		createScheme(scheme, info.scheme);
-		info.key.Assign(reinterpret_cast<const byte*>(key.constData()), key.size());
+		info.key.Assign(reinterpret_cast<const byte*>(key.constData()),
+						static_cast<size_t>(key.size()));
 
 		_loadedChiphers.insert(keyIndex, info);
 		if(grantInit) {//only set key index. Storing is done a step later for granting
@@ -582,14 +585,18 @@ tuple<QByteArray, QByteArray, SecByteBlock> CryptoController::generateExportKey(
 			auto pw = password.toUtf8();
 
 			//create a salt
-			salt.resize(info.scheme->ivLength());
-			_asymCrypto->rng().GenerateBlock(reinterpret_cast<byte*>(salt.data()), salt.size());
+			salt.resize(static_cast<int>(info.scheme->ivLength()));
+			_asymCrypto->rng().GenerateBlock(reinterpret_cast<byte*>(salt.data()),
+											 static_cast<size_t>(salt.size()));
 
 			//generate the key
 			PKCS5_PBKDF2_HMAC<SHA3_256> keydev;
 			keydev.DeriveKey(info.key.data(), info.key.size(),
-							 PwPurpose, reinterpret_cast<const byte*>(pw.constData()), pw.size(),
-							 reinterpret_cast<const byte*>(salt.constData()), salt.size(), PwRounds);
+							 PwPurpose, reinterpret_cast<const byte*>(pw.constData()),
+							 static_cast<size_t>(pw.size()),
+							 reinterpret_cast<const byte*>(salt.constData()),
+							 static_cast<size_t>(salt.size()),
+							 PwRounds);
 		}
 
 		return make_tuple(info.scheme->name(), salt, info.key);
@@ -613,8 +620,11 @@ SecByteBlock CryptoController::recoverExportKey(const QByteArray &scheme, const
 		//generate the key
 		PKCS5_PBKDF2_HMAC<SHA3_256> keydev;
 		keydev.DeriveKey(info.key.data(), info.key.size(),
-						 PwPurpose, reinterpret_cast<const byte*>(pw.constData()), pw.size(),
-						 reinterpret_cast<const byte*>(salt.constData()), salt.size(), PwRounds);
+						 PwPurpose, reinterpret_cast<const byte*>(pw.constData()),
+						 static_cast<size_t>(pw.size()),
+						 reinterpret_cast<const byte*>(salt.constData()),
+						 static_cast<size_t>(salt.size()),
+						 PwRounds);
 
 		return info.key;
 	} catch(CppException &e) {
@@ -662,7 +672,7 @@ void CryptoController::verifyImportCmac(const QByteArray &scheme, const SecByteB
 		CipherInfo info;
 		createScheme(scheme, info.scheme);
 		info.key = key;
-		return verifyCmacImpl(info, data, mac);
+		verifyCmacImpl(info, data, mac);
 	} catch(CppException &e) {
 		throw CryptoException(defaults(),
 							  QStringLiteral("Failed to verify cmac for import data"),
@@ -680,7 +690,7 @@ void CryptoController::verifyImportCmacForCrypto(const QByteArray &scheme, const
 		CipherInfo info;
 		createScheme(scheme, info.scheme);
 		info.key = key;
-		return verifyCmacImpl(info, trustMessage, mac);
+		verifyCmacImpl(info, trustMessage, mac);
 	} catch(CppException &e) {
 		throw CryptoException(defaults(),
 							  QStringLiteral("Failed to verify cmac for crypto keys"),
@@ -829,8 +839,9 @@ const CryptoController::CipherInfo &CryptoController::getInfo(quint32 keyIndex)
 		keyFile.close();
 
 		auto key = _asymCrypto->decrypt(encData);
-		info.key.Assign(reinterpret_cast<const byte*>(key.constData()), key.size());
-		memset(key.data(), 0, key.size());
+		info.key.Assign(reinterpret_cast<const byte*>(key.constData()),
+						static_cast<size_t>(key.size()));
+		memset(key.data(), 0, static_cast<size_t>(key.size()));
 
 		//test if the key is of valid length
 		if(info.key.size() != info.scheme->toKeyLength(static_cast<quint32>(info.key.size())))
@@ -866,7 +877,7 @@ void CryptoController::cleanCiphers() const
 	auto keys = settings()->childKeys();
 	settings()->endGroup();
 
-	for(auto key : keys) {
+	for(const auto &key : qAsConst(keys)) {
 		auto ok = false;
 		auto keyIndex = key.toUInt(&ok);
 		if(!ok)
@@ -910,7 +921,8 @@ QByteArray CryptoController::encryptImpl(const CryptoController::CipherInfo &inf
 {
 	auto enc = info.scheme->encryptor();
 	enc->SetKeyWithIV(info.key.data(), info.key.size(),
-					  reinterpret_cast<const byte*>(salt.constData()), salt.size());
+					  reinterpret_cast<const byte*>(salt.constData()),
+					  static_cast<size_t>(salt.size()));
 
 	QByteArray cipher;
 	QByteArraySource(plain, true,
@@ -925,7 +937,8 @@ QByteArray CryptoController::decryptImpl(const CryptoController::CipherInfo &inf
 {
 	auto dec = info.scheme->decryptor();
 	dec->SetKeyWithIV(info.key.data(), info.key.size(),
-					  reinterpret_cast<const byte*>(salt.constData()), salt.size());
+					  reinterpret_cast<const byte*>(salt.constData()),
+					  static_cast<size_t>(salt.size()));
 
 	QByteArray plain;
 	QByteArraySource(cipher, true,

src/datasync/cryptocontroller_p.h

@@ -76,13 +76,13 @@ class Q_DATASYNC_EXPORT CryptoController : public Controller
 
 	//load, clear, remove key material
 	void acquireStore(bool existing);
-	void loadKeyMaterial(const QUuid &deviceId);
+	void loadKeyMaterial(QUuid deviceId);
 	void clearKeyMaterial();
-	void deleteKeyMaterial(const QUuid &deviceId);
+	void deleteKeyMaterial(QUuid deviceId);
 
 	//create and store new keys
 	void createPrivateKeys(const QByteArray &nonce);
-	void storePrivateKeys(const QUuid &deviceId) const;
+	void storePrivateKeys(QUuid deviceId) const;
 
 	//wrapper to sign a message
 	QByteArray serializeSignedMessage(const Message &message);

src/datasync/datastore.cpp

@@ -36,11 +36,11 @@ void DataStore::initStore(const QString &setupName)
 			this, PSIG(&DataStore::dataResetted));
 }
 
-DataStore::~DataStore() {}
+DataStore::~DataStore() = default;
 
-qint64 DataStore::count(int metaTypeId) const
+qint64 DataStore::count(int metaTypeId) const //MAJOR change to uint
 {
-	return d->store->count(d->typeName(metaTypeId));
+	return static_cast<qint64>(d->store->count(d->typeName(metaTypeId)));
 }
 
 QStringList DataStore::keys(int metaTypeId) const
@@ -50,8 +50,10 @@ QStringList DataStore::keys(int metaTypeId) const
 
 QVariantList DataStore::loadAll(int metaTypeId) const
 {
+	const auto allData = d->store->loadAll(d->typeName(metaTypeId));
 	QVariantList resList;
-	for(auto val : d->store->loadAll(d->typeName(metaTypeId)))
+	resList.reserve(allData.size());
+	for(const auto &val : allData)
 		resList.append(d->serializer->deserialize(val, metaTypeId));
 	return resList;
 }
@@ -134,15 +136,17 @@ void DataStore::update(int metaTypeId, QObject *object) const
 
 QVariantList DataStore::search(int metaTypeId, const QString &query, SearchMode mode) const
 {
+	const auto dataList= d->store->find(d->typeName(metaTypeId), query, mode);
 	QVariantList resList;
-	for(auto val : d->store->find(d->typeName(metaTypeId), query, mode))
+	resList.reserve(dataList.size());
+	for(const auto &val : dataList)
 		resList.append(d->serializer->deserialize(val, metaTypeId));
 	return resList;
 }
 
 void DataStore::iterate(int metaTypeId, const function<bool (QVariant)> &iterator) const
 {
-	for(auto key : keys(metaTypeId)) {
+	for(const auto &key : keys(metaTypeId)) {
 		if(!iterator(load(metaTypeId, key)))
 			break;
 	}
@@ -215,8 +219,7 @@ QString LocalStoreException::qWhat() const
 	QString msg = Exception::qWhat() +
 				  QStringLiteral("\n\tContext: %1"
 								 "\n\tTypeName: %2")
-				  .arg(_context)
-				  .arg(QString::fromUtf8(_key.typeName));
+				  .arg(_context, QString::fromUtf8(_key.typeName));
 	if(!_key.id.isNull())
 		msg += QStringLiteral("\n\tKey: %1").arg(_key.id);
 	return msg;
@@ -259,8 +262,7 @@ QString NoDataException::qWhat() const
 	return Exception::qWhat() +
 			QStringLiteral("\n\tTypeName: %1"
 						   "\n\tKey: %2")
-			.arg(QString::fromUtf8(_key.typeName))
-			.arg(_key.id);
+			.arg(QString::fromUtf8(_key.typeName), _key.id);
 }
 
 void NoDataException::raise() const

src/datasync/datastoremodel.cpp

@@ -39,7 +39,7 @@ void DataStoreModel::initStore(DataStore *store)
 					 this, &DataStoreModel::storeResetted);
 }
 
-DataStoreModel::~DataStoreModel() {}
+DataStoreModel::~DataStoreModel() = default;
 
 DataStore *DataStoreModel::store() const
 {

src/datasync/defaults.cpp

@@ -145,7 +145,7 @@ DatabaseRef::DatabaseRef() :
 	d(nullptr)
 {}
 
-DatabaseRef::~DatabaseRef() {}
+DatabaseRef::~DatabaseRef() = default;
 
 DatabaseRef::DatabaseRef(DatabaseRefPrivate *d) :
 	d(d)
@@ -246,7 +246,7 @@ void DefaultsPrivate::clearDefaults()
 	for(auto it = setupDefaults.constBegin(); it != setupDefaults.constEnd(); it++)
 		weakRefs.append({it.key(), it.value().toWeakRef()});
 	setupDefaults.clear();
-	for(auto ref : weakRefs) {
+	for(const auto &ref : qAsConst(weakRefs)) {
 #undef QTDATASYNC_LOG
 #define QTDATASYNC_LOG ref.second.toStrongRef()->logger
 		if(ref.second)
@@ -269,14 +269,14 @@ QSharedPointer<DefaultsPrivate> DefaultsPrivate::obtainDefaults(const QString &s
 		throw SetupDoesNotExistException(setupName);
 }
 
-DefaultsPrivate::DefaultsPrivate(const QString &setupName, const QDir &storageDir, const QUrl &roAddress, const QHash<Defaults::PropertyKey, QVariant> &properties, QJsonSerializer *serializer, ConflictResolver *resolver) :
-	setupName(setupName),
-	storageDir(storageDir),
-	logger(new Logger("defaults", setupName, this)),
-	roAddress(roAddress),
+DefaultsPrivate::DefaultsPrivate(QString setupName, QDir storageDir, QUrl roAddress, QHash<Defaults::PropertyKey, QVariant> properties, QJsonSerializer *serializer, ConflictResolver *resolver) :
+	setupName(std::move(setupName)),
+	storageDir(std::move(storageDir)),
+	logger(new Logger("defaults", this->setupName, this)),
+	roAddress(std::move(roAddress)),
 	serializer(serializer),
 	resolver(resolver),
-	properties(properties),
+	properties(std::move(properties)),
 	roMutex(),
 	roNodes(),
 	cacheInfo(nullptr),
@@ -307,16 +307,15 @@ DefaultsPrivate::DefaultsPrivate(const QString &setupName, const QDir &storageDi
 DefaultsPrivate::~DefaultsPrivate()
 {
 	QMutexLocker _(&roMutex);
-	for(auto node : roNodes)
+	for(const auto &node : qAsConst(roNodes))
 		node->deleteLater();
 	roNodes.clear();
 }
 
 QSqlDatabase DefaultsPrivate::acquireDatabase()
 {
 	auto name = DefaultsPrivate::DatabaseName
-				.arg(setupName)
-				.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThread()), 16));
+				.arg(setupName, QString::number(reinterpret_cast<quint64>(QThread::currentThread()), 16));
 	if((dbRefHash.localData()[setupName])++ == 0) {
 		auto database = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), name);
 		database.setDatabaseName(storageDir.absoluteFilePath(QStringLiteral("store.db")));
@@ -362,8 +361,7 @@ void DefaultsPrivate::releaseDatabase()
 {
 	if(--(dbRefHash.localData()[setupName]) == 0) {
 		auto name = DefaultsPrivate::DatabaseName
-					.arg(setupName)
-					.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThread()), 16));
+					.arg(setupName, QString::number(reinterpret_cast<quint64>(QThread::currentThread()), 16));
 		QSqlDatabase::database(name).close();
 		QSqlDatabase::removeDatabase(name);
 	}
@@ -417,7 +415,7 @@ void DefaultsPrivate::makePassive()
 // ------------- PRIVATE IMPLEMENTATION DatabaseRef -------------
 
 DatabaseRefPrivate::DatabaseRefPrivate(QSharedPointer<DefaultsPrivate> defaultsPrivate, QObject *object) :
-	_defaultsPrivate(defaultsPrivate),
+	_defaultsPrivate(std::move(defaultsPrivate)),
 	_object(object),
 	_database()
 {

src/datasync/defaults_p.h

@@ -57,10 +57,10 @@ class Q_DATASYNC_EXPORT DefaultsPrivate : public QObject
 	static void clearDefaults();
 	static QSharedPointer<DefaultsPrivate> obtainDefaults(const QString &setupName);
 
-	DefaultsPrivate(const QString &setupName,
-					const QDir &storageDir,
-					const QUrl &roAddress,
-					const QHash<Defaults::PropertyKey, QVariant> &properties,
+	DefaultsPrivate(QString setupName,
+					QDir storageDir,
+					QUrl roAddress,
+					QHash<Defaults::PropertyKey, QVariant> properties,
 					QJsonSerializer *serializer,
 					ConflictResolver *resolver);
 	~DefaultsPrivate() override;

src/datasync/emitteradapter.cpp

@@ -6,21 +6,21 @@ EmitterAdapter::EmitterAdapter(QObject *changeEmitter, QSharedPointer<CacheInfo>
 	QObject(origin),
 	_isPrimary(changeEmitter->metaObject()->inherits(&ChangeEmitter::staticMetaObject)),
 	_emitterBackend(changeEmitter),
-	_cache(cacheInfo)
+	_cache(std::move(cacheInfo))
 {
 	if(_isPrimary) {
 		connect(_emitterBackend, SIGNAL(dataChanged(QObject*,QtDataSync::ObjectKey,bool)),
 				this, SLOT(dataChangedImpl(QObject*,QtDataSync::ObjectKey,bool)),
 				Qt::QueuedConnection);
 		connect(_emitterBackend, SIGNAL(dataResetted(QObject*)),
-				this, SLOT(dataResettedImpl(QObject*,QByteArray)),
+				this, SLOT(dataResettedImpl(QObject*)),
 				Qt::QueuedConnection);
 	} else {
 		connect(_emitterBackend, SIGNAL(remoteDataChanged(QtDataSync::ObjectKey,bool)),
 				this, SLOT(remoteDataChangedImpl(QtDataSync::ObjectKey,bool)),
 				Qt::QueuedConnection);
 		connect(_emitterBackend, SIGNAL(remoteDataResetted()),
-				this, SLOT(remoteDataResettedImpl(QByteArray)),
+				this, SLOT(remoteDataResettedImpl()),
 				Qt::QueuedConnection);
 	}
 }
@@ -151,7 +151,7 @@ void EmitterAdapter::dropCached()
 		return;
 
 	QWriteLocker _(&_cache->lock);
-	return _cache->cache.clear();
+	_cache->cache.clear();
 }
 
 void EmitterAdapter::dataChangedImpl(QObject *origin, const ObjectKey &key, bool deleted)