General code cleanup and coverity fixes - mostly fixes uninitialized members

24 files changed, 122 insertions, 173 deletions

diff --git a/src/kvilib/ext/KviCryptEngine.h b/src/kvilib/ext/KviCryptEngine.h
index 6539cf1b5..aa5759da3 100644
--- a/src/kvilib/ext/KviCryptEngine.h
+++ b/src/kvilib/ext/KviCryptEngine.h
@@ -125,7 +125,7 @@ protected:
 	//
 	// The following two should have clear meaning
 	//
-	void clearLastError() { m_szLastError = ""; }
+	void clearLastError() { setLastError(""); }
 	void setLastError(const QString & err) { m_szLastError = err; }
 #endif //COMPILE_CRYPT_SUPPORT
 };
diff --git a/src/kvilib/ext/KviCryptEngineDescription.h b/src/kvilib/ext/KviCryptEngineDescription.h
index 8347b20e6..692bdfa29 100644
--- a/src/kvilib/ext/KviCryptEngineDescription.h
+++ b/src/kvilib/ext/KviCryptEngineDescription.h
@@ -40,17 +40,17 @@
 class KVILIB_API KviCryptEngineDescription : public KviHeapObject
 {
 public:
-        KviCryptEngineDescription(){}
-        virtual ~KviCryptEngineDescription(){}
+        KviCryptEngineDescription() = default;
+        virtual ~KviCryptEngineDescription() = default;
 
 public:
-	QString m_szName;                            /**< engine name */
-	QString m_szDescription;                     /**< details */
-	QString m_szAuthor;                          /**< algorithm author */
-	int m_iFlags;                                /**< properties */
-	crypt_engine_allocator_func m_allocFunc;     /**< engine allocator */
-	crypt_engine_deallocator_func m_deallocFunc; /**< deallocation function (if called from outside the origin module) */
-	void * m_providerHandle;                     /**< used to identify the provider module */
+	QString m_szName;                                      /**< engine name */
+	QString m_szDescription;                               /**< details */
+	QString m_szAuthor;                                    /**< algorithm author */
+	int m_iFlags = 0;                                      /**< properties */
+	crypt_engine_allocator_func m_allocFunc = nullptr;     /**< engine allocator */
+	crypt_engine_deallocator_func m_deallocFunc = nullptr; /**< deallocation function (if called from outside the origin module) */
+	void * m_providerHandle = nullptr;                     /**< used to identify the provider module */
 };
 
 #endif //COMPILE_CRYPT_SUPPORT
diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp
index 5de804a80..6b259e8a2 100644
--- a/src/kvilib/net/KviUrl.cpp
+++ b/src/kvilib/net/KviUrl.cpp
@@ -27,13 +27,7 @@
 #include <QUrl>
 
 KviUrl::KviUrl()
-{
-}
-
-KviUrl::KviUrl(const KviUrl & u)
-{
-	*this = u;
-}
+    = default;
 
 KviUrl::KviUrl(const char * szUrl)
 {
@@ -47,6 +41,9 @@ KviUrl::KviUrl(const QString & szUrl)
 	parse();
 }
 
+KviUrl::KviUrl(const KviUrl &)
+    = default;
+
 KviUrl::~KviUrl()
     = default;
 
@@ -76,14 +73,5 @@ KviUrl & KviUrl::operator=(const QString & szUrl)
 	return *this;
 }
 
-KviUrl & KviUrl::operator=(const KviUrl & u)
-{
-	m_szUrl = u.m_szUrl;
-	m_szProtocol = u.m_szProtocol;
-	m_szHost = u.m_szHost;
-	m_szPath = u.m_szPath;
-	m_szUser = u.m_szUser;
-	m_szPass = u.m_szPass;
-	m_uPort = u.m_uPort;
-	return *this;
-}
+KviUrl & KviUrl::operator=(const KviUrl &)
+    = default;
diff --git a/src/kvilib/net/KviUrl.h b/src/kvilib/net/KviUrl.h
index 0c98c7989..afd7ff257 100644
--- a/src/kvilib/net/KviUrl.h
+++ b/src/kvilib/net/KviUrl.h
@@ -35,7 +35,7 @@ public:
 	KviUrl();
 	KviUrl(const char * szUrl);
 	KviUrl(const QString & szUrl);
