Apply clang-tidy: modernize-use-nullptr

13 files changed, 235 insertions, 235 deletions

diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index e8e349c36..ec5b99811 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -77,7 +77,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget * parent, O
     : QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
-	m_pOptionsWidget = 0;
+	m_pOptionsWidget = nullptr;
 	setText(0, e->szName);
 	setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon)));
 	parent->insertTopLevelItem(0, this);
@@ -87,7 +87,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem * paren
     : QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
-	m_pOptionsWidget = 0;
+	m_pOptionsWidget = nullptr;
 	setText(0, e->szName);
 	setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon)));
 	parent->insertChild(0, this);
@@ -184,7 +184,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSortingEnabled(false);
 	m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-	m_pTreeWidget->setCurrentItem(NULL);
+	m_pTreeWidget->setCurrentItem(nullptr);
 
 	connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
 
@@ -259,7 +259,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal
 	g1->setRowStretch(0, 1);
 	g1->setColumnStretch(1, 1);
 
-	fillTreeWidget(0, g_pOptionsInstanceManager->instanceEntryTree(), szGroup);
+	fillTreeWidget(nullptr, g_pOptionsInstanceManager->instanceEntryTree(), szGroup);
 
 	if(!parent())
 	{
@@ -633,7 +633,7 @@ void OptionsDialog::apply(bool bDialogAboutToClose)
 		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		if(it)
 		{
-			treeWidgetItemSelectionChanged(it, 0);
+			treeWidgetItemSelectionChanged(it, nullptr);
 			if(curTab > 0 && it->m_pOptionsWidget)
 				if(it->m_pOptionsWidget->tabWidget())
 					it->m_pOptionsWidget->tabWidget()->setCurrentIndex(curTab);
@@ -677,7 +677,7 @@ void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem * it)
 	{
 		it->m_pOptionsWidget->commit();
 		delete it->m_pOptionsWidget;
-		it->m_pOptionsWidget = 0;
+		it->m_pOptionsWidget = nullptr;
 	}
 	//refreshTreeWidget(); // <-- this tends to jump into infinite recursion
 }
diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp
index 2ed928724..f7ece29cf 100644
--- a/src/modules/options/OptionsInstanceManager.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -651,7 +651,7 @@ static const char * g_szName_OptionsWidget_windowListClassic = KVI_OPTIONS_WIDGE
 static const char * g_szClassName_OptionsWidget_windowListClassic = "OptionsWidget_windowListClassic";
 
 OptionsInstanceManager::OptionsInstanceManager()
