Merge pull request #1962 from DarthGandalf/modernize

Apply several fixes of clang-tidy

39 files changed, 283 insertions, 298 deletions

diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp
index b3bdfe825..12078282b 100644
--- a/src/modules/objects/KvsObject_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -157,6 +157,6 @@ KVSO_CLASS_FUNCTION(button, clickEvent)
 // slots
 void KvsObject_button::slotClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "clickEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index a13f29c20..43dcc3918 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -170,12 +170,12 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
 	if(!widget())
 		return true;
 	int colorDialogOption, sum = 0;
-	for(QStringList::Iterator it = szOptions.begin(); it != szOptions.end(); ++it)
+	for(auto & szOption : szOptions)
 	{
 		colorDialogOption = 0;
 		for(unsigned int j = 0; j < option_num; j++)
 		{
-			if(KviQString::equalCI((*it), option_tbl[j]))
+			if(KviQString::equalCI(szOption, option_tbl[j]))
 			{
 				colorDialogOption = option_cod[j];
 				break;
@@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
 		if(colorDialogOption)
 			sum = sum | colorDialogOption;
 		else
-			c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &szOption);
 	}
 	((QColorDialog *)widget())->setOptions(QColorDialog::ColorDialogOptions(sum));
 	return true;
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index f4c7044ea..73eab6c59 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -167,7 +167,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, setTime)
 // slots
 void KvsObject_dateTimeEdit::slotDateTimeChanged(const QDateTime &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "dateTimeChangedEvent", params);
 }
 
@@ -186,7 +186,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, timeChangedEvent)
 // slots
 void KvsObject_dateTimeEdit::slotTimeChanged(const QTime &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "timeChangedEvent", params);
 }
 
@@ -199,6 +199,6 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, dateChangedEvent)
 // slots
 void KvsObject_dateTimeEdit::slotDateChanged(const QDate &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "dateChangedEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index 66fe4a5f4..c90cfa27c 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -88,7 +88,7 @@ KVSO_CLASS_FUNCTION(dockWindow, addWidget)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("widget", KVS_PT_HOBJECT, 0, hWidget)
 	KVSO_PARAMETERS_END(c)
-	if(hWidget == (kvs_hobject_t)0)
+	if(hWidget == (kvs_hobject_t) nullptr)
 	{
 		// null widget ?
 		c->warning(__tr2qs_ctx("Can't add a null object", "objects"));
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index 183edcdb0..54bd9a990 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -291,7 +291,7 @@ void KvsObject_ftp::slotCommandFinished(int iId, bool bError)
 	lParams.append(new KviKvsVariant(bError));
 	if(bError)
 		lParams.append(new KviKvsVariant(m_pFtp->errorString()));
-	callFunction(this, "commandFinishedEvent", 0, &lParams);
+	callFunction(this, "commandFinishedEvent", nullptr, &lParams);
 }
 
 void KvsObject_ftp::slotCommandStarted(int)
@@ -303,7 +303,7 @@ void KvsObject_ftp::slotDataTransferProgress(qint64 done, qint64 total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataTransferProgressEvent", 0, &lParams);
+	callFunction(this, "dataTransferProgressEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, dataTransferProgressEvent)
@@ -320,7 +320,7 @@ void KvsObject_ftp::slotListInfo(const QUrlInfo & i)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(i.name()));
-	callFunction(this, "listInfoEvent", 0, &lParams);
+	callFunction(this, "listInfoEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, listInfoEvent)
@@ -354,7 +354,7 @@ void KvsObject_ftp::slotStateChanged(int state)
 		szState = "Closing";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szState));
-	callFunction(this, "stateChangedEvent", 0, &lParams);
+	callFunction(this, "stateChangedEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, stateChangedEvent)
diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp
index 7ee0e4f59..de7325f34 100644
--- a/src/modules/objects/KvsObject_hBox.cpp
+++ b/src/modules/objects/KvsObject_hBox.cpp
@@ -176,13 +176,13 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
 		return true;
 	}
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -191,7 +191,7 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 	}
 	((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
 	return true;
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 2840b08d3..1340a89db 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -291,7 +291,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETER("local_filename", KVS_PT_STRING, KVS_PF_OPTIONAL, szDest)
 	KVSO_PARAMETERS_END(c)
 
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	if(!szDest.isEmpty())
 	{
 		pFile = new QFile(szDest);
@@ -324,7 +324,7 @@ bool KvsObject_http::functionPost(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETER("post_data", KVS_PT_STRING, 0, szData)
 	KVSO_PARAMETER("local_filename", KVS_PT_STRING, 0, szDest)
 	KVSO_PARAMETERS_END(c)
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	if(!szDest.isEmpty())
 	{
 		pFile = new QFile(szDest);
@@ -409,7 +409,7 @@ void KvsObject_http::slotRequestFinished(int id, bool error)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)id));
 	lParams.append(new KviKvsVariant(error));
-	callFunction(this, "requestFinishedEvent", 0, &lParams);
+	callFunction(this, "requestFinishedEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionRequestStartedEvent(KviKvsObjectFunctionCall * c)
@@ -421,7 +421,7 @@ void KvsObject_http::slotRequestStarted(int id)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)id));
-	callFunction(this, "requestStartedEvent", 0, &lParams);
+	callFunction(this, "requestStartedEvent", nullptr, &lParams);
 }
 
 void KvsObject_http::slotDataReadProgress(int done, int total)
@@ -429,7 +429,7 @@ void KvsObject_http::slotDataReadProgress(int done, int total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataReadProgressEvent", 0, &lParams);
+	callFunction(this, "dataReadProgressEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionDataReadProgressEvent(KviKvsObjectFunctionCall * c)
 {
@@ -441,7 +441,7 @@ void KvsObject_http::slotDataSendProgress(int done, int total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataSendProgressEvent", 0, &lParams);
+	callFunction(this, "dataSendProgressEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionDataSendProgressEvent(KviKvsObjectFunctionCall * c)
 {
@@ -457,7 +457,7 @@ void KvsObject_http::slotDone(bool error)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(error));
-	callFunction(this, "doneEvent", 0, &lParams);
+	callFunction(this, "doneEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionResponseHeaderReceivedEvent(KviKvsObjectFunctionCall * c)
@@ -474,7 +474,7 @@ void KvsObject_http::redirect(QString & file, const QHttpResponseHeader & r)
 {
 	QUrl url(r.value("location"));
 	m_pHttp->setHost(url.host());
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	pFile = new QFile(file);
 	pFile->open(QIODevice::WriteOnly);
 	int id = m_pHttp->get(url.path(), pFile);
@@ -512,7 +512,7 @@ void KvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader & r)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szResponse));
-	callFunction(this, "responseHeaderReceivedEvent", 0, &lParams);
+	callFunction(this, "responseHeaderReceivedEvent", nullptr, &lParams);
 }
 void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r)
 {
@@ -540,7 +540,7 @@ void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szResponse));
-	callFunction(this, "readyreadEvent", 0, &lParams);
+	callFunction(this, "readyreadEvent", nullptr, &lParams);
 }
 
 void KvsObject_http::slotStateChanged(int state)
@@ -563,7 +563,7 @@ void KvsObject_http::slotStateChanged(int state)
 		szState = "Closing";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szState));
-	callFunction(this, "stateChangedEvent", 0, &lParams);
+	callFunction(this, "stateChangedEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall * c)
 {
@@ -581,7 +581,7 @@ bool KvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *)
 }
 void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 {
-	KviKvsArray * pArray = 0;
+	KviKvsArray * pArray = nullptr;
 	pArray = new KviKvsArray();
 	for(int i = 0; i < sslerrors.count(); i++)
 	{
@@ -589,7 +589,7 @@ void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(pArray));
-	callFunction(this, "sslErrorEvent", 0, &lParams);
+	callFunction(this, "sslErrorEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall * c)
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 3c3baff78..6d9ebf848 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -245,13 +245,13 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
 	KVSO_PARAMETER("alignment", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, alignment)
 	KVSO_PARAMETERS_END(c)
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 	}
 	((QLabel *)widget())->setAlignment((Qt::Alignment)sum);
 	return true;
@@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
 	if(!widget())
 		return true;
 	int framestyle, sum = 0;
-	for(QStringList::Iterator it = style.begin(); it != style.end(); ++it)
+	for(auto & it : style)
 	{
 		framestyle = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), frame_tbl[j]))
