diff options
Diffstat (limited to 'src')
32 files changed, 32 insertions, 231 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp index bc611721f..e880c9d7c 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp @@ -1035,8 +1035,6 @@ namespace KviKvsCoreCallbackCommands KVSCCC(privateimpl) { - Q_UNUSED(__pSwitches); - kvs_hobject_t hObject; QString szFunctionName; KVSCCC_PARAMETERS_BEGIN diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.h b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h index 6062e21df..c3e001477 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.h +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h @@ -31,7 +31,7 @@ #include "KviKvsScript.h" #include "KviKvsParameterProcessor.h" -#define KVSCCC(_name) bool _name(KviKvsRunTimeContext * __pContext, KviKvsVariantList * __pParams, KviKvsSwitchList * __pSwitches, const KviKvsScript * __pCallback) +#define KVSCCC(_name) bool _name([[maybe_unused]] KviKvsRunTimeContext * __pContext, [[maybe_unused]] KviKvsVariantList * __pParams, [[maybe_unused]] KviKvsSwitchList * __pSwitches, const KviKvsScript * __pCallback) #define KVSCCC_pContext __pContext #define KVSCCC_pParams __pParams diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.cpp b/src/kvirc/kvs/KviKvsCoreFunctions.cpp index 3e805c0f1..7d90034ab 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions.cpp @@ -147,17 +147,12 @@ namespace KviKvsCoreFunctions KVSCF(strayAt) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(g_szStaticStrayConstantAt); return true; } KVSCF(mightBeStrayAtOrThis) { - Q_UNUSED(__pParams); - KviKvsObject * o = KVSCF_pContext->thisObject(); if(o) { diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.h b/src/kvirc/kvs/KviKvsCoreFunctions.h index d8f5e29b5..d3be8c750 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions.h +++ b/src/kvirc/kvs/KviKvsCoreFunctions.h @@ -30,7 +30,7 @@ #include "KviKvsVariant.h" #include "KviKvsParameterProcessor.h" -#define KVSCF(_name) bool _name(KviKvsRunTimeContext * __pContext, KviKvsVariantList * __pParams, KviKvsVariant * __pRetBuffer) +#define KVSCF(_name) bool _name([[maybe_unused]] KviKvsRunTimeContext * __pContext, [[maybe_unused]] KviKvsVariantList * __pParams, [[maybe_unused]] KviKvsVariant * __pRetBuffer) #define KVSCF_pContext __pContext #define KVSCF_pParams __pParams diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 16540e403..dd416556b 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -270,8 +270,6 @@ namespace KviKvsCoreFunctions KVSCF(array) { - Q_UNUSED(__pContext); - KviKvsArray * a = new KviKvsArray(); for(KviKvsVariant * v = KVSCF_pParams->first(); v; v = KVSCF_pParams->next()) @@ -351,9 +349,6 @@ namespace KviKvsCoreFunctions KVSCF(b) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Bold))); return true; } @@ -793,9 +788,6 @@ namespace KviKvsCoreFunctions KVSCF(countStatusBarItems) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - if(g_pMainWindow->mainStatusBar()) { QList<QWidget *> widgets = g_pMainWindow->mainStatusBar()->findChildren<QWidget *>(); @@ -824,9 +816,6 @@ namespace KviKvsCoreFunctions KVSCF(cr) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar('\r'))); return true; } @@ -1172,9 +1161,6 @@ namespace KviKvsCoreFunctions KVSCF(falseCKEYWORDWORKAROUND) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(false); return true; } @@ -1263,9 +1249,6 @@ namespace KviKvsCoreFunctions KVSCF(firstConnectedConsole) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KviConsoleWindow * c = g_pApp->topmostConnectedConsole(); KVSCF_pRetBuffer->setInteger(c ? c->numericId() : 0); return true; @@ -1296,8 +1279,6 @@ namespace KviKvsCoreFunctions KVSCF(flatten) { - Q_UNUSED(__pContext); - KviKvsArray * a = new KviKvsArray(); KVSCF_pRetBuffer->setArray(a); unsigned int uIdx = 0; diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp index 2f930ee81..bdf7714b6 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp @@ -134,9 +134,6 @@ namespace KviKvsCoreFunctions KVSCF(globals) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setHash(new KviKvsHash(*(KviKvsKernel::instance()->globalVariables()))); return true; } @@ -174,8 +171,6 @@ namespace KviKvsCoreFunctions KVSCF(hash) { - Q_UNUSED(__pContext); - KviKvsHash * a = new KviKvsHash(); for(KviKvsVariant * key = KVSCF_pParams->first(); key; key = KVSCF_pParams->next()) @@ -299,8 +294,6 @@ namespace KviKvsCoreFunctions KVSCF(lag) { - Q_UNUSED(__pParams); - if(!KVSCF_pContext->window()->console()) return KVSCF_pContext->errorNoIrcContext(); if(!KVSCF_pContext->window()->console()->connection()) @@ -344,9 +337,6 @@ namespace KviKvsCoreFunctions KVSCF(hptimestamp) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - struct timeval tv; kvi_gettimeofday(&tv); kvs_real_t dTimestamp = (kvs_real_t)(tv.tv_sec); @@ -373,9 +363,6 @@ namespace KviKvsCoreFunctions KVSCF(i) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Italic))); return true; } @@ -482,8 +469,6 @@ namespace KviKvsCoreFunctions KVSCF(insideAlias) { - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(KVSCF_pContext->aliasSwitchList()); return true; } @@ -621,9 +606,6 @@ namespace KviKvsCoreFunctions KVSCF(isMainWindowActive) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(g_pMainWindow->isActiveWindow()); return true; } @@ -644,9 +626,6 @@ namespace KviKvsCoreFunctions KVSCF(isMainWindowMinimized) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(g_pMainWindow->isMinimized()); return true; } @@ -1044,9 +1023,6 @@ namespace KviKvsCoreFunctions KVSCF(lf) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar('\n'))); return true; } diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp index ecf020dd8..1cf80c156 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp @@ -331,9 +331,6 @@ namespace KviKvsCoreFunctions KVSCF(nothing) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setNothing(); return true; } @@ -359,9 +356,6 @@ namespace KviKvsCoreFunctions KVSCF(nullCKEYWORDWORKAROUND) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setHObject(nullptr); return true; } @@ -384,9 +378,6 @@ namespace KviKvsCoreFunctions KVSCF(o) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reset))); return true; } @@ -513,9 +504,6 @@ namespace KviKvsCoreFunctions KVSCF(r) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reverse))); return true; } @@ -678,9 +666,6 @@ namespace KviKvsCoreFunctions KVSCF(receivedBytes) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setInteger(g_uIncomingTraffic); return true; } diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp index d16bc3c01..fb3b8fcea 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp @@ -85,7 +85,6 @@ namespace KviKvsCoreFunctions KVSCF(scriptContextName) { - Q_UNUSED(__pParams); KVSCF_pRetBuffer->setString(KVSCF_pContext->script()->name()); return true; } @@ -132,9 +131,6 @@ namespace KviKvsCoreFunctions KVSCF(sentBytes) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setInteger(g_uOutgoingTraffic); return true; } @@ -480,8 +476,6 @@ namespace KviKvsCoreFunctions KVSCF(thisCKEYWORDWORKAROUND) { - Q_UNUSED(__pParams); - // prologue: parameter handling KviKvsObject * o = KVSCF_pContext->thisObject(); KVSCF_pRetBuffer->setHObject(o ? o->handle() : ((kvs_hobject_t) nullptr)); @@ -717,9 +711,6 @@ namespace KviKvsCoreFunctions KVSCF(trueCKEYWORDWORKAROUND) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setBoolean(true); return true; } @@ -781,9 +772,6 @@ namespace KviKvsCoreFunctions KVSCF(u) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Underline))); return true; } @@ -904,9 +892,6 @@ namespace KviKvsCoreFunctions KVSCF(unixtime) { - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - KVSCF_pRetBuffer->setInteger((kvs_int_t)(time(nullptr))); return true; } diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp index f250701f9..b595382e3 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp @@ -151,8 +151,6 @@ namespace KviKvsCoreSimpleCommands bool multipleModeCommand(KviKvsRunTimeContext * __pContext, KviKvsVariantList * __pParams, KviKvsSwitchList * __pSwitches, char plusminus, char flag) { - Q_UNUSED(__pSwitches); - QString szTokens; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("tokens", KVS_PT_STRING, KVS_PF_APPENDREMAINING, szTokens) @@ -263,8 +261,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(rfc2812wrapper) { - Q_UNUSED(__pSwitches); - QString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text", KVS_PT_STRING, KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING, szText) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.h b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h index 82ddb50b2..37f467f3d 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.h +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h @@ -32,7 +32,7 @@ #include "KviKvsSwitchList.h" #include "KviKvsParameterProcessor.h" -#define KVSCSC(_name) bool _name(KviKvsRunTimeContext * __pContext, KviKvsVariantList * __pParams, KviKvsSwitchList * __pSwitches) +#define KVSCSC(_name) bool _name([[maybe_unused]] KviKvsRunTimeContext * __pContext, [[maybe_unused]] KviKvsVariantList * __pParams, [[maybe_unused]] KviKvsSwitchList * __pSwitches) #define KVSCSC_pContext __pContext #define KVSCSC_pParams __pParams diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp index 10a6d7718..921e77e2a 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp @@ -208,8 +208,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(back) { - Q_UNUSED(__pParams); - if(KVSCSC_pSwitches->find('a', "all-networks")) { for(auto & wnd : g_pGlobalWindowDict) @@ -523,8 +521,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(cap) { - Q_UNUSED(__pSwitches); - QString szCommand, szParams; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("command", KVS_PT_NONEMPTYSTRING, 0, szCommand) @@ -726,8 +722,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(debugCKEYWORDWORKAROUND) { - Q_UNUSED(__pContext); - QString szAll; KVSCSC_pParams->allAsString(szAll); if(KVSCSC_pSwitches->find('c', "scriptcontext-name")) @@ -1336,8 +1330,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(error) { - Q_UNUSED(__pSwitches); - QString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->error("%Q", &szAll); @@ -1583,10 +1575,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(exit) { - Q_UNUSED(__pSwitches); - Q_UNUSED(__pContext); - Q_UNUSED(__pParams); - g_pApp->quit(); return true; } diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp index b4ac02e9a..cb20d05e3 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp @@ -86,9 +86,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(halt) { - Q_UNUSED(__pSwitches); - Q_UNUSED(__pParams); - KVSCSC_pContext->setHaltCalled(); return false; } @@ -277,8 +274,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(inject) { - Q_UNUSED(__pSwitches); - QString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szText) @@ -377,8 +372,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(join) { - Q_UNUSED(__pSwitches); - QString szChans, szKeys; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("chans", KVS_PT_NONEMPTYSTRING, 0, szChans) @@ -448,8 +441,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(kick) { - Q_UNUSED(__pSwitches); - QString szUser; QString szReason; KVSCSC_PARAMETERS_BEGIN @@ -611,9 +602,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(listtimers) { - Q_UNUSED(__pSwitches); - Q_UNUSED(__pParams); - KviPointerHashTable<QString, KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict(); if(!pTimerDict) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index b9c359ef2..c71992301 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -96,8 +96,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(me) { - Q_UNUSED(__pSwitches); - QString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text", KVS_PT_STRING, KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING, szText) @@ -143,8 +141,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(mode) { - Q_UNUSED(__pSwitches); - QString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text", KVS_PT_STRING, KVS_PF_APPENDREMAINING, szText) @@ -226,8 +222,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(nick) { - Q_UNUSED(__pSwitches); - QString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname", KVS_PT_NONEMPTYSTRING, 0, szNick) @@ -363,8 +357,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(openurl) { - Q_UNUSED(__pSwitches); - QString szUrl; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("url", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szUrl) @@ -510,8 +502,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(operwall) { - Q_UNUSED(__pSwitches); - QString szMessage; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("message", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szMessage) @@ -586,8 +576,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(option) { - Q_UNUSED(__pSwitches); - QString szName; QString szValue; KVSCSC_PARAMETERS_BEGIN @@ -1067,8 +1055,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(query) { - Q_UNUSED(__pSwitches); - QString szTargets, szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("targets", KVS_PT_NONEMPTYSTRING, 0, szTargets) @@ -1210,10 +1196,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(raise) { - Q_UNUSED(__pSwitches); - Q_UNUSED(__pParams); - Q_UNUSED(__pContext); - if(!g_pMainWindow->isVisible()) g_pMainWindow->show(); g_pMainWindow->raise(); @@ -1353,8 +1335,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(returnCKEYWORDWORKAROUND) { - Q_UNUSED(__pSwitches); - if(KVSCSC_pParams->count() == 0) { KVSCSC_pContext->returnValue()->setNothing(); @@ -1400,8 +1380,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(run) { - Q_UNUSED(__pSwitches); - QString szCommand; QStringList l; KVSCSC_PARAMETERS_BEGIN diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp index 27def27eb..f91970ccb 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp @@ -443,8 +443,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(setreturn) { - Q_UNUSED(__pSwitches); - if(KVSCSC_pParams->count() == 0) { KVSCSC_pContext->returnValue()->setNothing(); @@ -571,7 +569,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(srand) { - Q_UNUSED(__pSwitches); QString tmp; for(int i = 0; i < 10; i++) @@ -644,8 +641,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(topic) { - Q_UNUSED(__pSwitches); - QString szChannel; QString szTopic; KVSCSC_PARAMETERS_BEGIN @@ -936,8 +931,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(warning) { - Q_UNUSED(__pSwitches); - QString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->warning("%Q", &szAll); @@ -964,8 +957,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(wallops) { - Q_UNUSED(__pSwitches); - QString szMessage; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("message", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szMessage) @@ -1018,8 +1009,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(who) { - Q_UNUSED(__pSwitches); - QString szData; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("filter", KVS_PT_NONEMPTYSTRING, KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING, szData) @@ -1079,8 +1068,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whois) { - Q_UNUSED(__pSwitches); - QString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szNick) @@ -1121,8 +1108,6 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whowas) { - Q_UNUSED(__pSwitches); - QString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szNick) diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp index 2d03efa86..55b0a8e9f 100644 --- a/src/kvirc/kvs/parser/KviKvsParser.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser.cpp @@ -2916,10 +2916,10 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList() { \ QString szValue; \ \ - const QChar * pStart = KVSP_curCharPointer; \ + [[maybe_unused]] const QChar * pStart = KVSP_curCharPointer; \ const QChar * pBegin = KVSP_curCharPointer; \ int iLen = 0; \ - int iNestedTerminators = 0; \ + [[maybe_unused]] int iNestedTerminators = 0; \ \ for(;;) \ { \ @@ -3017,8 +3017,6 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList() } LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseCommandLiteralParameter) -Q_UNUSED(pStart); -Q_UNUSED(iNestedTerminators); case 0: case '$': @@ -3033,8 +3031,6 @@ case '\t': LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseStringLiteralParameter) - Q_UNUSED(pStart); - Q_UNUSED(iNestedTerminators); case 0: case '$': @@ -3054,7 +3050,6 @@ LITERAL_PARAM_PARSING_FUNCTION_END */ LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseHashKeyLiteralParameter) - Q_UNUSED(pStart); case '{': LITERAL_PARAM_PARSING_FUNCTION_WARN_NESTED_TERMINATOR @@ -3072,7 +3067,6 @@ case ' ': LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseCommaSeparatedLiteralParameter) - Q_UNUSED(pStart); case '(': LITERAL_PARAM_PARSING_FUNCTION_WARN_NESTED_TERMINATOR @@ -3091,7 +3085,6 @@ case '\t': LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseSingleLiteralParameterInParenthesis) - Q_UNUSED(pStart); case '(': LITERAL_PARAM_PARSING_FUNCTION_WARN_NESTED_TERMINATOR @@ -3109,8 +3102,6 @@ case '\t': LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END LITERAL_PARAM_PARSING_FUNCTION_BEGIN(parseBindingOperationLiteralParameter) - Q_UNUSED(pStart); - Q_UNUSED(iNestedTerminators); case 0: case '$': diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index 1f46c24b6..4ccdbf6b9 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -211,7 +211,7 @@ bool KviWindow::hasAttention(AttentionLevel eLevel) void KviWindow::demandAttention() { - WId windowId = isDocked() ? g_pMainWindow->winId() : winId(); + [[maybe_unused]] WId windowId = isDocked() ? g_pMainWindow->winId() : winId(); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) FLASHWINFO fwi; @@ -223,8 +223,6 @@ void KviWindow::demandAttention() FlashWindowEx(&fwi); #elif defined(COMPILE_KDE_SUPPORT) KWindowSystem::demandAttention(windowId, true); -#else - Q_UNUSED(windowId) #endif } 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 |