-    : QObject(0)
+    : QObject(nullptr)
 {
 
 	//qDebug("Instantiating");
@@ -662,7 +662,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e0;
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_connection_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_connection;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection
@@ -701,7 +701,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e1;
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced
@@ -740,7 +740,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e2;
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_connectionSsl;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl
@@ -772,11 +772,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_connectionSsl;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSsl, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_connectionSocket;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket
@@ -808,11 +808,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_connectionSocket;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSocket, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_identService_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_identService;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService
@@ -844,11 +844,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_identService;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identService, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_proxy_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_proxy;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy
@@ -880,11 +880,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_proxy;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_proxy, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_dcc_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_dcc;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc
@@ -922,7 +922,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccGeneral;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral
@@ -954,11 +954,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccGeneral;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccGeneral, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced
@@ -990,11 +990,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccSend_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccSend;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend
@@ -1032,7 +1032,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral
@@ -1064,11 +1064,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_dccSendGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced
@@ -1100,11 +1100,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_dccSendAdvanced;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendAdvanced, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccChat_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccChat;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat
@@ -1136,11 +1136,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccChat;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccChat, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccVoice;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice
@@ -1172,11 +1172,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccVoice;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccVoice, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_general_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_general;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general
@@ -1214,7 +1214,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_mediaTypes;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes
@@ -1246,11 +1246,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_mediaTypes;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_mediaTypes, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_sound_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_sound;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound
@@ -1288,7 +1288,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_soundGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral
@@ -1320,11 +1320,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_soundGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_soundGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_sounds_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_sounds;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds
@@ -1356,11 +1356,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_sounds;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sounds, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_textEncoding;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding
@@ -1392,11 +1392,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_textEncoding;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textEncoding, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_uparser_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_uparser;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser
@@ -1428,11 +1428,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_uparser;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_uparser, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_urlHandlers;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers
@@ -1464,11 +1464,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_urlHandlers;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_urlHandlers, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_identity_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_identity;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity
@@ -1506,7 +1506,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget
@@ -1538,11 +1538,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityAvatar;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar
@@ -1574,11 +1574,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityAvatar;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAvatar, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced
@@ -1610,11 +1610,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityProfile;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile
@@ -1646,11 +1646,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityProfile;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityProfile, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_inputLook_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_inputLook;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook
@@ -1682,11 +1682,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_inputLook;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputLook, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_interfaceFeatures_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_interfaceFeatures;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures
@@ -1724,7 +1724,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_inputFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures
@@ -1756,11 +1756,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_inputFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_notifier_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_notifier;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier
@@ -1792,11 +1792,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_notifier;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifier, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_tray_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_tray;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray
@@ -1828,11 +1828,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_tray;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tray, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_irc_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_irc;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc
@@ -1870,7 +1870,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_channel_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_channel;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel
@@ -1908,7 +1908,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_channelGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral
@@ -1940,11 +1940,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_channelGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced
@@ -1976,11 +1976,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_channelAdvanced;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelAdvanced, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircGeneral;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral
@@ -2012,11 +2012,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircGeneral;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircGeneral, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced
@@ -2048,11 +2048,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircOutput;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput
@@ -2084,11 +2084,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircOutput;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircOutput, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_protection_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_protection;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection
@@ -2126,7 +2126,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_antispam_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_antispam;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam
@@ -2158,11 +2158,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_antispam;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_antispam, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection
@@ -2194,11 +2194,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ctcpFloodProtection;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcpFloodProtection, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ignore_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ignore;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore
@@ -2230,11 +2230,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ignore;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ignore, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_query_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_query;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query
@@ -2266,11 +2266,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_query;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_query, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_tools_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_tools;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools
@@ -2308,7 +2308,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting
@@ -2347,7 +2347,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e3;
 	e3 = new OptionsWidgetInstanceEntry;
 	e3->createProc = &classOptionsWidget_highlighting_createInstanceProc;
-	e3->pWidget = 0;
+	e3->pWidget = nullptr;
 	e3->szClassName = g_szClassName_OptionsWidget_highlighting;
 	e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting
@@ -2379,11 +2379,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e3->szNameNoLocale = g_szName_OptionsWidget_highlighting;
 	e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_highlighting, "options");
 	e2->pChildList->append(e3);
-	e3->pChildList = 0;
+	e3->pChildList = nullptr;
 
 	e3 = new OptionsWidgetInstanceEntry;
 	e3->createProc = &classOptionsWidget_alerts_createInstanceProc;
-	e3->pWidget = 0;
+	e3->pWidget = nullptr;
 	e3->szClassName = g_szClassName_OptionsWidget_alerts;
 	e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts
@@ -2415,11 +2415,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e3->szNameNoLocale = g_szName_OptionsWidget_alerts;
 	e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alerts, "options");
 	e2->pChildList->append(e3);
