Remove Q_UNUSED macros

16 files changed, 26 insertions, 69 deletions

diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 0e9246146..3497843ba 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -72,9 +72,8 @@ bool kvi_dcc_video_is_valid_codec(const char * codecName)
 	return false;
 }
 
-static DccVideoCodec * kvi_dcc_video_get_codec(const char * codecName)
+static DccVideoCodec * kvi_dcc_video_get_codec([[maybe_unused]] const char * codecName)
 {
-	Q_UNUSED(codecName);
 #ifndef COMPILE_DISABLE_OGG_THEORA
 	if(kvi_strEqualCI("theora", codecName))
 		return new DccVideoTheoraCodec();
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp
index 4e37eca2e..102b666e8 100644
--- a/src/modules/help/HelpIndex.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -83,12 +83,10 @@ QDataStream & operator<<(QDataStream & s, const Document & l)
 	return s;
 }
 
-HelpIndex::HelpIndex(QString dp, const QString & hp)
+HelpIndex::HelpIndex(QString dp, const QString & /* hp */)
     : QObject(nullptr)
     , docPath(std::move(dp))
 {
-	Q_UNUSED(hp);
-
 	alreadyHaveDocList = false;
 
 	connect(qApp, SIGNAL(lastWindowClosed()), this, SLOT(setLastWinClosed()));
@@ -99,12 +97,10 @@ HelpIndex::HelpIndex(QString dp, const QString & hp)
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext()));
 }
 