+			if(KviQString::equalCI(it, frame_tbl[j]))
 			{
 				framestyle = frame_cod[j];
 				break;
@@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
 		if(framestyle)
 			sum = sum | framestyle;
 		else
-			c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &it);
 	}
 	((QLabel *)widget())->setFrameStyle(sum);
 	return true;
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index a843a6928..db302cc8c 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -225,14 +225,14 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit, setInputValidator)
 KVSO_END_REGISTERCLASS(KvsObject_lineEdit)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_lineEdit, KvsObject_widget)
-m_pCompleter = 0;
+m_pCompleter = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_lineEdit)
 if(m_pCompleter)
 {
 	delete m_pCompleter;
-	m_pCompleter = 0;
+	m_pCompleter = nullptr;
 }
 KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
@@ -496,7 +496,7 @@ KVSO_CLASS_FUNCTION(lineEdit, enableCompleter)
 KVSO_CLASS_FUNCTION(lineEdit, disableCompleter)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	((QLineEdit *)widget())->setCompleter(0);
+	((QLineEdit *)widget())->setCompleter(nullptr);
 	return true;
 }
 KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter)
@@ -504,9 +504,9 @@ KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter)
 	CHECK_INTERNAL_POINTER(widget())
 	if(m_pCompleter)
 	{
-		((QLineEdit *)widget())->setCompleter(0);
+		((QLineEdit *)widget())->setCompleter(nullptr);
 		delete m_pCompleter;
-		m_pCompleter = 0;
+		m_pCompleter = nullptr;
 	}
 	return true;
 }
@@ -519,7 +519,7 @@ KVSO_CLASS_FUNCTION(lineEdit, returnPressedEvent)
 
 void KvsObject_lineEdit::slotreturnPressed()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "returnPressedEvent", params);
 }
 
@@ -531,7 +531,7 @@ KVSO_CLASS_FUNCTION(lineEdit, lostFocusEvent)
 
 void KvsObject_lineEdit::slotlostFocus()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "lostFocusEvent", params);
 }
 
diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp
index f5996d173..25ccf5dfc 100644
--- a/src/modules/objects/KvsObject_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -146,7 +146,7 @@ KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_list)
 delete m_pDataList;
-m_pDataList = 0;
+m_pDataList = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 KVSO_CLASS_FUNCTION(list, current)
@@ -168,35 +168,35 @@ KVSO_CLASS_FUNCTION(list, current)
 KVSO_CLASS_FUNCTION(list, eof)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->current() != 0);
+	c->returnValue()->setBoolean(m_pDataList->current() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveLast)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->last() != 0);
+	c->returnValue()->setBoolean(m_pDataList->last() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, movePrev)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->prev() != 0);
+	c->returnValue()->setBoolean(m_pDataList->prev() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveNext)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->next() != 0);
+	c->returnValue()->setBoolean(m_pDataList->next() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveFirst)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->first() != 0);
+	c->returnValue()->setBoolean(m_pDataList->first() != nullptr);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 80115a989..807eed373 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -349,7 +349,7 @@ KVSO_CLASS_FUNCTION(listWidget, setIcon)
 	if(!pItem)
 		return true;
 
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isEmpty())
 	{
 		pItem->setIcon(QIcon());
@@ -696,26 +696,26 @@ KVSO_CLASS_FUNCTION(listWidget, itemEnteredEvent)
 void KvsObject_listWidget::currentItemChanged(QListWidgetItem * currentItem, QListWidgetItem *)
 {
 	if(!currentItem)
-		callFunction(this, "currentItemChangedEvent", 0, 0);
+		callFunction(this, "currentItemChangedEvent", nullptr, nullptr);
 	else
 	{
 		KviKvsVariantList params(new KviKvsVariant(currentItem->text()));
-		callFunction(this, "currentItemChangedEvent", 0, &params);
+		callFunction(this, "currentItemChangedEvent", nullptr, &params);
 	}
 }
 void KvsObject_listWidget::selectionChanged()
 {
-	callFunction(this, "selectionChangedEvent", 0, 0);
+	callFunction(this, "selectionChangedEvent", nullptr, nullptr);
 }
 
 void KvsObject_listWidget::slotItemEntered(QListWidgetItem * item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
-	callFunction(this, "itemEnteredEvent", 0, &params);
+	callFunction(this, "itemEnteredEvent", nullptr, &params);
 }
 
 void KvsObject_listWidget::slotItemChanged(QListWidgetItem * item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
-	callFunction(this, "itemChangedEvent", 0, &params);
+	callFunction(this, "itemChangedEvent", nullptr, &params);
 }
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 1ab46746c..bc16dc8a7 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -611,10 +611,10 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter, KviKvsObject)
 
 m_pPainter = new QPainter();
 bDonotdeleteinternalqpainter = false;
-m_pPrinter = 0;
-m_pDeviceObject = 0;
-m_pPainterPath = 0;
-m_pGradient = 0;
+m_pPrinter = nullptr;
+m_pDeviceObject = nullptr;
+m_pPainterPath = nullptr;
+m_pGradient = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -622,16 +622,16 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_painter)
 
 if(m_pPainterPath)
 	delete m_pPainterPath;
-m_pPainterPath = 0;
+m_pPainterPath = nullptr;
 if(m_pGradient)
 	delete m_pGradient;
-m_pGradient = 0;
+m_pGradient = nullptr;
 if(m_pPainter && !bDonotdeleteinternalqpainter)
 	delete m_pPainter;
-m_pPainter = 0;
+m_pPainter = nullptr;
 if(m_pPrinter)
 	delete m_pPrinter;
-m_pPrinter = 0;
+m_pPrinter = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -1193,7 +1193,7 @@ KVSO_CLASS_FUNCTION(painter, begin)
 			}
 			else
 			{
-				QPrintDialog printDialog(m_pPrinter, 0);
+				QPrintDialog printDialog(m_pPrinter, nullptr);
 				if(printDialog.exec() == QDialog::Accepted)
 				{
 					qDebug("papersize %d", m_pPrinter->paperSize());
@@ -1202,7 +1202,7 @@ KVSO_CLASS_FUNCTION(painter, begin)
 				}
 				else
 				{
-					m_pPrinter = 0;
+					m_pPrinter = nullptr;
 					return true;
 				}
 			}
@@ -1267,9 +1267,9 @@ void KvsObject_painter::detachDevice()
 	if(m_pPrinter)
 	{
 		delete m_pPrinter;
-		m_pPrinter = 0;
+		m_pPrinter = nullptr;
 	}
-	m_pDeviceObject = 0;
+	m_pDeviceObject = nullptr;
 }
 
 KVSO_CLASS_FUNCTION(painter, end)
@@ -1282,7 +1282,7 @@ KVSO_CLASS_FUNCTION(painter, end)
 		if(m_pPrinter)
 		{
 			delete m_pPrinter;
-			m_pPrinter = 0;
+			m_pPrinter = nullptr;
 		}
 	}
 	else
