Merge branch 'master' into python3

65 files changed, 302 insertions, 294 deletions

diff --git a/src/modules/objects/KvsObject_button.h b/src/modules/objects/KvsObject_button.h
index 45e1e3408..cb8758d57 100644
--- a/src/modules/objects/KvsObject_button.h
+++ b/src/modules/objects/KvsObject_button.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool text(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_checkBox.h b/src/modules/objects/KvsObject_checkBox.h
index 1db7575f8..68dca40ff 100644
--- a/src/modules/objects/KvsObject_checkBox.h
+++ b/src/modules/objects/KvsObject_checkBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setChecked(KviKvsObjectFunctionCall * c);
 	bool isChecked(KviKvsObjectFunctionCall * c);
 	bool toggleEvent(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_colorDialog.h b/src/modules/objects/KvsObject_colorDialog.h
index 35321731c..a6d37121f 100644
--- a/src/modules/objects/KvsObject_colorDialog.h
+++ b/src/modules/objects/KvsObject_colorDialog.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); }
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setCurrentColor(KviKvsObjectFunctionCall * c);
 	bool currentColorChangedEvent(KviKvsObjectFunctionCall * c);
 	bool colorSelectedEvent(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 331f3fe5a..e4ec1924c 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -306,8 +306,6 @@ KVSO_CLASS_FUNCTION(comboBox, setCurrentItem)
 }
 KVSO_CLASS_FUNCTION(comboBox, popup)
 {
-	Q_UNUSED(c);
-
 	if(widget())
 		((QComboBox *)widget())->showPopup();
 	return true;
diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h
index 2d14c01f9..dc0376229 100644
--- a/src/modules/objects/KvsObject_comboBox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -37,7 +37,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool changeItem(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.h b/src/modules/objects/KvsObject_dateTimeEdit.h
index f10340900..400c32f8a 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.h
+++ b/src/modules/objects/KvsObject_dateTimeEdit.h
@@ -39,7 +39,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool date(KviKvsObjectFunctionCall * c);
 	bool setDate(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_dialog.h b/src/modules/objects/KvsObject_dialog.h
index 14c2b668c..9975d944b 100644
--- a/src/modules/objects/KvsObject_dialog.h
+++ b/src/modules/objects/KvsObject_dialog.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setModal(KviKvsObjectFunctionCall * c);
 };
 
diff --git a/src/modules/objects/KvsObject_dockWindow.h b/src/modules/objects/KvsObject_dockWindow.h
index dab239f54..0fe56de9c 100644
--- a/src/modules/objects/KvsObject_dockWindow.h
+++ b/src/modules/objects/KvsObject_dockWindow.h
@@ -34,7 +34,7 @@ class KvsObject_dockWindow : public KvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_dockWindow)
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addWidget(KviKvsObjectFunctionCall * c);
 	bool setAllowedDockAreas(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index d0f773b85..2b2e10746 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -93,12 +93,12 @@ const QIODevice::OpenMode mod_cod[] = {
 		Attempts to open the file in specified mode or modes [i]sum[/i].
 		Valid modes are:[br]
 		[pre]
-			RAW     - RAW, non-buffered access[br]
-			ReadOnly     - opens the file read-only[br]
-			WriteOnly    - opens the file write-only[br]
-			ReadWrite    - opens the file in read-write mode[br]
-			Append       - opens the file in append mode. The file index is set to the end of the file.[br]
-			Truncate     - truncates the file[br]
+			RAW     - RAW, non-buffered access
+			ReadOnly     - opens the file read-only
+			WriteOnly    - opens the file write-only
+			ReadWrite    - opens the file in read-write mode
+			Append       - opens the file in append mode. The file index is set to the end of the file.
+			Truncate     - truncates the file
 		[/pre]
 		If you call this function without any parameters, the file is
 		opened in read-only mode.[br]
@@ -335,8 +335,8 @@ KVSO_CLASS_FUNCTION(file, putch)
 	KVSO_PARAMETERS_END(c)
 	if(szChar.length() > 1)
 		c->warning(__tr2qs_ctx("Argument too long, using only first char", "objects"));
-	const char * ch = szChar.toUtf8().data();
-	if(!m_pFile->putChar(ch[0]))
+	QByteArray szCh = szChar.toUtf8();
+	if(!m_pFile->putChar(szCh[0]))
 		c->warning(__tr2qs_ctx("Write error occurred!", "objects"));
 	return true;
 }
@@ -375,8 +375,8 @@ KVSO_CLASS_FUNCTION(file, unGetch)
 	KVSO_PARAMETERS_END(c)
 	if(szChar.length() > 1)
 		c->warning(__tr2qs_ctx("Argument too long, using only the first char", "objects"));
-	const char * ch = szChar.toUtf8().data();
-	m_pFile->ungetChar(ch[0]);
+	QByteArray szCh = szChar.toUtf8();
+	m_pFile->ungetChar(szCh[0]);
 	return true;
 }
 
@@ -554,8 +554,8 @@ KVSO_CLASS_FUNCTION(file, writeBlock)
 			}
 			QString szBlock;
 			pVariantData->asString(szBlock);
-			const char * block = szBlock.toUtf8().data();
-			int rlen = m_pFile->write(block, uLen);
+			QByteArray block = szBlock.toUtf8();
+			int rlen = m_pFile->write(block.data(), uLen);
 			c->returnValue()->setInteger(rlen);
 		}
 	}
diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h
index 50cf5a78e..f2506d6fa 100644
--- a/src/modules/objects/KvsObject_groupBox.h
+++ b/src/modules/objects/KvsObject_groupBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTitle(KviKvsObjectFunctionCall * c);
 	bool title(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_hBox.h b/src/modules/objects/KvsObject_hBox.h
index ef2ce93ca..e94717587 100644
--- a/src/modules/objects/KvsObject_hBox.h
+++ b/src/modules/objects/KvsObject_hBox.h
@@ -34,7 +34,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setMargin(KviKvsObjectFunctionCall * c);
 	bool setSpacing(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 6d9ebf848..da4744cbd 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -120,21 +120,21 @@ const int frame_cod[] = {
 		Returns a string containing alignment flags that are set for
 		this label. The flags are separated by commas.[br]
 		An example output could look like this:[br]
-		[pre]Bottom, Right[/pre][br]
+		[pre]Bottom, Right[/pre]
 		See [classfnc]$setAlignment[/classfnc]() for explanation of all
 		alignment flags.
 		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
 		This function sets alignment flags, given as parameters, for
 		this label. Valid flags are:
 		[pre]
-			Right     - Text is aligned to right border[br]
-			Left      - Text is aligned to left border[br]
-			Top       - Text is aligned to the top border[br]
-			Bottom    - Text is aligned to the bottom border[br]
-			HCenter   - Text is horizontally centered[br]
-			VCenter   - Text is vertically centered[br]
-			Center    - Equals HCenter + VCenter[br]
-			Justify   - Text is spaced apart to cover available room[br]
+			Right     - Text is aligned to right border
+			Left      - Text is aligned to left border
+			Top       - Text is aligned to the top border
+			Bottom    - Text is aligned to the bottom border
+			HCenter   - Text is horizontally centered
+			VCenter   - Text is vertically centered
+			Center    - Equals HCenter + VCenter
+			Justify   - Text is spaced apart to cover available room
 		[/pre]
 		It is obvious that you can not set [i]Right[/i]
 		and [i]Left[/i] simultaneously - this will [b]not[/b]
@@ -153,17 +153,17 @@ const int frame_cod[] = {
 		The flags determine the shape or shadow of the
 		label's frame. Valid shape flags are:[br]
 		[pre]
-			NoFrame   - Draw no frame. You shouldn't specify a shadow when using this.[br]
-			Box       - Draws a rectangular box. Its borders can be [i]Raised[/i] or [i]Sunken[/i][br]
-			Panel     - Draws a rectangular panel which can be [i]Raised[/i] or [i]Sunken[/i][br]
-			WinPanel  - Similar to [i]Panel[/i], but is more in Win95 style[br]
+			NoFrame   - Draw no frame. You shouldn't specify a shadow when using this.
+			Box       - Draws a rectangular box. Its borders can be [i]Raised[/i] or [i]Sunken[/i]
+			Panel     - Draws a rectangular panel which can be [i]Raised[/i] or [i]Sunken[/i]
+			WinPanel  - Similar to [i]Panel[/i], but is more in Win95 style
 			Hline     - Draws a horizontal line that frames nothing (useful as separator)
 		[/pre]
 		Valid shadow flags are:[br]
 		[pre]
-			Plain     - No 3D effect (draws using foreground color)[br]
-			Raised    - Makes the label look like it was raised above the parent widget[br]
-			Sunken    - Makes the label look like it was [i]pushed[/i] inside the parent widget[br]
+			Plain     - No 3D effect (draws using foreground color)
+			Raised    - Makes the label look like it was raised above the parent widget
+			Sunken    - Makes the label look like it was [i]pushed[/i] inside the parent widget
 		[/pre]
 		!fn: $setImage(<image_id>)
 		Sets the image to be displayed on this label.
diff --git a/src/modules/objects/KvsObject_label.h b/src/modules/objects/KvsObject_label.h
index 1382c60f6..de6728ab2 100644
--- a/src/modules/objects/KvsObject_label.h
+++ b/src/modules/objects/KvsObject_label.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTitle(KviKvsObjectFunctionCall * c);
 	bool setText(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index 2c57a60fd..b48e5b2e7 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -98,10 +98,10 @@ const int align_cod[] = {
 		Sets the resize mode of the parent widget in relation to this layout.
 		<mode> can be one of:[br]
 		[pre]
-			-Auto: this is the default[br]
-			-Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
-			-Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller[br]
-			-FreeResize: the parent widget of this layout is not constrained at all[br]
+			-Auto: this is the default
+			-Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.
+			-Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller
+			-FreeResize: the parent widget of this layout is not constrained at all
 		[/pre]
 */
 
diff --git a/src/modules/objects/KvsObject_layout.h b/src/modules/objects/KvsObject_layout.h
index 99b0c1238..c41a01e66 100644
--- a/src/modules/objects/KvsObject_layout.h
+++ b/src/modules/objects/KvsObject_layout.h
@@ -33,7 +33,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addWidget(KviKvsObjectFunctionCall * c);
 	bool addMultiCellWidget(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_lcd.h b/src/modules/objects/KvsObject_lcd.h
index 3595aa164..f1a923906 100644
--- a/src/modules/objects/KvsObject_lcd.h
+++ b/src/modules/objects/KvsObject_lcd.h
@@ -34,7 +34,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool displayStr(KviKvsObjectFunctionCall * c);
 	bool setMode(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index 8af1498ce..daeea0142 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -72,9 +72,9 @@ static const int mode_cod[] = {
 		!fn: $setEchoMode(<echo_mode:string>)
 		Sets the line edit's echo mode. Possible value are:[br]
 		[pre]
-			-Normal: display chars as they entered[br]
-			-Noecho: do not display anything[br]
-			-Password: display asterisks instead of the characters actually entered[br]
+			-Normal: display chars as they entered
+			-Noecho: do not display anything
+			-Password: display asterisks instead of the characters actually entered
 		[/pre]
 		See also [classfnc]$echoMode[/classfnc]().
 		!fn: <string> $echoMode()
diff --git a/src/modules/objects/KvsObject_lineEdit.h b/src/modules/objects/KvsObject_lineEdit.h
index a004190a2..92e1d8754 100644
--- a/src/modules/objects/KvsObject_lineEdit.h
+++ b/src/modules/objects/KvsObject_lineEdit.h
@@ -42,7 +42,7 @@ protected:
 	QCompleter * m_pCompleter;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setCompleter(KviKvsObjectFunctionCall * c);
 	bool enableCompleter(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp
index 25ccf5dfc..83bc9ca5c 100644
--- a/src/modules/objects/KvsObject_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -26,7 +26,7 @@
 #include "KviMemory.h"
 #include "KviLocale.h"
 #include "KvsObject_list.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 /*
 	@doc: list
@@ -48,6 +48,23 @@
 		[classfnc:list]$moveNext[/classfnc](),[classfnc:list]$movePrev[/classfnc](),
 		[classfnc:list]$current[/classfnc]() and [classfnc:list]$eof[/classfnc]() functions.
 	@functions:
+		!fn: $sort(<bReverse:bool>)
+		Sorts items in the list alphabetically ($true) or in reverse order ($false); Default to $false.
+		[example]
+			%list=$new(list);[br]
+			%list->$append('Foo');[br]
+			%list->$append('Bar');[br]
+			%list->$append('Dummy');[br]
+			%list->$append('Aria');[br]
+			[br]
+			%list->$sort(true);[br]
+			%list->$moveFirst();[br]
+			while(%list->$eof())[br]
+			{[br]
+			  echo %list->$current();[br]
+			  %list->$moveNext();[br]
+			}[br]
+		[/example]
 		!fn: <integer> $count()
 		Returns the number of items in the list
 		!fn: <boolean> $isEmpty()
@@ -168,7 +185,7 @@ KVSO_CLASS_FUNCTION(list, current)
 KVSO_CLASS_FUNCTION(list, eof)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->current() != nullptr);
+	c->returnValue()->setBoolean(m_pDataList->safeCurrent() != nullptr);
 	return true;
 }
 
@@ -299,7 +316,7 @@ KVSO_CLASS_FUNCTION(list, clear)
 	return true;
 }
 
-inline int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2)
+int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2)
 {
 	return p1->compare(p2);
 }
@@ -307,7 +324,13 @@ inline int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2)
 KVSO_CLASS_FUNCTION(list, sort)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
+	bool bReverse;
+	KVSO_PARAMETERS_BEGIN(c)
+	KVSO_PARAMETER("bReverse", KVS_PT_BOOL, KVS_PF_OPTIONAL, bReverse)
+	KVSO_PARAMETERS_END(c)
 	m_pDataList->sort();
+	if(bReverse)
+		m_pDataList->invert();
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index df2db43a1..e7a634f57 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -288,7 +288,7 @@ KVSO_CLASS_FUNCTION(listWidget, isChecked)
 	QListWidgetItem * pItem = ((QListWidget *)widget())->item(iIdx);
 	if(!pItem)
 		return true;
-	c->returnValue()->setBoolean(pItem->checkState() == Qt::Checked ? 1 : 0);
+	c->returnValue()->setBoolean(pItem->checkState() == Qt::Checked ? true : false);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_listWidget.h b/src/modules/objects/KvsObject_listWidget.h
index c1eb80fcb..90a6b14c4 100644
--- a/src/modules/objects/KvsObject_listWidget.h
+++ b/src/modules/objects/KvsObject_listWidget.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool changeItem(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_mainWindow.h b/src/modules/objects/KvsObject_mainWindow.h
index 88eb727bd..01e1f0859 100644
--- a/src/modules/objects/KvsObject_mainWindow.h
+++ b/src/modules/objects/KvsObject_mainWindow.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setCentralWidget(KviKvsObjectFunctionCall * c);
 };
diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h
index f0bcd5c14..a1e8a5478 100644
--- a/src/modules/objects/KvsObject_menuBar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 };
diff --git a/src/modules/objects/KvsObject_multiLineEdit.h b/src/modules/objects/KvsObject_multiLineEdit.h
index a17bbb39b..576715d59 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.h
+++ b/src/modules/objects/KvsObject_multiLineEdit.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool functionTextLine(KviKvsObjectFunctionCall * c);
 	bool functionInsertLine(KviKvsObjectFunctionCall * c);
 	bool functionRemoveLine(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 2c447d368..4918253d3 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -235,10 +235,10 @@ const char * const brushstyles_tbl[] = {
 		All parameters are in integer form.
 		The HSV system, like RGB, has three components:[br]
 		[pre]
-			* H, for hue, is either 0-359 if the color is chromatic (not gray), or meaningless if it is gray.[br]
-			It represents degrees on the color wheel familiar to most people. Red is 0 (degrees), green is 120 and blue is 240.[br]
-			* S, for saturation, is 0-255, and the bigger it is, the stronger the color is. Grayish colors have saturation near 0; very strong colors have saturation near 255.[br]
-			* V, for value, is 0-255 and represents lightness or brightness of the color. 0 is black; 255 is as far from black as possible.[br]
+			* H, for hue, is either 0-359 if the color is chromatic (not gray), or meaningless if it is gray.
+			It represents degrees on the color wheel familiar to most people. Red is 0 (degrees), green is 120 and blue is 240.
+			* S, for saturation, is 0-255, and the bigger it is, the stronger the color is. Grayish colors have saturation near 0; very strong colors have saturation near 255.
+			* V, for value, is 0-255 and represents lightness or brightness of the color. 0 is black; 255 is as far from black as possible.
 		[/pre]
 		Examples: [b]Red[/b] is H=0, S=255, V=255.[br]
 		Light red could have H about 0, S about 50-100, and S=255.
@@ -284,17 +284,17 @@ const char * const brushstyles_tbl[] = {
 		Draws the given <text> within the rectangle specified by <x>,<y> <width> and <height>.[br]
 		The <flag> parameters may be:[br]
 		[pre]
-			Left[br]
-			Top[br]
-			Right[br]
-			Bottom[br]
-			HCenter[br]
-			VCenter[br]
-			Center[br]
-			TextSingleLine[br]
-			TextExpandTabs[br]
-			TextShowMnemonic[br]
-			TextWordWrap[br]
+			Left
+			Top
+			Right
+			Bottom
+			HCenter
+			VCenter
+			Center
+			TextSingleLine
+			TextExpandTabs
+			TextShowMnemonic
+			TextWordWrap
 			TextIncludeTrailingSpaces
 		[/pre]
 		!fn: $drawPixmap(<x:integer>,<y:integer>,<pixmap:hobject>,<sx:integer>,<sy:integer>,<ex:integer>,<ey:integer>)
@@ -302,12 +302,12 @@ const char * const brushstyles_tbl[] = {
 		!fn: $setFont(<family:string>,<size:integer>[,<style:enum>,<style:enum>,..])[br]
 		Set the font's family, size and style, valid flag for style are:[br]
 		[pre]
-			italic[br]
-			bold [br]
-			underline [br]
-			overline [br]
-			strikeout [br]
-			fixedpitch [br]
+			italic
+			bold
+			underline
+			overline
+			strikeout
+			fixedpitch
 		[/pre]
 		!fn: $setFontSize(<size:unsigned integer>)[br]
 		Set the current painter font's size.[br]
@@ -333,7 +333,7 @@ const char * const brushstyles_tbl[] = {
 		Sets the background mode of the painter to <bgMode>:
 		Valid values are:[br]
 		[pre]
-			- Transparent (that is the default value);[br]
+			- Transparent (that is the default value);
 			- Opaque.
 		[/pre]
 		!fn: $setOpacity(<opacity_factor:real>)
@@ -418,7 +418,7 @@ const char * const brushstyles_tbl[] = {
 				if ($$->%scrollright >= 550) return
 				%P->$scale(0.$$->%Zoomindex,0.$$->%Zoomindex)
 				%P->$translate(400,350)
-				%P->$drawText($$->%scrollright,10,"Another cool class brought to you by...",-1,Auto)	
+				%P->$drawText($$->%scrollright,10,"Another cool class brought to you by...",-1,Auto)
 				$$->%scrollright += 3;
 				%P->$reset()
 			}
@@ -1271,8 +1271,6 @@ void KvsObject_painter::detachDevice()
 
 KVSO_CLASS_FUNCTION(painter, end)
 {
-	Q_UNUSED(c);
-
 	if(!m_pDeviceObject)
 	{
 		m_pPainter->end();
@@ -1958,7 +1956,6 @@ KVSO_CLASS_FUNCTION(painter, setGradientAsBrush)
 
 KVSO_CLASS_FUNCTION(painter, clearGradient)
 {
-	Q_UNUSED(c);
 	if(!m_pGradient)
 		delete m_pGradient;
 	m_pGradient = nullptr;
@@ -2113,7 +2110,7 @@ KVSO_CLASS_FUNCTION(painter, drawPath)
 	CHECK_INTERNAL_POINTER(m_pPainter)
 	m_pPainter->drawPath(*m_pPainterPath);
 	//delete m_pPainterPath;
-	//m_pPainterPath=0;
+	//m_pPainterPath=nullptr;
 	return true;
 }
 
@@ -2144,7 +2141,6 @@ KVSO_CLASS_FUNCTION(painter, setCompositionMode)
 }
 KVSO_CLASS_FUNCTION(painter, resetPath)
 {
-	Q_UNUSED(c);
 	if(m_pPainterPath)
 	{
 		delete m_pPainterPath;
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index c2b56476d..e3ef0a5c8 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -533,7 +533,6 @@ KVSO_CLASS_FUNCTION(pixmap, loadAnimation)
 
 KVSO_CLASS_FUNCTION(pixmap, startAnimation)
 {
-	Q_UNUSED(c);
 	if(m_pAnimatedPixmap)
 		m_pAnimatedPixmap->start();
 	return true;
@@ -541,7 +540,6 @@ KVSO_CLASS_FUNCTION(pixmap, startAnimation)
 
 KVSO_CLASS_FUNCTION(pixmap, stopAnimation)
 {
-	Q_UNUSED(c);
 	if(m_pAnimatedPixmap)
 		m_pAnimatedPixmap->stop();
 	return true;
diff --git a/src/modules/objects/KvsObject_pixmap.h b/src/modules/objects/KvsObject_pixmap.h
index 35874f1f6..63b4de5c4 100644
--- a/src/modules/objects/KvsObject_pixmap.h
+++ b/src/modules/objects/KvsObject_pixmap.h
@@ -58,7 +58,7 @@ public:
 			{
 				*m_pImage = m_pPixmap->toImage();
 				delete m_pPixmap;
-				m_pPixmap = 0;
+				m_pPixmap = nullptr;
 			}
 		}
 		m_currentType = Image;
@@ -75,7 +75,7 @@ public:
 			{
 				*m_pPixmap = m_pPixmap->fromImage(*m_pImage);
 				delete m_pImage;
-				m_pImage = 0;
+				m_pImage = nullptr;
 			}
 		}
 		m_currentType = Pixmap;
diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 67624bf72..ac52f7744 100644
--- a/src/modules/objects/KvsObject_popupMenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -38,7 +38,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool setTitle(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_progressBar.h b/src/modules/objects/KvsObject_progressBar.h
index 4a957ae20..284753c45 100644
--- a/src/modules/objects/KvsObject_progressBar.h
+++ b/src/modules/objects/KvsObject_progressBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setProgress(KviKvsObjectFunctionCall * c);
 	bool setTotalSteps(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_radioButton.h b/src/modules/objects/KvsObject_radioButton.h
index b57cd3801..81af5d1c9 100644
--- a/src/modules/objects/KvsObject_radioButton.h
+++ b/src/modules/objects/KvsObject_radioButton.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool isChecked(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_slider.cpp b/src/modules/objects/KvsObject_slider.cpp
index 73b71937e..b36350810 100644
--- a/src/modules/objects/KvsObject_slider.cpp
+++ b/src/modules/objects/KvsObject_slider.cpp
@@ -67,11 +67,11 @@
 		Sets the tickmark settings for this slider.[br]
 		Values are:[br]
 		[pre]
-			NoMarks - do not draw any tickmarks.[br]
-			Both - draw tickmarks on both sides of the groove.[br]
-			Above - draw tickmarks above the (horizontal) slider[br]
-			Below - draw tickmarks below the (horizontal) slider[br]
-			Left - draw tickmarks to the left of the (vertical) slider[br]
+			NoMarks - do not draw any tickmarks.
+			Both - draw tickmarks on both sides of the groove.
+			Above - draw tickmarks above the (horizontal) slider
+			Below - draw tickmarks below the (horizontal) slider
+			Left - draw tickmarks to the left of the (vertical) slider
 			Right - draw tickmarks to the right of the (vertical) slider
 		[/pre]
 		!fn: $setTickInterval(<value>)
diff --git a/src/modules/objects/KvsObject_slider.h b/src/modules/objects/KvsObject_slider.h
index 953add8a9..5ce6ae201 100644
--- a/src/modules/objects/KvsObject_slider.h
+++ b/src/modules/objects/KvsObject_slider.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTracking(KviKvsObjectFunctionCall * c);
 	bool setValue(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 92f2e3db9..b1e492c7e 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -101,10 +101,10 @@ const char * const sockerrors_tbl[] = {
 		[pre]
 			0 = Unconnected
 			1 = HostLookUp
-			2 = Connecting[br]
-			3 = Connected[br]
-			4 = Bound[br]
-			5 = Closing[br]
+			2 = Connecting
+			3 = Connected
+			4 = Bound
+			5 = Closing
 			6 = Listening
 		[/pre]
 		!fn: $connect(<host>,<port>)
@@ -325,7 +325,6 @@ KVSO_CLASS_FUNCTION(socket, status)
 
 KVSO_CLASS_FUNCTION(socket, close)
 {
-	Q_UNUSED(c);
 	m_pSocket->disconnectFromHost();
 	return true;
 }
@@ -408,7 +407,7 @@ KVSO_CLASS_FUNCTION(socket, read)
 		// convert NULLS to char 255
 		char * buffer = (char *)KviMemory::allocate(iLen);
 		m_pSocket->read(buffer, iLen);
-		for(size_t i{}; i < iLen; i++)
+		for(int i{}; i < iLen; i++)
 		{
 			if(!buffer[i])
 				buffer[i] = (char)(255);
diff --git a/src/modules/objects/KvsObject_socket.h b/src/modules/objects/KvsObject_socket.h
index 2bb623be9..09c8159eb 100644
--- a/src/modules/objects/KvsObject_socket.h
+++ b/src/modules/objects/KvsObject_socket.h
@@ -35,13 +35,13 @@ class KvsObject_socket : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_socket)
 protected:
-	QAbstractSocket * m_pSocket;
-	QTcpServer * m_pServer;
-	KviKvsRunTimeContext * m_pContext;
-	bool bIsSetFromExternal;
+	QAbstractSocket * m_pSocket = nullptr;
+	QTcpServer * m_pServer = nullptr;
+	KviKvsRunTimeContext * m_pContext = nullptr;
+	bool bIsSetFromExternal = false;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	const char * getStateString(QAbstractSocket::SocketState);
 
 	void setInternalSocket(QAbstractSocket * pSocket)
diff --git a/src/modules/objects/KvsObject_spinBox.h b/src/modules/objects/KvsObject_spinBox.h
index f0eb2313d..76f25d9e2 100644
--- a/src/modules/objects/KvsObject_spinBox.h
+++ b/src/modules/objects/KvsObject_spinBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTracking(KviKvsObjectFunctionCall * c);
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 7fd68c240..a4c036546 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -27,7 +27,7 @@
 #include "KviLocale.h"
 #include "KvsObject_sql.h"
 #include "KvsObject_memoryBuffer.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <QHash>
 #include <QSqlDriver>
 #include <QSqlError>
@@ -482,8 +482,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
 		else
 			pValue = new KviKvsVariant(QString());
 		pHash->set(record.fieldName(i), pValue);
-		KviKvsVariant * value2 = pHash->get(record.fieldName(i));
-		value2->type();
+		(void)pHash->get(record.fieldName(i));
 	}
 	c->returnValue()->setHash(pHash);
 	return true;
diff --git a/src/modules/objects/KvsObject_tabWidget.h b/src/modules/objects/KvsObject_tabWidget.h
index 9b0b14d1c..5db1f58b3 100644
--- a/src/modules/objects/KvsObject_tabWidget.h
+++ b/src/modules/objects/KvsObject_tabWidget.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	QList<kvs_hobject_t> tabsList;
 
 	bool addTab(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 17c12fd66..d2d7bee17 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -737,28 +737,24 @@ KVSO_CLASS_FUNCTION(tableWidget, setCellWidget)
 
 KVSO_CLASS_FUNCTION(tableWidget, hideHorizontalHeader)
 {
-	Q_UNUSED(c);
 	((QTableWidget *)widget())->horizontalHeader()->hide();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, hideVerticalHeader)
 {
-	Q_UNUSED(c);
 	((QTableWidget *)widget())->verticalHeader()->hide();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, showHorizontalHeader)
 {
-	Q_UNUSED(c);
 	((QTableWidget *)widget())->horizontalHeader()->show();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, showVerticalHeader)
 {
-	Q_UNUSED(c);
 	((QTableWidget *)widget())->verticalHeader()->show();
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_tableWidget.h b/src/modules/objects/KvsObject_tableWidget.h
index b25613c36..416e78f9b 100644
--- a/src/modules/objects/KvsObject_tableWidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -39,15 +39,15 @@ class KvsObject_tableWidget;
 class KviCellItemDelegate : public QItemDelegate
 {
 public:
-	KviCellItemDelegate(QAbstractItemView * pWidget = 0, KvsObject_tableWidget * pParent = 0);
+	KviCellItemDelegate(QAbstractItemView * pWidget = nullptr, KvsObject_tableWidget * pParent = nullptr);
 	~KviCellItemDelegate();
 
 protected:
 	KvsObject_tableWidget * m_pParentScript;
 
 public:
-	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
-	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override;
+	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
 };
 
 class KvsObject_tableWidget : public KvsObject_widget
@@ -60,11 +60,11 @@ public:
 	bool paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index);
 
 protected:
-	KviKvsRunTimeContext * m_pContext;
-	KviCellItemDelegate * m_pCellItemDelegate;
+	KviKvsRunTimeContext * m_pContext = nullptr;
+	KviCellItemDelegate * m_pCellItemDelegate = nullptr;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool setForeground(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_textBrowser.h b/src/modules/objects/KvsObject_textBrowser.h
index a4fc36041..eda1d4ea6 100644
--- a/src/modules/objects/KvsObject_textBrowser.h
+++ b/src/modules/objects/KvsObject_textBrowser.h
@@ -38,7 +38,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setSource(KviKvsObjectFunctionCall * c);
 	bool forward(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_toolBar.h b/src/modules/objects/KvsObject_toolBar.h
index ce6fa0620..7eaa60bae 100644
--- a/src/modules/objects/KvsObject_toolBar.h
+++ b/src/modules/objects/KvsObject_toolBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addSeparator(KviKvsObjectFunctionCall * c);
 	bool setLabel(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_toolButton.h b/src/modules/objects/KvsObject_toolButton.h
index f9dcbb7d7..7cb4e43b4 100644
--- a/src/modules/objects/KvsObject_toolButton.h
+++ b/src/modules/objects/KvsObject_toolButton.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setImage(KviKvsObjectFunctionCall * c);
 	bool setUsesBigPixmap(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index 127be0065..d09523888 100644
--- a/src/modules/objects/KvsObject_trayIcon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -62,10 +62,10 @@
 		Message can be clicked by the user; the messageClickedEvent() will be triggered when this occurs.[br]
 		Valid values for message_icon are:
 		[pre]
-			- NoIcon : No icon is shown.[br]
-			- Information : An information icon is shown.[br]
-			- Warning : A standard warning icon is shown.[br]
-			- Critical : A critical warning icon is shown.[br]
+			- NoIcon : No icon is shown.
+			- Information : An information icon is shown.
+			- Warning : A standard warning icon is shown.
+			- Critical : A critical warning icon is shown.
 		[/pre]
 		!fn: setContextMenu(<popupmenu:hobject>).
 		Associates the given <popupmenu> with the tray icon.
@@ -74,11 +74,11 @@
 		If you reimplement this function the reason parameter will be passed as $0.
 		Values for reason are:[br]
 		[pre]
-			- Unknown : Unknown reason.[br]
-			- Context : The context menu for the tray icon was requested.[br]
-			- DoubleClick : The tray icon was double clicked.[br]
-			- Trigger : The tray icon was clicked.[br]
-			- MiddleClick : The tray icon was clicked with the middle mouse button.[br]
+			- Unknown : Unknown reason.
+			- Context : The context menu for the tray icon was requested.
+			- DoubleClick : The tray icon was double clicked.
+			- Trigger : The tray icon was clicked.
+			- MiddleClick : The tray icon was clicked with the middle mouse button.
 		[/pre]
 		The default implementation emits the [classfnc]$activated[/classfnc]() signal.
 		!fn: messageClickedEvent()
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index afaf389ca..15b8e1a47 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -318,7 +318,6 @@ KVSO_CLASS_FUNCTION(treeWidget, setAcceptDrops)
 
 KVSO_CLASS_FUNCTION(treeWidget, clear)
 {
-	Q_UNUSED(c);
 	if(widget())
 		((QTreeWidget *)object())->clear();
 	return true;
@@ -443,14 +442,12 @@ KVSO_CLASS_FUNCTION(treeWidget, setAllColumnsShowFocus)
 
 KVSO_CLASS_FUNCTION(treeWidget, hideListViewHeader)
 {
-	Q_UNUSED(c);
 	((QTreeWidget *)widget())->header()->hide();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, showListViewHeader)
 {
-	Q_UNUSED(c);
 	((QTreeWidget *)widget())->header()->show();
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_treeWidget.h b/src/modules/objects/KvsObject_treeWidget.h
index db277c107..bfa64c589 100644
--- a/src/modules/objects/KvsObject_treeWidget.h
+++ b/src/modules/objects/KvsObject_treeWidget.h
@@ -42,7 +42,7 @@ public:
 	void fileDropped(QString &, QTreeWidgetItem *);
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setBackgroundImage(KviKvsObjectFunctionCall * c);
 	bool addColumn(KviKvsObjectFunctionCall * c);
@@ -90,15 +90,15 @@ class KviKvsTreeWidget : public QTreeWidget
 	Q_OBJECT
 public:
 	KviKvsTreeWidget(QWidget * par, const char * name, KvsObject_treeWidget *);
-	virtual ~KviKvsTreeWidget();
+	~KviKvsTreeWidget();
 
 protected:
 	KvsObject_treeWidget * m_pParentScript;
 
 protected:
-	void dropEvent(QDropEvent * e);
-	void dragEnterEvent(QDragEnterEvent * e);
-	void dragMoveEvent(QDragMoveEvent * e);
+	void dropEvent(QDropEvent * e) override;
+	void dragEnterEvent(QDragEnterEvent * e) override;
+	void dragMoveEvent(QDragMoveEvent * e) override;
 };
 
 #endif // _CLASS_TREEWIDGET_H_
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index dc38fc591..ca5419f1e 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -345,7 +345,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem, isChecked)
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	c->returnValue()->setBoolean(((QTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0) == Qt::Checked ? 1 : 0);
+	c->returnValue()->setBoolean(((QTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0) == Qt::Checked ? true : false);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index 8d3aa01f6..9e4c13f6e 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -40,7 +40,7 @@ protected:
 	QTreeWidgetItem * m_pTreeWidgetItem;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 protected:
 	bool setText(KviKvsObjectFunctionCall * c);
@@ -68,7 +68,7 @@ class KviKvsStandardTreeWidgetItem : public QTreeWidgetItem
 public:
 	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob, QTreeWidget * par);
 	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob, QTreeWidgetItem * par);
-	virtual ~KviKvsStandardTreeWidgetItem();
+	~KviKvsStandardTreeWidgetItem();
 
 protected:
 	KvsObject_treeWidgetItem * m_pMasterObject;
diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index 76f750fc1..557dd5b35 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -82,15 +82,15 @@ const int align_cod[] = {
 		Adds a stretchable space with zero minimum size and stretch factor stretch to the end of this box layout.
 		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
 		Sets the alignment for widget w to  flags, given as parameters.[br]
-		Valid flags are:[br]
+		Valid flags are:
 		[pre]
-			Right[br]
-			Left[br]
-			Top[br]
-			Bottom[br]
-			HCenter[br]
-			VCenter[br]
-			Center[br]
+			Right
+			Left
+			Top
+			Bottom
+			HCenter
+			VCenter
+			Center
 			Justify
 		[/pre]
 */
@@ -111,11 +111,8 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_vBox)
 
 KVSO_END_CONSTRUCTOR(KvsObject_vBox)
 
-bool KvsObject_vBox::init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams)
+bool KvsObject_vBox::init(KviKvsRunTimeContext *, KviKvsVariantList *)
 {
-	Q_UNUSED(pContext);
-	Q_UNUSED(pParams);
-
 	SET_OBJECT(KviTalVBox);
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_vBox.h b/src/modules/objects/KvsObject_vBox.h
index 24b7ae590..4b46c4274 100644
--- a/src/modules/objects/KvsObject_vBox.h
+++ b/src/modules/objects/KvsObject_vBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setMargin(KviKvsObjectFunctionCall * c);
 	bool setSpacing(KviKvsObjectFunctionCall * c);
 	bool setStretchFactor(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 0a0a24354..abb46faba 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -1094,7 +1094,6 @@ KVSO_CLASS_FUNCTION(webView, addToJavaScriptWindowObject)
 }
 KVSO_CLASS_FUNCTION(webView, setEventFilter)
 {
-	Q_UNUSED(c);
 	QWebFrame * pFrame;
 	pFrame = ((QWebView *)widget())->page()->mainFrame();
 	pFrame->addToJavaScriptWindowObject("kvs", this);
@@ -1323,8 +1322,7 @@ void KvsObject_webView::slotDownloadRequest(const QNetworkRequest & r)
 			pReply->deleteLater();
 			return;
 		}
-		KviKvsDownloadHandler * pHandler = new KviKvsDownloadHandler(this, pFile, pReply, g_iDownloadId);
-		Q_UNUSED(pHandler);
+		(void)new KviKvsDownloadHandler(this, pFile, pReply, g_iDownloadId);
 		g_iDownloadId++;
 	}
 }
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index 45de20ceb..92c47804a 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -44,15 +44,15 @@ public:
 	KviKvsWebView(QWidget * par, const char * name, KvsObject_webView *);
 	//void accept();
 	//void reject();
-	virtual ~KviKvsWebView();
+	~KviKvsWebView();
 
 protected:
 	KvsObject_webView * m_pParentScript;
 
 protected:
-	virtual void mouseMoveEvent(QMouseEvent * ev);
-	virtual void contextMenuEvent(QContextMenuEvent *);
-	virtual bool event(QEvent * e);
+	void mouseMoveEvent(QMouseEvent * ev) override;
+	void contextMenuEvent(QContextMenuEvent *) override;
+	bool event(QEvent * e) override;
 	/*protected slots:
 	void slotNextClicked();
 	void slotBackClicked();
@@ -65,16 +65,16 @@ class KvsObject_webView : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_webView)
 protected:
-	KviKvsRunTimeContext * m_pContext;
-	int elementMapId;
+	KviKvsRunTimeContext * m_pContext = nullptr;
+	int elementMapId = 1;
 	int insertElement(const QWebElement & ele);
 	QWebElement getElement(int iIdx);
 	int getElementId(const QWebElement &);
 	QHash<int, QWebElement> m_elementMapper;
-	KviPointerList<KviKvsObject> * lWebelement;
+	KviPointerList<KviKvsObject> * lWebelement = nullptr;
 	QHash<QString, QWebElement *> m_dictCache;
-	KviPointerList<QNetworkReply> * m_pReplyList;
-	QNetworkAccessManager * m_pNetworkManager;
+	KviPointerList<QNetworkReply> * m_pReplyList = nullptr;
+	QNetworkAccessManager * m_pNetworkManager = nullptr;
 	QWebElementCollection m_webElementCollection;
 	QWebElement m_currentElement;
 
@@ -83,7 +83,7 @@ public:
 protected:
 	void getFrames(QWebFrame * pCurFrame, QStringList & szFramesNames);
 	QWebFrame * findFrame(QWebFrame * pCurFrame, QString & szFrameName);
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool removeFromDocument(KviKvsObjectFunctionCall * c);
 	bool makePreview(KviKvsObjectFunctionCall * c);
 
@@ -160,7 +160,7 @@ class KviKvsDownloadHandler : public QObject
 public:
 	KviKvsDownloadHandler(KvsObject_webView * pParent, QFile * pFile, QNetworkReply * pNetReply, int iId);
 
-	virtual ~KviKvsDownloadHandler();
+	~KviKvsDownloadHandler();
 
 protected:
 	KvsObject_webView * m_pParentScript;
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index eb3009a2b..c41183d5b 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -422,15 +422,15 @@ const char * const widgettypes_tbl[] = {
 		This function sets widget flags, given as parameters.
 		Valid flags are:
 		[pre]
-			TopLevel        - indicates that this widget is a top-level widget[br]
-			Dialog          - indicates that this widget is a top-level window that should be decorated as a dialog[br]
-			Desktop         - indicates that this widget is the desktop[br]
-			Popup           - indicates that this widget is a popup top-level window[br]
-			Title           - gives the window a title bar[br]
-			StaysOnTop      - window stays on top [br]
-			SysMenu         - add a windows system menu[br]
-			Minimize        - add a minimize button for the sysmenu style[br]
-			Maximize        - add a maximize button for the sysmenu style[br]
+			TopLevel        - indicates that this widget is a top-level widget
+			Dialog          - indicates that this widget is a top-level window that should be decorated as a dialog
+			Desktop         - indicates that this widget is the desktop
+			Popup           - indicates that this widget is a popup top-level window
+			Title           - gives the window a title bar
+			StaysOnTop      - window stays on top
+			SysMenu         - add a windows system menu
+			Minimize        - add a minimize button for the sysmenu style
+			Maximize        - add a maximize button for the sysmenu style
 		[/pre]
 		!fn: $centerToScreen()
 		Centers the window on the screen (useful only for toplevel widgets).[br]
@@ -439,48 +439,48 @@ const char * const widgettypes_tbl[] = {
 		Sets the way the widget accepts keyboard focus.[br]
 		Valid parameters are:
 		[pre]
-			- TabFocus;	(widget accepts keyboard focus by tabbing)[br]
-			- ClickFocus; (widget accepts keyboard focus by clicking)[br]
-			- StrongFocus; (widget accepts both tabbing/clicking)[br]
-			- No Focus;  (widget does not accept focus at all; this is the default value)[br]
+			- TabFocus;	(widget accepts keyboard focus by tabbing)
+			- ClickFocus; (widget accepts keyboard focus by clicking)
+			- StrongFocus; (widget accepts both tabbing/clicking)
+			- NoFocus;  (widget does not accept focus at all; this is the default value)
 		[/pre]
 		!fn: $keyPressEvent(<key>)
 		If widget accepts keyboard focus (see [classfnc]$setFocusPolicy[/classfnc] ) this function handles for keys;
 		In its argument the key pressed.[br]
 		Special keys are:
 		[pre]
-			- Return [br]
-			- Enter	[br]
-			- Down (cursor arrow down) [br]
-			- Up   (cursor arrow up) [br]
-			- Left (cursor arrow left) [br]
-			- Right (cursor arrow right) [br]
-			- Shift [br]
-			- Ctrl [br]
-			- Alt [br]
-			- CapsLock [br]
-			- Backspace [br]
-			- Del [br]
-			- Esc [br]
-			- 0 [br]
-			- 1 [br]
-			- 2 [br]
-			- 3 [br]
-			- 4 [br]
-			- 5 [br]
-			- 6 [br]
-			- 7 [br]
-			- 8 [br]
-			- 9 [br]
-			- + [br]
-			- - [br]
-			- * [br]
-			- / [br]
-			- ( [br]
-			- ) [br]
-			- = [br]
-			- . [br]
-			- ^ [br]
+			- Return
+			- Enter
+			- Down (cursor arrow down)
+			- Up   (cursor arrow up)
+			- Left (cursor arrow left)
+			- Right (cursor arrow right)
+			- Shift
+			- Ctrl
+			- Alt
+			- CapsLock
+			- Backspace
+			- Del
+			- Esc
+			- 0
+			- 1
+			- 2
+			- 3
+			- 4
+			- 5
+			- 6
+			- 7
+			- 8
+			- 9
+			- +
+			- -
+			- *
+			- /
+			- (
+			- )
+			- =
+			- .
+			- ^
 		[/pre]
 		!fn: $mapFromGlobal(<x>,<y>)
 		Translates the global screen coordinate pos to widget coordinates.
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index 4d35b34e1..a7fc36a17 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -46,14 +46,14 @@ public:
 	QWidget * widget() { return (QWidget *)object(); };
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	QWebView * m_pWebview;
+	QWebView * m_pWebview = nullptr;
 #endif
-	virtual bool eventFilter(QObject * o, QEvent * e);
-	KviKvsRunTimeContext * m_pContext;
-	QGraphicsDropShadowEffect * pGraphicsEffect;
+	bool eventFilter(QObject * o, QEvent * e) override;
+	KviKvsRunTimeContext * m_pContext = nullptr;
+	QGraphicsDropShadowEffect * pGraphicsEffect = nullptr;
 	// ok, it is clear that we're messing with the naming conventions for the
 	// object classes :D
 	// let's try to use this one:
@@ -144,12 +144,12 @@ class KviKvsWidget : public QWidget
 	Q_PROPERTY(QSize sizeHint READ sizeHint)
 public:
 	KviKvsWidget(KvsObject_widget * ob, QWidget * par);
-	virtual ~KviKvsWidget();
+	~KviKvsWidget();
 
 protected:
 	KvsObject_widget * m_pObject;
 
 public:
-	QSize sizeHint() const;
+	QSize sizeHint() const override;
 };
 #endif //_CLASS_WIDGET_H_
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 28ccbd7a8..5bd8b428a 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,8 +34,6 @@
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName)
     : KviWindow(KviWindow::ScriptObject, szName)
 {
-	m_pCentralWidget = nullptr;
-	m_pIcon = nullptr;
 }
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index 172db20de..0c21138ff 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -36,12 +36,12 @@ public:
 	~KviKvsScriptWindowWindow();
 
 protected:
-	KvsObject_widget * m_pCentralWidgetObject;
-	QWidget * m_pCentralWidget;
-	QPixmap * m_pIcon;
+	KvsObject_widget * m_pCentralWidgetObject = nullptr;
+	QWidget * m_pCentralWidget = nullptr;
+	QPixmap * m_pIcon = nullptr;
 
 public:
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 	void setIcon(QPixmap * pPixmap) { m_pIcon = pPixmap; };
 	void setCentralWidget(KvsObject_widget * o, QWidget * w);
 	void setWindowTitleString(const QString & s)
@@ -49,7 +49,7 @@ public:
 		setFixedCaption(s);
 		fillCaptionBuffers();
 	};
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 protected slots:
 	void centralWidgetObjectDestroyed();
 	void centralWidgetDestroyed();
@@ -60,10 +60,10 @@ class KvsObject_window : public KvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_window)
 public:
-	QWidget * widget() { return (QWidget *)object(); };
+	QWidget * widget() { return (QWidget *)object(); }
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setWindowTitle(KviKvsObjectFunctionCall * c);
 	bool setIcon(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_wizard.h b/src/modules/objects/KvsObject_wizard.h
index 976e25f93..b37b0aa8a 100644
--- a/src/modules/objects/KvsObject_wizard.h
+++ b/src/modules/objects/KvsObject_wizard.h
@@ -41,7 +41,7 @@ public:
 	void backClicked();
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addPage(KviKvsObjectFunctionCall * c);
 	bool insertPage(KviKvsObjectFunctionCall * c);
@@ -68,7 +68,7 @@ public:
 	KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard *);
 	void accept();
 	void reject();
-	virtual ~KviKvsMdmWizard();
+	~KviKvsMdmWizard();
 
 protected:
 	KvsObject_wizard * m_pParentScript;
diff --git a/src/modules/objects/KvsObject_workspace.h b/src/modules/objects/KvsObject_workspace.h
index 3a8aa1c0a..40d7bb5c8 100644
--- a/src/modules/objects/KvsObject_workspace.h
+++ b/src/modules/objects/KvsObject_workspace.h
@@ -36,7 +36,7 @@ public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
 	QHash<kvs_hobject_t, QMdiSubWindow *> * pWidgetDict;
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addSubWindow(KviKvsObjectFunctionCall * c);
 	bool removeSubWindow(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 1131aa4c2..2c7763a1b 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -285,19 +285,16 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 	if(list.isEmpty())
 		return nullptr;
 
-	Q_FOREACH(QWidget * w, list)
+	for(QWidget * w : list)
 	{
-		//qDebug("TLW: %s::%s (look for %s::%s)",w->metaObject()->className(),w->objectName().toUtf8().data(),szClass.toUtf8().data(),szName.toUtf8().data());
-		if(
-		    (
-		        szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
+		if((szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
 		    && (szName.isEmpty() || KviQString::equalCI(w->objectName(), szName)))
 			return w;
 	}
 
 	if(bRecursive)
 	{
-		Q_FOREACH(QWidget * w, list)
+		for(QWidget * w : list)
 		{
 			w = findWidgetToWrap(szClass, szName, w, bRecursive);
 			if(w)
@@ -314,22 +311,20 @@ QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QSt
 	if(list.isEmpty())
 		return nullptr;
 
-	Q_FOREACH(QObject * obj, list)
+	for(QObject * obj : list)
 	{
 		if(!obj->isWidgetType())
 			continue;
 
 		QWidget * w = (QWidget *)obj;
-		if(
-		    (
-		        szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
+		if((szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
 		    && (szName.isEmpty() || KviQString::equalCI(w->objectName(), szName)))
 			return w;
 	}
 
 	if(bRecursive)
 	{
-		Q_FOREACH(QObject * obj, list)
+		for(QObject * obj : list)
 		{
 			if(!obj->isWidgetType())
 				continue;
diff --git a/src/modules/objects/KvsObject_wrapper.h b/src/modules/objects/KvsObject_wrapper.h
index 523ffe6c6..0a79d2d3b 100644
--- a/src/modules/objects/KvsObject_wrapper.h
+++ b/src/modules/objects/KvsObject_wrapper.h
@@ -37,7 +37,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	QWidget * findTopLevelWidgetToWrap(const QString & szClass, const QString & szName, bool bRecursive);
 	QWidget * findWidgetToWrap(const QString & szClass, const QString & szName, QWidget * pParent, bool bRecursive);
 };
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index d44bc06f2..12d9e6c00 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -174,7 +174,7 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
 			kills only all the instances of that class (derived class definitions
 			and instances in this case are [b]not[/b] killed).[br]
 		@seealso:
-			[cmd]class[/cmd], [cmd]objects.clear[/cmd], [fnc]$classDefined[/fnc](),
+			[cmd]class[/cmd], [cmd]objects.clearObjects[/cmd], [fnc]$classDefined[/fnc](),
 			[doc:objects]Object scripting[/doc]
 	*/
 
@@ -202,15 +202,15 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
 static bool objects_kvs_cmd_clearObjects(KviKvsModuleCommandCall * c)
 {
 	/*
-		@doc: objects.clear
+		@doc: objects.clearObjects
 		@title:
-			objects.clear
+			objects.clearObjects
 		@type:
 			command
 		@short:
 			Removes all the user class definitions
 		@syntax:
-			objects.clear [-i]
+			objects.clearObjects [-i]
 		@description:
 			Removes the definition of all the user classes and kill all the object
 			instances (also instances of the builtin classes).[br]
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index f89318575..28525e7d0 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -58,7 +58,7 @@
 	g_pKvs##__className##Class->registerStandardFalseReturnFunctionHandler(__szName);
 
 #define KVSO_BEGIN_REGISTERCLASS(__className, __stringName, __baseClass)                                                                 \
-	static KviKvsObjectClass * g_pKvs##__className##Class = 0;                                                                           \
+	static KviKvsObjectClass * g_pKvs##__className##Class = nullptr;                                                                     \
 	static KviKvsObject * kvs_##__className##_createInstance(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName) \
 	{                                                                                                                                    \
 		return new __className(pClass, pParent, szName);                                                                                 \
@@ -66,7 +66,7 @@
 	void __className::unregisterSelf()                                                                                                   \
 	{                                                                                                                                    \
 		delete g_pKvs##__className##Class;                                                                                               \
-		g_pKvs##__className##Class = 0;                                                                                                  \
+		g_pKvs##__className##Class = nullptr;                                                                                            \
 	}                                                                                                                                    \
 	void __className::registerSelf()                                                                                                     \
 	{                                                                                                                                    \
@@ -92,7 +92,7 @@
 	}
 
 #define KVSO_CLASS_FUNCTION(__className, __functionName) \
-	bool KvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c)
+	bool KvsObject_##__className::__functionName([[maybe_unused]] KviKvsObjectFunctionCall * c)
 
 #define CHECK_INTERNAL_POINTER(__pointer)                                                     \
 	if(!__pointer)                                                                            \
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 565172619..935bdb8b0 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -43,6 +43,8 @@
 //#define QFTPDTP_DEBUG
 
 #include "qftp.h"
+
+#include <utility>
 #include "qabstractsocket.h"
 
 #ifndef QT_NO_FTP
@@ -90,14 +92,18 @@ public:
 QBasicAtomicInt QFtpCommand::idCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
 
 QFtpCommand::QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba)
-    : command(cmd), rawCmds(raw), is_ba(true)
+    : command(cmd)
+    , rawCmds(std::move(raw))
+    , is_ba(true)
 {
 	id = idCounter.fetchAndAddRelaxed(1);
 	data.ba = new QByteArray(ba);
 }
 
 QFtpCommand::QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev)
-    : command(cmd), rawCmds(raw), is_ba(false)
+    : command(cmd)
+    , rawCmds(std::move(raw))
+    , is_ba(false)
 {
 	id = idCounter.fetchAndAddRelaxed(1);
 	data.dev = dev;
@@ -958,7 +964,7 @@ bool QFtpPI::processReply()
 		// both examples where the parenthesis are used, and where
 		// they are missing. We need to scan for the address and host
 		// info.
-		QRegExp addrPortPattern(QLatin1String("(\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)"));
+		QRegExp addrPortPattern(QLatin1String(R"((\d+),(\d+),(\d+),(\d+),(\d+),(\d+))"));
 		if(addrPortPattern.indexIn(replyText) == -1)
 		{
 #if defined(QFTPPI_DEBUG)
diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp
index 2df6adfdb..6e19960c5 100644
--- a/src/modules/objects/qtftp/qurlinfo.cpp
+++ b/src/modules/objects/qtftp/qurlinfo.cpp
@@ -43,38 +43,32 @@
 
 #include "qurl.h"
 #include "qdir.h"
-#include <limits.h>
+#include <climits>
 
 QT_BEGIN_NAMESPACE
 
 class QUrlInfoPrivate
 {
 public:
-	QUrlInfoPrivate() : permissions(0),
-	                    size(0),
-	                    isDir(false),
-	                    isFile(true),
-	                    isSymLink(false),
-	                    isWritable(true),
-	                    isReadable(true),
-	                    isExecutable(false)
+	QUrlInfoPrivate()
+
 	{
 	}
 
 	QString name;
-	int permissions;
+	int permissions{ 0 };
 	QString owner;
 	QString group;
-	qint64 size;
+	qint64 size{ 0 };
 
 	QDateTime lastModified;
 	QDateTime lastRead;
-	bool isDir;
-	bool isFile;
-	bool isSymLink;
-	bool isWritable;
-	bool isReadable;
-	bool isExecutable;
+	bool isDir{ false };
+	bool isFile{ true };
+	bool isSymLink{ false };
+	bool isWritable{ true };
+	bool isReadable{ true };
+	bool isExecutable{ false };
 };
 
 /*!
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index dbecaa42e..84e5e28e5 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -42,6 +42,8 @@
 //#define QHTTP_DEBUG
 
 #include <qplatformdefs.h>
+
+#include <utility>
 #include "qhttp.h"
 
 #ifndef QT_NO_HTTP
@@ -71,7 +73,7 @@ class QHttpNormalRequest;
 class QHttpRequest
 {
 public:
-	QHttpRequest() : finished(false)
+	QHttpRequest()
 	{
 		id = idCounter.fetchAndAddRelaxed(1);
 	}
@@ -86,7 +88,7 @@ public:
 	virtual QIODevice * destinationDevice() = 0;
 
 	int id;
-	bool finished;
+	bool finished{ false };
 
 private:
 	static QBasicAtomicInt idCounter;
@@ -98,11 +100,20 @@ public:
 	Q_DECLARE_PUBLIC(QHttp)
 
 	inline QHttpPrivate(QHttp * parent)
-	    : socket(nullptr), reconnectAttempts(2),
-	      deleteSocket(0), state(QHttp::Unconnected),
-	      error(QHttp::NoError), port(0), mode(QHttp::ConnectionModeHttp),
-	      toDevice(nullptr), postDevice(nullptr), bytesDone(0), chunkedSize(-1),
-	      repost(false), pendingPost(false), q_ptr(parent)
+	    : socket(nullptr)
+	    , reconnectAttempts(2)
+	    , deleteSocket(false)
+	    , state(QHttp::Unconnected)
+	    , error(QHttp::NoError)
+	    , port(0)
+	    , mode(QHttp::ConnectionModeHttp)
+	    , toDevice(nullptr)
+	    , postDevice(nullptr)
+	    , bytesDone(0)
+	    , chunkedSize(-1)
+	    , repost(false)
+	    , pendingPost(false)
+	    , q_ptr(parent)
 	{
 	}
 
@@ -346,8 +357,10 @@ void QHttpPGHRequest::start(QHttp * http)
 class QHttpSetHostRequest : public QHttpRequest
 {
 public:
-	QHttpSetHostRequest(const QString & h, quint16 p, QHttp::ConnectionMode m)
-	    : hostName(h), port(p), mode(m)
+	QHttpSetHostRequest(QString h, quint16 p, QHttp::ConnectionMode m)
+	    : hostName(std::move(h))
+	    , port(p)
+	    , mode(m)
 	{
 	}
 
@@ -396,7 +409,9 @@ void QHttpSetHostRequest::start(QHttp * http)
 class QHttpSetUserRequest : public QHttpRequest
 {
 public:
-	QHttpSetUserRequest(const QString & userName, const QString & password) : user(userName), pass(password)
+	QHttpSetUserRequest(QString userName, QString password)
+	    : user(std::move(userName))
+	    , pass(std::move(password))
 	{
 	}
 
@@ -510,8 +525,7 @@ class QHttpCloseRequest : public QHttpRequest
 {
 public:
 	QHttpCloseRequest()
-	{
-	}
+	    = default;
 	void start(QHttp *) override;
 
 	QIODevice * sourceDevice() override
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index c6063c6c4..194fe856d 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -860,10 +860,10 @@ const quint8 hirespversion = 1;
 class QNtlmBuffer
 {
 public:
-	QNtlmBuffer() : len(0), maxLen(0), offset(0) {}
-	quint16 len;
-	quint16 maxLen;
-	quint32 offset;
+	QNtlmBuffer() {}
+	quint16 len{ 0 };
+	quint16 maxLen{ 0 };
+	quint32 offset{ 0 };
 	enum
 	{
 		Size = 8