project cleanup

Author: Skycoder42

.qmake.conf

@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += warning_clean exceptions
 DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
-MODULE_VERSION = 2.1.3
+MODULE_VERSION = 2.1.4

.travis.yml

@@ -4,20 +4,21 @@ services:
   - docker
 
 sudo: required
+dist: trusty
+osx_image: xcode9.2
 
 env:
   global:
-    - QT_VER=5.10.0
+    - QPMX_CACHE_DIR=$HOME/.qpmx-cache
+    - QT_VER=5.10.1
 
 matrix:
   include:
     - os: linux
-      dist: trusty
       env:
         - PLATFORM=gcc_64
         - BUILD_DOC=true
     - os: osx
-      osx_image: xcode9.1
       env:
         - PLATFORM=clang_64
 
@@ -44,9 +45,10 @@ deploy:
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - 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

@@ -6,6 +6,7 @@ The Qt auto updater library is a library to automatically check for updates and
 
 [![Travis Build Status](https://travis-ci.org/Skycoder42/QtAutoUpdater.svg?branch=master)](https://travis-ci.org/Skycoder42/QtAutoUpdater)
 [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/5iw2byrvnsdfytxv/branch/master?svg=true)](https://ci.appveyor.com/project/Skycoder42/qtautoupdater/branch/master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a5b2e3cc66c644869515d2f3a5c3ff49)](https://www.codacy.com/app/Skycoder42/QtAutoUpdater)
 
 ## Features
 ### Core Library

appveyor.yml

@@ -5,7 +5,7 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.10.0
+  QT_VER: 5.10.1
 
   matrix:
     - PLATFORM: msvc2017_64
@@ -17,12 +17,12 @@ matrix:
   exclude:
     - PLATFORM: msvc2017_64
       image: Visual Studio 2015
-    - PLATFORM: mingw53_32
-      image: Visual Studio 2015
     - PLATFORM: msvc2015_64
       image: Visual Studio 2017
     - PLATFORM: msvc2015
       image: Visual Studio 2017
+    - PLATFORM: mingw53_32
+      image: Visual Studio 2017
 
 install:
   - git clone https://github.com/Skycoder42/QtModules.git .\qtmodules-travis

deploy.json

@@ -0,0 +1,11 @@
+{
+	"title": "QtAutoUpdater",
+	"description": "A Qt library to automatically check for updates and install them.",
+	"modules": [ "QtAutoUpdaterCore", "QtAutoUpdaterGui" ],
+	"dependencies": [],
+	"excludes": [ "static", "android", "ios", "winrt" ],
+	"license": {
+		"name": "BSD-3-Clause",
+		"path": "LICENSE"
+	}
+}

examples/examples.pro

@@ -1,6 +1,3 @@
 TEMPLATE = subdirs
 
 SUBDIRS = autoupdatercore autoupdatergui
-
-docTarget.target = doxygen
-QMAKE_EXTRA_TARGETS += docTarget

qtautoupdater.pro

@@ -2,9 +2,17 @@ load(qt_parts)
 
 SUBDIRS += doc
 
-docTarget.target = doxygen
-docTarget.CONFIG += recursive
-docTarget.recurse_target = doxygen
-QMAKE_EXTRA_TARGETS += docTarget
+doxygen.target = doxygen
+doxygen.CONFIG = recursive
+doxygen.recurse_target = doxygen
+doxygen.recurse += doc
+QMAKE_EXTRA_TARGETS += doxygen
 
-DISTFILES += .qmake.conf
+lrelease.target = lrelease
+lrelease.CONFIG = recursive
+lrelease.recurse_target = lrelease
+lrelease.recurse += sub_src
+QMAKE_EXTRA_TARGETS += lrelease
+
+DISTFILES += .qmake.conf \
+	sync.profile

src/autoupdatercore/adminauthoriser.h

@@ -13,7 +13,6 @@ namespace QtAutoUpdater
 class Q_AUTOUPDATERCORE_EXPORT AdminAuthoriser
 {
 public:
-	//! Virtual destructor
 	virtual inline ~AdminAuthoriser() {}
 	//! Tests whether this program already has elevated rights or not
 	virtual bool hasAdminRights() = 0;

src/autoupdatergui/adminauthorization_mac.cpp

@@ -68,7 +68,7 @@ bool AdminAuthorization::executeAsAdmin(const QString &program, const QStringLis
 
 	QVector<char *> args;
 	QVector<QByteArray> utf8Args;
-	foreach (const QString &argument, arguments) {
+	for(auto argument : arguments) {
 		utf8Args.push_back(argument.toUtf8());
 		args.push_back(utf8Args.last().data());
 	}

src/autoupdatergui/adminauthorization_x11.cpp

@@ -76,7 +76,7 @@ bool AdminAuthorization::hasAdminRights()
 
 bool AdminAuthorization::executeAsAdmin(const QString &program, const QStringList &arguments)
 {
-	foreach(auto su, suFontends) {
+	for(auto su : qAsConst(suFontends)) {
 		auto command = QStandardPaths::findExecutable(su.first);
 		if(!command.isEmpty()) {
 			auto args = su.second;
@@ -157,7 +157,6 @@ static bool execAdminFallback(const QString &program, const QStringList &argumen
 		QByteArray data;
 		QByteArray errData;
 		int bytes = 0;
-		int errBytes = 0;
 		char buf[1024];
 		char errBuf[1024];
 		while (bytes >= 0) {
@@ -174,7 +173,7 @@ static bool execAdminFallback(const QString &program, const QStringList &argumen
 				else
 					bytes = 0;
 			}
-			errBytes = ::read(pipedData[0], errBuf, 1023);
+			int errBytes = ::read(pipedData[0], errBuf, 1023);
 			if (errBytes > 0)
 			{
 				errData.append(errBuf, errBytes);
@@ -266,7 +265,7 @@ static bool execAdminFallback(const QString &program, const QStringList &argumen
 		::unsetenv("LC_ALL");
 
 		::execv(SU_COMMAND, argp);
-		_exit(0);
+		_exit(EXIT_FAILURE);
 		return false;
 	}
 }