@@ -1323,12 +1323,12 @@ KVSO_CLASS_FUNCTION(painter, drawText)
 	int align, sum = 0;
 	if(szAlignList.count())
 	{
-		for(QStringList::Iterator it = szAlignList.begin(); it != szAlignList.end(); ++it)
+		for(auto & it : szAlignList)
 		{
 			align = 0;
 			for(unsigned int j = 0; j < align_num; j++)
 			{
-				if(KviQString::equalCI((*it), align_tbl[j]))
+				if(KviQString::equalCI(it, align_tbl[j]))
 				{
 					align = align_cod[j];
 					break;
@@ -1337,7 +1337,7 @@ KVSO_CLASS_FUNCTION(painter, drawText)
 			if(align)
 				sum = sum | align;
 			else
-				c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+				c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 		}
 	}
 	QRect rect;
@@ -1964,7 +1964,7 @@ KVSO_CLASS_FUNCTION(painter, clearGradient)
 	Q_UNUSED(c);
 	if(!m_pGradient)
 		delete m_pGradient;
-	m_pGradient = 0;
+	m_pGradient = nullptr;
 	return true;
 }
 
@@ -2151,7 +2151,7 @@ KVSO_CLASS_FUNCTION(painter, resetPath)
 	if(m_pPainterPath)
 	{
 		delete m_pPainterPath;
-		m_pPainterPath = 0;
+		m_pPainterPath = nullptr;
 	}
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 8505b606f..fd618fcea 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -107,10 +107,10 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, frameChangedEvent)
 KVSO_END_REGISTERCLASS(KvsObject_pixmap)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap, KviKvsObject)
-m_pAnimatedPixmap = 0;
+m_pAnimatedPixmap = nullptr;
 m_currentType = Image;
-m_pPixmap = 0;
-m_pImage = 0;
+m_pPixmap = nullptr;
+m_pImage = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_pixmap)
@@ -181,17 +181,17 @@ KVSO_CLASS_FUNCTION(pixmap, fill)
 				m_pPixmap = new QPixmap();
 			*m_pPixmap = QPixmap::fromImage(*m_pImage);
 			delete m_pImage;
-			m_pImage = 0;
+			m_pImage = nullptr;
 		}
 		else
 		{
-			m_pPixmap = 0;
+			m_pPixmap = nullptr;
 		}
 	}
 	else if(m_currentType == AnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	m_currentType = Pixmap;
 	if(!m_pPixmap)
@@ -213,7 +213,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize)
 		if(m_pImage)
 		{
 			delete m_pImage;
-			m_pImage = 0;
+			m_pImage = nullptr;
 		}
 	}
 	else if(m_currentType == AnimatedPixmap)
@@ -221,7 +221,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize)
 		if(m_pAnimatedPixmap)
 		{
 			delete m_pAnimatedPixmap;
-			m_pAnimatedPixmap = 0;
+			m_pAnimatedPixmap = nullptr;
 		}
 	}
 	else if(m_pPixmap)
@@ -339,7 +339,7 @@ KVSO_CLASS_FUNCTION(pixmap, pixel)
 		m_pImage = new QImage();
 		*m_pImage = m_pPixmap->toImage();
 		delete m_pPixmap;
-		m_pPixmap = 0;
+		m_pPixmap = nullptr;
 	}
 	m_currentType = Image;
 	QRgb rgb = m_pImage->pixel(iX, iY);
@@ -521,12 +521,12 @@ KVSO_CLASS_FUNCTION(pixmap, loadAnimation)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(m_pPixmap)
 	{
 		delete m_pPixmap;
-		m_pPixmap = 0;
+		m_pPixmap = nullptr;
 	}
 	m_pAnimatedPixmap = new KviAnimatedPixmap(szFile);
 	connect(m_pAnimatedPixmap, SIGNAL(frameChanged()), this, SLOT(frameChanged()));
@@ -658,7 +658,7 @@ KVSO_CLASS_FUNCTION(pixmap, loadFromMemoryBuffer)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(!m_pPixmap)
 		m_pPixmap = new QPixmap();
@@ -680,7 +680,7 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(!m_pPixmap)
 		m_pPixmap = new QPixmap();
@@ -744,6 +744,6 @@ KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent)
 // slots
 void KvsObject_pixmap::frameChanged()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "frameChangedEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index 9a5531835..f2075ab7c 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -232,8 +232,8 @@ KVSO_CLASS_FUNCTION(popupMenu, insertItem)
 	KVSO_PARAMETER("icon_id", KVS_PT_STRING, KVS_PF_OPTIONAL, szIcon)
 	KVSO_PARAMETERS_END(c)
 
-	QPixmap * pix = 0;
-	QAction * pAction = 0;
+	QPixmap * pix = nullptr;
+	QAction * pAction = nullptr;
 	if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 73a8ed92a..706454f37 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -308,12 +308,12 @@ KVSO_CLASS_FUNCTION(process, normalExit)
 
 void KvsObject_process::slotReadStdout()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "readyReadStdoutEvent", params);
 }
 
 void KvsObject_process::slotReadStderr()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "readyReadStderrEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 0d386d3cb..e72a369b4 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -664,13 +664,13 @@ void KvsObject_socket::slotReadyRead()
 
 void KvsObject_socket::slotConnected()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "connectedEvent", lParams);
 }
 
 void KvsObject_socket::slotDisconnected()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "disconnectedEvent", lParams);
 }
 
@@ -684,7 +684,7 @@ void KvsObject_socket::slotError(QAbstractSocket::SocketError socketError)
 
 void KvsObject_socket::slotHostFound()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "hostFoundEvent", lParams);
 }
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index e4de050f1..7fd68c240 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -133,13 +133,13 @@ KVSO_END_REGISTERCLASS(KvsObject_sql)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_sql, KviKvsObject)
 
-m_pCurrentSQlQuery = 0;
+m_pCurrentSQlQuery = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_sql)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_sql)
 if(m_pCurrentSQlQuery)
 	delete m_pCurrentSQlQuery;
-m_pCurrentSQlQuery = 0;
+m_pCurrentSQlQuery = nullptr;
 KVSO_END_DESTRUCTOR(KvsObject_sql)
 
 KVSO_CLASS_FUNCTION(sql, setConnection)
@@ -179,7 +179,7 @@ KVSO_CLASS_FUNCTION(sql, setConnection)
 		m_pCurrentSQlQuery = new QSqlQuery(db);
 	}
 	else
-		m_pCurrentSQlQuery = 0;
+		m_pCurrentSQlQuery = nullptr;
 	c->returnValue()->setBoolean(bOk);
 	return true;
 }
@@ -303,7 +303,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection)
 		if(m_pCurrentSQlQuery)
 		{
 			delete m_pCurrentSQlQuery;
-			m_pCurrentSQlQuery = 0;
+			m_pCurrentSQlQuery = nullptr;
 		}
 		QSqlDatabase::removeDatabase(szConnectionName);
 		return true;
@@ -311,7 +311,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection)
 	if(m_pCurrentSQlQuery)
 	{
 		delete m_pCurrentSQlQuery;
-		m_pCurrentSQlQuery = 0;
+		m_pCurrentSQlQuery = nullptr;
 	}
 	QSqlDatabase::removeDatabase(mSzConnectionName);
 	return true;
@@ -465,7 +465,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
 	QSqlRecord record = m_pCurrentSQlQuery->record();
 	for(int i = 0; i < record.count(); i++)
 	{
-		KviKvsVariant * pValue = 0;
+		KviKvsVariant * pValue = nullptr;
 		QVariant value = record.value(i);
 		if(value.type() == QVariant::LongLong)
 			pValue = new KviKvsVariant((kvs_int_t)value.toLongLong());
@@ -475,7 +475,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
 		{
 			KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("memoryBuffer");
 			KviKvsVariantList params(new KviKvsVariant(QString()));
-			KviKvsObject * pObject = pClass->allocateInstance(0, "", c->context(), &params);
+			KviKvsObject * pObject = pClass->allocateInstance(nullptr, "", c->context(), &params);
 			*((KvsObject_memoryBuffer *)pObject)->pBuffer() = value.toByteArray();
 			pValue = new KviKvsVariant(pObject->handle());
 		}
diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index 018ed70b1..1029ecc62 100644
--- a/src/modules/objects/KvsObject_tabWidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -250,7 +250,7 @@ KVSO_CLASS_FUNCTION(tabWidget, widgetAt)
 	KVSO_PARAMETER("index", KVS_PT_INTEGER, 0, iIndex)
 	KVSO_PARAMETERS_END(c)
 	if(iIndex >= tabsList.count() || iIndex < 0)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(tabsList.at(iIndex));
 	return true;
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 63e9cd49e..901994049 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -477,7 +477,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setIcon)
 	KVSO_PARAMETER("col", KVS_PT_UNSIGNEDINTEGER, 0, uCol)
 	KVSO_PARAMETER("icon", KVS_PT_VARIANT, 0, vPixmap)
 	KVSO_PARAMETERS_END(c)
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isHObject())
 	{
 		vPixmap->asHObject(obHpixmap);
@@ -809,7 +809,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setItemFlags)
 void KvsObject_tableWidget::slotItemEntered(QTableWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i->row()), new KviKvsVariant((kvs_int_t)i->column()));
