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

2 files changed, 20 insertions, 20 deletions

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 };
 };
 
 /*!