-	KviUrl(const KviUrl & u);
+	KviUrl(const KviUrl &);
 	~KviUrl();
 
 protected:
@@ -61,7 +61,7 @@ public:
 	kvi_u32_t port() const { return m_uPort; };
 
 	KviUrl & operator=(const QString & szUrl);
-	KviUrl & operator=(const KviUrl & u);
+	KviUrl & operator=(const KviUrl &);
 };
 
 #endif //_KVI_URL_H_
diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
index 21697370a..e70cef9db 100644
--- a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
@@ -28,8 +28,6 @@
 KviAsynchronousConnectionData::KviAsynchronousConnectionData()
     : KviHeapObject()
 {
-	m_pReconnectInfo = nullptr;
-	bUseLastServerInContext = false;
 }
 
 KviAsynchronousConnectionData::~KviAsynchronousConnectionData()
diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.h b/src/kvirc/kernel/KviAsynchronousConnectionData.h
index 747999b28..0c165ba99 100644
--- a/src/kvirc/kernel/KviAsynchronousConnectionData.h
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.h
@@ -37,7 +37,7 @@ public:
 
 public:
 	QString szServer;
-	bool bUseLastServerInContext; // this is checked ONLY if szServer is empty
+	bool bUseLastServerInContext = false; // this is checked ONLY if szServer is empty
 	kvi_u32_t uPort;
 	bool bPortIsOk;
 	bool bUseIPv6;
@@ -50,7 +50,7 @@ public:
 	QString szNick;
 	QString szInitUMode;
 	QString szServerId;
-	KviIrcServerReconnectInfo * m_pReconnectInfo;
+	KviIrcServerReconnectInfo * m_pReconnectInfo = nullptr;
 };
 
 #endif //!_KVI_ASYNCHRONOUSCONNECTIONDATA_H_
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncData.h b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
index 89acde382..827385a53 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncData.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
@@ -29,6 +29,8 @@
 // KviIrcConnectionAsyncWhowasData for creating an awhowas command
 // It is now also used by KviIrcConnectionAsyncWhoisData
 
+#include "KviQString.h"
+
 #include <unordered_set>
 
 #ifndef __GNUC__
@@ -45,14 +47,9 @@ public:
 
 	T * lookup(const QString & nick)
 	{
-		if(m_pInfoList.empty())
-			return nullptr;
-
 		for(auto & i : m_pInfoList)
-		{
 			if(KviQString::equalCI(nick, i->szNick))
 				return i;
-		}
 
 		return nullptr;
 	}
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
index ac236eeb4..f8973e8fc 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
@@ -27,8 +27,6 @@
 
 KviAsyncWhoisInfo::KviAsyncWhoisInfo()
 {
-	pCallback = nullptr;
-	pMagic = nullptr;
 }
 
 KviAsyncWhoisInfo::~KviAsyncWhoisInfo()
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
index e6d8c513c..5c8ac5bcb 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
@@ -25,13 +25,14 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviQString.h"
 #include "KviPointerList.h"
 #include "KviIrcConnectionAsyncData.h"
 
-class KviWindow;
+#include <QString>
+
 class KviKvsScript;
 class KviKvsVariant;
