Apply all modernize-* fixes from clang-tidy except for modernize-use-auto

8 files changed, 54 insertions, 40 deletions

diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp
index d1fa8211d..1cf6e0db7 100644
--- a/src/modules/objects/KvsObject_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -26,7 +26,7 @@
 #include "KviMemory.h"
 #include "KviLocale.h"
 #include "KvsObject_list.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 /*
 	@doc: list
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index df2db43a1..e7a634f57 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -288,7 +288,7 @@ KVSO_CLASS_FUNCTION(listWidget, isChecked)
 	QListWidgetItem * pItem = ((QListWidget *)widget())->item(iIdx);
 	if(!pItem)
 		return true;
-	c->returnValue()->setBoolean(pItem->checkState() == Qt::Checked ? 1 : 0);
+	c->returnValue()->setBoolean(pItem->checkState() == Qt::Checked ? true : false);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 373cee877..3c71eeb2d 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -27,7 +27,7 @@
 #include "KviLocale.h"
 #include "KvsObject_sql.h"
 #include "KvsObject_memoryBuffer.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <QHash>
 #include <QSqlDriver>
 #include <QSqlError>
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index dc38fc591..ca5419f1e 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -345,7 +345,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem, isChecked)
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	c->returnValue()->setBoolean(((QTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0) == Qt::Checked ? 1 : 0);
+	c->returnValue()->setBoolean(((QTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0) == Qt::Checked ? true : false);
 	return true;
 }
 
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 565172619..935bdb8b0 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -43,6 +43,8 @@
 //#define QFTPDTP_DEBUG
 
 #include "qftp.h"
+
+#include <utility>
 #include "qabstractsocket.h"
 
 #ifndef QT_NO_FTP
@@ -90,14 +92,18 @@ public:
 QBasicAtomicInt QFtpCommand::idCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
 
 QFtpCommand::QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba)
-    : command(cmd), rawCmds(raw), is_ba(true)
+    : command(cmd)
+    , rawCmds(std::move(raw))
+    , is_ba(true)
 {
 	id = idCounter.fetchAndAddRelaxed(1);
 	data.ba = new QByteArray(ba);
 }
 
 QFtpCommand::QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev)
