From e4a34cb9b7d59a08a162d642fbbca8c08804b3ff Mon Sep 17 00:00:00 2001
From: Alexey Sokolov
Date: Sun, 10 Jun 2018 00:16:59 +0100
Subject: Apply all modernize-* fixes from clang-tidy except for
 modernize-use-auto

---
 src/modules/dcc/DccFileTransfer.cpp    | 4 ++--
 src/modules/dcc/DccMarshal.cpp         | 2 +-
 src/modules/dcc/DccVoiceAdpcmCodec.cpp | 2 +-
 src/modules/dcc/DccVoiceCodec.cpp      | 6 ++----
 src/modules/dcc/DccVoiceWindow.cpp     | 4 ++--
 src/modules/dcc/requests.cpp           | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/modules/dcc')

diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 7de19d38c..34fa1ff34 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1882,9 +1882,9 @@ QString DccFileTransfer::tipText()
 {
 	QString s;
 
-	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr()).arg(id());
+	s = QString(R"(<table><tr><td bgcolor="#000000"><font color="#FFFFFF"><b>DCC %1 (ID %2)</b></font></td></tr>)").arg(m_szDccType.ptr()).arg(id());
 
-	s += "<tr><td bgcolor=\"#404040\"><font color=\"#FFFFFF\">";
+	s += R"(<tr><td bgcolor="#404040"><font color="#FFFFFF">)";
 	s += __tr2qs_ctx("Transfer Log", "dcc");
 	s += "</font></td></tr>";
 	s += "<tr><td bgcolor=\"#C0C0C0\">";
diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp
index fa7d2b0b3..486aa9aee 100644
--- a/src/modules/dcc/DccMarshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -32,7 +32,7 @@
 #include "kvi_socket.h"
 #include "KviFileUtils.h"
 
-#include <stdlib.h> //for exit()
+#include <cstdlib> //for exit()
 
 #include <QTimer>
 
diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
index f3b9e0334..de05544e1 100644
--- a/src/modules/dcc/DccVoiceAdpcmCodec.cpp
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
@@ -53,7 +53,7 @@
 #define _ADPCMCODEC_CPP_
 #include "DccVoiceAdpcmCodec.h"
 
-#include <stdio.h> /*DBG*/
+#include <cstdio> /*DBG*/
 
 #ifndef __STDC__
 #define signed
diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 8f52060a2..1028e7c72 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -29,8 +29,7 @@
 #include <QBuffer>
 
 DccVoiceCodec::DccVoiceCodec()
-{
-}
+    = default;
 
 DccVoiceCodec::~DccVoiceCodec()
     = default;
@@ -95,8 +94,7 @@ int DccVoiceNullCodec::decodedFrameSize()
 }
 
 DccVideoCodec::DccVideoCodec()
-{
-}
+    = default;
 
 DccVideoCodec::~DccVideoCodec()
     = default;
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index be04e9e83..279823727 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -49,7 +49,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>  // for open()
 #include <sys/ioctl.h> // for ioctl()
@@ -1014,7 +1014,7 @@ void DccVoiceWindow::startOrStopTalking(bool bStart)
 		stopTalking();
 }
 
-int DccVoiceWindow::getMixerVolume(void) const
+int DccVoiceWindow::getMixerVolume() const
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	int fd;
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 2e856ac44..f33b1fae1 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -1175,7 +1175,7 @@ static void dccModuleParseDccList(KviDccRequest *)
 	// FIXME!
 }
 
-typedef void (*dccParseProc)(KviDccRequest *);
+using dccParseProc = void (*)(KviDccRequest *);
 typedef struct _dccParseProcEntry
 {
 	const char * type;
-- 
cgit v1.3.1-10-gc9f91