-	e3->pChildList = 0;
+	e3->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_avatar_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_avatar;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar
@@ -2451,11 +2451,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_avatar;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_avatar, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_away_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_away;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away
@@ -2487,11 +2487,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_away;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_away, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ctcp_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ctcp;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp
@@ -2523,11 +2523,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ctcp;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcp, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_lag_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_lag;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag
@@ -2559,11 +2559,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_lag;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_lag, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_logging_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_logging;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging
@@ -2595,11 +2595,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_logging;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_logging, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_nickServ_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_nickServ;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ
@@ -2631,11 +2631,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_nickServ;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_nickServ, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_notify_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_notify;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify
@@ -2667,11 +2667,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_notify;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notify, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_textIcons_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_textIcons;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons
@@ -2703,11 +2703,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_textIcons;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textIcons, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_ircViewTheme_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_ircViewTheme;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme
@@ -2745,7 +2745,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewLook;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook
@@ -2777,11 +2777,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewLook;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewLook, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures
@@ -2813,11 +2813,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker
@@ -2849,11 +2849,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewMarker;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewMarker, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_message_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_message;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message
@@ -2891,7 +2891,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_privmsg_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_privmsg;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg
@@ -2923,11 +2923,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_privmsg;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_privmsg, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_timestamp_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_timestamp;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp
@@ -2959,11 +2959,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_timestamp;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_timestamp, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_messageColors_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_messageColors;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors
@@ -2995,11 +2995,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_messageColors;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_messageColors, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_standardColors_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_standardColors;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors
@@ -3031,11 +3031,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_standardColors;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_standardColors, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_notifierLook_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_notifierLook;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook
@@ -3067,11 +3067,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_notifierLook;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifierLook, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_servers_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_servers;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers
@@ -3103,11 +3103,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_servers;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_servers, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_theme_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_theme;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme
@@ -3139,11 +3139,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_theme;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_theme, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_themeTransparency_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_themeTransparency;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency
@@ -3175,11 +3175,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_themeTransparency;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeTransparency, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_themeToolBarApplets_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_themeToolBarApplets;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets
@@ -3211,11 +3211,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_themeToolBarApplets;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeToolBarApplets, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_topicLabel_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_topicLabel;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel
@@ -3247,11 +3247,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_topicLabel;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_topicLabel, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_userList_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_userList;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList
@@ -3289,7 +3289,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListBackground;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground
@@ -3321,11 +3321,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListBackground;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListBackground, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListForeground;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground
@@ -3357,11 +3357,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListForeground;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListForeground, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListGrid;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid
@@ -3393,11 +3393,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListGrid;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListGrid, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures
@@ -3429,11 +3429,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_windowList_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_windowList;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList
@@ -3471,7 +3471,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_windowListTree;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree
@@ -3509,7 +3509,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground
@@ -3541,11 +3541,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeForeground;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeForeground, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground
@@ -3577,11 +3577,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeBackground;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeBackground, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures
@@ -3613,11 +3613,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeFeatures;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeFeatures, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_windowListClassic;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic
@@ -3649,7 +3649,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_windowListClassic;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListClassic, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 }
 
 void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList)
@@ -3664,7 +3664,7 @@ void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInst
 				{
 					disconnect(pEntry->pWidget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed()));
 					delete pEntry->pWidget->parent();
-					pEntry->pWidget = 0;
+					pEntry->pWidget = nullptr;
 				}
 				else
 				{
@@ -3687,14 +3687,14 @@ OptionsInstanceManager::~OptionsInstanceManager()
 void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
-	m_pInstanceTree = 0;
+	m_pInstanceTree = nullptr;
 }
 
 void OptionsInstanceManager::widgetDestroyed()
 {
 	OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(), m_pInstanceTree);
 	if(pEntry)
-		pEntry->pWidget = 0;
+		pEntry->pWidget = nullptr;
 	if(g_iOptionWidgetInstances > 0)
 		g_iOptionWidgetInstances--;
 }
@@ -3702,7 +3702,7 @@ void OptionsInstanceManager::widgetDestroyed()
 KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar)
 {
 	if(!pEntry)
-		return NULL;
+		return nullptr;
 
 #if 0
 	if(pEntry->pWidget)
@@ -3786,7 +3786,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QOb
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList)
@@ -3805,7 +3805,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName)
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 5b891fb8e..04afa1040 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -48,7 +48,7 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal)
 
 	setObjectName("container");
 
-	m_pOptionsWidget = NULL;
+	m_pOptionsWidget = nullptr;
 
 	if(bModal)
 		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
@@ -76,7 +76,7 @@ void OptionsWidgetContainer::setNextToLeft(QWidget * pWidget)
 
 void OptionsWidgetContainer::optionsWidgetDestroyed()
 {
-	m_pOptionsWidget = NULL;
+	m_pOptionsWidget = nullptr;
 }
 
 void OptionsWidgetContainer::childEvent(QChildEvent * e)
@@ -89,7 +89,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e)
 		if(e->child() == static_cast<QObject *>(m_pOptionsWidget))
 		{
 			QObject::disconnect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed()));
