";
+ s += R"(| )";
s += __tr2qs_ctx("Transfer Log", "dcc");
s += " | ";
s += "";
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 //for exit()
+#include //for exit()
#include
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 /*DBG*/
+#include /*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
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
#include
#include
-#include
+#include
#include
#include // for open()
#include // 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;
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 1ab23e940..ca9ef2cfd 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -48,11 +48,14 @@
#include
#include
#include
+#include
extern EventEditorWindow * g_pEventEditorWindow;
-EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, const QString & params)
- : QTreeWidgetItem(par), m_uEventIdx(uEvIdx), m_szParams(params)
+EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, QString params)
+ : QTreeWidgetItem(par)
+ , m_uEventIdx(uEvIdx)
+ , m_szParams(std::move(params))
{
setName(name);
}
@@ -63,8 +66,9 @@ void EventEditorEventTreeWidgetItem::setName(const QString & szName)
setText(0, m_szName);
}
-EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, const QString & buffer, bool bEnabled)
- : QTreeWidgetItem(par), m_szBuffer(buffer)
+EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, QString buffer, bool bEnabled)
+ : QTreeWidgetItem(par)
+ , m_szBuffer(std::move(buffer))
{
m_cPos = 0;
setEnabled(bEnabled); //this updates the icon too
diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h
index 670b1e427..5dbfc69fa 100644
--- a/src/modules/eventeditor/EventEditorWindow.h
+++ b/src/modules/eventeditor/EventEditorWindow.h
@@ -43,7 +43,7 @@ public:
QString m_szParams;
public:
- EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, const QString & params);
+ EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, QString params);
~EventEditorEventTreeWidgetItem(){};
public:
@@ -60,7 +60,7 @@ public:
int m_cPos;
public:
- EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, const QString & buffer, bool bEnabled);
+ EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, QString buffer, bool bEnabled);
~EventEditorHandlerTreeWidgetItem(){};
public:
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index d802c2bc1..70dfcd9c3 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -248,7 +248,7 @@ void FileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem &
QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const
{
// FIXME fixed width
- return QSize(((FileTransferWidget *)parent())->viewport()->size().width(), 68);
+ return { ((FileTransferWidget *)parent())->viewport()->size().width(), 68 };
}
FileTransferWindow::FileTransferWindow(
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp
index 8b7db7720..4e37eca2e 100644
--- a/src/modules/help/HelpIndex.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -45,18 +45,24 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
+#include
QT_BEGIN_NAMESPACE
struct Term
{
Term() = default;
- Term(const QString & t, int f, QVector l) : term(t), frequency(f), documents(l) {}
+ Term(QString t, int f, QVector l)
+ : term(std::move(t))
+ , frequency(f)
+ , documents(std::move(l))
+ {
+ }
QString term;
int frequency = -1;
QVector documents;
@@ -77,8 +83,9 @@ QDataStream & operator<<(QDataStream & s, const Document & l)
return s;
}
-HelpIndex::HelpIndex(const QString & dp, const QString & hp)
- : QObject(nullptr), docPath(dp)
+HelpIndex::HelpIndex(QString dp, const QString & hp)
+ : QObject(nullptr)
+ , docPath(std::move(dp))
{
Q_UNUSED(hp);
@@ -92,8 +99,9 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp)
connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext()));
}
-HelpIndex::HelpIndex(const QStringList & dl, const QString & hp)
- : QObject(nullptr), docList{dl}
+HelpIndex::HelpIndex(QStringList dl, const QString & hp)
+ : QObject(nullptr)
+ , docList{ std::move(dl) }
{
Q_UNUSED(hp);
diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h
index 968640699..5938ec136 100644
--- a/src/modules/help/HelpIndex.h
+++ b/src/modules/help/HelpIndex.h
@@ -93,8 +93,8 @@ public:
QList positions;
};
- HelpIndex(const QString & dp, const QString & hp);
- HelpIndex(const QStringList & dl, const QString & hp);
+ HelpIndex(QString dp, const QString & hp);
+ HelpIndex(QStringList dl, const QString & hp);
void writeDict();
void readDict();
void makeIndex();
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 8ae68e57b..c7140d641 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -186,7 +186,7 @@ void HelpWindow::startSearch()
str = str.replace("`", "\"");
QString buf = str;
str = str.replace("-", " ");
- str = str.replace(QRegExp("\\s[\\S]?\\s"), " ");
+ str = str.replace(QRegExp(R"(\s[\S]?\s)"), " ");
m_terms = str.split(" ", QString::SkipEmptyParts);
QStringList termSeq;
QStringList seqWords;
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index d1112450e..b21b81904 100644
--- a/src/modules/http/HttpFileTransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -304,11 +304,11 @@ int HttpFileTransfer::displayHeight(int iLineSpacing)
QString HttpFileTransfer::tipText()
{
QString s;
- s = QString("| HTTP Transfer (ID %1) | ").arg(id());
+ s = QString(R"(| HTTP Transfer (ID %1) | )").arg(id());
if(m_lRequest.count() > 0)
{
- s += "| Request Headers | ";
+ s += R"(| Request Headers | )";
s += "| ";
for(QStringList::ConstIterator it = m_lRequest.begin(); it != m_lRequest.end(); ++it)
{
@@ -321,7 +321,7 @@ QString HttpFileTransfer::tipText()
if(m_lHeaders.count() > 0)
{
- s += " | | Response Headers | ";
+ s += R"(| Response Headers | )";
s += "";
for(QStringList::ConstIterator it = m_lHeaders.begin(); it != m_lHeaders.end(); ++it)
{
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index c9149a682..8e08bb427 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include
+#include
#include "libkviiograph.h"
#include "KviMainWindow.h"
diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp
index bbdb67812..35f297f40 100644
--- a/src/modules/language/detector.cpp
+++ b/src/modules/language/detector.cpp
@@ -23,10 +23,10 @@
// DO NOT EDIT THIS FILE: Edit detector/build_detector.pl instead!
//
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
#include "detector.h"
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 392ab9d60..8a52f28e8 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -113,7 +113,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem & sovIt
ChannelTreeWidgetItem * item = dynamic_cast(treeWidget->itemFromIndex(index));
if(!item)
- return QSize(100, iHeight);
+ return { 100, iHeight };
QFontMetrics fm(sovItem.font);
switch(index.column())
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index c0cb2590d..f954ad9df 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -58,7 +58,7 @@
#include
#include
-#include //for INT_MAX
+#include //for INT_MAX
extern LogViewWindow * g_pLogViewWindow;
@@ -739,7 +739,7 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile)
// insert msgtype icon at start of the current text line
KviMessageTypeSettings msg(KVI_OPTION_MSGTYPE(iMsgType));
QString szIcon = g_pIconManager->getSmallIconResourceName((KviIconManager::SmallIcon)msg.pixId());
- szTmp.prepend("![\"\"](\"") ");
+ szTmp.prepend(" )");
/*
* Check if the nick who has talked is the same of the above line.
diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp
index 98366a9c7..c85256e40 100644
--- a/src/modules/mediaplayer/MpMp3.cpp
+++ b/src/modules/mediaplayer/MpMp3.cpp
@@ -239,7 +239,7 @@ int get_first_header(mp3info * mp3, long startpos)
long valid_start = 0;
fseek(mp3->file, startpos, SEEK_SET);
- while(1)
+ while(true)
{
while((c = fgetc(mp3->file)) != 255 && (c != EOF))
{
diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp
index 83910e576..6e9018a0d 100644
--- a/src/modules/notifier/NotifierMessage.cpp
+++ b/src/modules/notifier/NotifierMessage.cpp
@@ -31,9 +31,11 @@
#include
#include
+#include
-NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText)
- : m_szText{szText}, m_pPixmap{pPixmap}
+NotifierMessage::NotifierMessage(QPixmap * pPixmap, QString szText)
+ : m_szText{ std::move(szText) }
+ , m_pPixmap{ pPixmap }
{
m_pHBox = new QHBoxLayout(this);
m_pHBox->setSpacing(SPACING);
diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h
index bdc1e7fb9..02c72078a 100644
--- a/src/modules/notifier/NotifierMessage.h
+++ b/src/modules/notifier/NotifierMessage.h
@@ -52,7 +52,7 @@ public:
* \param szText const reference to message text in irc format
* \return NotifierMessage
*/
- NotifierMessage(QPixmap * pPixmap, const QString & szText);
+ NotifierMessage(QPixmap * pPixmap, QString szText);
/**
* \brief Destroys the NotifierMessage object
*/
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index 2a18d54e0..8158b5063 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -1083,7 +1083,7 @@ void NotifierWindow::returnPressed()
addMessage(pTab->wnd(), szTmp.ptr(), szHtml, 0);
m_pLineEdit->setText("");
- KviUserInput::parse(szTxt, pTab->wnd(), QString(), 1);
+ KviUserInput::parse(szTxt, pTab->wnd(), QString(), true);
}
void NotifierWindow::progressUpdate()
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
+#include
/*
@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
+#include
#include
#include
#include
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
#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
+#include
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
+
+#include
#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
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 6efc60b7a..5d7c5bf76 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -515,7 +515,7 @@ OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar()
delete m_pLocalAvatar;
}
-void OptionsWidget_identityAvatar::commit(void)
+void OptionsWidget_identityAvatar::commit()
{
KviOptionsWidget::commit();
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index aff19dc3b..100d2627e 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -32,7 +32,7 @@
#include
#include
-#include
+#include
OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * parent)
: KviOptionsWidget(parent)
diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp
index 1ba20c593..9a390bf90 100644
--- a/src/modules/package/libkvipackage.cpp
+++ b/src/modules/package/libkvipackage.cpp
@@ -37,7 +37,7 @@
#include
#include
-#include
+#include
static QString createRandomDir()
{
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index ef08d3b67..87b97cfeb 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -415,7 +415,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget * p, KviRegisteredU
m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor"));
g->addWidget(m_pCustomColorCheck, 5, 0, 1, 2);
- m_pCustomColorSelector = new KviColorSelector(p2, QString(), m_pCustomColor, 1);
+ m_pCustomColorSelector = new KviColorSelector(p2, QString(), m_pCustomColor, true);
g->addWidget(m_pCustomColorSelector, 5, 2);
QPushButton * pb = new QPushButton(__tr2qs_ctx("All Properties...", "register"), p2);
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 907119896..d13560d5a 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -219,7 +219,7 @@ QSize RegisteredUsersDialogItemDelegate::sizeHint(const QStyleOptionViewItem & o
//users
// RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
- return QSize(300, LVI_ICON_SIZE + 2 * LVI_BORDER);
+ return { 300, LVI_ICON_SIZE + 2 * LVI_BORDER };
}
}
@@ -445,9 +445,9 @@ void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup * group)
if(ok && !text.isEmpty())
{
QString szOldGroup = group->name();
- g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(0);
+ g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(false);
g_pLocalRegisteredUserDataBase->groupDict()->remove(szOldGroup);
- g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(1);
+ g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(true);
group->setName(text);
g_pLocalRegisteredUserDataBase->groupDict()->insert(text, group);
diff --git a/src/modules/rijndael/InitVectorEngine.cpp b/src/modules/rijndael/InitVectorEngine.cpp
index 776308260..e0ba47b36 100644
--- a/src/modules/rijndael/InitVectorEngine.cpp
+++ b/src/modules/rijndael/InitVectorEngine.cpp
@@ -24,7 +24,7 @@
#include "InitVectorEngine.h"
-#include
+#include
#include "KviTimeUtils.h"
namespace InitVectorEngine
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 199c25fce..fd9cb880e 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -33,7 +33,7 @@
#include "KviMainWindow.h"
#include "KviPointerHashTable.h"
-#include
+#include
extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 92ea18fa6..18f0c599b 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -49,7 +49,7 @@
#include
#include
-#include
+#include
#ifdef COMPILE_ESD_SUPPORT
#include
diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp
index 726d0cc85..8d724e766 100644
--- a/src/modules/spaste/SlowPasteController.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -81,7 +81,7 @@ bool SlowPasteController::pasteFileInit(QString & fileName)
return true;
}
-bool SlowPasteController::pasteClipboardInit(void)
+bool SlowPasteController::pasteClipboardInit()
{
if(m_pFile)
return false; // can't paste clipboard while pasting a file
@@ -103,7 +103,7 @@ bool SlowPasteController::pasteClipboardInit(void)
return true;
}
-void SlowPasteController::pasteFile(void)
+void SlowPasteController::pasteFile()
{
QString line;
char data[1024];
@@ -132,7 +132,7 @@ void SlowPasteController::pasteFile(void)
}
}
-void SlowPasteController::pasteClipboard(void)
+void SlowPasteController::pasteClipboard()
{
if(m_pClipBuff->isEmpty() || !g_pApp->windowExists(m_pWindow))
{
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 42adb10b1..2abab2c10 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -41,7 +41,7 @@
#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
#include
-#include
+#include
#include
#endif
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index eda0f371e..d625a9b72 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -113,7 +113,7 @@ SaveThemeDialog::SaveThemeDialog(QWidget * pParent)
m_pThemeVersionEdit = new QLineEdit(pPage);
m_pThemeVersionEdit->setText(info.version());
- QRegExp rx("\\d{1,2}\\.\\d{1,2}(\\.\\d{1,2})?");
+ QRegExp rx(R"(\d{1,2}\.\d{1,2}(\.\d{1,2})?)");
QValidator * validator = new QRegExpValidator(rx, this);
m_pThemeVersionEdit->setValidator(validator);
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index 5341ddc8f..4f63f91ee 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -50,8 +50,7 @@ KTorrentDbusInterface::KTorrentDbusInterface()
}
KTorrentDbusInterface::~KTorrentDbusInterface()
-{
-}
+ = default;
bool KTorrentDbusInterface::findRunningApp()
{
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index f7e7f4baa..cc337f972 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -36,6 +36,7 @@
#include
#include
+#include
#include "KviNetworkAccessManager.h"
@@ -49,8 +50,11 @@ namespace UPnP
{
// The constructor for information services
- Service::Service(const QString & hostname, int port, const QString & informationUrl)
- : m_iPendingRequests(0), m_szBaseXmlPrefix("s"), m_szHostname(hostname), m_iPort(port)
+ Service::Service(QString hostname, int port, const QString & informationUrl)
+ : m_iPendingRequests(0)
+ , m_szBaseXmlPrefix("s")
+ , m_szHostname(std::move(hostname))
+ , m_iPort(port)
{
m_szInformationUrl = informationUrl;
qDebug() << "UPnP::Service: created information service url='" << m_szInformationUrl << "'." << endl;
diff --git a/src/modules/upnp/Service.h b/src/modules/upnp/Service.h
index de81a5ee6..acae54418 100644
--- a/src/modules/upnp/Service.h
+++ b/src/modules/upnp/Service.h
@@ -71,7 +71,7 @@ namespace UPnP
public: // public methods
// The constructor for the root service
- Service(const QString & hostname, int port, const QString & informationUrl);
+ Service(QString hostname, int port, const QString & informationUrl);
// The constructor for action services
Service(const ServiceParameters & params);
// The destructor
--
cgit v1.3.1-10-gc9f91
|
| |