+class KviWindow;
 
 class KVIRC_API KviAsyncWhoisInfo
 {
@@ -44,12 +45,12 @@ public:
 	QString szIdle;
 	QString szSignon;
 	QString szChannels;
-	QString szAway; // The szSpecial member is renamed szAway as its sole purpose is to tell whether the user is away or not
+	QString szAway;
 	QString szAuth;
 	QString szAdditional;
-	KviKvsScript * pCallback;
-	KviKvsVariant * pMagic;
-	KviWindow * pWindow;
+	KviKvsScript * pCallback = nullptr;
+	KviKvsVariant * pMagic = nullptr;
+	KviWindow * pWindow = nullptr;
 
 public:
 	KviAsyncWhoisInfo();
diff --git a/src/kvirc/kernel/KviIrcContext.h b/src/kvirc/kernel/KviIrcContext.h
index 8c6a0a903..94f04fbf1 100644
--- a/src/kvirc/kernel/KviIrcContext.h
+++ b/src/kvirc/kernel/KviIrcContext.h
@@ -133,20 +133,20 @@ public:
 	void registerContextWindow(KviWindow * pWnd);
 	bool unregisterContextWindow(KviWindow * pWnd);
 
-	inline std::vector<KviIrcDataStreamMonitor *> & monitorList() { return m_pMonitorList; };
+	inline std::vector<KviIrcDataStreamMonitor *> & monitorList() { return m_pMonitorList; }
 
 	// links window
 	void createLinksWindow();
-	inline void setLinksWindowPointer(KviExternalServerDataParser * l) { m_pLinksWindow = l; };
-	inline KviExternalServerDataParser * linksWindow() { return m_pLinksWindow; };
+	inline void setLinksWindowPointer(KviExternalServerDataParser * l) { m_pLinksWindow = l; }
+	inline KviExternalServerDataParser * linksWindow() const { return m_pLinksWindow; }
 
 	// list window
 	void createListWindow();
-	inline void setListWindowPointer(KviExternalServerDataParser * l) { m_pListWindow = l; };
-	inline KviExternalServerDataParser * listWindow() { return m_pListWindow; };
+	inline void setListWindowPointer(KviExternalServerDataParser * l) { m_pListWindow = l; }
+	inline KviExternalServerDataParser * listWindow() const { return m_pListWindow; }
 
 	void setAsynchronousConnectionData(KviAsynchronousConnectionData * d);
-	inline KviAsynchronousConnectionData * asynchronousConnectionData() { return m_pAsynchronousConnectionData; };
+	inline KviAsynchronousConnectionData * asynchronousConnectionData() const { return m_pAsynchronousConnectionData; }
 	void destroyAsynchronousConnectionData();
 	// used by KviConsoleWindow (for now) and KviUserParser
 	void connectToCurrentServer();
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index 2dcd7e47d..9dc5698c3 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -634,7 +634,7 @@
 static char * g_hNextObjectHandle = (char *)nullptr;
 
 KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName)
-    : QObject(pParent)
+    : QObject(pParent), m_pClass{pClass}, m_szName{szName}
 {
 	setObjectName(szName);
 
@@ -643,27 +643,11 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, c
 	m_hObject = (kvs_hobject_t)g_hNextObjectHandle;
 	g_hNextObjectHandle++;
 
-	m_pObject = nullptr;
-	m_bObjectOwner = true; // true by default
-
-	m_szName = szName;
-
-	m_pClass = pClass;
-
 	m_pChildList = new KviPointerList<KviKvsObject>;
 	m_pChildList->setAutoDelete(false);
 
 	m_pDataContainer = new KviKvsHash();
 
-	m_pFunctionHandlers = nullptr; // no local function handlers yet!
-
-	m_bInDelayedDeath = false;
-	m_bDestructorCalled = false;
-	m_bAboutToDie = false;
-
-	m_pSignalDict = nullptr;     // no signals connected to remote slots
-	m_pConnectionList = nullptr; // no local slots connected to remote signals
-
 	if(pParent)
 		pParent->registerChild(this);
 
diff --git a/src/kvirc/kvs/object/KviKvsObject.h b/src/kvirc/kvs/object/KviKvsObject.h
index 12c701f5c..9af090be9 100644
--- a/src/kvirc/kvs/object/KviKvsObject.h
+++ b/src/kvirc/kvs/object/KviKvsObject.h
@@ -36,13 +36,13 @@
 
 class KviKvsObjectFunctionCall;
 
-typedef struct _KviKvsObjectConnection
+struct KviKvsObjectConnection
 {
-	KviKvsObject * pSourceObject; // source object (owner of the struct)
-	KviKvsObject * pTargetObject; // target object
-	QString szSignal;             // source signal name
-	QString szSlot;               // target slot function
-} KviKvsObjectConnection;
+	KviKvsObject * pSourceObject = nullptr; // source object (owner of the struct)
+	KviKvsObject * pTargetObject = nullptr; // target object
+	QString szSignal;                       // source signal name
+	QString szSlot;                         // target slot function
+};
 
 typedef KviPointerList<KviKvsObjectConnection> KviKvsObjectConnectionList;
 typedef KviPointerListIterator<KviKvsObjectConnection> KviKvsObjectConnectionListIterator;
