added setupName getter/prop to most public classes

Author: Skycoder42

src/datasync/accountmanager.cpp

@@ -81,6 +81,8 @@ void AccountManager::initReplica(QRemoteObjectNode *node)
 	d->replica = node->acquire<AccountManagerPrivateReplica>();
 	d->replica->setParent(this);
 
+	connect(d->replica, &AccountManagerPrivateReplica::setupNameChanged,
+			this, PSIG(&AccountManager::setupNameChanged));
 	connect(d->replica, &AccountManagerPrivateReplica::deviceNameChanged,
 			this, PSIG(&AccountManager::deviceNameChanged));
 	connect(d->replica, &AccountManagerPrivateReplica::deviceFingerprintChanged,
@@ -216,6 +218,11 @@ void AccountManager::importAccountTrusted(const QByteArray &importData, const QS
 	}
 }
 
+QString AccountManager::setupName() const
+{
+	return d->replica->setupName();
+}
+
 QString AccountManager::deviceName() const
 {
 	return d->replica->deviceName();

src/datasync/accountmanager.h

@@ -120,6 +120,7 @@ class Q_DATASYNC_EXPORT AccountManager : public QObject
 {
 	Q_OBJECT
 
+	Q_PROPERTY(QString setupName READ setupName NOTIFY setupNameChanged REVISION 2)
 	//! The display name of the device
 	Q_PROPERTY(QString deviceName READ deviceName WRITE setDeviceName RESET resetDeviceName NOTIFY deviceNameChanged)
 	//! The fingerprint of the devices cryptographic keys
@@ -161,6 +162,7 @@ class Q_DATASYNC_EXPORT AccountManager : public QObject
 	//! @copydoc importAccountTrusted(const QJsonObject &, const QString &, const std::function<void(bool,QString)> &, bool)
 	void importAccountTrusted(const QByteArray &importData, const QString &password, const std::function<void(bool,QString)> &completedFn, bool keepData = false);
 
+	QString setupName() const;
 	//! @readAcFn{AccountManager::deviceName}
 	QString deviceName() const;
 	//! @readAcFn{AccountManager::deviceFingerprint}
@@ -200,6 +202,7 @@ public Q_SLOTS:
 	//! Is emitted when a device has been granted access to the current account
 	void accountAccessGranted(const QUuid &deviceId, QPrivateSignal);
 
+	Q_REVISION(2) void setupNameChanged(const QString &setupName, QPrivateSignal);
 	//! @notifyAcFn{AccountManager::deviceName}
 	void deviceNameChanged(const QString &deviceName, QPrivateSignal);
 	//! @notifyAcFn{AccountManager::deviceFingerprint}

src/datasync/accountmanager_p.cpp

@@ -29,6 +29,11 @@ AccountManagerPrivate::AccountManagerPrivate(ExchangeEngine *engineParent) :
 			this, &AccountManagerPrivate::accountAccessGranted);
 }
 
+QString AccountManagerPrivate::setupName() const
+{
+	return _engine->defaults().setupName();
+}
+
 QString AccountManagerPrivate::deviceName() const
 {
 	return _engine->remoteConnector()->deviceName();

src/datasync/accountmanager_p.h

@@ -18,6 +18,7 @@ class AccountManagerPrivate : public AccountManagerPrivateSource
 public:
 	explicit AccountManagerPrivate(ExchangeEngine *engineParent);
 
+	QString setupName() const override;
 	QString deviceName() const override;
 	QByteArray deviceFingerprint() const override;
 	QString lastError() const override;

src/datasync/accountmanager_p.rep

@@ -2,6 +2,7 @@
 #include "accountmanager.h"
 
 class AccountManagerPrivate {
+	PROP(QString setupName READONLY)
 	PROP(QString deviceName READWRITE);
 	PROP(QByteArray deviceFingerprint READONLY);
 	PROP(QString lastError READONLY);

src/datasync/conflictresolver.cpp

@@ -17,6 +17,11 @@ void ConflictResolver::setDefaults(const Defaults &defaults)
 	d->settings = defaults.createSettings(this, QString::fromUtf8(name()));
 }
 
+QString ConflictResolver::setupName() const
+{
+	return d->defaultsName;
+}
+
 QByteArray ConflictResolver::name() const
 {
 	return "resolver";

src/datasync/conflictresolver.h

@@ -26,6 +26,7 @@ class Q_DATASYNC_EXPORT ConflictResolver : public QObject
 	//! @private
 	void setDefaults(const Defaults &defaults);
 
+	QString setupName() const;
 	//! The resolvers name. Used for logging
 	virtual QByteArray name() const;
 	//! The method called to resolve conflicts between two datasets

src/datasync/datastore.cpp

@@ -22,6 +22,11 @@ DataStore::DataStore(const QString &setupName, QObject *parent) :
 	initStore(setupName);
 }
 
+QString DataStore::setupName() const
+{
+	return d->defaults.setupName();
+}
+
 DataStore::DataStore(QObject *parent, void *) :
 	QObject{parent},
 	d{nullptr}

src/datasync/datastore.h

@@ -41,6 +41,8 @@ class Q_DATASYNC_EXPORT DataStore : public QObject
 	explicit DataStore(const QString &setupName, QObject *parent = nullptr);
 	~DataStore() override;
 
+	QString setupName() const;
+
 	//! @copybrief DataStore::count() const
 	qint64 count(int metaTypeId) const;
 	//! @copybrief DataStore::keys() const

src/datasync/datastoremodel.cpp

@@ -46,6 +46,11 @@ DataStore *DataStoreModel::store() const
 	return d->store;
 }
 
+QString DataStoreModel::setupName() const
+{
+	return d->store->setupName();
+}
+
 int DataStoreModel::typeId() const
 {
 	return d->type;