-	callFunction(this, "itemEnteredEvent", 0, &params);
+	callFunction(this, "itemEnteredEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent)
@@ -821,7 +821,7 @@ KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent)
 void KvsObject_tableWidget::cellActivated(int iRow, int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol));
-	callFunction(this, "cellActivatedEvent", 0, &params);
+	callFunction(this, "cellActivatedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent)
@@ -833,7 +833,7 @@ KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent)
 void KvsObject_tableWidget::cellDoubleClicked(int iRow, int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol));
-	callFunction(this, "cellDoubleClickedEvent", 0, &params);
+	callFunction(this, "cellDoubleClickedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, cellDoubleClickedEvent)
@@ -846,7 +846,7 @@ bool KvsObject_tableWidget::paint(QPainter * p, const QStyleOptionViewItem & opt
 	p->save();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, &params);
 	((KvsObject_painter *)pObject)->setInternalPainter(p);
 	p->setClipRect(option.rect);
 	p->translate(option.rect.x(), option.rect.y());
@@ -872,8 +872,7 @@ KviCellItemDelegate::KviCellItemDelegate(QAbstractItemView * pWidget, KvsObject_
 }
 
 KviCellItemDelegate::~KviCellItemDelegate()
-{
-}
+    = default;
 
 void KviCellItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index be89766f2..97263b046 100644
--- a/src/modules/objects/KvsObject_textBrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -138,7 +138,7 @@ KVSO_CLASS_FUNCTION(textBrowser, reload)
 void KvsObject_textBrowser::anchorClicked(const QUrl & url)
 {
 	KviKvsVariantList parms(new KviKvsVariant(url.path()));
-	callFunction(this, "linkClickedEvent", 0, &parms);
+	callFunction(this, "linkClickedEvent", nullptr, &parms);
 }
 
 KVSO_CLASS_FUNCTION(textBrowser, linkClickedEvent)
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 6ada08c2d..fa0be17eb 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -334,6 +334,6 @@ KVSO_CLASS_FUNCTION(toolButton, clickEvent)
 
 void KvsObject_toolButton::slotClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "clickEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index 2b0211c76..127be0065 100644
--- a/src/modules/objects/KvsObject_trayIcon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -105,7 +105,7 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon, messageClickedEvent)
 KVSO_END_REGISTERCLASS(KvsObject_trayIcon)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_trayIcon, KviKvsObject)
-m_pTrayIcon = new QSystemTrayIcon(0);
+m_pTrayIcon = new QSystemTrayIcon(nullptr);
 connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(slotActivated(QSystemTrayIcon::ActivationReason)));
 connect(m_pTrayIcon, SIGNAL(messageClicked()), this, SLOT(slotMessageClicked()));
 
@@ -221,8 +221,8 @@ KVSO_CLASS_FUNCTION(trayIcon, messageClickedEvent)
 }
 void KvsObject_trayIcon::slotMessageClicked()
 {
-	KviKvsVariantList * lParams = 0;
-	callFunction(this, "messageClickedEvent", 0, lParams);
+	KviKvsVariantList * lParams = nullptr;
+	callFunction(this, "messageClickedEvent", nullptr, lParams);
 }
 
 void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
@@ -240,5 +240,5 @@ void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
 		szReason = "MiddleClick";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szReason));
-	callFunction(this, "activatedEvent", 0, &lParams);
+	callFunction(this, "activatedEvent", nullptr, &lParams);
 }
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index d8be9006e..113b300f8 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -254,7 +254,7 @@ KVSO_CLASS_FUNCTION(treeWidget, topLevelItem)
 	KVSO_PARAMETERS_END(c)
 	QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->topLevelItem(iIdx);
 	if(!pItem)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
 	return true;
@@ -271,7 +271,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemAt)
 	QPoint pPoint = ((QTreeWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos, iYpos));
 	QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->itemAt(pPoint);
 	if(!pItem)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
 	return true;
