small stuff

Author: Skycoder42

.gitignore

@@ -37,3 +37,6 @@ Makefile*
 # QtCtreator CMake
 CMakeLists.txt.user
 
+*.json.user
+.qpmx-dev-cache
+

.qmake.conf

@@ -1,7 +1,6 @@
 load(qt_build_config)
 
 CONFIG += warning_clean exceptions c++14
-win32:cross_compile: CONFIG += winrt
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 
 versionAtLeast(QT_VERSION, 5.11.0): CONFIG += sample_test_model

src/datasync/exception.cpp

@@ -12,7 +12,7 @@ Exception::Exception(const Defaults &defaults, const QString &message) :
 	Exception{defaults.setupName(), message}
 {}
 
-Exception::Exception(const Exception * const other) :
+Exception::Exception(const Exception * const other) :  //MAJOR use normal copy ctr instead
 	QException{},
 	_setupName{other->_setupName},
 	_message{other->_message}

src/datasync/remoteconfig.cpp

@@ -57,6 +57,21 @@ void RemoteConfig::setKeepaliveTimeout(int keepaliveTimeout)
 	d->keepaliveTimeout = keepaliveTimeout;
 }
 
+QVariantMap RemoteConfig::storedHeaders() const
+{
+	QVariantMap map;
+	for(auto it = d->headers.constBegin(); it != d->headers.constEnd(); ++it)
+		map.insert(QString::fromUtf8(it.key()), QString::fromUtf8(it.value()));
+	return map;
+}
+
+void RemoteConfig::setStoredHeaders(const QVariantMap &map)
+{
+	d->headers.clear();
+	for(auto it = map.constBegin(); it != map.constEnd(); ++it)
+		d->headers.insert(it.key().toUtf8(), it.value().toString().toUtf8());
+}
+
 
 
 QDataStream &QtDataSync::operator<<(QDataStream &stream, const RemoteConfig &deviceInfo)

src/datasync/remoteconfig.h

@@ -5,6 +5,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qshareddata.h>
+#include <QtCore/qvariant.h>
 
 #include "QtDataSync/qtdatasync_global.h"
 
@@ -21,10 +22,12 @@ class Q_DATASYNC_EXPORT RemoteConfig
 	//! A access secret needed in order to connect to the server
 	Q_PROPERTY(QString accessKey READ accessKey WRITE setAccessKey)
 	//! A collection of additional HTTP headers to be sent with the request
-	Q_PROPERTY(HeaderHash headers READ headers WRITE setHeaders)
+	Q_PROPERTY(QtDataSync::RemoteConfig::HeaderHash headers READ headers WRITE setHeaders STORED false)
 	//! The keep alive timeout to be used to send pings to the server
 	Q_PROPERTY(int keepaliveTimeout READ keepaliveTimeout WRITE setKeepaliveTimeout)
 
+	Q_PROPERTY(QVariantMap storedHeaders READ storedHeaders WRITE setStoredHeaders)
+
 public:
 	//! Typedef for a hash of additional HTTP headers
 	using HeaderHash = QHash<QByteArray, QByteArray>;
@@ -66,6 +69,9 @@ class Q_DATASYNC_EXPORT RemoteConfig
 private:
 	QSharedDataPointer<RemoteConfigPrivate> d;
 
+	QVariantMap storedHeaders() const;
+	void setStoredHeaders(const QVariantMap &map);
+
 	friend Q_DATASYNC_EXPORT QDataStream &operator<<(QDataStream &stream, const RemoteConfig &deviceInfo);
 	friend Q_DATASYNC_EXPORT QDataStream &operator>>(QDataStream &stream, RemoteConfig &deviceInfo);
 };

src/datasync/setup.cpp

@@ -29,7 +29,7 @@ void Setup::setCleanupTimeout(unsigned long timeout)
 	SetupPrivate::timeout = timeout;
 }
 