-    : command(cmd), rawCmds(raw), is_ba(false)
+    : command(cmd)
+    , rawCmds(std::move(raw))
+    , is_ba(false)
 {
 	id = idCounter.fetchAndAddRelaxed(1);
 	data.dev = dev;
@@ -958,7 +964,7 @@ bool QFtpPI::processReply()
 		// both examples where the parenthesis are used, and where
 		// they are missing. We need to scan for the address and host
 		// info.
-		QRegExp addrPortPattern(QLatin1String("(\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)"));
+		QRegExp addrPortPattern(QLatin1String(R"((\d+),(\d+),(\d+),(\d+),(\d+),(\d+))"));
 		if(addrPortPattern.indexIn(replyText) == -1)
 		{
 #if defined(QFTPPI_DEBUG)
diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp
index 2df6adfdb..6e19960c5 100644
--- a/src/modules/objects/qtftp/qurlinfo.cpp
+++ b/src/modules/objects/qtftp/qurlinfo.cpp
@@ -43,38 +43,32 @@
 
 #include "qurl.h"
 #include "qdir.h"
-#include <limits.h>
+#include <climits>
 
 QT_BEGIN_NAMESPACE
 
 class QUrlInfoPrivate
 {
 public:
-	QUrlInfoPrivate() : permissions(0),
-	                    size(0),
-	                    isDir(false),
-	                    isFile(true),
-	                    isSymLink(false),
-	                    isWritable(true),
-	                    isReadable(true),
-	                    isExecutable(false)
+	QUrlInfoPrivate()
+
 	{
 	}
 
 	QString name;
-	int permissions;
+	int permissions{ 0 };
 	QString owner;
 	QString group;
-	qint64 size;
+	qint64 size{ 0 };
 
 	QDateTime lastModified;
 	QDateTime lastRead;
-	bool isDir;
-	bool isFile;
-	bool isSymLink;
-	bool isWritable;
-	bool isReadable;
-	bool isExecutable;
+	bool isDir{ false };
+	bool isFile{ true };
+	bool isSymLink{ false };
+	bool isWritable{ true };
+	bool isReadable{ true };
+	bool isExecutable{ false };
 };
 
 /*!
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index dbecaa42e..84e5e28e5 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -42,6 +42,8 @@
 //#define QHTTP_DEBUG
 
 #include <qplatformdefs.h>
+
+#include <utility>
 #include "qhttp.h"
 
 #ifndef QT_NO_HTTP
@@ -71,7 +73,7 @@ class QHttpNormalRequest;
 class QHttpRequest
 {
 public:
-	QHttpRequest() : finished(false)
+	QHttpRequest()
 	{
 		id = idCounter.fetchAndAddRelaxed(1);
 	}
@@ -86,7 +88,7 @@ public:
 	virtual QIODevice * destinationDevice() = 0;
 
 	int id;
-	bool finished;
+	bool finished{ false };
 
 private:
 	static QBasicAtomicInt idCounter;
@@ -98,11 +100,20 @@ public:
 	Q_DECLARE_PUBLIC(QHttp)
 
 	inline QHttpPrivate(QHttp * parent)
-	    : socket(nullptr), reconnectAttempts(2),
-	      deleteSocket(0), state(QHttp::Unconnected),
-	      error(QHttp::NoError), port(0), mode(QHttp::ConnectionModeHttp),
-	      toDevice(nullptr), postDevice(nullptr), bytesDone(0), chunkedSize(-1),
-	      repost(false), pendingPost(false), q_ptr(parent)
+	    : socket(nullptr)
+	    , reconnectAttempts(2)
+	    , deleteSocket(false)
+	    , state(QHttp::Unconnected)
+	    , error(QHttp::NoError)
+	    , port(0)
+	    , mode(QHttp::ConnectionModeHttp)
+	    , toDevice(nullptr)
+	    , postDevice(nullptr)
+	    , bytesDone(0)
+	    , chunkedSize(-1)
+	    , repost(false)
+	    , pendingPost(false)
+	    , q_ptr(parent)
 	{
 	}
 
@@ -346,8 +357,10 @@ void QHttpPGHRequest::start(QHttp * http)
 class QHttpSetHostRequest : public QHttpRequest
 {
 public:
-	QHttpSetHostRequest(const QString & h, quint16 p, QHttp::ConnectionMode m)
-	    : hostName(h), port(p), mode(m)
+	QHttpSetHostRequest(QString h, quint16 p, QHttp::ConnectionMode m)
+	    : hostName(std::move(h))
+	    , port(p)
+	    , mode(m)
 	{
 	}
 
@@ -396,7 +409,9 @@ void QHttpSetHostRequest::start(QHttp * http)
 class QHttpSetUserRequest : public QHttpRequest
 {
 public:
-	QHttpSetUserRequest(const QString & userName, const QString & password) : user(userName), pass(password)
+	QHttpSetUserRequest(QString userName, QString password)
+	    : user(std::move(userName))
+	    , pass(std::move(password))
 	{
 	}
 
@@ -510,8 +525,7 @@ class QHttpCloseRequest : public QHttpRequest
 {
 public:
 	QHttpCloseRequest()
-	{
-	}
+	    = default;
 	void start(QHttp *) override;
 
 	QIODevice * sourceDevice() override
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index c6063c6c4..194fe856d 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -860,10 +860,10 @@ const quint8 hirespversion = 1;
 class QNtlmBuffer
 {
 public:
-	QNtlmBuffer() : len(0), maxLen(0), offset(0) {}
-	quint16 len;
-	quint16 maxLen;
-	quint32 offset;
+	QNtlmBuffer() {}
+	quint16 len{ 0 };
+	quint16 maxLen{ 0 };
+	quint32 offset{ 0 };
 	enum
 	{
 		Size = 8