@@ -335,7 +335,7 @@ KVSO_CLASS_FUNCTION(treeWidget, selectedItems)
 			pArray->set(i, new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)list.at(i))));
 	}
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(treeWidget, firstChild)
 	if(widget())
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->topLevelItem(0)));
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -353,7 +353,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentItem)
 	if(widget())
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem()));
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 /*
@@ -484,7 +484,7 @@ void KvsObject_treeWidget::slotClicked(QTreeWidgetItem * i, int col)
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "itemClickedEvent", 0, &params);
+	callFunction(this, "itemClickedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, selectionChangedEvent)
@@ -499,12 +499,12 @@ void KvsObject_treeWidget::slotSelectionChanged()
 	{
 		QTreeWidgetItem * it = (QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem();
 		KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(it)));
-		callFunction(this, "selectionChangedEvent", 0, &params);
+		callFunction(this, "selectionChangedEvent", nullptr, &params);
 	}
 	else
 	{
-		KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t)0));
-		callFunction(this, "selectionChangedEvent", 0, &params);
+		KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t) nullptr));
+		callFunction(this, "selectionChangedEvent", nullptr, &params);
 	}
 }
 
@@ -517,7 +517,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentChangedEvent)
 void KvsObject_treeWidget::slotCurrentChanged(QTreeWidgetItem * i, QTreeWidgetItem * prev)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(prev)));
-	callFunction(this, "currentChangedEvent", 0, &params);
+	callFunction(this, "currentChangedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemActivatedEvent)
@@ -530,7 +530,7 @@ void KvsObject_treeWidget::slotItemActivated(QTreeWidgetItem * i, int col)
 {
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "itemActivatedEvent", 0, &params);
+	callFunction(this, "itemActivatedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, onItemEvent)
@@ -544,7 +544,7 @@ void KvsObject_treeWidget::slotOnItemEntered(QTreeWidgetItem * i, int col)
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "onItemEvent", 0, &params);
+	callFunction(this, "onItemEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent)
@@ -556,7 +556,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent)
 void KvsObject_treeWidget::slotItemExpanded(QTreeWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
-	callFunction(this, "itemExpandedEvent", 0, &params);
+	callFunction(this, "itemExpandedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent)
@@ -568,7 +568,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent)
 void KvsObject_treeWidget::slotItemCollapsed(QTreeWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
-	callFunction(this, "itemCollapsedEvent", 0, &params);
+	callFunction(this, "itemCollapsedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemChangedEvent)
@@ -581,14 +581,14 @@ void KvsObject_treeWidget::slotItemChanged(QTreeWidgetItem * item, int col)
 {
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), column);
-	callFunction(this, "itemChangedEvent", 0, &params);
+	callFunction(this, "itemChangedEvent", nullptr, &params);
 }
 
 void KvsObject_treeWidget::fileDropped(QString & szFile, QTreeWidgetItem * item)
 {
 	KviKvsVariant * file = new KviKvsVariant(szFile);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), file);
-	callFunction(this, "fileDroppedEvent", 0, &params);
+	callFunction(this, "fileDroppedEvent", nullptr, &params);
 }
 
 KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWidget * parent)
@@ -603,8 +603,7 @@ KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWi
 }
 
 KviKvsTreeWidget::~KviKvsTreeWidget()
-{
-}
+    = default;
 
 void KviKvsTreeWidget::dragEnterEvent(QDragEnterEvent * e)
 {
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index ad4a37e26..508b1cf01 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -145,7 +145,7 @@ KVSO_END_REGISTERCLASS(KvsObject_treeWidgetItem)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_treeWidgetItem, KviKvsObject)
 
-m_pTreeWidgetItem = 0;
+m_pTreeWidgetItem = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_treeWidgetItem)
 
@@ -183,9 +183,9 @@ bool KvsObject_treeWidgetItem::init(KviKvsRunTimeContext * pContext, KviKvsVaria
 
 void KvsObject_treeWidgetItem::childDestroyed()
 {
-	if(m_pTreeWidgetItem == 0)
+	if(m_pTreeWidgetItem == nullptr)
 		return;
-	m_pTreeWidgetItem = 0;
+	m_pTreeWidgetItem = nullptr;
 	die();
 }
 
@@ -208,11 +208,11 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 kvs_hobject_t KvsObject_treeWidgetItem::itemToHandle(QTreeWidgetItem * it)
 {
 	if(!it)
-		return (kvs_hobject_t)0;
+		return (kvs_hobject_t) nullptr;
 	KvsObject_treeWidgetItem * pObject;
 	pObject = ((KviKvsStandardTreeWidgetItem *)it)->masterObject();
 	if(!pObject)
-		return (kvs_hobject_t)0;
+		return (kvs_hobject_t) nullptr;
 	return pObject->handle();
 }
 
@@ -393,7 +393,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem, setPixmap)
 	KVSO_PARAMETER("column", KVS_PT_UNSIGNEDINTEGER, 0, uCol)
 	KVSO_PARAMETER("pixmap", KVS_PT_VARIANT, 0, vPixmap)
 	KVSO_PARAMETERS_END(c)
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isEmpty())
 	{
 		m_pTreeWidgetItem->setIcon(uCol, QIcon());
diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index a8a17d282..76f750fc1 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -192,13 +192,13 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
 	}
 
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &it);
 	}
 	if(widget())
 		((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 41a774b80..89d07f0fe 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -65,9 +65,9 @@ void KviKvsDownloadHandler::slotReplyFinished()
 	m_pParentScript->callFunction(m_pParentScript, "downloadCompletedEvent", &params);
 	m_pFile->close();
 	delete m_pFile;
-	m_pFile = 0;
+	m_pFile = nullptr;
 	m_pReply->deleteLater();
-	m_pReply = 0;
+	m_pReply = nullptr;
 	this->deleteLater();
 }
 
@@ -77,12 +77,12 @@ KviKvsDownloadHandler::~KviKvsDownloadHandler()
 	{
 		m_pFile->close();
 		delete m_pFile;
-		m_pFile = 0;
+		m_pFile = nullptr;
 	}
 	if(m_pReply)
 	{
 		delete m_pReply;
-		m_pReply = 0;
+		m_pReply = nullptr;
 	}
 }
 void KviKvsDownloadHandler::slotReadyRead()
@@ -449,7 +449,7 @@ QWebFrame * KvsObject_webView::findFrame(QWebFrame * pCurFrame, QString & szFram
 				return pCurFrame;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KVSO_CLASS_FUNCTION(webView, setLinkDelegationPolicy)
@@ -518,7 +518,7 @@ KVSO_CLASS_FUNCTION(webView, makePreview)
 	painter.end();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), &params);
 	((KvsObject_pixmap *)pObject)->setInternalImage(pImage);
 	c->returnValue()->setHObject(pObject->handle());
 	return true;
@@ -821,12 +821,12 @@ KVSO_CLASS_FUNCTION(webView, findText)
 	KVSO_PARAMETERS_END(c)
 	int findflag = 0;
 	int sum = 0;
-	for(QStringList::Iterator it = szFindFlag.begin(); it != szFindFlag.end(); ++it)
+	for(auto & it : szFindFlag)
 	{
 		findflag = 0;
 		for(unsigned int j = 0; j < findflag_num; j++)
 		{
-			if(KviQString::equalCI((*it), findflag_tbl[j]))
+			if(KviQString::equalCI(it, findflag_tbl[j]))
 			{
 				findflag = findflag_cod[j];
 				break;
@@ -835,7 +835,7 @@ KVSO_CLASS_FUNCTION(webView, findText)
 		if(findflag)
 			sum = sum | findflag;
 		else
-			c->warning(__tr2qs_ctx("Unknown findflag  '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown findflag  '%Q'", "objects"), &it);
 	}
 	((QWebView *)widget())->findText(szName, (QWebPage::FindFlags)findflag);
 	return true;
@@ -1169,7 +1169,7 @@ KVSO_CLASS_FUNCTION(webView, appendWebViewActionToMenu)
 		c->warning(__tr2qs_ctx("Can't add a non-popupmenu object", "objects"));
 		return true;
 	}
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	for(unsigned int i = 0; i < actions_num; i++)
 	{
 		if(KviQString::equalCI(szActionName, actions_tbl[i]))
@@ -1311,7 +1311,7 @@ void KvsObject_webView::slotLoadFinished(bool bOk)
 
 void KvsObject_webView::slotLoadStarted()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "loadStartedEvent", lParams);
 }
 
@@ -1413,6 +1413,5 @@ bool KviKvsWebView::event(QEvent * e)
 	return QWebView::event(e);
 }
 KviKvsWebView::~KviKvsWebView()
-{
-}
+    = default;
 #endif // COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index c6fcfaca8..8f60a145e 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -66,8 +66,7 @@ KviKvsWidget::KviKvsWidget(KvsObject_widget * object, QWidget * par)
 }
 
 KviKvsWidget::~KviKvsWidget()
-{
-}
+    = default;
 
 QSize KviKvsWidget::sizeHint() const
 {
@@ -750,7 +749,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				QRect rect = ((QPaintEvent *)e)->rect();
 				KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter");
 				KviKvsVariantList params;
-				KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, &params);
+				KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, &params);
 				QPainter p(widget());
 				((KvsObject_painter *)pObject)->setInternalPainter(&p);
 				p.setClipRect(rect);
@@ -870,7 +869,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				}
 
 				KviKvsVariantList params(new KviKvsVariant(tmp));
-				callFunction(this, "keyPressEvent", 0, &params);
+				callFunction(this, "keyPressEvent", nullptr, &params);
 			}
 			break;
 			case QEvent::MouseButtonPress:
@@ -926,7 +925,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				lParams.append(new KviKvsVariant((kvs_int_t)aparam));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()));
-				if(!callFunction(this, "mouseDoubleClickEvent", 0, &lParams))
+				if(!callFunction(this, "mouseDoubleClickEvent", nullptr, &lParams))
 					brokenhandler = true; // ignore results of a broken event handler
 			}
 
@@ -936,16 +935,16 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				KviKvsVariantList lParams;
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()));
-				if(!callFunction(this, "mouseMoveEvent", 0, &lParams))
+				if(!callFunction(this, "mouseMoveEvent", nullptr, &lParams))
 					brokenhandler = true; // ignore results of a broken event handler
 			}
 			break;
 			case QEvent::FocusIn:
-				if(!callFunction(this, "focusInEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "focusInEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::FocusOut:
-				if(!callFunction(this, "focusOutEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "focusOutEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Resize:
@@ -958,27 +957,27 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				break;
 			}
 			case QEvent::Move:
-				if(!callFunction(this, "moveEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "moveEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Close:
-				if(!callFunction(this, "closeEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "closeEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Enter:
-				if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Leave:
-				if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Show:
-				if(!callFunction(this, "showEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "showEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Hide:
-				if(!callFunction(this, "hideEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "hideEvent", &oReturnBuffer, nullptr))
 					ret = false;
 				break;
 			default:
@@ -1434,7 +1433,7 @@ KVSO_CLASS_FUNCTION(widget, parentWidget)
 	if(parentScriptWidget())
 		c->returnValue()->setHObject(parentObject()->handle());
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -1733,10 +1732,10 @@ KVSO_CLASS_FUNCTION(widget, setWFlags)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("widget_flags", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, wflags)
 	KVSO_PARAMETERS_END(c)
-	Qt::WindowFlags flag, sum = 0;
+	Qt::WindowFlags flag, sum = nullptr;
 	for(auto & it : wflags)
 	{
-		flag = 0;
+		flag = nullptr;
 		for(size_t j{}; j < widgettypes_num; j++)
 		{
 			if(KviQString::equalCI(it, widgettypes_tbl[j]))
@@ -1843,7 +1842,7 @@ KVSO_CLASS_FUNCTION(widget, setParent)
 
 	if(!ob)
 	{
-		widget()->setParent(0);
+		widget()->setParent(nullptr);
 		return true;
 	}
 	else if(!ob->object()->isWidgetType())
@@ -2066,7 +2065,7 @@ KVSO_CLASS_FUNCTION(widget, grab)
 	*pPixmap = QPixmap::grabWidget(((QWidget *)(ob->object())));
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), &params);
 	((KvsObject_pixmap *)pObject)->setInternalPixmap(pPixmap);
 	c->returnValue()->setHObject(pObject->handle());
 	return true;
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 34ede2ed8..43fb2aea3 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,13 +34,12 @@
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName)
     : KviWindow(KviWindow::ScriptObject, szName)
 {
-	m_pCentralWidget = 0;
-	m_pIcon = 0;
+	m_pCentralWidget = nullptr;
+	m_pIcon = nullptr;
 }
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
-{
-}
+    = default;
 
 void KviKvsScriptWindowWindow::setCentralWidget(KvsObject_widget * o, QWidget * w)
 {
@@ -56,14 +55,14 @@ void KviKvsScriptWindowWindow::resizeEvent(QResizeEvent *)
 
 void KviKvsScriptWindowWindow::centralWidgetObjectDestroyed()
 {
-	m_pCentralWidget = 0;
-	m_pCentralWidgetObject = 0;
+	m_pCentralWidget = nullptr;
+	m_pCentralWidgetObject = nullptr;
 }
 
 void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 {
-	m_pCentralWidget = 0;
-	m_pCentralWidgetObject = 0;
+	m_pCentralWidget = nullptr;
+	m_pCentralWidgetObject = nullptr;
 }
 
 QPixmap * KviKvsScriptWindowWindow::myIconPtr()
diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 509ae7ecd..f708ffcd1 100644
--- a/src/modules/objects/KvsObject_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -315,14 +315,14 @@ KVSO_CLASS_FUNCTION(wizard, setFinishBtnText)
 }
 bool KvsObject_wizard::accept()
 {
-	KviKvsVariantList * pParams = 0;
-	callFunction(this, "acceptEvent", 0, pParams);
+	KviKvsVariantList * pParams = nullptr;
+	callFunction(this, "acceptEvent", nullptr, pParams);
 	return true;
 }
 bool KvsObject_wizard::reject()
 {
-	KviKvsVariantList * pParams = 0;
-	callFunction(this, "rejectEvent", 0, pParams);
+	KviKvsVariantList * pParams = nullptr;
+	callFunction(this, "rejectEvent", nullptr, pParams);
 	return true;
 }
 KVSO_CLASS_FUNCTION(wizard, nextClickedEvent)
@@ -333,7 +333,7 @@ KVSO_CLASS_FUNCTION(wizard, nextClickedEvent)
 
 void KvsObject_wizard::nextClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "nextClickedEvent", params);
 }
 KVSO_CLASS_FUNCTION(wizard, backClickedEvent)
@@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(wizard, backClickedEvent)
 
 void KvsObject_wizard::backClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "backClickedEvent", params);
 }
 KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard * parent)
@@ -374,5 +374,4 @@ void KviKvsMdmWizard::slotBackClicked()
 	m_pParentScript->backClicked();
 }
 KviKvsMdmWizard::~KviKvsMdmWizard()
-{
-}
+    = default;
diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index c0413f703..9d984c5c3 100644
--- a/src/modules/objects/KvsObject_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -190,7 +190,7 @@ if(pWidgetDict)
 {
 	pWidgetDict->clear();
 	delete pWidgetDict;
-	pWidgetDict = 0;
+	pWidgetDict = nullptr;
 }
 KVSO_END_CONSTRUCTOR(KvsObject_workspace)
 
@@ -300,7 +300,7 @@ KVSO_CLASS_FUNCTION(workspace, activeWindow)
 		}
 	}
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 585014d5e..e3c23c1aa 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -172,14 +172,14 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext, KviKvsVariantList
 	if(!pParams)
 		return false;
 
-	QWidget * pWidget = NULL;
+	QWidget * pWidget = nullptr;
 	unsigned int i = 0;
 
 	while(i < pParams->count())
 	{
 		QString szClass;
 		QString szName;
-		QString s = 0;
+		QString s = nullptr;
 
 		pParams->at(i)->asString(s);
 		i++;
@@ -283,7 +283,7 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 {
 	QWidgetList list = g_pApp->topLevelWidgets();
 	if(list.isEmpty())
-		return NULL;
+		return nullptr;
 
 	Q_FOREACH(QWidget * w, list)
 	{
@@ -305,14 +305,14 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QString & szName, QWidget * pParent, bool bRecursive)
 {
 	QList<QObject *> list = pParent->children();
 	if(list.isEmpty())
-		return NULL;
+		return nullptr;
 
 	Q_FOREACH(QObject * obj, list)
 	{
@@ -340,5 +340,5 @@ QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QSt
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 6cdd96b54..b7ebafe9f 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -130,9 +130,7 @@ public:
 	{
 		m_pReader = pReader;
 	}
-	~KviXmlHandler()
-	{
-	}
+	~KviXmlHandler() override = default;
 
 private:
 	bool kvsCodeFailure()
@@ -162,7 +160,7 @@ private:
 	}
 
 public:
-	virtual bool startDocument()
+	bool startDocument() override
 	{
 		KviKvsVariant ret;
 		if(!m_pReader->callFunction(m_pReader, "onDocumentStart", &ret))
@@ -170,7 +168,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool endDocument()
+	bool endDocument() override
 	{
 		KviKvsVariant ret;
 		if(!m_pReader->callFunction(m_pReader, "onDocumentEnd", &ret))
@@ -178,7 +176,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs)
+	bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -196,7 +194,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName)
+	bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -209,7 +207,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool characters(const QString & szChars)
+	bool characters(const QString & szChars) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -220,7 +218,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool warning(const QXmlParseException & exception)
+	bool warning(const QXmlParseException & exception) override
 	{
 		// recoverable
 		QString szMsg;
@@ -235,7 +233,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool error(const QXmlParseException & exception)
+	bool error(const QXmlParseException & exception) override
 	{
 		// recoverable
 		QString szMsg;
@@ -250,7 +248,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool fatalError(const QXmlParseException & exception)
+	bool fatalError(const QXmlParseException & exception) override
 	{
 		QString szMsg;
 		decodeException(szMsg, true, exception);
@@ -258,7 +256,7 @@ public:
 		return true;
 	}
 
-	virtual QString errorString() const
+	QString errorString() const override
 	{
 		return m_szErrorString;
 	}
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 99c348974..8d741cf65 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -518,9 +518,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 	QDir d(szPath);
 	QStringList sl;
 	sl = d.entryList(QDir::Files);
-	for(QStringList::Iterator it2 = sl.begin(); it2 != sl.end(); ++it2)
+	for(auto szName : sl)
 	{
-		QString szName = *it2;
 		szName.replace("--", "::");
 		if(szName != ".." && szName != ".")
 			classdict->insert(szName.left(szName.length() - 4), &bFake);
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 626aaae70..565172619 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -69,7 +69,7 @@ class QFtpCommand
 {
 public:
 	QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba);
-	QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = 0);
+	QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = nullptr);
 	~QFtpCommand();
 
 	int id;
@@ -78,8 +78,7 @@ public:
 
 	// If is_ba is true, ba is used; ba is never 0.
 	// Otherwise dev is used; dev can be 0 or not.
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
@@ -116,7 +115,7 @@ QFtpCommand::~QFtpCommand()
  *
  *********************************************************************/
 QFtpDTP::QFtpDTP(QFtpPI * p, QObject * parent) : QObject(parent),