-			m_pOptionsWidget = NULL;
+			m_pOptionsWidget = nullptr;
 		}
 	}
 
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 62159e7fb..401142f47 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -665,9 +665,9 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
     : KviOptionsWidget(parent)
 {
-	m_pISelector = 0;
-	m_pWSelector = 0;
-	m_pSSelector = 0;
+	m_pISelector = nullptr;
+	m_pWSelector = nullptr;
+	m_pSSelector = nullptr;
 
 	m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_bI = m_sModeStr.contains('i');
@@ -721,7 +721,7 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
     : KviOptionsWidget(pParent)
 {
 	setObjectName("identity_profiles_option_widget");
-	m_pEditor = 0;
+	m_pEditor = nullptr;
 	m_iCurrentEditedProfile = -1;
 
 	createLayout();
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 19fe5dd5c..866fb7f91 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -146,7 +146,7 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 	layout()->setColumnStretch(2, 1);
 	layout()->setRowStretch(0, 1);
 
-	m_pLastItem = 0;
+	m_pLastItem = nullptr;
 
 	fillTreeWidget();
 }
@@ -241,7 +241,7 @@ void OptionsWidget_mediaTypes::delMediaType()
 	if(m_pLastItem)
 	{
 		MediaTypeTreeWidgetItem * it = m_pLastItem;
-		m_pLastItem = 0;
+		m_pLastItem = nullptr;
 		delete it;
 	}
 }
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 881700613..aa0485040 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -372,7 +372,7 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 	createLayout();
 
 	int i;
-	m_pLastItem = 0;
+	m_pLastItem = nullptr;
 
 	m_pListView = new MessageListWidget(this);
 	m_pListViewItemDelegate = new MessageListWidgetItemDelegate(m_pListView);
@@ -525,7 +525,7 @@ void OptionsWidget_messageColors::itemChanged()
 	if(m_pLastItem)
 		saveLastItem();
 
-	m_pLastItem = 0; // do NOT save in this routine
+	m_pLastItem = nullptr; // do NOT save in this routine
 
 	m_pForeListWidget->setEnabled(it);
 	m_pBackListWidget->setEnabled(it);
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index ebffe0fc5..a98dcd91a 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -115,7 +115,7 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
 	}
 	else
 	{
-		m_pServerMaskEdit = 0;
+		m_pServerMaskEdit = nullptr;
 	}
 
 	l = new QLabel(__tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help", "options"), this);
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 8bebd95f2..cd121aa39 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -134,7 +134,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIPv6Check->setEnabled(false);
 #endif
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 
 	fillProxyList();
 
@@ -177,7 +177,7 @@ void OptionsWidget_proxy::fillProxyList()
 		}
 	}
 	if(!(g_pProxyDataBase->currentProxy()))
-		currentItemChanged(0, 0);
+		currentItemChanged(nullptr, nullptr);
 
 	enableDisableUseProxySelector();
 }
@@ -357,7 +357,7 @@ void OptionsWidget_proxy::removeCurrent()
 	if(m_pLastEditedItem)
 	{
 		QTreeWidgetItem * tmp = m_pLastEditedItem;
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		delete tmp;
 
 		QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
@@ -367,7 +367,7 @@ void OptionsWidget_proxy::removeCurrent()
 		}
 		else
 		{
-			currentItemChanged(0, 0);
+			currentItemChanged(nullptr, nullptr);
 		}
 	}
 }
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 11b85ba22..64a96a712 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -77,28 +77,28 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork *
 	setModal(true);
 	setObjectName("network_details");
 
-	m_pOnConnectEditor = NULL;
-	m_pOnLoginEditor = NULL;
+	m_pOnConnectEditor = nullptr;
+	m_pOnLoginEditor = nullptr;
 
-	m_pUserEditor = NULL;
-	m_pPassEditor = NULL;
-	m_pNickEditor = NULL;
-	m_pAlternativeNickEditor = NULL;
-	m_pRealEditor = NULL;
-	m_pDescEditor = NULL;
+	m_pUserEditor = nullptr;
+	m_pPassEditor = nullptr;
+	m_pNickEditor = nullptr;
+	m_pAlternativeNickEditor = nullptr;
+	m_pRealEditor = nullptr;
+	m_pDescEditor = nullptr;
 
-	m_pEncodingEditor = NULL;
-	m_pTextEncodingEditor = NULL;
+	m_pEncodingEditor = nullptr;
+	m_pTextEncodingEditor = nullptr;
 
-	m_pAutoConnectCheck = NULL;
+	m_pAutoConnectCheck = nullptr;
 
