constructor cleanup main lib

Author: Skycoder42

src/datasync/accountmanager.cpp

@@ -28,7 +28,7 @@ class LoginRequestPrivate
 public:
 	LoginRequestPrivate(DeviceInfo deviceInfo, AccountManagerPrivateReplica *replica);
 	DeviceInfo device;
-	bool acted;
+	bool acted = false;
 
 	QPointer<AccountManagerPrivateReplica> replica;
 };
@@ -49,26 +49,26 @@ using namespace QtDataSync;
 // ------------- AccountManager Implementation -------------
 
 AccountManager::AccountManager(QObject *parent) :
-	AccountManager(DefaultSetup, parent)
+	AccountManager{DefaultSetup, parent}
 {}
 
 AccountManager::AccountManager(const QString &setupName, QObject *parent) :
-	QObject(parent),
-	d(new AccountManagerPrivateHolder())
+	QObject{parent},
+	d{new AccountManagerPrivateHolder()}
 {
 	initReplica(setupName);
 }
 
 AccountManager::AccountManager(QRemoteObjectNode *node, QObject *parent) :
-	QObject(parent),
-	d(new AccountManagerPrivateHolder())
+	QObject{parent},
+	d{new AccountManagerPrivateHolder()}
 {
 	initReplica(node);
 }
 
 AccountManager::AccountManager(QObject *parent, void *) :
-	QObject(parent),
-	d(new AccountManagerPrivateHolder())
+	QObject{parent},
+	d{new AccountManagerPrivateHolder()}
 {} //No init
 
 void AccountManager::initReplica(const QString &setupName)
@@ -288,7 +288,7 @@ void AccountManager::loginRequestedImpl(const DeviceInfo &deviceInfo)
 // ------------- LoginRequest Implementation -------------
 
 LoginRequest::LoginRequest(LoginRequestPrivate *d_ptr) :
-	d(d_ptr)
+	d{d_ptr}
 {}
 
 LoginRequest::LoginRequest(const LoginRequest &other) = default;
@@ -338,19 +338,18 @@ void LoginRequest::reject()
 
 
 LoginRequestPrivate::LoginRequestPrivate(DeviceInfo deviceInfo, AccountManagerPrivateReplica *replica) :
-	device(std::move(deviceInfo)),
-	acted(false),
-	replica(replica)
+	device{std::move(deviceInfo)},
+	replica{replica}
 {}
 
 // ------------- DeviceInfo Implementation -------------
 
 DeviceInfo::DeviceInfo() :
-	d(new DeviceInfoPrivate())
+	d{new DeviceInfoPrivate()}
 {}
 
 DeviceInfo::DeviceInfo(const QUuid &deviceId, const QString &name, const QByteArray &fingerprint) :
-	d(new DeviceInfoPrivate(deviceId, name, fingerprint))
+	d{new DeviceInfoPrivate(deviceId, name, fingerprint)}
 {}
 
 DeviceInfo::DeviceInfo(const DeviceInfo &other) = default;
@@ -412,10 +411,10 @@ bool DeviceInfo::operator!=(const DeviceInfo &other) const
 
 
 DeviceInfoPrivate::DeviceInfoPrivate(QUuid deviceId, QString name, QByteArray fingerprint) :
-	QSharedData(),
-	deviceId(std::move(deviceId)),
-	name(std::move(name)),
-	fingerprint(std::move(fingerprint))
+	QSharedData{},
+	deviceId{std::move(deviceId)},
+	name{std::move(name)},
+	fingerprint{std::move(fingerprint)}
 {}
 
 DeviceInfoPrivate::DeviceInfoPrivate(const DeviceInfoPrivate &other) = default;

src/datasync/accountmanager_p.cpp

@@ -9,9 +9,9 @@ using std::tie;
 #define QTDATASYNC_LOG _logger
 
 AccountManagerPrivate::AccountManagerPrivate(ExchangeEngine *engineParent) :