-void Setup::removeSetup(const QString &name, bool waitForFinished)
+void Setup::removeSetup(const QString &name, bool waitForFinished) //TODO add awaitable version
 {
 	QMutexLocker _(&SetupPrivate::setupMutex);
 	if(!SetupPrivate::engines.contains(name))
@@ -106,6 +106,17 @@ Setup::Setup() :
 	d{new SetupPrivate()}
 {}
 
+Setup::Setup(Setup &&other) noexcept
+{
+	swap(d, other.d);
+}
+
+Setup &Setup::operator=(Setup &&other) noexcept
+{
+	swap(d, other.d);
+	return *this;
+}
+
 Setup::~Setup() = default;
 
 QString Setup::localDir() const

src/datasync/setup.h

@@ -68,7 +68,7 @@ class Q_DATASYNC_EXPORT Setup
 	//! The serializer to be used to serialize and deserialize data to and from the store
 	Q_PROPERTY(QJsonSerializer* serializer READ serializer WRITE setSerializer RESET resetSerializer)
 	//! An optional conflict resolver to handle merge conflicts
-	Q_PROPERTY(ConflictResolver* conflictResolver READ conflictResolver WRITE setConflictResolver RESET resetConflictResolver)
+	Q_PROPERTY(QtDataSync::ConflictResolver* conflictResolver READ conflictResolver WRITE setConflictResolver RESET resetConflictResolver)
 	//! An alternative handler for fatal errors
 	Q_PROPERTY(FatalErrorHandler fatalErrorHandler READ fatalErrorHandler WRITE setFatalErrorHandler RESET resetFatalErrorHandler)
 	//! The size of the internal database cache, in bytes
@@ -80,7 +80,7 @@ class Q_DATASYNC_EXPORT Setup
 	//! The ssl configuration to be used to connect to the remote
 	Q_PROPERTY(QSslConfiguration sslConfiguration READ sslConfiguration WRITE setSslConfiguration RESET resetSslConfiguration)
 	//! The configuration to be used to connect to the remote
-	Q_PROPERTY(RemoteConfig remoteConfiguration READ remoteConfiguration WRITE setRemoteConfiguration RESET resetRemoteConfiguration)
+	Q_PROPERTY(QtDataSync::RemoteConfig remoteConfiguration READ remoteConfiguration WRITE setRemoteConfiguration RESET resetRemoteConfiguration)
 	//! The name of the preferred keystore provider
 	Q_PROPERTY(QString keyStoreProvider READ keyStoreProvider WRITE setKeyStoreProvider RESET resetKeyStoreProvider)
 	//! The algorithmic scheme to be used for new signature keys
@@ -192,6 +192,8 @@ class Q_DATASYNC_EXPORT Setup
 	static KeyStore *loadKeystore(const QString &provider, QObject *parent = nullptr, const QString &setupName = DefaultSetup);
 
 	Setup();
+	Setup(Setup &&other) noexcept;
+	Setup &operator=(Setup &&other) noexcept;
 	~Setup();
 
 	//! @readAcFn{Setup::localDir}
@@ -401,4 +403,5 @@ Q_DECL_CONSTEXPR inline int GB(intmax_t value)
 }
 
 }
+
 #endif // QTDATASYNC_SETUP_H

src/plugins/keystores/keystores.pro

@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS += plain
 qtHaveModule(KWallet): SUBDIRS += kwallet
 unix:!android:!ios:system(pkg-config --exists libsecret-1): SUBDIRS += secretservice
-win32:!winrt: SUBDIRS += wincred
+win32:!cross_compile: SUBDIRS += wincred
 mac|ios: SUBDIRS += keychain
 android:qtHaveModule(androidextras): SUBDIRS += android
 

tools/tools.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-!android:!ios:!winrt: SUBDIRS += appserver
+!cross_compile: SUBDIRS += appserver
 
 prepareRecursiveTarget(lrelease)
 QMAKE_EXTRA_TARGETS += lrelease run-tests