-	m_pNickServTreeWidget = NULL;
-	m_pNickServCheck = NULL;
-	m_pAddRuleButton = NULL;
-	m_pDelRuleButton = NULL;
-	m_pEditRuleButton = NULL;
+	m_pNickServTreeWidget = nullptr;
+	m_pNickServCheck = nullptr;
+	m_pAddRuleButton = nullptr;
+	m_pDelRuleButton = nullptr;
+	m_pEditRuleButton = nullptr;
 
-	m_pChannelListSelector = NULL;
+	m_pChannelListSelector = nullptr;
 
 	QGridLayout * g = new QGridLayout(this);
 
@@ -482,7 +482,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 		m_pChannelListSelector->commit();
 
 	if(m_lstChannels.isEmpty())
-		n->setAutoJoinChannelList(0);
+		n->setAutoJoinChannelList(nullptr);
 	else
 		n->setAutoJoinChannelList(new QStringList(m_lstChannels));
 
@@ -501,7 +501,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 			n->setNickServRuleSet(rs);
 		}
 		else
-			n->setNickServRuleSet(0);
+			n->setNickServRuleSet(nullptr);
 	}
 
 	if(m_pOnConnectEditor)
@@ -1225,7 +1225,7 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s)
 	if(m_pChannelListSelector)
 		m_pChannelListSelector->commit();
 	if(m_lstChannels.isEmpty())
-		s->setAutoJoinChannelList(0);
+		s->setAutoJoinChannelList(nullptr);
 	else
 		s->setAutoJoinChannelList(new QStringList(m_lstChannels));
 
@@ -1250,7 +1250,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget * par
     : QTreeWidgetItem(parent)
 {
 	setIcon(0, QIcon(pm));
-	m_pServerData = 0;
+	m_pServerData = nullptr;
 	m_pNetworkData = new KviIrcNetwork(*n);
 	setText(0, n->name());
 	setText(1, n->description());
@@ -1263,7 +1263,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *
 	m_pServerData = new KviIrcServer(*s);
 	setText(0, s->hostName());
 	setText(1, s->description());
-	m_pNetworkData = 0;
+	m_pNetworkData = nullptr;
 }
 
 IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem()
@@ -1303,9 +1303,9 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	connect(m_pImportPopup, SIGNAL(aboutToShow()), this, SLOT(importPopupAboutToShow()));
 	connect(m_pImportPopup, SIGNAL(triggered(QAction *)), this, SLOT(importPopupActivated(QAction *)));
 
-	m_pServerDetailsDialog = 0;
-	m_pNetworkDetailsDialog = 0;
-	m_pImportFilter = 0;
+	m_pServerDetailsDialog = nullptr;
+	m_pNetworkDetailsDialog = nullptr;
+	m_pImportFilter = nullptr;
 
 	m_pFilterLabel = new QLabel(__tr2qs_ctx("Filter:", "options"), this);
 	addWidgetToLayout(m_pFilterLabel, 0, 0, 0, 0);
@@ -1433,7 +1433,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 
 	KviTalToolTip::add(tb, __tr2qs_ctx("This button shows a list of recently used servers.<br>It allows you to quickly find them in the list.", "options"));
 
-	m_pShowThisDialogAtStartupSelector = NULL;
+	m_pShowThisDialogAtStartupSelector = nullptr;
 
 	// The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog
 	if(parent->inherits("OptionsWidgetContainer"))
@@ -1498,12 +1498,12 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	}
 	else
 	{
-		m_pConnectCurrent = NULL;
+		m_pConnectCurrent = nullptr;
 	}
 
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 
-	m_pClipboard = 0;
+	m_pClipboard = nullptr;
 
 	m_bShowingFavoritesOnly = KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly);
 
@@ -1519,9 +1519,9 @@ OptionsWidget_servers::~OptionsWidget_servers()
 {
 	if(m_pImportFilter)
 	{
-		disconnect(m_pImportFilter, 0, this, 0);
+		disconnect(m_pImportFilter, nullptr, this, nullptr);
 		m_pImportFilter->die();
-		m_pImportFilter = 0;
+		m_pImportFilter = nullptr;
 	}
 
 	if(m_pClipboard)
@@ -1539,7 +1539,7 @@ void OptionsWidget_servers::slotShowThisDialogAtStartupSelectorDestroyed()
 	KVI_ASSERT(m_pShowThisDialogAtStartupSelector);
 
 	removeSelector(m_pShowThisDialogAtStartupSelector);
-	m_pShowThisDialogAtStartupSelector = NULL;
+	m_pShowThisDialogAtStartupSelector = nullptr;
 }
 
 void OptionsWidget_servers::recentServersPopupAboutToShow()