-                                                 socket(0),
+                                                 socket(nullptr),
                                                  listener(this),
                                                  pi(p),
                                                  callWriteData(false)
@@ -152,7 +151,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 	if(socket)
 	{
 		delete socket;
-		socket = 0;
+		socket = nullptr;
 	}
 	socket = new QTcpSocket(this);
 #ifndef QT_NO_BEARERMANAGEMENT
@@ -277,7 +276,7 @@ void QFtpDTP::writeData()
 		}
 
 		// do we continue uploading?
-		callWriteData = data.dev != 0;
+		callWriteData = data.dev != nullptr;
 	}
 }
 
@@ -658,7 +657,7 @@ void QFtpDTP::setupSocket()
 void QFtpDTP::clearData()
 {
 	is_ba = false;
-	data.dev = 0;
+	data.dev = nullptr;
 }
 
 /**********************************************************************
@@ -670,7 +669,7 @@ QFtpPI::QFtpPI(QObject * parent) : QObject(parent),
                                    rawCommand(false),
                                    transferConnectionExtended(true),
                                    dtp(this),
-                                   commandSocket(0),
+                                   commandSocket(nullptr),
                                    state(Begin), abortState(None),
                                    currentCmd(QString()),
                                    waitForDtpToConnect(false),
@@ -2068,10 +2067,10 @@ QFtp::Command QFtp::currentCommand() const
 QIODevice * QFtp::currentDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	QFtpCommand * c = d->pending.first();
 	if(c->is_ba)
-		return 0;
+		return nullptr;
 	return c->data.dev;
 }
 
diff --git a/src/modules/objects/qtftp/qftp.h b/src/modules/objects/qtftp/qftp.h
index 68c14e46d..f9b6ff1df 100644
--- a/src/modules/objects/qtftp/qftp.h
+++ b/src/modules/objects/qtftp/qftp.h
@@ -143,7 +143,8 @@ public:
 public Q_SLOTS:
 	void abort();
 
-	Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+	void stateChanged(int);
 	void listInfo(const QUrlInfo &);
 	void readyRead();
 	void dataTransferProgress(qint64, qint64);
@@ -239,8 +240,7 @@ private:
 
 	// If is_ba is true, ba is used; ba is never 0.
 	// Otherwise dev is used; dev can be 0 or not.
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp
index 9e7849354..2df6adfdb 100644
--- a/src/modules/objects/qtftp/qurlinfo.cpp
+++ b/src/modules/objects/qtftp/qurlinfo.cpp
@@ -126,7 +126,7 @@ public:
 
 QUrlInfo::QUrlInfo()
 {
-	d = 0;
+	d = nullptr;
 }
 
 /*!
@@ -142,7 +142,7 @@ QUrlInfo::QUrlInfo(const QUrlInfo & ui)
 	}
 	else
 	{
-		d = 0;
+		d = nullptr;
 	}
 }
 
@@ -442,7 +442,7 @@ QUrlInfo & QUrlInfo::operator=(const QUrlInfo & ui)
 	else
 	{
 		delete d;
-		d = 0;
+		d = nullptr;
 	}
 	return *this;
 }
@@ -684,7 +684,7 @@ bool QUrlInfo::equal(const QUrlInfo & i1, const QUrlInfo & i2,
 bool QUrlInfo::operator==(const QUrlInfo & other) const
 {
 	if(!d)
-		return other.d == 0;
+		return other.d == nullptr;
 	if(!other.d)
 		return false;
 
@@ -710,7 +710,7 @@ bool QUrlInfo::operator==(const QUrlInfo & other) const
 */
 bool QUrlInfo::isValid() const
 {
-	return d != 0;
+	return d != nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index 8dd437451..dbecaa42e 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -76,8 +76,7 @@ public:
 		id = idCounter.fetchAndAddRelaxed(1);
 	}
 	virtual ~QHttpRequest()