@@ -58,45 +58,45 @@ public:
 
 protected:
 	// main data
-	QString m_szName;             // object name
-	kvs_hobject_t m_hObject;      // global object handle
-	KviKvsObjectClass * m_pClass; // the class definition
+	QString m_szName;                        // object name
+	kvs_hobject_t m_hObject;                 // global object handle
+	KviKvsObjectClass * m_pClass = nullptr;  // the class definition
 
-	KviKvsHash * m_pDataContainer; // member variables
+	KviKvsHash * m_pDataContainer = nullptr; // member variables
 
-	KviPointerList<KviKvsObject> * m_pChildList;
+	KviPointerList<KviKvsObject> * m_pChildList = nullptr;
 
-	KviPointerHashTable<QString, KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // our function handlers
+	KviPointerHashTable<QString, KviKvsObjectFunctionHandler> * m_pFunctionHandlers = nullptr; // our function handlers
 
-	KviPointerHashTable<QString, KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions
+	KviPointerHashTable<QString, KviKvsObjectConnectionList> * m_pSignalDict = nullptr; // our signals connected to other object functions
 
-	KviKvsObjectConnectionList * m_pConnectionList; // signals connected to this object functions
+	KviKvsObjectConnectionList * m_pConnectionList = nullptr; // signals connected to this object functions
 
 	// this is valid when processing one of our slots
 	kvs_hobject_t m_hSignalSender;
 	QString m_szSignalName;
 
 	// if this object wraps a qt one, it is here
-	QObject * m_pObject;
-	bool m_bObjectOwner; // do we have to destroy it ?
+	QObject * m_pObject = nullptr;
+	bool m_bObjectOwner = true; // do we have to destroy it ?
 
 	// We're going to die soon after the control is given back to the event loop
-	bool m_bInDelayedDeath;
+	bool m_bInDelayedDeath = false;
 	// We're going to die BEFORE the control is given back to the event loop
-	bool m_bAboutToDie;
+	bool m_bAboutToDie = false;
 	// Did we already call the destructor ?
-	bool m_bDestructorCalled;
+	bool m_bDestructorCalled = false;
 
 public:
-	kvs_hobject_t handle() { return m_hObject; };
+	kvs_hobject_t handle() { return m_hObject; }
 
 	// the wrapped Qt object (may be 0!)
-	QObject * object() const { return m_pObject; };
+	QObject * object() const { return m_pObject; }
 	void setObject(QObject * o, bool bIsOwned = true);
 
-	const QString & getName() { return m_szName; };
+	const QString & getName() const { return m_szName; }
 
-	KviKvsObject * parentObject() { return (KviKvsObject *)parent(); };
+	KviKvsObject * parentObject() { return (KviKvsObject *)parent(); }
 	QWidget * parentScriptWidget();
 
 	bool connectSignal(const QString & sigName, KviKvsObject * target, const QString & slotName);
@@ -111,18 +111,18 @@ public:
 	// should be generated inside object functions (either from scripting or by core calls)
 	int emitSignal(const QString & sigName, KviKvsObjectFunctionCall * pOuterCall, KviKvsVariantList * pParams = 0);
 
-	void setSignalSender(kvs_hobject_t hObject) { m_hSignalSender = hObject; };
-	kvs_hobject_t signalSender() { return m_hSignalSender; };
-	void setSignalName(const QString & szSigName) { m_szSignalName = szSigName; };
+	void setSignalSender(kvs_hobject_t hObject) { m_hSignalSender = hObject; }
+	kvs_hobject_t signalSender() { return m_hSignalSender; }
+	void setSignalName(const QString & szSigName) { m_szSignalName = szSigName; }
 