-	AccountManagerPrivateSource(engineParent),
-	_engine(engineParent),
-	_logger(_engine->defaults().createLogger("account", this))
+	AccountManagerPrivateSource{engineParent},
+	_engine{engineParent},
+	_logger{_engine->defaults().createLogger("account", this)}
 {
 	connect(_engine->remoteConnector(), &RemoteConnector::deviceNameChanged,
 			this, &AccountManagerPrivate::deviceNameChanged);

src/datasync/changecontroller.cpp

@@ -10,13 +10,7 @@ using namespace QtDataSync;
 #define QTDATASYNC_LOG QTDATASYNC_LOG_CONTROLLER
 
 ChangeController::ChangeController(const Defaults &defaults, QObject *parent) :
-	Controller("change", defaults, parent),
-	_store(nullptr),
-	_emitter(nullptr),
-	_uploadingEnabled(false),
-	_uploadLimit(10), //good default
-	_activeUploads(),
-	_changeEstimate(0)
+	Controller{"change", defaults, parent}
 {}
 
 void ChangeController::initialize(const QVariantHash &params)
@@ -214,35 +208,27 @@ void ChangeController::uploadNext(bool emitStarted)
 
 
 
-ChangeController::ChangeInfo::ChangeInfo() :
-	key(),
-	version(0),
-	checksum()
-{}
+ChangeController::ChangeInfo::ChangeInfo() = default;
 
 ChangeController::ChangeInfo::ChangeInfo(ObjectKey key, quint64 version, QByteArray checksum) :
-	key(std::move(key)),
-	version(version),
-	checksum(std::move(checksum))
+	key{std::move(key)},
+	version{version},
+	checksum{std::move(checksum)}
 {}
 
 
 
-ChangeController::CachedObjectKey::CachedObjectKey() :
-	ObjectKey(),
-	_hash()
-{}
+ChangeController::CachedObjectKey::CachedObjectKey() = default;
 
 ChangeController::CachedObjectKey::CachedObjectKey(ObjectKey other, QUuid deviceId) :
-	ObjectKey(std::move(other)),
-	optionalDevice(std::move(deviceId)),
-	_hash()
+	ObjectKey{std::move(other)},
+	optionalDevice{std::move(deviceId)}
 {}
 
 ChangeController::CachedObjectKey::CachedObjectKey(QByteArray hash, QUuid deviceId) :
-	ObjectKey(),
-	optionalDevice(std::move(deviceId)),
-	_hash(std::move(hash))
+	ObjectKey{},
+	optionalDevice{std::move(deviceId)},
+	_hash{std::move(hash)}
 {}
 
 QByteArray ChangeController::CachedObjectKey::hashed() const

src/datasync/changecontroller_p.h

@@ -21,7 +21,7 @@ class Q_DATASYNC_EXPORT ChangeController : public Controller
 public:
 	struct Q_DATASYNC_EXPORT ChangeInfo {
 		ObjectKey key;
-		quint64 version;
+		quint64 version = 0;
 		QByteArray checksum;
 
 		ChangeInfo();
@@ -75,12 +75,12 @@ private Q_SLOTS:
 		bool isDelete;
 	};
 
-	LocalStore *_store;
-	ChangeEmitter *_emitter;
-	bool _uploadingEnabled;
-	int _uploadLimit;
+	LocalStore *_store = nullptr;
+	ChangeEmitter *_emitter = nullptr;
+	bool _uploadingEnabled = false;
+	int _uploadLimit = 10;
 	QHash<CachedObjectKey, UploadInfo> _activeUploads;
-	quint32 _changeEstimate;
+	quint32 _changeEstimate = 0;
 };
 
 //not exported, just like the class

src/datasync/changeemitter.cpp

@@ -2,8 +2,8 @@
 using namespace QtDataSync;
 
 ChangeEmitter::ChangeEmitter(const Defaults &defaults, QObject *parent) :
-	ChangeEmitterSource(parent),
-	_cache(defaults.cacheHandle().value<QSharedPointer<EmitterAdapter::CacheInfo>>())
+	ChangeEmitterSource{parent},
+	_cache{defaults.cacheHandle().value<QSharedPointer<EmitterAdapter::CacheInfo>>()}
 {}
 
 void ChangeEmitter::triggerChange(QObject *origin, const ObjectKey &key, bool deleted, bool changed)