-	{
-	}
+	    = default;
 
 	virtual void start(QHttp *) = 0;
 	virtual bool hasRequestHeader();
@@ -99,10 +98,10 @@ public:
 	Q_DECLARE_PUBLIC(QHttp)
 
 	inline QHttpPrivate(QHttp * parent)
-	    : socket(0), reconnectAttempts(2),
+	    : socket(nullptr), reconnectAttempts(2),
 	      deleteSocket(0), state(QHttp::Unconnected),
 	      error(QHttp::NoError), port(0), mode(QHttp::ConnectionModeHttp),
-	      toDevice(0), postDevice(0), bytesDone(0), chunkedSize(-1),
+	      toDevice(nullptr), postDevice(nullptr), bytesDone(0), chunkedSize(-1),
 	      repost(false), pendingPost(false), q_ptr(parent)
 	{
 	}
@@ -216,26 +215,25 @@ public:
 		data.ba = d;
 	}
 
-	~QHttpNormalRequest()
+	~QHttpNormalRequest() override
 	{
 		if(is_ba)
 			delete data.ba;
 	}
 
-	void start(QHttp *);
-	bool hasRequestHeader();
-	QHttpRequestHeader requestHeader();
+	void start(QHttp *) override;
+	bool hasRequestHeader() override;
+	QHttpRequestHeader requestHeader() override;
 	inline void setRequestHeader(const QHttpRequestHeader & h) { header = h; }
 
-	QIODevice * sourceDevice();
-	QIODevice * destinationDevice();
+	QIODevice * sourceDevice() override;
+	QIODevice * destinationDevice() override;
 
 protected:
 	QHttpRequestHeader header;
 
 private:
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
@@ -246,7 +244,7 @@ private:
 void QHttpNormalRequest::start(QHttp * http)
 {
 	if(!http->d->socket)
-		http->d->setSock(0);
+		http->d->setSock(nullptr);
 	http->d->header = header;
 
 	if(is_ba)
@@ -255,7 +253,7 @@ void QHttpNormalRequest::start(QHttp * http)
 		if(http->d->buffer.size() >= 0)
 			http->d->header.setContentLength(http->d->buffer.size());
 
-		http->d->postDevice = 0;
+		http->d->postDevice = nullptr;
 	}
 	else
 	{
@@ -269,14 +267,14 @@ void QHttpNormalRequest::start(QHttp * http)
 		}
 		else
 		{
-			http->d->postDevice = 0;
+			http->d->postDevice = nullptr;
 		}
 	}
 
 	if(to && (to->isOpen() || to->open(QIODevice::WriteOnly)))
 		http->d->toDevice = to;
 	else
-		http->d->toDevice = 0;
+		http->d->toDevice = nullptr;
 
 	http->d->reconnectAttempts = 2;
 	http->d->_q_slotSendRequest();
@@ -295,7 +293,7 @@ QHttpRequestHeader QHttpNormalRequest::requestHeader()
 QIODevice * QHttpNormalRequest::sourceDevice()
 {
 	if(is_ba)
-		return 0;
+		return nullptr;
 	return data.dev;
 }
 
@@ -325,11 +323,9 @@ public:
 	{
 	}
 
-	~QHttpPGHRequest()
-	{
-	}
+	~QHttpPGHRequest() override = default;
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 };
 
 void QHttpPGHRequest::start(QHttp * http)
@@ -355,15 +351,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -404,15 +400,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -443,7 +439,7 @@ public:
 		this->proxy = proxy;
 	}
 