-HelpIndex::HelpIndex(QStringList dl, const QString & hp)
+HelpIndex::HelpIndex(QStringList dl, const QString & /* hp */)
     : QObject(nullptr)
     , docList{ std::move(dl) }
 {
-	Q_UNUSED(hp);
-
 	alreadyHaveDocList = true;
 
 	connect(qApp, SIGNAL(lastWindowClosed()), this, SLOT(setLastWinClosed()));
diff --git a/src/modules/mediaplayer/MpInterface.cpp b/src/modules/mediaplayer/MpInterface.cpp
index f0feb5861..ae17beb61 100644
--- a/src/modules/mediaplayer/MpInterface.cpp
+++ b/src/modules/mediaplayer/MpInterface.cpp
@@ -104,8 +104,7 @@ QString MpInterface::amipEval(const QString &)
 	mp3info mp3;                \
 	if(!scan_mp3_file(f, &mp3)) \
 		return QString();       \
-	QTextCodec * pCodec;        \
-	pCodec = mediaplayer_get_codec();
+	[[maybe_unused]] QTextCodec * pCodec = mediaplayer_get_codec();
 
 #define SCAN_MP3_FILE_RET_INT   \
 	QString f = getLocalFile(); \
@@ -142,7 +141,6 @@ QString MpInterface::comment()
 QString MpInterface::year()
 {
 	SCAN_MP3_FILE
-	Q_UNUSED(pCodec);
 	return QString(mp3.id3.year);
 }
 
diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp
index c85256e40..7218e4ffc 100644
--- a/src/modules/mediaplayer/MpMp3.cpp
+++ b/src/modules/mediaplayer/MpMp3.cpp
@@ -384,9 +384,8 @@ int get_id3(mp3info * mp3)
 		}
 		else
 		{
-			size_t dummy = fread(fbuf, 1, 3, mp3->file);
+			(void)fread(fbuf, 1, 3, mp3->file);
 			fbuf[3] = '\0';
-			Q_UNUSED(dummy);
 			mp3->id3.genre[0] = 255;
 
 			if(!strcmp((const char *)"TAG", (const char *)fbuf))
@@ -394,21 +393,21 @@ int get_id3(mp3info * mp3)
 				mp3->id3_isvalid = 1;
 				mp3->datasize -= 128;
 				fseek(mp3->file, -125, SEEK_END);
-				dummy = fread(mp3->id3.title, 1, 30, mp3->file);
+				(void)fread(mp3->id3.title, 1, 30, mp3->file);
 				mp3->id3.title[30] = '\0';
-				dummy = fread(mp3->id3.artist, 1, 30, mp3->file);
+				(void)fread(mp3->id3.artist, 1, 30, mp3->file);
 				mp3->id3.artist[30] = '\0';
-				dummy = fread(mp3->id3.album, 1, 30, mp3->file);
+				(void)fread(mp3->id3.album, 1, 30, mp3->file);
 				mp3->id3.album[30] = '\0';
-				dummy = fread(mp3->id3.year, 1, 4, mp3->file);
+				(void)fread(mp3->id3.year, 1, 4, mp3->file);
 				mp3->id3.year[4] = '\0';
-				dummy = fread(mp3->id3.comment, 1, 30, mp3->file);
+				(void)fread(mp3->id3.comment, 1, 30, mp3->file);
 				mp3->id3.comment[30] = '\0';
 				if(mp3->id3.comment[28] == '\0')
 				{
 					mp3->id3.track[0] = mp3->id3.comment[29];
 				}
-				dummy = fread(mp3->id3.genre, 1, 1, mp3->file);
+				(void)fread(mp3->id3.genre, 1, 1, mp3->file);
 				unpad(mp3->id3.title);
 				unpad(mp3->id3.artist);
 				unpad(mp3->id3.album);
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_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 084cd9123..aa2e7b548 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -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;
@@ -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_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index ba47de24d..b1e492c7e 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -325,7 +325,6 @@ KVSO_CLASS_FUNCTION(socket, status)
 
 KVSO_CLASS_FUNCTION(socket, close)
 {
-	Q_UNUSED(c);
 	m_pSocket->disconnectFromHost();
 	return true;
 }
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_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_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index 61464bfe7..557dd5b35 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -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_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/object_macros.h b/src/modules/objects/object_macros.h
index f89318575..c6e92c9dc 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -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/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 5bb9ddca9..47ff68796 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -637,9 +637,7 @@ void OptionsWidget_messageColors::load()
 	//qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
 	//qDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
 	//qDebug("ERRNO (%d)",errno);
-	int dummy; // make gcc happy
-	dummy = symlink(szGlobal.toLocal8Bit().data(), szLocal.toLocal8Bit().data());
-	Q_UNUSED(dummy);
+	(void)symlink(szGlobal.toLocal8Bit().data(), szLocal.toLocal8Bit().data());
 // FIXME: Do it also on windows...
 #endif
 
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index 8937b6a63..ce4b60de1 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -66,9 +66,8 @@ extern KviCString g_szLastReturnValue;
 extern QStringList g_lWarningList;
 extern QString g_lError;
 
-static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_echo(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char *pcText = nullptr, *pcWinId = nullptr;
 	KviWindow * pWnd = nullptr;
 	int iColorSet = 0;
@@ -104,9 +103,8 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
 	return Py_BuildValue("i", 1);
 }
 
-static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_say(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char *pcText = nullptr, *pcWinId = nullptr;
 	KviWindow * pWnd = nullptr;
 
@@ -143,9 +141,8 @@ static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
 	return Py_BuildValue("i", 1);
 }
 
-static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_warning(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * pcText = nullptr;
 
 	if(QThread::currentThread() != g_pApp->thread())
@@ -166,9 +163,8 @@ static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
 	return Py_BuildValue("i", 1);
 }
 
-static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_getLocal(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * szVarName = nullptr;
 	QString tmp;
 
@@ -197,9 +193,8 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 	return nullptr;
 }
 
-static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_setLocal(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char *szVarName = nullptr, *szVarValue = nullptr;
 	QString tmp;
 
@@ -228,9 +223,8 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 	return nullptr;
 }
 
-static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_getGlobal(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * szVarName = nullptr;
 	QString tmp;
 
@@ -259,9 +253,8 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 	return nullptr;
 }
 
-static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_setGlobal(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char *szVarName = nullptr, *szVarValue = nullptr;
 	QString tmp;
 
@@ -290,9 +283,8 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 	return nullptr;
 }
 
-static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_eval(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * pcCode = nullptr;
 	KviWindow * pWnd = nullptr;
 	char * pcRetVal = nullptr;
@@ -330,9 +322,8 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 	return Py_BuildValue("s", pcRetVal);
 }
 
-static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_internalWarning(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * pcText = nullptr;
 
 	if(QThread::currentThread() != g_pApp->thread())
@@ -350,9 +341,8 @@ static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs)
 	return Py_BuildValue("i", 1);
 }
 
-static PyObject * PyKVIrc_error(PyObject * pSelf, PyObject * pArgs)
+static PyObject * PyKVIrc_error(PyObject * /* pSelf */, PyObject * pArgs)
 {
-	Q_UNUSED(pSelf);
 	const char * pcText = nullptr;
 
 	if(QThread::currentThread() != g_pApp->thread())
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 00bd5297a..00519dfe2 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -1019,9 +1019,7 @@ void SetupWizard::accept()
 		// Make local->global link
 		QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir);
 		unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data());
-		int dummy; // make gcc happy
-		dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(), QTextCodec::codecForLocale()->fromUnicode(localPath).data());
-		Q_UNUSED(dummy);
+		(void)symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(), QTextCodec::codecForLocale()->fromUnicode(localPath).data());
 #endif
 
 #ifdef COMPILE_KDE_SUPPORT