@@ -1585,7 +1585,7 @@ void OptionsWidget_servers::selectBestServerByUrl(const QString & szUrl)
 	int uCount = m_pTreeWidget->topLevelItemCount();
 	int uIdx = 0;
 
-	IrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
+	IrcServerOptionsTreeWidgetItem * pBestCandidate = nullptr;
 	kvi_u32_t uBestCandidateScore = 0;
 
 	while(uIdx < uCount)
@@ -1658,7 +1658,7 @@ void OptionsWidget_servers::fillServerList()
 {
 	IrcServerOptionsTreeWidgetItem * net;
 	IrcServerOptionsTreeWidgetItem * srv;
-	IrcServerOptionsTreeWidgetItem * cur = 0;
+	IrcServerOptionsTreeWidgetItem * cur = nullptr;
 
 	KviPointerHashTableIterator<QString, KviIrcNetwork> it(*(g_pServerDataBase->recordDict()));
 
@@ -1961,9 +1961,9 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 
 	if(m_pImportFilter)
 	{
-		disconnect(m_pImportFilter, 0, this, 0);
+		disconnect(m_pImportFilter, nullptr, this, nullptr);
 		m_pImportFilter->die();
-		m_pImportFilter = 0;
+		m_pImportFilter = nullptr;
 	}
 
 	bool bOk = false;
@@ -1971,7 +1971,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 	if(!bOk)
 		return;
 
-	m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, 0);
+	m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, nullptr);
 
 	if(!m_pImportFilter)
 	{
@@ -1987,7 +1987,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 
 void OptionsWidget_servers::importerDead()
 {
-	m_pImportFilter = 0;
+	m_pImportFilter = nullptr;
 }
 
 void OptionsWidget_servers::importServer(const KviIrcServer & s, const QString & network)
@@ -2203,7 +2203,7 @@ IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QStrin
 		if(KviQString::equalCI(it->text(0), netname))
 			return it;
 	}
-	return 0;
+	return nullptr;
 }
 
 void OptionsWidget_servers::clearList()
@@ -2216,13 +2216,13 @@ void OptionsWidget_servers::clearList()
 
 	if(QMessageBox::question(this,
 	       __tr2qs_ctx("Confirm Clearing Server List - KVIrc", "options"), txt,
-	       __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), 0, 1)
+	       __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), nullptr, 1)
 	    != 0)
 		return;
 
 	m_pTreeWidget->clear();
-	m_pLastEditedItem = 0;
-	currentItemChanged(0, 0);
+	m_pLastEditedItem = nullptr;
+	currentItemChanged(nullptr, nullptr);
 }
 
 void OptionsWidget_servers::detailsClicked()
@@ -2249,7 +2249,7 @@ void OptionsWidget_servers::detailsClicked()
 		}
 
 		delete m_pServerDetailsDialog;
-		m_pServerDetailsDialog = 0;
+		m_pServerDetailsDialog = nullptr;
 		return;
 	}
 	if(m_pLastEditedItem->m_pNetworkData)
@@ -2272,6 +2272,6 @@ void OptionsWidget_servers::detailsClicked()
 		}
 
 		delete m_pNetworkDetailsDialog;
-		m_pNetworkDetailsDialog = 0;
+		m_pNetworkDetailsDialog = nullptr;
 	}
 }
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index e22cdbf7f..6dddf8d3a 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -197,7 +197,7 @@ void OptionsWidget_soundGeneral::soundAutoDetect()
 
 	g_pApp->setOverrideCursor(Qt::WaitCursor);
 
-	m->ctrl("detectSoundSystem", 0);
+	m->ctrl("detectSoundSystem", nullptr);
 	soundFillBox();
 
 	g_pApp->restoreOverrideCursor();
@@ -211,7 +211,7 @@ void OptionsWidget_soundGeneral::mediaAutoDetect()
 
 	g_pApp->setOverrideCursor(Qt::WaitCursor);
 