-	inline void start(QHttp * http)
+	inline void start(QHttp * http) override
 	{
 		http->d->proxy = proxy;
 		QString user = proxy.user();
@@ -455,13 +451,13 @@ public:
 		http->d->finishedWithSuccess();
 	}
 
-	inline QIODevice * sourceDevice()
+	inline QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	inline QIODevice * destinationDevice()
+	inline QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -483,15 +479,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -516,15 +512,15 @@ public:
 	QHttpCloseRequest()
 	{
 	}
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 };
 
@@ -537,7 +533,7 @@ class QHttpHeaderPrivate
 {
 	Q_DECLARE_PUBLIC(QHttpHeader)
 public:
-	inline virtual ~QHttpHeaderPrivate() {}
+	inline virtual ~QHttpHeaderPrivate() = default;
 
 	QList<QPair<QString, QString>> values;
 	bool valid;
@@ -663,8 +659,7 @@ QHttpHeader::QHttpHeader(QHttpHeaderPrivate & dd, const QHttpHeader & header)
     Destructor.
 */
 QHttpHeader::~QHttpHeader()
-{
-}
+    = default;
 
 /*!
     Assigns \a h and returns a reference to this http header.
@@ -1964,7 +1959,7 @@ qint64 QHttp::bytesAvailable() const
 */
 qint64 QHttp::read(char * data, qint64 maxlen)
 {
-	if(data == 0 && maxlen != 0)
+	if(data == nullptr && maxlen != 0)
 	{
 		qWarning("QHttp::read: Null pointer error");
 		return -1;
@@ -2060,7 +2055,7 @@ QHttpResponseHeader QHttp::lastResponse() const
 QIODevice * QHttp::currentSourceDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	return d->pending.first()->sourceDevice();
 }
 
@@ -2077,7 +2072,7 @@ QIODevice * QHttp::currentSourceDevice() const
 QIODevice * QHttp::currentDestinationDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	return d->pending.first()->destinationDevice();
 }
 
@@ -2286,7 +2281,7 @@ int QHttp::get(const QString & path, QIODevice * to)
 {
 	QHttpRequestHeader header(QLatin1String("GET"), path);
 	header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive"));
-	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, to));
+	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, to));
 }
 
 /*!
@@ -2360,7 +2355,7 @@ int QHttp::head(const QString & path)
 {
 	QHttpRequestHeader header(QLatin1String("HEAD"), path);
 	header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive"));
-	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, 0));
+	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, nullptr));
 }
 
 /*!
@@ -2689,7 +2684,7 @@ void QHttpPrivate::_q_slotClosed()
 		finishedWithError(QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Server closed connection unexpectedly")), QHttp::UnexpectedClose);
 	}
 
-	postDevice = 0;
+	postDevice = nullptr;
 	if(state != QHttp::Closing)
 		setState(QHttp::Closing);
 	QMetaObject::invokeMethod(q, "_q_slotDoFinished", Qt::QueuedConnection);
@@ -2742,7 +2737,7 @@ void QHttpPrivate::_q_slotConnected()
 void QHttpPrivate::_q_slotError(QAbstractSocket::SocketError err)
 {
 	Q_Q(QHttp);
-	postDevice = 0;
+	postDevice = nullptr;
 
 	if(state == QHttp::Connecting || state == QHttp::Reading || state == QHttp::Sending)
 	{
@@ -2831,7 +2826,7 @@ void QHttpPrivate::postMoreData()
 		}
 		if(postDevice->atEnd())
 		{
-			postDevice = 0;
+			postDevice = nullptr;
 		}
 
 		socket->write(arr, n);
@@ -3024,7 +3019,7 @@ void QHttpPrivate::_q_slotReadyRead()
 	else
 	{
 		qint64 n = socket->bytesAvailable();
-		QByteArray * arr = 0;
+		QByteArray * arr = nullptr;
 		if(chunkedSize != -1)
 		{
 			// transfer-encoding is chunked
@@ -3139,7 +3134,7 @@ void QHttpPrivate::_q_slotReadyRead()
 				qint64 bytesWritten;
 				bytesWritten = toDevice->write(*arr, n);
 				delete arr;
-				arr = 0;
+				arr = nullptr;
 				// if writing to the device does not succeed, quit with error
 				if(bytesWritten == -1 || bytesWritten < n)
 				{
@@ -3162,7 +3157,7 @@ void QHttpPrivate::_q_slotReadyRead()
 				char * ptr = rba.reserve(arr->size());
 				memcpy(ptr, arr->data(), arr->size());
 				delete arr;
-				arr = 0;
+				arr = nullptr;
 #if defined(QHTTP_DEBUG)
 				qDebug("QHttp::_q_slotReadyRead(): read %lld bytes (%lld bytes done)", n, bytesDone + q->bytesAvailable());
 #endif
@@ -3263,7 +3258,7 @@ void QHttpPrivate::closeConn()
 	if(state == QHttp::Closing || state == QHttp::Unconnected)
 		return;
 
-	postDevice = 0;
+	postDevice = nullptr;
 	setState(QHttp::Closing);
 
 	// Already closed ?
@@ -3289,7 +3284,7 @@ void QHttpPrivate::setSock(QTcpSocket * sock)
 		delete socket;
 
 	// use the new QTcpSocket socket, or create one if socket is 0.
-	deleteSocket = (sock == 0);
+	deleteSocket = (sock == nullptr);
 	socket = sock;
 	if(!socket)
 	{
diff --git a/src/modules/objects/qthttp/qhttp.h b/src/modules/objects/qthttp/qhttp.h
index f40361656..3e622e943 100644
--- a/src/modules/objects/qthttp/qhttp.h
+++ b/src/modules/objects/qthttp/qhttp.h
@@ -252,7 +252,8 @@ public Q_SLOTS:
 	void ignoreSslErrors();
 #endif
 
-	Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+	void stateChanged(int);
 	void responseHeaderReceived(const QHttpResponseHeader & resp);
 	void readyRead(const QHttpResponseHeader & resp);
 
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index afe462a98..c6063c6c4 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -132,7 +132,7 @@ static QByteArray qNtlmPhase3(QHttpAuthenticatorPrivate * ctx, const QByteArray
   Constructs an empty authentication object
 */
 QHttpAuthenticator::QHttpAuthenticator()
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -388,9 +388,8 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray,
     */
 
 	QByteArray headerVal;
-	for(int i = 0; i < values.size(); ++i)
+	for(const auto & current : values)
 	{
-		const QPair<QByteArray, QByteArray> & current = values.at(i);
 		if(current.first.toLower() != search)
 			continue;
 		QByteArray str = current.second.toLower();
@@ -443,7 +442,7 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray,
 QByteArray QHttpAuthenticatorPrivate::calculateResponse(const QByteArray & requestMethod, const QByteArray & path)
 {
 	QByteArray response;
-	const char * methodString = 0;
+	const char * methodString = nullptr;
 	switch(method)
 	{
 		case QHttpAuthenticatorPrivate::None:
@@ -1219,7 +1218,7 @@ QByteArray qEncodeHmacMd5(QByteArray & key, const QByteArray & message)
 static QByteArray qCreatev2Hash(const QHttpAuthenticatorPrivate * ctx,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// since v2 Hash is need for both NTLMv2 and LMv2 it is calculated
 	// only once and stored and reused
 	if(phase3->v2Hash.size() == 0)
@@ -1277,7 +1276,7 @@ static QByteArray qEncodeNtlmv2Response(const QHttpAuthenticatorPrivate * ctx,
     const QNtlmPhase2Block & ch,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// return value stored in phase3
 	qCreatev2Hash(ctx, phase3);
 
@@ -1352,7 +1351,7 @@ static QByteArray qEncodeLmv2Response(const QHttpAuthenticatorPrivate * ctx,
     const QNtlmPhase2Block & ch,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// return value stored in phase3
 	qCreatev2Hash(ctx, phase3);