internal code updates

Author: Skycoder42

.qmake.conf

@@ -5,4 +5,9 @@ win32:cross_compile: CONFIG += winrt
 
 DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
-MODULE_VERSION = 4.0.0
+MODULE_VERSION_MAJOR = 4
+MODULE_VERSION_MINOR = 0
+MODULE_VERSION_PATCH = 1
+MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
+MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}
+

.travis.yml

@@ -9,7 +9,8 @@ osx_image: xcode9.2
 
 env:
   global:
-    - QT_VER=5.10.0
+    - QPMX_CACHE_DIR=$HOME/.qpmx-cache
+    - QT_VER=5.10.1
     - EXTRA_MODULES=".qtremoteobjects .skycoder42.jsonserializer"
     - STATIC_QT_MODS="qttools qtwebsockets qtscxml qtremoteobjects"
     - STATIC_EXTRA_MODS="qtjsonserializer"
@@ -20,7 +21,7 @@ matrix:
       env:
         - PLATFORM=gcc_64
         - BUILD_DOC=true
-        - EXTRA_PKG="libsecret-1-dev gnome-keyring" #in order to build secrectservice keystore
+        - EXTRA_PKG="libsecret-1-dev" #in order to build secrectservice keystore
     - os: linux
       env:
         - PLATFORM=android_armv7
@@ -59,10 +60,10 @@ deploy:
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  #TODO rm qpmx locks
+  - rm -fr $QPMX_CACHE_DIR/locks
 cache:
   directories:
-    - $HOME/.cache/Skycoder42/qpmx
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
+    - $QPMX_CACHE_DIR

README.md

@@ -158,7 +158,7 @@ auto store = new QtDataSync::DataStore(this); //Use the "default setup"
 //store an entry
 store->save<Data>({42, "tree"});
 //load all entries
-foreach(Data d, store->loadAll<Data>()) {
+for(Data d : store->loadAll<Data>()) {
 	qDebug() << d.key << d.value;
 });
 ```

appveyor.yml

@@ -5,7 +5,7 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.10.0
+  QT_VER: 5.10.1
   EXTRA_MODULES: .qtremoteobjects;.skycoder42.jsonserializer
   STATIC_QT_MODS: qttools qtwebsockets qtscxml qtremoteobjects
   STATIC_EXTRA_MODS: qtjsonserializer

doc/datatypestore.dox

@@ -225,7 +225,7 @@ initially. This can be a potentially long operation, and thus you should only us
 number of datasets does not get extremly big.
 
 One additional feature of the store is that it provides read-only STL iterators for easy access.
-Using it with foreach however is currently not possible, as the store is not a value type.
+Using it with for/foreach however is currently not possible, as the store is not a value type.
 
 @sa DataStore, DataStore::loadAll, DataTypeStore
 */

examples/datasync/Sample/accountdialog.cpp

@@ -70,7 +70,7 @@ void AccountDialog::exec(const QString &setup, QWidget *parent)
 void AccountDialog::updateDevices(const QList<QtDataSync::DeviceInfo> &devices)
 {
 	ui->treeWidget->clear();
-	foreach(auto device, devices) {
+	for(auto device : devices) {
 		auto item = new QTreeWidgetItem(ui->treeWidget);
 		item->setText(0, device.name());
 		item->setText(1, printFingerprint(device.fingerprint()));
@@ -111,7 +111,7 @@ void AccountDialog::login(QtDataSync::LoginRequest request)
 QString AccountDialog::printFingerprint(const QByteArray &fingerprint)
 {
 	QByteArrayList res;
-	foreach(char c, fingerprint)
+	for(char c : fingerprint)
 		res.append(QByteArray(1, c).toHex());
 	return QString::fromUtf8(res.join(':'));
 }

examples/datasync/Sample/exchangedialog.cpp

@@ -35,7 +35,7 @@ void ExchangeDialog::exec(QtDataSync::AccountManager *manager, QWidget *parent)
 void ExchangeDialog::devicesChanged(QList<QtDataSync::UserInfo> devices)
 {
 	ui->treeWidget->clear();
-	foreach(auto dev, devices) {
+	for(auto dev : devices) {
 		auto item = new QTreeWidgetItem(ui->treeWidget);
 		item->setText(0, dev.name());
 		item->setText(1, QStringLiteral("%1:%2").arg(dev.address().toString()).arg(dev.port()));

src/datasync/changecontroller.cpp

@@ -143,7 +143,7 @@ void ChangeController::uploadNext(bool emitStarted)
 
 			//skip stuff already beeing uploaded (could still have changed, but to prevent errors)
 			auto skip = false;
-			foreach(auto mKey, _activeUploads.keys()) {
+			for(auto mKey : _activeUploads.keys()) {
 				if(key == mKey) {
 					skip = true;
 					break;

src/datasync/changeemitter.cpp

@@ -58,7 +58,7 @@ void ChangeEmitter::triggerRemoteClear(const QByteArray &typeName)
 {
 	if(_cache) {
 		QWriteLocker _(&_cache->lock);
-		foreach(auto key, _cache->cache.keys()) {
+		for(auto key : _cache->cache.keys()) {
 			if(key.typeName == typeName)
 				_cache->cache.remove(key);
 		}

src/datasync/cryptocontroller.cpp

@@ -129,7 +129,7 @@ QStringList CryptoController::allKeystoreKeys()
 QStringList CryptoController::availableKeystoreKeys()
 {
 	QStringList keys;
-	foreach(auto key, factory->allKeys()) {
+	for(auto key : factory->allKeys()) {
 		if(factory->isAvailable(key))
 			keys.append(key);
 	}
@@ -860,7 +860,7 @@ void CryptoController::cleanCiphers() const
 	auto keys = settings()->childKeys();
 	settings()->endGroup();
 
-	foreach(auto key, keys) {
+	for(auto key : keys) {
 		auto ok = false;
 		auto keyIndex = key.toUInt(&ok);
 		if(!ok)