-	m->ctrl("detectMediaPlayer", 0);
+	m->ctrl("detectMediaPlayer", nullptr);
 	mediaFillBox();
 
 	g_pApp->restoreOverrideCursor();
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index f0084e6e3..d889f8cb6 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -139,7 +139,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 		gbox = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Spell Checker Dictionaries", "options"));
 
 		KviKvsVariant availableDictionaries;
-		KviKvsScript::evaluate("$spellchecker.availableDictionaries", NULL, NULL, &availableDictionaries);
+		KviKvsScript::evaluate("$spellchecker.availableDictionaries", nullptr, nullptr, &availableDictionaries);
 		const KviPointerHashTable<QString, KviKvsVariant> * hashTable = availableDictionaries.hash()->dict();
 		KviPointerHashTableIterator<QString, KviKvsVariant> iter(*hashTable);
 		QMap<QString, QString> dictMap;
@@ -240,6 +240,6 @@ void OptionsWidget_textEncoding::commit()
 		}
 	}
 	KVI_OPTION_STRINGLIST(KviOption_stringlistSpellCheckerDictionaries) = wantedDictionaries;
-	KviKvsScript::run("spellchecker.reloadDictionaries", NULL);
+	KviKvsScript::run("spellchecker.reloadDictionaries", nullptr);
 #endif
 }
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index e07d6923e..702fe42a2 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -70,9 +70,9 @@ void TextIconTableItem::setId(int id)
 OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
     : KviOptionsWidget(parent)
 {
-	m_pPopup = 0;
+	m_pPopup = nullptr;
 	m_iLastEditedRow = -1;
-	m_pCurrentIconButton = 0;
+	m_pCurrentIconButton = nullptr;
 	setObjectName("texticons_options_widget");
 	createLayout();
 
@@ -169,7 +169,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon)
 	m_pCurrentItem->icon()->setId(eIcon);
 	m_pCurrentItem->setIcon(QIcon(*m_pCurrentItem->icon()->pixmap()));
 
-	KviTalHBox * pBox = new KviTalHBox(0);
+	KviTalHBox * pBox = new KviTalHBox(nullptr);
 	pBox->setSpacing(0);
 	pBox->setMargin(0);
 
@@ -230,10 +230,10 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW
 	{
 		QWidget * pOldWidget = m_pTable->cellWidget(prev->row(), 1);
 		if(pOldWidget)
-			m_pTable->setCellWidget(prev->row(), 1, NULL);
+			m_pTable->setCellWidget(prev->row(), 1, nullptr);
 	}
 
-	m_pCurrentItem = NULL;
+	m_pCurrentItem = nullptr;
 
 	if(!cur)
 		return;
@@ -244,7 +244,7 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW
 
 	m_pCurrentItem = (TextIconTableItem *)cur;
 
-	KviTalHBox * pBox = new KviTalHBox(0);
+	KviTalHBox * pBox = new KviTalHBox(nullptr);
 	pBox->setSpacing(0);
 	pBox->setMargin(0);
 
@@ -266,7 +266,7 @@ void OptionsWidget_textIcons::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 	m_pTable->setItem(m_pTable->rowCount() - 1, 0, new QTableWidgetItem(__tr2qs_ctx("unnamed", "options")));
-	m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, 0));
+	m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, nullptr));
 	m_pTable->scrollToBottom();
 	m_pDel->setEnabled(true);
 }
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index ff958f594..0461eea58 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -38,9 +38,9 @@
 
 #include <QSplitter>
 
-KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = nullptr;
 
-OptionsInstanceManager * g_pOptionsInstanceManager = 0;
+OptionsInstanceManager * g_pOptionsInstanceManager = nullptr;
 
 extern int g_iOptionWidgetInstances;
 
@@ -111,7 +111,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		{
 			if(d->parent())
 			{
-				d->setParent(0);
+				d->setParent(nullptr);
 				d->setGeometry(0, 0, d->width(), d->height());
 			}
 		}
@@ -349,11 +349,11 @@ static bool options_module_cleanup(KviModule * m)
 	for(d = l.first(); d; d = l.next())
 		delete d;
 	delete g_pOptionsDialogDict;
-	g_pOptionsDialogDict = 0;
+	g_pOptionsDialogDict = nullptr;
 
 	g_pOptionsInstanceManager->cleanup(m);
 	delete g_pOptionsInstanceManager;
-	g_pOptionsInstanceManager = 0;
+	g_pOptionsInstanceManager = nullptr;
 
 	return true;
 }