src/datasync/conflictresolver.cpp

@@ -3,8 +3,8 @@
 using namespace QtDataSync;
 
 ConflictResolver::ConflictResolver(QObject *parent) :
-	QObject(parent),
-	d(new ConflictResolverPrivate())
+	QObject{parent},
+	d{new ConflictResolverPrivate()}
 {}
 
 ConflictResolver::~ConflictResolver() = default;
@@ -35,11 +35,3 @@ QSettings *ConflictResolver::settings() const
 {
 	return d->settings;
 }
-
-// ------------- Private Implementation -------------
-
-ConflictResolverPrivate::ConflictResolverPrivate() :
-	defaults(),
-	logger(nullptr),
-	settings(nullptr)
-{}

src/datasync/conflictresolver_p.h

@@ -10,11 +10,9 @@ namespace QtDataSync {
 class ConflictResolverPrivate
 {
 public:
-	ConflictResolverPrivate();
-
 	Defaults defaults;
-	Logger *logger;
-	QSettings *settings;
+	Logger *logger = nullptr;
+	QSettings *settings = nullptr;
 };
 
 }

src/datasync/controller.cpp

@@ -12,11 +12,11 @@ using namespace std::chrono;
 #define QTDATASYNC_LOG _logger
 
 QtDataSync::Controller::Controller(const QByteArray &name, Defaults defaults, QObject *parent) :
-	QObject(parent),
-	_defaults(std::move(defaults)),
-	_logger(_defaults.createLogger(name, this)),
-	_settings(_defaults.createSettings(this, QString::fromUtf8(name))),
-	_opTimer(new QTimer(this))
+	QObject{parent},
+	_defaults{std::move(defaults)},
+	_logger{_defaults.createLogger(name, this)},
+	_settings{_defaults.createSettings(this, QString::fromUtf8(name))},
+	_opTimer{new QTimer(this)}
 {
 	connect(_opTimer, &QTimer::timeout,
 			this, &Controller::onTimeout);

src/datasync/cryptocontroller.cpp

@@ -114,12 +114,7 @@ const QString CryptoController::keyCryptKeyTemplate(QStringLiteral("%1/encryptio
 const QString CryptoController::keyKeyFileTemplate(QStringLiteral("key_%1.enc"));
 
 CryptoController::CryptoController(const Defaults &defaults, QObject *parent) :
-	Controller("crypto", defaults, parent),
-	_keyStore(nullptr),
-	_asymCrypto(nullptr),
-	_loadedChiphers(),
-	_localCipher(0),
-	_fingerprint()
+	Controller{"crypto", defaults, parent}
 {}
 
 QStringList CryptoController::allKeystoreKeys()
@@ -952,14 +947,12 @@ QByteArray CryptoController::decryptImpl(const CryptoController::CipherInfo &inf
 // ------------- ClientCrypto Implementation -------------
 
 ClientCrypto::ClientCrypto(QObject *parent) :
-	AsymmetricCrypto(parent),
+	AsymmetricCrypto{parent},
 #ifdef QT_NO_DEBUG
-	_rng(true, 32),
+	_rng{true, 32}
 #else //fast rng seeding for debug builds
-	_rng(false),
+	_rng{false}
 #endif
-	_signKey(nullptr),
-	_cryptKey(nullptr)
 {}
 
 void ClientCrypto::generate(Setup::SignatureScheme signScheme, const QVariant &signKeyParam, Setup::EncryptionScheme cryptScheme, const QVariant &cryptKeyParam)

src/datasync/cryptocontroller_p.h

@@ -159,9 +159,9 @@ class Q_DATASYNC_EXPORT CryptoController : public Controller
 	static const QString keyKeyFileTemplate;
 
 	QPointer<KeyStore> _keyStore;
-	ClientCrypto *_asymCrypto;
+	ClientCrypto *_asymCrypto = nullptr;
 	mutable QHash<quint32, CipherInfo> _loadedChiphers;
-	quint32 _localCipher;
+	quint32 _localCipher = 0;
 
 	QByteArray _fingerprint;