-	KviPointerHashTable<QString, KviKvsObjectFunctionHandler> * functionHandlers() { return m_pFunctionHandlers; };
+	KviPointerHashTable<QString, KviKvsObjectFunctionHandler> * functionHandlers() { return m_pFunctionHandlers; }
 
-	KviKvsHash * dataContainer() { return m_pDataContainer; };
+	KviKvsHash * dataContainer() { return m_pDataContainer; }
 
 	bool die();
 	bool dieNow();
 
-	KviKvsObjectClass * getExactClass() { return m_pClass; };
+	KviKvsObjectClass * getExactClass() { return m_pClass; }
 	KviKvsObjectClass * getClass(const QString & classOverride = QString());
 	bool inheritsClass(KviKvsObjectClass * pClass);
 	bool inheritsClass(const QString & szClass);
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 604907fca..8c8ad786a 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -74,6 +74,7 @@
 #include <QInputMethodEvent>
 #include <QFileInfo>
 
+#include <array>
 #include <tuple>
 #include <vector>
 
@@ -704,9 +705,9 @@ void KviWindow::createSystemTextEncodingPopup()
 		pAction->setMenu(g_pMdiWindowSystemTextEncodingPopupSmartUtf8);
 
 		// second level menus (encoding groups)
-		QMenu * pPopupStandard[KVI_NUM_ENCODING_GROUPS];
-		QMenu * pPopupSmart[KVI_NUM_ENCODING_GROUPS];
-		QMenu * pPopupSmartUtf8[KVI_NUM_ENCODING_GROUPS];
+		std::array<QMenu *, KVI_NUM_ENCODING_GROUPS> pPopupStandard = {};
+		std::array<QMenu *, KVI_NUM_ENCODING_GROUPS> pPopupSmart = {};
+		std::array<QMenu *, KVI_NUM_ENCODING_GROUPS> pPopupSmartUtf8 = {};
 
 		uint u = 0;
 		const char * pcEncodingGroup = KviLocale::instance()->encodingGroup(u);
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index b373e87ea..d2c03f419 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -61,8 +61,6 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name)
 	setWindowTitle(__tr2qs("Join Channels - KVIrc"));
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)));
 
-	m_pConsole = nullptr;
-
 	QGridLayout * g = new QGridLayout(this);
 
 	m_pTreeWidget = new ChannelsJoinDialogTreeWidget(this);
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h
index 1022ac08d..ed3361c3c 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.h
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.h
@@ -37,8 +37,8 @@
 #include <QTreeWidget>
 
 class KviConsoleWindow;
-class QGroupBox;
 class QCheckBox;
+class QGroupBox;
 class QLineEdit;
 class QPushButton;
 class QString;
@@ -52,7 +52,7 @@ class ChannelsJoinDialogTreeWidget : public QTreeWidget
 	Q_OBJECT
 public:
 	ChannelsJoinDialogTreeWidget(QWidget * par)
-	    : QTreeWidget(par), m_pJoinPopup(nullptr){};
+	    : QTreeWidget(par){};
 
 	~ChannelsJoinDialogTreeWidget()
 	{
@@ -61,7 +61,7 @@ public:
 	};
 
 protected:
-	QMenu * m_pJoinPopup;
+	QMenu * m_pJoinPopup = nullptr;
 	/**
 	* \brief Called when the user clicks on the list
 	* \param e mouse event descriptor
@@ -100,19 +100,19 @@ protected:
 		RecentChannelItem,
 		RegisteredChannelItem
 	};
-	QLineEdit * m_pChannelEdit;
-	ChannelsJoinDialogTreeWidget * m_pTreeWidget;
-	QGroupBox * m_pGroupBox;
-	QLineEdit * m_pPass;
-	QCheckBox * m_pShowAtStartupCheck;
-	QCheckBox * m_pCloseAfterJoinCheck;
-	QPushButton * m_pJoinButton;
-	QPushButton * m_pRegButton;
-	QPushButton * m_pClearButton;
-	KviConsoleWindow * m_pConsole;
+	QLineEdit * m_pChannelEdit = nullptr;
+	ChannelsJoinDialogTreeWidget * m_pTreeWidget = nullptr;
+	QGroupBox * m_pGroupBox = nullptr;
+	QLineEdit * m_pPass = nullptr;
+	QCheckBox * m_pShowAtStartupCheck = nullptr;
+	QCheckBox * m_pCloseAfterJoinCheck = nullptr;
+	QPushButton * m_pJoinButton = nullptr;
+	QPushButton * m_pRegButton = nullptr;
+	QPushButton * m_pClearButton = nullptr;
+	KviConsoleWindow * m_pConsole = nullptr;
 
 public:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 
 	/**
 	* \brief Fills in the servers' list
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp
index f34a9fc47..8b7db7720 100644
--- a/src/modules/help/HelpIndex.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE
 
 struct Term
 {
-	Term() : frequency(-1) {}
+	Term() = default;
 	Term(const QString & t, int f, QVector<Document> l) : term(t), frequency(f), documents(l) {}
 	QString term;
-	int frequency;
+	int frequency = -1;
 	QVector<Document> documents;
 	bool operator<(const Term & i2) const { return frequency < i2.frequency; }
 };
@@ -83,9 +83,8 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp)
 	Q_UNUSED(hp);
 
 	alreadyHaveDocList = false;
-	lastWindowClosed = false;
-	connect(qApp, SIGNAL(lastWindowClosed()),
-	    this, SLOT(setLastWinClosed()));
+
+	connect(qApp, SIGNAL(lastWindowClosed()), this, SLOT(setLastWinClosed()));
 
 	m_pTimer = new QTimer(this);
 	m_pTimer->setSingleShot(true);
@@ -94,12 +93,12 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp)
 }
 
 HelpIndex::HelpIndex(const QStringList & dl, const QString & hp)
-    : QObject(nullptr)
+    : QObject(nullptr), docList{dl}
 {
 	Q_UNUSED(hp);
-	docList = dl;
+
 	alreadyHaveDocList = true;
-	lastWindowClosed = false;
+
 	connect(qApp, SIGNAL(lastWindowClosed()), this, SLOT(setLastWinClosed()));
 }
 
diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h
index 0a6b401f8..968640699 100644
--- a/src/modules/help/HelpIndex.h
+++ b/src/modules/help/HelpIndex.h
@@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE
 
 struct Document
 {
+	Document() = default;
 	Document(int d, int f) : docNumber(d), frequency(f) {}
-	Document() : docNumber(-1), frequency(0) {}
 	bool operator==(const Document & doc) const
 	{
 		return docNumber == doc.docNumber;
@@ -70,8 +70,8 @@ struct Document
 	{
 		return frequency < doc.frequency;
 	}
-	qint16 docNumber;
-	qint16 frequency;
+	qint16 docNumber = -1;
+	qint16 frequency = 0;
 };
 
 QDataStream & operator>>(QDataStream & s, Document & l);
@@ -104,8 +104,8 @@ public:
 	void setDocListFile(const QString &);
 	void setDocList(const QStringList &);
 
-	const QStringList & documentList() { return docList; };
-	const QStringList & titlesList() { return titleList; };
+	const QStringList & documentList() const { return docList; };
+	const QStringList & titlesList() const { return titleList; };
 
 signals:
 	void indexingStart(int);
@@ -127,19 +127,21 @@ private:
 	QVector<Document> setupDummyTerm(const QStringList &);
 	bool searchForPattern(const QStringList &, const QStringList &, const QString &);
 	void buildMiniDict(const QString &);
+
 	QString getCharsetForDocument(QFile *);
 	QStringList docList;
 	QStringList titleList;
 	QHash<QString, Entry *> dict;
 	QHash<QString, PosEntry *> miniDict;
-	uint wordNum;
+	uint wordNum = 0;
 	QString docPath;
-	QString dictFile, docListFile;
+	QString dictFile;
+	QString docListFile;
 	bool alreadyHaveDocList;
-	bool lastWindowClosed;
+	bool lastWindowClosed = false;
 	QHash<QString, QString> documentTitleCache;
-	QTimer * m_pTimer;
-	int m_iCurItem;
+	QTimer * m_pTimer = nullptr;
+	int m_iCurItem = 0;
 };
 
 #endif
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index dcfe35ebf..c81554fda 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -46,7 +46,6 @@ extern KVIRC_API int g_iIdentDaemonRunningUsers;
 
 void startIdentService()
 {
-	//	qDebug("Stargin");
 	if(!g_pIdentDaemon)
 		g_pIdentDaemon = new KviIdentDaemon();
 	if(!g_pIdentDaemon->isRunning())
@@ -59,16 +58,13 @@ void startIdentService()
 		usleep(100);
 #endif
 	}
-	//	qDebug("Service started");
 }
 
 void stopIdentService()
 {
-	//	qDebug("Stopping");
 	if(g_pIdentDaemon)
 		delete g_pIdentDaemon;
 	g_pIdentDaemon = nullptr;
-	//	qDebug("Stopped");
 }
 
 KviIdentSentinel::KviIdentSentinel()
@@ -155,7 +151,6 @@ KviIdentRequest::~KviIdentRequest()
 KviIdentDaemon::KviIdentDaemon()
     : KviSensitiveThread()
 {
-	//	qDebug("Thread constructor");
 	m_szUser = KVI_OPTION_STRING(KviOption_stringIdentdUser);
 	if(m_szUser.isEmpty())
 		m_szUser = "kvirc";
@@ -166,17 +161,14 @@ KviIdentDaemon::KviIdentDaemon()
 	m_bEnableIPv6 = false;
 #endif
 	m_bIPv6ContainsIPv4 = KVI_OPTION_BOOL(KviOption_boolIdentdIPv6ContainsIPv4);
-	//	qDebug("Thread constructor done");
 }
 
 KviIdentDaemon::~KviIdentDaemon()
 {
-	//	qDebug("Thread destructor");
 	terminate();
 	g_iIdentDaemonRunningUsers = 0;
 
 	g_pIdentDaemon = nullptr;
-	//	qDebug("Destructor gone");
 }
 
 void KviIdentDaemon::postMessage(const char * message, KviIdentRequest * r, const char * szAux)
@@ -201,7 +193,6 @@ void KviIdentDaemon::postMessage(const char * message, KviIdentRequest * r, cons
 
 void KviIdentDaemon::run()
 {
-	//	qDebug("RUN STARTED");
 	m_sock = KVI_INVALID_SOCKET;
 	m_sock6 = KVI_INVALID_SOCKET;
 	bool bEventPosted = false;
@@ -511,7 +502,6 @@ ipv6_failure:
 				}
 				else
 				{
-					//				qDebug("Data is : (%s)",r->m_szData.ptr());
 					if(r->m_szData.len() > 1024)
 					{
 						// request too long...kill it
@@ -556,7 +546,6 @@ exit_thread:
 	delete m_pRequestList;
 	m_pRequestList = nullptr;
 
-	//	qDebug("RUN EXITING");
 }
 
 /*
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 238755aa6..613222ab5 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -47,13 +47,13 @@ public:
 	time_t m_tStart;
 };
 
-typedef struct _KviIdentMessageData
+struct KviIdentMessageData
 {
 	KviCString szMessage;
 	KviCString szHost;
 	KviCString szAux;
 	unsigned int uPort;
-} KviIdentMessageData;
+};
 
 class KviIdentSentinel : public QObject
 {
@@ -63,7 +63,7 @@ public:
 	~KviIdentSentinel();
 
 protected:
-	virtual bool event(QEvent * e);
+	bool event(QEvent * e) override;
 };
 
 class KviIdentDaemon : public KviSensitiveThread
@@ -79,10 +79,10 @@ private:
 	bool m_bIPv6ContainsIPv4;
 	kvi_socket_t m_sock;
 	kvi_socket_t m_sock6;
-	KviPointerList<KviIdentRequest> * m_pRequestList;
+	KviPointerList<KviIdentRequest> * m_pRequestList = nullptr;
 
 public:
-	virtual void run();
+	void run() override;
 
 protected:
 	void postMessage(const char * message, KviIdentRequest * r, const char * szAux = 0);
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 28ccbd7a8..5bd8b428a 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,8 +34,6 @@
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName)
     : KviWindow(KviWindow::ScriptObject, szName)
 {
-	m_pCentralWidget = nullptr;
-	m_pIcon = nullptr;
 }
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index 172db20de..c70bbc59d 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -36,12 +36,12 @@ public:
 	~KviKvsScriptWindowWindow();
 
 protected:
-	KvsObject_widget * m_pCentralWidgetObject;
-	QWidget * m_pCentralWidget;
-	QPixmap * m_pIcon;
+	KvsObject_widget * m_pCentralWidgetObject = nullptr;
+	QWidget * m_pCentralWidget = nullptr;
+	QPixmap * m_pIcon = nullptr;
 
 public:
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 	void setIcon(QPixmap * pPixmap) { m_pIcon = pPixmap; };
 	void setCentralWidget(KvsObject_widget * o, QWidget * w);
 	void setWindowTitleString(const QString & s)
@@ -49,7 +49,7 @@ public:
 		setFixedCaption(s);
 		fillCaptionBuffers();
 	};
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 protected slots:
 	void centralWidgetObjectDestroyed();
 	void centralWidgetDestroyed();
@@ -60,7 +60,7 @@ class KvsObject_window : public KvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_window)
 public:
-	QWidget * widget() { return (QWidget *)object(); };
+	QWidget * widget() { return (QWidget *)object(); }
 
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 2fa75fb7d..6ff3e5e31 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -48,8 +48,6 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal)
 
 	setObjectName("container");
 
-	m_pOptionsWidget = nullptr;
-
 	if(bModal)
 		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
 }
diff --git a/src/modules/options/OptionsWidgetContainer.h b/src/modules/options/OptionsWidgetContainer.h
index 5f26c2f5d..17328c12d 100644
--- a/src/modules/options/OptionsWidgetContainer.h
+++ b/src/modules/options/OptionsWidgetContainer.h
@@ -28,8 +28,8 @@
 
 #include <QDialog>
 
-class QPushButton;
 class QGridLayout;
+class QPushButton;
 
 class OptionsWidgetContainer : public QDialog
 {
@@ -39,9 +39,9 @@ public:
 	~OptionsWidgetContainer();
 
 protected:
-	KviOptionsWidget * m_pOptionsWidget;
-	QPushButton * m_pCancel;
-	QGridLayout * m_pLayout;
+	KviOptionsWidget * m_pOptionsWidget = nullptr;
+	QPushButton * m_pCancel = nullptr;
+	QGridLayout * m_pLayout = nullptr;
 
 public:
 	void setup(KviOptionsWidget * w);
@@ -49,10 +49,10 @@ public:
 	void setNextToLeft(QWidget * pWidget);
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void showEvent(QShowEvent * e);
-	virtual void childEvent(QChildEvent * e);
-	virtual void reject();
+	void closeEvent(QCloseEvent * e) override;
+	void showEvent(QShowEvent * e) override;
+	void childEvent(QChildEvent * e) override;
+	void reject() override;
 protected slots:
 	void okClicked();
 	void cancelClicked();
diff --git a/src/modules/theme/SaveThemeDialog.h b/src/modules/theme/SaveThemeDialog.h
index 2f852615c..903f30784 100644
--- a/src/modules/theme/SaveThemeDialog.h
+++ b/src/modules/theme/SaveThemeDialog.h
@@ -54,16 +54,14 @@ protected:
 	QLineEdit * m_pThemeVersionEdit;
 	QLineEdit * m_pAuthorNameEdit;
 	QWidget * m_pImageSelectionPage;
-	QPushButton * m_pOkButton;
 	QCheckBox * m_pSaveIconsCheckBox;
 
 protected:
-	virtual void accept();
+	void accept() override;
 	bool saveTheme();
 protected slots:
 	void makeScreenshot();
 	void imageSelectionChanged(const QString & szImagePath);
-	//void themeNameChanged(const QString &txt);
 };
 
 #endif //!_SAVETHEMEDIALOG_H_