From 82f44408f63075903c6fd9ff1fb4765caf840d47 Mon Sep 17 00:00:00 2001 From: wodim Date: Sun, 27 Aug 2017 03:24:11 +0200 Subject: Add a checkbox in the event editor to enable or disable event handlers. Fixes #2189 --- src/modules/eventeditor/EventEditorWindow.cpp | 31 +++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'src/modules/eventeditor/EventEditorWindow.cpp') diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index d54d110d3..effdd44b2 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -39,6 +39,7 @@ #include "KviQString.h" #include "KviKvsEventManager.h" #include "KviTalVBox.h" +#include "KviTalHBox.h" #include #include @@ -110,8 +111,18 @@ EventEditor::EventEditor(QWidget * par) box->setSpacing(0); box->setMargin(0); - m_pNameEditor = new QLineEdit(box); + KviTalHBox * hbox = new KviTalHBox(box); + hbox->setContentsMargins(10, 0, 10, 0); + + m_pIsEnabled = new QCheckBox(hbox); + m_pIsEnabled->setText(__tr2qs_ctx("E&nabled", "editor")); + m_pIsEnabled->setEnabled(false); + connect(m_pIsEnabled, SIGNAL(clicked(bool)), this, SLOT(toggleCurrentHandlerEnabled())); + + m_pNameEditor = new QLineEdit(hbox); + m_pNameEditor->setText(__tr2qs_ctx("No item selected", "editor")); m_pNameEditor->setToolTip(__tr2qs_ctx("Edit the event handler name.", "editor")); + m_pNameEditor->setEnabled(false); m_pEditor = KviScriptEditor::createInstance(box); m_pEditor->setFocus(); @@ -163,6 +174,14 @@ void EventEditor::eventHandlerDisabled(const QString & szHandler) QString szEventName = szHandler.split("::")[0]; QString szHandlerName = szHandler.split("::")[1]; qDebug("Handler %s of event %s : disabled", szHandlerName.toUtf8().data(), szEventName.toUtf8().data()); + + QTreeWidgetItem * pSelectedItem = nullptr; + QList itemList = m_pTreeWidget->selectedItems(); + if (!itemList.isEmpty()) + { + pSelectedItem = itemList.first(); + } + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { EventEditorEventTreeWidgetItem * pItem = (EventEditorEventTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); @@ -173,6 +192,8 @@ void EventEditor::eventHandlerDisabled(const QString & szHandler) if(KviQString::equalCI(szHandlerName, ((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->name())) { ((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->setEnabled(false); + if (pItem->child(j) == pSelectedItem) + m_pIsEnabled->setChecked(false); return; } } @@ -310,6 +331,7 @@ void EventEditor::removeCurrentHandler() parent->setIcon(0, QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EventNoHandlers)))); } + m_pIsEnabled->setEnabled(false); m_pEditor->setEnabled(false); m_pNameEditor->setEnabled(false); } @@ -320,6 +342,7 @@ void EventEditor::toggleCurrentHandlerEnabled() KVI_ASSERT(m_bOneTimeSetupDone); if(m_pLastEditedItem) { + m_pIsEnabled->setChecked(!(m_pLastEditedItem->m_bEnabled)); m_pLastEditedItem->setEnabled(!(m_pLastEditedItem->m_bEnabled)); m_pTreeWidget->repaint(m_pTreeWidget->visualItemRect(m_pLastEditedItem)); currentItemChanged(m_pLastEditedItem, nullptr); @@ -398,6 +421,8 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) if(it->parent()) { m_pLastEditedItem = (EventEditorHandlerTreeWidgetItem *)it; + m_pIsEnabled->setEnabled(true); + m_pIsEnabled->setChecked(m_pLastEditedItem->isEnabled()); m_pNameEditor->setEnabled(true); m_pNameEditor->setText(m_pLastEditedItem->name()); m_pEditor->setEnabled(true); @@ -408,8 +433,10 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) else { m_pLastEditedItem = nullptr; + m_pIsEnabled->setEnabled(false); + m_pIsEnabled->setChecked(false); m_pNameEditor->setEnabled(false); - m_pNameEditor->setText(""); + m_pNameEditor->setText(__tr2qs_ctx("No item selected", "editor")); m_pEditor->setEnabled(false); QString parms = ((EventEditorEventTreeWidgetItem *)it)->m_szParams; if(parms.isEmpty()) -- cgit v1.3.1-10-gc9f91 From 63e9e485a7a924187d13dc44a7b576acad569e9c Mon Sep 17 00:00:00 2001 From: Szymon Tomasz Stefanek Date: Thu, 28 Dec 2017 17:37:31 +0100 Subject: Pull in wodim's fix for #1959 --- src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp | 5 +++++ src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp | 1 + src/kvirc/kvs/event/KviKvsEventManager.cpp | 10 ++++++++++ src/kvirc/kvs/event/KviKvsEventManager.h | 5 +++++ src/modules/eventeditor/EventEditorWindow.cpp | 7 +++++-- src/modules/eventeditor/EventEditorWindow.h | 1 - 6 files changed, 26 insertions(+), 3 deletions(-) (limited to 'src/modules/eventeditor/EventEditorWindow.cpp') diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp index 17e317520..bc611721f 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp @@ -530,6 +530,10 @@ namespace KviKvsCoreCallbackCommands list instead of being added.[br] The may be one of the KVIrc builtin event names or a numeric code (from 0 to 999) of a RAW server message.[br] + can only contain alphanumeric characters. If the + provided handler name contains invalid characters, they are + silently removed. If the provided handler name does not contain + a single valid character, the handler will be named "unnamed".[br] If the -q switch is specified then the command runs in quiet mode. @seealso: [cmd]eventctl[/cmd] [fnc]$iseventenabled[/fnc] @@ -558,6 +562,7 @@ namespace KviKvsCoreCallbackCommands } else { + KviKvsEventManager::instance()->cleanHandlerName(szHandlerName); iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp index ca27ec799..1c09ec45c 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp @@ -1498,6 +1498,7 @@ namespace KviKvsCoreSimpleCommands } else { + KviKvsEventManager::instance()->cleanHandlerName(szHandlerName); iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp index 15ca56f3c..74a82419a 100644 --- a/src/kvirc/kvs/event/KviKvsEventManager.cpp +++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp @@ -33,6 +33,8 @@ #include "KviWindow.h" #include "KviKvsVariantList.h" +#include + /* @doc: events @type: @@ -636,3 +638,11 @@ void KviKvsEventManager::saveAppEvents(const QString & szFileName) } } } + +void KviKvsEventManager::cleanHandlerName(QString & szHandlerName) +{ + static QRegExp re(KVI_KVS_EVENT_HANDLER_NAME_INVALID_CHARS_REG_EXP); + szHandlerName.replace(re, ""); + if (szHandlerName.isEmpty()) + szHandlerName = "unnamed"; +} diff --git a/src/kvirc/kvs/event/KviKvsEventManager.h b/src/kvirc/kvs/event/KviKvsEventManager.h index 2f2f4eb98..a151ec638 100644 --- a/src/kvirc/kvs/event/KviKvsEventManager.h +++ b/src/kvirc/kvs/event/KviKvsEventManager.h @@ -36,6 +36,9 @@ class KviKvsVariantList; #define KVI_KVS_NUM_RAW_EVENTS 1000 +#define KVI_KVS_EVENT_HANDLER_NAME_REG_EXP "^[A-Za-z0-9_]*$" +#define KVI_KVS_EVENT_HANDLER_NAME_INVALID_CHARS_REG_EXP "[^A-Za-z0-9_]" + class KVIRC_API KviKvsEventManager : public QObject { Q_OBJECT @@ -127,6 +130,8 @@ public: void saveAppEvents(const QString & szFileName); void loadRawEvents(const QString & szFileName); void saveRawEvents(const QString & szFileName); + + void cleanHandlerName(QString & szHandlerName); signals: void eventHandlerDisabled(const QString &); }; diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index effdd44b2..1ab23e940 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -123,9 +123,13 @@ EventEditor::EventEditor(QWidget * par) m_pNameEditor->setText(__tr2qs_ctx("No item selected", "editor")); m_pNameEditor->setToolTip(__tr2qs_ctx("Edit the event handler name.", "editor")); m_pNameEditor->setEnabled(false); + QRegExpValidator * pValidator = new QRegExpValidator(QRegExp(KVI_KVS_EVENT_HANDLER_NAME_REG_EXP), this); + m_pNameEditor->setValidator(pValidator); + m_pNameEditor->setEnabled(false); m_pEditor = KviScriptEditor::createInstance(box); m_pEditor->setFocus(); + m_pEditor->setEnabled(false); m_bOneTimeSetupDone = false; m_pLastEditedItem = nullptr; } @@ -391,8 +395,7 @@ void EventEditor::saveLastEditedItem() return; ((EventEditorHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor()); QString buffer = m_pNameEditor->text(); - //not-so elaborate fix for #218, we'd better rework this - buffer.replace(QRegExp("[^A-Za-z0-9_]"), ""); + KviKvsEventManager::instance()->cleanHandlerName(buffer); if(!KviQString::equalCI(buffer, m_pLastEditedItem->m_szName)) { getUniqueHandlerName((EventEditorEventTreeWidgetItem *)(m_pLastEditedItem->parent()), buffer); diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h index 386b1a1a5..211733c22 100644 --- a/src/modules/eventeditor/EventEditorWindow.h +++ b/src/modules/eventeditor/EventEditorWindow.h @@ -67,7 +67,6 @@ public: const int & cursorPosition() { return m_cPos; }; void setCursorPosition(const int & cPos) { - qDebug("set cursor to %d", cPos); m_cPos = cPos; }; -- cgit v1.3.1-10-gc9f91 From e4a34cb9b7d59a08a162d642fbbca8c08804b3ff Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 10 Jun 2018 00:16:59 +0100 Subject: Apply all modernize-* fixes from clang-tidy except for modernize-use-auto --- src/kvilib/core/KviCString.cpp | 2 +- src/kvilib/core/KviError.cpp | 2 +- src/kvilib/core/KviMemory.cpp | 2 +- src/kvilib/core/KviQString.cpp | 6 ++-- src/kvilib/ext/KviNickColors.cpp | 2 +- src/kvilib/ext/KviPixmap.cpp | 7 ++-- src/kvilib/ext/KviRegisteredUserDataBase.cpp | 4 +-- src/kvilib/ext/KviRuntimeInfo.cpp | 2 +- src/kvilib/ext/KviStringConversion.cpp | 2 +- src/kvilib/irc/KviIrcMask.cpp | 2 +- src/kvilib/irc/KviIrcServer.cpp | 2 +- src/kvilib/locale/KviMessageCatalogue.cpp | 2 +- src/kvilib/net/KviDnsResolver.cpp | 2 +- src/kvilib/net/KviNetUtils.cpp | 4 +-- src/kvilib/net/KviSSL.cpp | 4 +-- src/kvilib/system/KviSignalHandler.cpp | 6 ++-- src/kvilib/system/KviThread.cpp | 4 +-- .../tal/KviTalIconAndRichTextItemDelegate.cpp | 2 +- src/kvirc/kernel/KviApplication.cpp | 4 +-- src/kvirc/kernel/KviApplication_setup.cpp | 2 +- src/kvirc/kernel/KviCoreActions.cpp | 2 +- src/kvirc/kernel/KviCustomToolBarDescriptor.cpp | 6 ++-- src/kvirc/kernel/KviCustomToolBarDescriptor.h | 2 +- src/kvirc/kernel/KviIpcSentinel.cpp | 4 +-- src/kvirc/kernel/KviIrcConnection.cpp | 3 +- .../kernel/KviIrcConnectionAsyncWhoisData.cpp | 3 +- src/kvirc/kernel/KviIrcConnectionServerInfo.cpp | 11 ++++--- src/kvirc/kernel/KviIrcConnectionServerInfo.h | 2 +- src/kvirc/kernel/KviIrcConnectionStatistics.cpp | 3 +- src/kvirc/kernel/KviIrcSocket.cpp | 3 +- src/kvirc/kernel/KviIrcUrl.cpp | 2 +- src/kvirc/kernel/KviNotifyList.cpp | 3 +- src/kvirc/kvs/KviKvsArray.cpp | 2 +- src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp | 2 +- src/kvirc/kvs/KviKvsPopupMenu.cpp | 16 +++++---- src/kvirc/kvs/KviKvsPopupMenu.h | 6 ++-- src/kvirc/kvs/KviKvsReport.cpp | 10 ++++-- src/kvirc/kvs/KviKvsReport.h | 2 +- src/kvirc/kvs/KviKvsScriptAddonManager.cpp | 11 +++++-- src/kvirc/kvs/KviKvsScriptAddonManager.h | 6 ++-- src/kvirc/kvs/KviKvsVariant.cpp | 6 ++-- src/kvirc/kvs/event/KviKvsEventHandler.cpp | 8 +++-- src/kvirc/kvs/event/KviKvsEventHandler.h | 2 +- src/kvirc/kvs/object/KviKvsObject.cpp | 6 ++-- src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp | 2 +- src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp | 2 +- .../tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp | 14 ++++---- .../tree/KviKvsTreeNodeSpecialCommandSwitch.cpp | 8 ++--- .../tree/KviKvsTreeNodeThisObjectFunctionCall.cpp | 2 +- src/kvirc/module/KviModule.cpp | 2 +- src/kvirc/sparser/KviIrcMessage.cpp | 7 ++-- src/kvirc/sparser/KviIrcServerParser_ctcp.cpp | 4 +-- src/kvirc/ui/KviChannelWindow.cpp | 20 ++++++------ src/kvirc/ui/KviConsoleWindow.cpp | 10 +++--- src/kvirc/ui/KviCustomToolBar.cpp | 2 +- src/kvirc/ui/KviHistoryWindow.cpp | 2 +- src/kvirc/ui/KviInput.cpp | 4 +-- src/kvirc/ui/KviInputEditor.cpp | 7 ++-- src/kvirc/ui/KviIrcToolBar.cpp | 2 +- src/kvirc/ui/KviIrcView.cpp | 6 ++-- src/kvirc/ui/KviIrcView_events.cpp | 2 +- src/kvirc/ui/KviMainWindow.cpp | 14 ++++---- src/kvirc/ui/KviMaskEditor.cpp | 2 +- src/kvirc/ui/KviModeEditor.cpp | 2 +- src/kvirc/ui/KviOptionsWidget.cpp | 2 +- src/kvirc/ui/KviQueryWindow.cpp | 6 ++-- src/kvirc/ui/KviStatusBar.cpp | 4 +-- src/kvirc/ui/KviStatusBarApplet.cpp | 2 +- src/kvirc/ui/KviTopicWidget.cpp | 6 ++-- src/kvirc/ui/KviTreeWindowList.cpp | 2 +- src/kvirc/ui/KviUserListView.cpp | 6 ++-- src/kvirc/ui/KviWindowListBase.cpp | 6 ++-- src/modules/actioneditor/ActionEditor.cpp | 2 +- src/modules/addon/AddonFunctions.cpp | 2 +- src/modules/aliaseditor/AliasEditorWindow.cpp | 2 +- src/modules/classeditor/ClassEditorWindow.cpp | 4 +-- src/modules/dcc/DccFileTransfer.cpp | 4 +-- src/modules/dcc/DccMarshal.cpp | 2 +- src/modules/dcc/DccVoiceAdpcmCodec.cpp | 2 +- src/modules/dcc/DccVoiceCodec.cpp | 6 ++-- src/modules/dcc/DccVoiceWindow.cpp | 4 +-- src/modules/dcc/requests.cpp | 2 +- src/modules/eventeditor/EventEditorWindow.cpp | 12 ++++--- src/modules/eventeditor/EventEditorWindow.h | 4 +-- .../filetransferwindow/FileTransferWindow.cpp | 2 +- src/modules/help/HelpIndex.cpp | 20 ++++++++---- src/modules/help/HelpIndex.h | 4 +-- src/modules/help/HelpWindow.cpp | 2 +- src/modules/http/HttpFileTransfer.cpp | 6 ++-- src/modules/iograph/libkviiograph.cpp | 2 +- src/modules/language/detector.cpp | 8 ++--- src/modules/list/ListWindow.cpp | 2 +- src/modules/logview/LogViewWindow.cpp | 4 +-- src/modules/mediaplayer/MpMp3.cpp | 2 +- src/modules/notifier/NotifierMessage.cpp | 6 ++-- src/modules/notifier/NotifierMessage.h | 2 +- src/modules/notifier/NotifierWindow.cpp | 2 +- src/modules/objects/KvsObject_list.cpp | 2 +- src/modules/objects/KvsObject_listWidget.cpp | 2 +- src/modules/objects/KvsObject_sql.cpp | 2 +- src/modules/objects/KvsObject_treeWidgeteItem.cpp | 2 +- src/modules/objects/qtftp/qftp.cpp | 12 +++++-- src/modules/objects/qtftp/qurlinfo.cpp | 28 +++++++--------- src/modules/objects/qthttp/qhttp.cpp | 38 +++++++++++++++------- src/modules/objects/qthttp/qhttpauthenticator.cpp | 8 ++--- src/modules/options/OptionsWidget_identity.cpp | 2 +- .../options/OptionsWidget_interfaceFeatures.cpp | 2 +- src/modules/package/libkvipackage.cpp | 2 +- src/modules/reguser/RegisteredUserEntryDialog.cpp | 2 +- src/modules/reguser/RegisteredUsersDialog.cpp | 6 ++-- src/modules/rijndael/InitVectorEngine.cpp | 2 +- src/modules/sharedfile/libkvisharedfile.cpp | 2 +- src/modules/snd/libkvisnd.cpp | 2 +- src/modules/spaste/SlowPasteController.cpp | 6 ++-- src/modules/system/libkvisystem.cpp | 2 +- src/modules/theme/SaveThemeDialog.cpp | 2 +- src/modules/torrent/KTorrentDbusInterface.cpp | 3 +- src/modules/upnp/Service.cpp | 8 +++-- src/modules/upnp/Service.h | 2 +- 119 files changed, 315 insertions(+), 262 deletions(-) (limited to 'src/modules/eventeditor/EventEditorWindow.cpp') diff --git a/src/kvilib/core/KviCString.cpp b/src/kvilib/core/KviCString.cpp index f3db9c12f..f7e3f3014 100644 --- a/src/kvilib/core/KviCString.cpp +++ b/src/kvilib/core/KviCString.cpp @@ -955,7 +955,7 @@ int kvi_strMatchRevCS(const char * str1, const char * str2, int index) s2--; // now start comparing - while(1) + while(true) { /* in this case, we have str1 = "lo" and str2 = "hello" */ if(s1 < str1 && !(s2 < str2)) diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp index dade349b3..714ba1726 100644 --- a/src/kvilib/core/KviError.cpp +++ b/src/kvilib/core/KviError.cpp @@ -34,7 +34,7 @@ #include // for the WSAE* error codes #endif -#include +#include #ifdef HAVE_STRERROR #include // for strerror() diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp index 90d936cf5..c5a941469 100644 --- a/src/kvilib/core/KviMemory.cpp +++ b/src/kvilib/core/KviMemory.cpp @@ -31,7 +31,7 @@ #define _KVI_MALLOC_CPP_ #include "KviMemory.h" -#include +#include #ifdef COMPILE_MEMORY_PROFILE #include "KviPointerList.h" diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp index 693b30968..56c33a142 100644 --- a/src/kvilib/core/KviQString.cpp +++ b/src/kvilib/core/KviQString.cpp @@ -31,8 +31,8 @@ #include "KviMemory.h" #include "KviLocale.h" -#include // for tolower() -#include // for sprintf() +#include // for tolower() +#include // for sprintf() #include // kvi_string.cpp @@ -1080,7 +1080,7 @@ namespace KviQString QChar * pPtr = (QChar *)szExp.constData(); if(!pPtr) - return 0; + return false; while(pPtr->unicode()) { diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp index 0ab76e70a..fdbe2bcf8 100644 --- a/src/kvilib/ext/KviNickColors.cpp +++ b/src/kvilib/ext/KviNickColors.cpp @@ -25,7 +25,7 @@ #include "KviNickColors.h" #include "KviMemory.h" -#include +#include #include namespace KviNickColors diff --git a/src/kvilib/ext/KviPixmap.cpp b/src/kvilib/ext/KviPixmap.cpp index a16ecaf25..6e8aaebec 100644 --- a/src/kvilib/ext/KviPixmap.cpp +++ b/src/kvilib/ext/KviPixmap.cpp @@ -27,6 +27,7 @@ #include "KviQString.h" #include +#include KviPixmap::KviPixmap() = default; @@ -55,7 +56,7 @@ bool KviPixmap::load(const QString & path) return false; } - m_pPix.reset(new QPixmap(path)); + m_pPix = std::make_unique(path); if(m_pPix->isNull()) { @@ -76,7 +77,7 @@ void KviPixmap::set(const QPixmap & pix, const QString & szPath) return; } - m_pPix.reset(new QPixmap(pix)); + m_pPix = std::make_unique(pix); m_szPath = szPath; } @@ -96,7 +97,7 @@ KviPixmap & KviPixmap::operator=(const KviPixmap & pix) if(!pix.path().isEmpty() && !pix.isNull()) { m_szPath = pix.path(); - m_pPix.reset(new QPixmap(*(pix.pixmap()))); + m_pPix = std::make_unique(*(pix.pixmap())); } else setNull(); diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp index cabe06fde..8b2e6f5a6 100644 --- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp +++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp @@ -349,13 +349,13 @@ bool KviRegisteredUserDataBase::removeMask(const KviIrcMask & mask) return true; } } - return 0; + return false; } bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask) { if(!mask) - return 0; + return false; if(mask->hasWildNick()) { // remove from the wild list diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp index ebbe22a0d..4537590a6 100644 --- a/src/kvilib/ext/KviRuntimeInfo.cpp +++ b/src/kvilib/ext/KviRuntimeInfo.cpp @@ -32,7 +32,7 @@ #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include -#include +#include #include #endif diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp index 5bb63f0f0..21e571fd6 100644 --- a/src/kvilib/ext/KviStringConversion.cpp +++ b/src/kvilib/ext/KviStringConversion.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include QString g_szGlobalDir; QString g_szLocalDir; diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp index b81abd717..47af63d94 100644 --- a/src/kvilib/irc/KviIrcMask.cpp +++ b/src/kvilib/irc/KviIrcMask.cpp @@ -371,7 +371,7 @@ bool KviIrcMask::matchWildString(const QString & szExp, const QString & szStr) c QChar * pPtr = (QChar *)szExp.constData(); if(!pPtr) - return 0; + return false; while(pPtr->unicode()) { diff --git a/src/kvilib/irc/KviIrcServer.cpp b/src/kvilib/irc/KviIrcServer.cpp index a88a33953..3d5a1c45d 100644 --- a/src/kvilib/irc/KviIrcServer.cpp +++ b/src/kvilib/irc/KviIrcServer.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include // This is not allowed on windows unless we force the symbol to be undefined // It works on linux since gcc allows undefined symbols by default diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp index b1b2618e9..abc9094e8 100644 --- a/src/kvilib/locale/KviMessageCatalogue.cpp +++ b/src/kvilib/locale/KviMessageCatalogue.cpp @@ -61,7 +61,7 @@ #include #include -#include +#include // The magic number of the GNU message catalog format. #define KVI_LOCALE_MAGIC 0x950412de diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp index 530f139ef..476692084 100644 --- a/src/kvilib/net/KviDnsResolver.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -29,7 +29,7 @@ #include -#include +#include #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp index 82b5804d9..d3aefae72 100644 --- a/src/kvilib/net/KviNetUtils.cpp +++ b/src/kvilib/net/KviNetUtils.cpp @@ -241,7 +241,7 @@ bool kvi_binaryIpToStringIp_V6(struct in6_addr in, QString & szBuffer) #endif -#include +#include bool kvi_select(int fd, bool * bCanRead, bool * bCanWrite, int iUSecs) { @@ -610,7 +610,7 @@ kvi_u32_t KviSockaddr::port() bool KviSockaddr::getStringAddress(QString & szBuffer) { if(!m_pData) - return 0; + return false; #ifdef COMPILE_IPV6_SUPPORT switch(((struct addrinfo *)m_pData)->ai_family) { diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp index 0da0cb286..8662b2f98 100644 --- a/src/kvilib/net/KviSSL.cpp +++ b/src/kvilib/net/KviSSL.cpp @@ -36,11 +36,11 @@ #include #include -#include +#include #if !(defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)) // linux, mac -#include +#include #endif static bool g_bSSLInitialized = false; diff --git a/src/kvilib/system/KviSignalHandler.cpp b/src/kvilib/system/KviSignalHandler.cpp index 6fca3f8db..02f4b6aa1 100644 --- a/src/kvilib/system/KviSignalHandler.cpp +++ b/src/kvilib/system/KviSignalHandler.cpp @@ -32,7 +32,7 @@ #include "KviSignalHandler.h" -#include +#include #include #include #include @@ -73,9 +73,7 @@ bool kvi_signalHandlerSetup() sigemptyset(&sa.sa_mask); sa.sa_flags |= SA_RESTART; - return - sigaction(SIGTERM, &sa, 0) == 0 && - sigaction(SIGINT , &sa, 0) == 0; + return sigaction(SIGTERM, &sa, nullptr) == 0 && sigaction(SIGINT, &sa, nullptr) == 0; } // In your Unix signal handlers, you write a byte to the write end of diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp index 3ed70ce60..fbe0888fc 100644 --- a/src/kvilib/system/KviThread.cpp +++ b/src/kvilib/system/KviThread.cpp @@ -32,11 +32,11 @@ #include // for _pipe() #else #include //for pipe() and other tricks -#include // on Windows it is useless +#include // on Windows it is useless #include #endif -#include +#include #include "kvi_settings.h" #include "KviError.h" diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp index c2b25cb70..e7f3ba758 100644 --- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp @@ -121,5 +121,5 @@ QSize KviTalIconAndRichTextItemDelegate::sizeHint(const QStyleOptionViewItem & o if(h < m_oMinimumSize.height()) h = m_oMinimumSize.height(); - return QSize(w, h); + return { w, h }; } diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 7bb963171..4689e619c 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -149,8 +149,8 @@ DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN KviApplication.h #include -#include // rand & srand -#include // time() in srand() +#include // rand & srand +#include // time() in srand() #include // std::map<> // Global application pointer diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp index b3121d6be..9797f50d1 100644 --- a/src/kvirc/kernel/KviApplication_setup.cpp +++ b/src/kvirc/kernel/KviApplication_setup.cpp @@ -37,7 +37,7 @@ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include #else -#include // for getenv() +#include // for getenv() #include // for symlink() <-- unused? #ifdef COMPILE_KDE_SUPPORT diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp index a2427603e..f970e5cb2 100644 --- a/src/kvirc/kernel/KviCoreActions.cpp +++ b/src/kvirc/kernel/KviCoreActions.cpp @@ -841,7 +841,7 @@ KviChangeNickAction::KviChangeNickAction(QObject * pParent) : KviSubmenuAction( pParent, QString(KVI_COREACTION_NICKNAMEMENU), - QString("dialog.textinput(\"" + __tr2qs("Change Nickname") + "\",\"" + __tr2qs("Please enter the new nickname") + "\",\"" + __tr2qs("OK") + "\",\"" + __tr2qs("Cancel") + "\"){ if($0 == 0 && $1 != \"\")nick $1; }"), + QString("dialog.textinput(\"" + __tr2qs("Change Nickname") + "\",\"" + __tr2qs("Please enter the new nickname") + "\",\"" + __tr2qs("OK") + "\",\"" + __tr2qs("Cancel") + R"("){ if($0 == 0 && $1 != "")nick $1; })"), __tr2qs("Change Nickname"), __tr2qs("Shows a popup menu that allows quickly changing the nickname"), KviActionManager::categoryIrc(), diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp index 99dbd4da8..b5c8a8ec2 100644 --- a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp +++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp @@ -23,6 +23,8 @@ //============================================================================= #include "KviCustomToolBarDescriptor.h" + +#include #include "KviCustomToolBar.h" #include "KviConfigurationFile.h" #include "KviAction.h" @@ -32,8 +34,8 @@ #include "KviKvsScript.h" #include "KviWindow.h" -KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const QString & szId, const QString & szLabelCode) - : m_szId(szId) +KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(QString szId, const QString & szLabelCode) + : m_szId(std::move(szId)) { m_iInternalId = g_pApp->getGloballyUniqueId(); m_pActions = new KviPointerList; diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.h b/src/kvirc/kernel/KviCustomToolBarDescriptor.h index 72273fac9..7b68cce1d 100644 --- a/src/kvirc/kernel/KviCustomToolBarDescriptor.h +++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.h @@ -38,7 +38,7 @@ class KVIRC_API KviCustomToolBarDescriptor friend class KviCustomToolBarManager; protected: - KviCustomToolBarDescriptor(const QString & szId, const QString & szLabelCode); + KviCustomToolBarDescriptor(QString szId, const QString & szLabelCode); public: ~KviCustomToolBarDescriptor(); diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp index 830fb1d0b..bfa60e6aa 100644 --- a/src/kvirc/kernel/KviIpcSentinel.cpp +++ b/src/kvirc/kernel/KviIpcSentinel.cpp @@ -41,8 +41,8 @@ #include // for getuid, getpid #include // for getuid, getpid -#include // for memcpy -#include // for malloc +#include // for memcpy +#include // for malloc #include diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index 8cddfc62a..c70a42097 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -72,6 +72,7 @@ #include #include +#include extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; @@ -88,7 +89,7 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext, KviIrcConnectionTar m_pAntiCtcpFloodData = new KviIrcConnectionAntiCtcpFloodData(); m_pNetsplitDetectorData = new KviIrcConnectionNetsplitDetectorData(); m_pAsyncWhoisData = new KviIrcConnectionAsyncWhoisData(); - m_pStatistics = std::unique_ptr(new KviIrcConnectionStatistics); + m_pStatistics = std::make_unique(); m_pRequestQueue = new KviIrcConnectionRequestQueue(); setupSrvCodec(); setupTextCodec(); diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp index f8973e8fc..fa6509ee8 100644 --- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp @@ -26,8 +26,7 @@ #include "KviKvsScript.h" KviAsyncWhoisInfo::KviAsyncWhoisInfo() -{ -} + = default; KviAsyncWhoisInfo::~KviAsyncWhoisInfo() { diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp index 7a2a98b91..3180e6bd3 100644 --- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp +++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp @@ -23,6 +23,8 @@ //============================================================================= #include "KviIrcConnectionServerInfo.h" + +#include #include "KviLocale.h" #include "KviMemory.h" #include "KviIrcUserDataBase.h" @@ -185,7 +187,7 @@ bool KviIrcConnectionServerInfo::isSupportedModeFlag(QChar c) const QChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) const { if(!m_pModePrefixTable) - return QChar(0); + return { 0 }; for(unsigned int i = 0; i < m_uPrefixes; i++) { if(m_pModePrefixTable[i * 3 + 2] & flag) @@ -197,7 +199,7 @@ QChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) const QChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) const { if(!m_pModePrefixTable) - return QChar(0); + return { 0 }; for(unsigned int i = 0; i < m_uPrefixes; i++) { if(m_pModePrefixTable[i * 3 + 2] & flag) @@ -274,8 +276,9 @@ void KviIrcConnectionServerInfo::setServerVersion(const QString & version) m_pServInfo = new KviBasicIrcServerInfo(this, version); } -KviBasicIrcServerInfo::KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParent, const QString & version) - : m_pParent(pParent), m_szServerVersion(version) +KviBasicIrcServerInfo::KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParent, QString version) + : m_pParent(pParent) + , m_szServerVersion(std::move(version)) { } diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.h b/src/kvirc/kernel/KviIrcConnectionServerInfo.h index 98988576c..e90dee11f 100644 --- a/src/kvirc/kernel/KviIrcConnectionServerInfo.h +++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.h @@ -40,7 +40,7 @@ protected: KviIrcConnectionServerInfo * m_pParent; public: - KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParent = nullptr, const QString & version = KviQString::Empty); + KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParent = nullptr, QString version = KviQString::Empty); virtual ~KviBasicIrcServerInfo(); public: diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp index 68f4ec53c..af7a2b6f7 100644 --- a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp +++ b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp @@ -25,8 +25,7 @@ #include "KviIrcConnectionStatistics.h" KviIrcConnectionStatistics::KviIrcConnectionStatistics() -{ -} + = default; KviIrcConnectionStatistics::~KviIrcConnectionStatistics() = default; diff --git a/src/kvirc/kernel/KviIrcSocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp index 9b69b7deb..fe99411be 100644 --- a/src/kvirc/kernel/KviIrcSocket.cpp +++ b/src/kvirc/kernel/KviIrcSocket.cpp @@ -45,6 +45,7 @@ #include #include +#include #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include //for gettimeofday() @@ -70,7 +71,7 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink) if(KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) < 100) KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) = 100; // this is our minimum, we don't want to lag the app - m_pFlushTimer.reset(new QTimer()); // queue flush timer + m_pFlushTimer = std::make_unique(); // queue flush timer connect(m_pFlushTimer.get(), SIGNAL(timeout()), this, SLOT(flushSendQueue())); } diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp index 1c8fed1d9..33614192a 100644 --- a/src/kvirc/kernel/KviIrcUrl.cpp +++ b/src/kvirc/kernel/KviIrcUrl.cpp @@ -112,7 +112,7 @@ void KviIrcUrl::split(const QString & url, KviIrcUrlParts & result) result.iPort = 6667; result.iError = 0; - QRegExp rx("^(irc(s)?(6)?://)?\\[?([\\w\\d\\.-]*|[\\d:a-f]*)\\]?(:(\\d*))?(/(.*))?$"); + QRegExp rx(R"(^(irc(s)?(6)?://)?\[?([\w\d\.-]*|[\d:a-f]*)\]?(:(\d*))?(/(.*))?$)"); if(rx.indexIn(url) < 0) { diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 6196c1eeb..a6a65bb9a 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -47,6 +47,7 @@ #include #include +#include #include #include @@ -815,7 +816,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage * msg) { if(KviQString::equalCI(s, szNick)) { - tmplist.emplace(i, std::unique_ptr(new KviIrcMask(szNick, szUser, szHost))); + tmplist.emplace(i, std::make_unique(szNick, szUser, szHost)); bGotIt = true; break; } diff --git a/src/kvirc/kvs/KviKvsArray.cpp b/src/kvirc/kvs/KviKvsArray.cpp index a70c0b415..e59aa488e 100644 --- a/src/kvirc/kvs/KviKvsArray.cpp +++ b/src/kvirc/kvs/KviKvsArray.cpp @@ -25,7 +25,7 @@ #include "KviKvsArray.h" #include "KviMemory.h" -#include +#include #define KVI_KVS_ARRAY_ALLOC_CHUNK 8 diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp index 4f83c5679..ecf020dd8 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp @@ -37,7 +37,7 @@ #include "KviApplication.h" #include "KviQueryWindow.h" -#include // rand & srand +#include // rand & srand namespace KviKvsCoreFunctions { diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp index 77a673b4e..1be8489c0 100644 --- a/src/kvirc/kvs/KviKvsPopupMenu.cpp +++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp @@ -34,6 +34,7 @@ #include "KviOptions.h" #include +#include // popup names // rootname : the root popup @@ -53,8 +54,9 @@ KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t, const QString & szItemName, con } } -KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t, const QString & szItemName, const KviKvsScript * pCondition) - : m_szItemName{szItemName}, m_eType{t} +KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t, QString szItemName, const KviKvsScript * pCondition) + : m_szItemName{ std::move(szItemName) } + , m_eType{ t } { if(pCondition) m_pKvsCondition = new KviKvsScript(*pCondition); @@ -392,8 +394,9 @@ void KviKvsPopupMenuItemMenu::clear() m_pMenu->clearMenuContents(); } -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemName, const QString & szMenuName, const QString & szText, const QString & szIcon, const QString & szCondition) - : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu, szItemName, szText, szIcon, szCondition), m_szMenuName{szMenuName} +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemName, QString szMenuName, const QString & szText, const QString & szIcon, const QString & szCondition) + : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu, szItemName, szText, szIcon, szCondition) + , m_szMenuName{ std::move(szMenuName) } { if(m_szMenuName[0] == '"' && m_szMenuName[m_szMenuName.length() - 1] == '"') { @@ -402,8 +405,9 @@ KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemNam } } -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemName, const QString & szMenuName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition) - : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu, szItemName, pText, pIcon, pCondition), m_szMenuName{szMenuName} +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemName, QString szMenuName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition) + : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu, szItemName, pText, pIcon, pCondition) + , m_szMenuName{ std::move(szMenuName) } { if(m_szMenuName[0] == '"' && m_szMenuName[m_szMenuName.length() - 1] == '"') { diff --git a/src/kvirc/kvs/KviKvsPopupMenu.h b/src/kvirc/kvs/KviKvsPopupMenu.h index 5f4e2383b..0ad36e19f 100644 --- a/src/kvirc/kvs/KviKvsPopupMenu.h +++ b/src/kvirc/kvs/KviKvsPopupMenu.h @@ -87,7 +87,7 @@ public: protected: KviKvsPopupMenuItem(Type t, const QString & szItemName, const QString & szCondition); - KviKvsPopupMenuItem(Type t, const QString & szItemName, const KviKvsScript * pCondition); + KviKvsPopupMenuItem(Type t, QString szItemName, const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItem(); @@ -250,8 +250,8 @@ class KVIRC_API KviKvsPopupMenuItemExtMenu : public KviKvsPopupMenuItemWithTextA friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemExtMenu(const QString & szItemName, const QString & szMenuName, const QString & szText, const QString & szIcon, const QString & szCondition); - KviKvsPopupMenuItemExtMenu(const QString & szItemName, const QString & szMenuName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition); + KviKvsPopupMenuItemExtMenu(const QString & szItemName, QString szMenuName, const QString & szText, const QString & szIcon, const QString & szCondition); + KviKvsPopupMenuItemExtMenu(const QString & szItemName, QString szMenuName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition); public: ~KviKvsPopupMenuItemExtMenu(); diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp index 7bd515293..2161e232b 100644 --- a/src/kvirc/kvs/KviKvsReport.cpp +++ b/src/kvirc/kvs/KviKvsReport.cpp @@ -23,6 +23,8 @@ //============================================================================= #include "KviKvsReport.h" + +#include #include "KviControlCodes.h" #include "KviWindow.h" #include "kvi_out.h" @@ -31,8 +33,12 @@ #include "KviDebugWindow.h" #include "KviOptions.h" -KviKvsReport::KviKvsReport(Type t, const QString & szContext, const QString & szMessage, const QString & szLocation, KviWindow * pWindow) - : m_eType(t), m_szContext(szContext), m_szMessage(szMessage), m_szLocation(szLocation), m_pWindow(pWindow) +KviKvsReport::KviKvsReport(Type t, QString szContext, QString szMessage, QString szLocation, KviWindow * pWindow) + : m_eType(t) + , m_szContext(std::move(szContext)) + , m_szMessage(std::move(szMessage)) + , m_szLocation(std::move(szLocation)) + , m_pWindow(pWindow) { m_pCallStack = nullptr; m_pCodeListing = nullptr; diff --git a/src/kvirc/kvs/KviKvsReport.h b/src/kvirc/kvs/KviKvsReport.h index f3f0b9ffa..4e969bf17 100644 --- a/src/kvirc/kvs/KviKvsReport.h +++ b/src/kvirc/kvs/KviKvsReport.h @@ -42,7 +42,7 @@ public: }; public: - KviKvsReport(Type t, const QString & szContext, const QString & szMessage, const QString & szLocation, KviWindow * pWindow); + KviKvsReport(Type t, QString szContext, QString szMessage, QString szLocation, KviWindow * pWindow); ~KviKvsReport(); protected: diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp index 9ad223469..f980f23a7 100644 --- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp +++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp @@ -31,16 +31,21 @@ #include "KviApplication.h" #include +#include KviKvsScriptAddonManager * KviKvsScriptAddonManager::m_pInstance = nullptr; KviKvsScriptAddon::KviKvsScriptAddon( - const QString & szName, - const QString & szVersion, + QString szName, + QString szVersion, const QString & szVisibleNameCode, const QString & szDescriptionCode, const QString & szUninstallCallbackCode, - const QString & szIconId) : KviHeapObject(), m_szName(szName), m_szVersion(szVersion), m_szIconId(szIconId) + QString szIconId) + : KviHeapObject() + , m_szName(std::move(szName)) + , m_szVersion(std::move(szVersion)) + , m_szIconId(std::move(szIconId)) { allocateScripts(szVisibleNameCode, szDescriptionCode, szUninstallCallbackCode); m_pConfigureCallback = nullptr; diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.h b/src/kvirc/kvs/KviKvsScriptAddonManager.h index a53c4da80..58536c75d 100644 --- a/src/kvirc/kvs/KviKvsScriptAddonManager.h +++ b/src/kvirc/kvs/KviKvsScriptAddonManager.h @@ -43,12 +43,12 @@ class KVIRC_API KviKvsScriptAddon : public KviHeapObject protected: KviKvsScriptAddon(); KviKvsScriptAddon( - const QString & szName, - const QString & szVersion, + QString szName, + QString szVersion, const QString & szVisibleNameCode, const QString & szDescriptionCode, const QString & szUninstallCallbackCode, - const QString & szIconId); + QString szIconId); public: KviKvsScriptAddon(const KviKvsScriptAddon & a); diff --git a/src/kvirc/kvs/KviKvsVariant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp index 38ae42cb6..b7547beef 100644 --- a/src/kvirc/kvs/KviKvsVariant.cpp +++ b/src/kvirc/kvs/KviKvsVariant.cpp @@ -27,7 +27,7 @@ #include "KviKvsHash.h" #include "KviKvsArray.h" -#include +#include #include int KviKvsVariantComparison::compareIntString(const KviKvsVariant * pV1, const KviKvsVariant * pV2) @@ -1671,7 +1671,7 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux) //skip leading '{' (*ppAux)++; int i = 0; - while(1) + while(true) { //skip leading space while((*ppAux)->isSpace()) @@ -1744,7 +1744,7 @@ KviKvsVariant * KviKvsVariant::unserializeArray(const QChar ** ppAux) KviKvsVariant * pElement = nullptr; (*ppAux)++; int i = 0; - while(1) + while(true) { pElement = unserialize(ppAux); if(pElement) diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp index 37f14aca3..4392623c4 100644 --- a/src/kvirc/kvs/event/KviKvsEventHandler.cpp +++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp @@ -24,6 +24,8 @@ #include "KviKvsEventHandler.h" +#include + KviKvsEventHandler::KviKvsEventHandler(Type t) : KviHeapObject(), m_type(t) { @@ -32,8 +34,10 @@ KviKvsEventHandler::KviKvsEventHandler(Type t) KviKvsEventHandler::~KviKvsEventHandler() = default; -KviKvsScriptEventHandler::KviKvsScriptEventHandler(const QString & szHandlerName, const QString & szContextName, const QString & szCode, bool bEnabled) - : KviKvsEventHandler(KviKvsEventHandler::Script), m_szName(szHandlerName), m_bEnabled(bEnabled) +KviKvsScriptEventHandler::KviKvsScriptEventHandler(QString szHandlerName, const QString & szContextName, const QString & szCode, bool bEnabled) + : KviKvsEventHandler(KviKvsEventHandler::Script) + , m_szName(std::move(szHandlerName)) + , m_bEnabled(bEnabled) { m_pScript = new KviKvsScript(szContextName, szCode); } diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.h b/src/kvirc/kvs/event/KviKvsEventHandler.h index c03ed7a4b..804e8750d 100644 --- a/src/kvirc/kvs/event/KviKvsEventHandler.h +++ b/src/kvirc/kvs/event/KviKvsEventHandler.h @@ -54,7 +54,7 @@ class KVIRC_API KviKvsScriptEventHandler : public KviKvsEventHandler { public: // the event handler becomes the owned of pszCode! - KviKvsScriptEventHandler(const QString & szHandlerName, const QString & szContextName, const QString & szCode, bool bEnabled = true); + KviKvsScriptEventHandler(QString szHandlerName, const QString & szContextName, const QString & szCode, bool bEnabled = true); virtual ~KviKvsScriptEventHandler(); protected: diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp index 490b7bad3..1dc4053da 100644 --- a/src/kvirc/kvs/object/KviKvsObject.cpp +++ b/src/kvirc/kvs/object/KviKvsObject.cpp @@ -45,9 +45,9 @@ #include #include -#include +#include - /* +/* @doc: objects @title: Object scripting @@ -524,7 +524,7 @@ by all the modern kernels and used in inter-process communication).[br] */ - /* +/* @doc: object @keyterms: object class, object, class diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp index ee541da7d..bd87977d2 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp @@ -25,7 +25,7 @@ #include "KviKvsTreeNodeExpression.h" #include "KviLocale.h" -#include +#include KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation) : KviKvsTreeNodeData(pLocation) diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp index 7783f28fe..c8191ca01 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp @@ -29,7 +29,7 @@ #include -#include +#include KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const QChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp index 45468925f..f9b829855 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp @@ -33,7 +33,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(QString & szBuffer) { - szBuffer = "Label \"extpopup\" for Special Command \"defpopup\""; + szBuffer = R"(Label "extpopup" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix) @@ -67,7 +67,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::execute(KviKvsRunTimeCon void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(QString & szBuffer) { - szBuffer = "Label \"item\" for Special Command \"defpopup\""; + szBuffer = R"(Label "item" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) @@ -101,7 +101,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelItem::execute(KviKvsRunTimeContext void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(QString & szBuffer) { - szBuffer = "Label \"label\" for Special Command \"defpopup\""; + szBuffer = R"(Label "label" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) @@ -131,7 +131,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::execute(KviKvsRunTimeContex void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(QString & szBuffer) { - szBuffer = "Label \"separator\" for Special Command \"defpopup\""; + szBuffer = R"(Label "separator" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefix) @@ -151,7 +151,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::execute(KviKvsRunTimeCo void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(QString & szBuffer) { - szBuffer = "Label \"epilogue\" for Special Command \"defpopup\""; + szBuffer = R"(Label "epilogue" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix) @@ -171,7 +171,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::execute(KviKvsRunTimeCon void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(QString & szBuffer) { - szBuffer = "Label \"prologue\" for Special Command \"defpopup\""; + szBuffer = R"(Label "prologue" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix) @@ -203,7 +203,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::~KviKvsTreeNodeSpecialCommandDef void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(QString & szBuffer) { - szBuffer = "Label \"popup\" for Special Command \"defpopup\""; + szBuffer = R"(Label "popup" for Special Command "defpopup")"; } void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp index c8946414a..f9afc3c64 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp @@ -74,7 +74,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitch void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString & szBuffer) { - szBuffer = "Label \"case\" for Special Command \"switch\""; + szBuffer = R"(Label "case" for Special Command "switch")"; } void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) @@ -168,7 +168,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitc void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString & szBuffer) { - szBuffer = "Label \"match\" for Special Command \"switch\""; + szBuffer = R"(Label "match" for Special Command "switch")"; } void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) @@ -227,7 +227,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwit void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString & szBuffer) { - szBuffer = "Label \"regexp\" for Special Command \"switch\""; + szBuffer = R"(Label "regexp" for Special Command "switch")"; } void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) @@ -286,7 +286,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwi void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString & szBuffer) { - szBuffer = "Label \"default\" for Special Command \"switch\""; + szBuffer = R"(Label "default" for Special Command "switch")"; } void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp index 1cac36ac8..3ef2e56f6 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp @@ -35,7 +35,7 @@ KviKvsTreeNodeThisObjectFunctionCall::~KviKvsTreeNodeThisObjectFunctionCall() void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(QString & szBuffer) { - szBuffer = "\"This\" Object Function Call \""; + szBuffer = R"("This" Object Function Call ")"; szBuffer += m_szFunctionName; szBuffer += "\""; } diff --git a/src/kvirc/module/KviModule.cpp b/src/kvirc/module/KviModule.cpp index de2e7e46e..8d381cde8 100644 --- a/src/kvirc/module/KviModule.cpp +++ b/src/kvirc/module/KviModule.cpp @@ -33,7 +33,7 @@ #include -#include +#include #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp index e5d8eea9a..49102ee78 100644 --- a/src/kvirc/sparser/KviIrcMessage.cpp +++ b/src/kvirc/sparser/KviIrcMessage.cpp @@ -72,7 +72,7 @@ KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnectio if(*m_ptr == ':') { ++m_ptr; - m_pParams.push_back(KviCString(m_ptr)); + m_pParams.emplace_back(m_ptr); break; // this was the last } else @@ -80,7 +80,7 @@ KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnectio aux = m_ptr; while(*m_ptr && (*m_ptr != ' ')) ++m_ptr; - m_pParams.push_back(KviCString(aux, m_ptr)); + m_pParams.emplace_back(aux, m_ptr); while(*m_ptr == ' ') ++m_ptr; } @@ -122,8 +122,7 @@ KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnectio } KviIrcMessage::~KviIrcMessage() -{ -} + = default; void KviIrcMessage::decodeAndSplitMask(char * b, QString & szNick, QString & szUser, QString & szHost) { diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp index 88932531f..eb8c0fd75 100644 --- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp @@ -62,7 +62,7 @@ #include "KviCryptController.h" #endif //COMPILE_CRYPT_SUPPORT -#include +#include #include #include @@ -1872,7 +1872,7 @@ void KviIrcServerParser::parseCtcpReplyAvatar(KviCtcpMessage * msg) msg->msg->haltOutput() ? QString() : textLine); } -typedef void (*dccModuleCtcpDccParseRoutine)(KviDccRequest * par); +using dccModuleCtcpDccParseRoutine = void (*)(KviDccRequest *); void KviIrcServerParser::parseCtcpRequestDcc(KviCtcpMessage * msg) { diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index c54a3956b..74c8f5441 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -59,7 +59,7 @@ #endif //COMPILE_CRYPT_SUPPORT #include -#include +#include #include #include @@ -398,7 +398,7 @@ void KviChannelWindow::loadProperties(KviConfigurationFile * pCfg) KviWindow::loadProperties(pCfg); if(m_pUserListView) { - bool bHidden = pCfg->readBoolEntry("UserListHidden", 0); + bool bHidden = pCfg->readBoolEntry("UserListHidden", false); m_pUserListView->setHidden(bHidden); m_pListViewButton->setChecked(!bHidden); if(!bHidden) @@ -1048,12 +1048,12 @@ void KviChannelWindow::getWindowListTipText(QString & szBuffer) { if((cas.lTalkingUsers.count() < 3) && (cas.lWereTalkingUsers.count() > 0)) { - szBuffer += ""; + szBuffer += R"()"; getTalkingUsersStats(szBuffer, cas.lWereTalkingUsers, true); szBuffer += ""; szBuffer += szRowEnd; } - szBuffer += ""; + szBuffer += R"()"; getTalkingUsersStats(szBuffer, cas.lTalkingUsers, false); szBuffer += ""; szBuffer += szRowEnd; @@ -1062,14 +1062,14 @@ void KviChannelWindow::getWindowListTipText(QString & szBuffer) { if(cas.lWereTalkingUsers.count() > 0) { - szBuffer += ""; + szBuffer += R"()"; getTalkingUsersStats(szBuffer, cas.lWereTalkingUsers, true); szBuffer += ""; szBuffer += szRowEnd; } } - szBuffer += ""; + szBuffer += R"()"; if(cas.dActionsPerMinute < 0.1) szBuffer += __tr2qs("No activity"); @@ -1254,7 +1254,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback) // first part (optimization): quickly find an high index that is _surely_lesser_ // than the correct one - while(1) + while(true) { iC++; szTmp = pEncoder->fromUnicode(szTmpBuffer.left(iPos)); @@ -1270,7 +1270,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback) // now, do it the simple way: increment our index until we perfectly fit into the // available space - while(1) + while(true) { iC++; @@ -1438,7 +1438,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) // first part (optimization): quickly find an high index that is _surely_lesser_ // than the correct one - while(1) + while(true) { iC++; szTmp = pEncoder->fromUnicode(szTmpBuffer.left(iPos)); @@ -1453,7 +1453,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) //printf("Multi message: %d optimization cyles", iC); // now, do it the simple way: increment our index until we perfectly fit into the // available space - while(1) + while(true) { iC++; diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index 8e2c3b70e..f400ef14d 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -280,7 +280,7 @@ void KviConsoleWindow::getUserTipText(const QString & nick, KviIrcUserEntry * e, if(e->avatar()) { - buffer += QString(nrs + "
" + enr).arg(e->avatar()->localPath()).arg(e->avatar()->size().width()); + buffer += QString(nrs + R"(
)" + enr).arg(e->avatar()->localPath()).arg(e->avatar()->size().width()); } if(e->hasRealName()) @@ -340,7 +340,7 @@ void KviConsoleWindow::getUserTipText(const QString & nick, KviIrcUserEntry * e, if(e->hasHops()) { - buffer += ""; + buffer += R"()"; buffer += __tr2qs("Hops: %1").arg(e->hops()); buffer += "" + enr; } @@ -353,14 +353,14 @@ void KviConsoleWindow::getUserTipText(const QString & nick, KviIrcUserEntry * e, if(e->hasAccountName()) { - buffer += ""; + buffer += R"()"; buffer += __tr2qs("Identified to account: %1").arg(e->accountName()); buffer += "" + enr; } if(e->isAway()) { - buffer += ""; + buffer += R"()"; buffer += __tr2qs("Probably away"); buffer += "" + enr; } @@ -1306,7 +1306,7 @@ void KviConsoleWindow::getWindowListTipText(QString & buffer) buffer += tspan; buffer += html_eofbold; - buffer += enr + ""; + buffer += enr + R"()"; tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->lastMessageTime())), KviTimeUtils::NoLeadingEmptyIntervals | KviTimeUtils::NoLeadingZeroes); diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp index 0e8081bb3..5fe6dafb6 100644 --- a/src/kvirc/ui/KviCustomToolBar.cpp +++ b/src/kvirc/ui/KviCustomToolBar.cpp @@ -358,7 +358,7 @@ QSize KviCustomToolBarSeparator::sizeHint() const int iExtent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent, &opt, this); if(m_pToolBar->orientation() == Qt::Horizontal) - return QSize(iExtent, 0); + return { iExtent, 0 }; else return QSize(0, iExtent); } diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp index 85b309f29..adfd141ae 100644 --- a/src/kvirc/ui/KviHistoryWindow.cpp +++ b/src/kvirc/ui/KviHistoryWindow.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include KviHistoryWindow::KviHistoryWindow(QWidget * pParent) : QListWidget(pParent) diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp index bb33bb81a..b84910d7d 100644 --- a/src/kvirc/ui/KviInput.cpp +++ b/src/kvirc/ui/KviInput.cpp @@ -60,8 +60,8 @@ #include #include -#include -#include +#include +#include //This comes from KviApplication.cpp extern KviColorWindow * g_pColorWindow; diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index d679fa923..1584dba31 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -73,6 +73,7 @@ #include #include +#include #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include @@ -121,8 +122,8 @@ public: { } - KviInputEditorTextBlock(const QString & text) - : szText(text) + KviInputEditorTextBlock(QString text) + : szText(std::move(text)) { } }; @@ -986,7 +987,7 @@ QChar KviInputEditor::getSubstituteChar(unsigned short uControlCode) return QChar('E'); break; default: - return QChar(uControlCode); + return { uControlCode }; break; } } diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp index 35b0f0bd7..567aabd31 100644 --- a/src/kvirc/ui/KviIrcToolBar.cpp +++ b/src/kvirc/ui/KviIrcToolBar.cpp @@ -309,7 +309,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip, const QPoint &) txt += nbspc + __tr2qs("Lag: ?.?\?"); //escaped a ? due to compiler trigraphs warning } - txt += ""; + txt += R"()"; txt += szIrcContext; txt += "" + enr; } diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 351050be3..7f1e628ac 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -107,7 +107,7 @@ #include #include -#include +#include #ifdef COMPILE_ON_WINDOWS #pragma warning(disable : 4102) @@ -2863,7 +2863,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect else { uLineWraps++; - bHadWordWraps = 1; + bHadWordWraps = true; } } if(pRect) @@ -2884,7 +2884,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect { QString szLink; int iEndOfLInk = iLastEscapeBlock; - while(1) + while(true) { if(l->pBlocks[iEndOfLInk].pChunk) { diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp index 1b7d38ace..69374aaf3 100644 --- a/src/kvirc/ui/KviIrcView_events.cpp +++ b/src/kvirc/ui/KviIrcView_events.cpp @@ -860,7 +860,7 @@ void KviIrcView::doMarkerToolTip() QString tip; tip += ""; - tip += "
"; + tip += R"(
)"; tip += __tr2qs("Scroll up to read from the last read line"); tip += "
"; diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 35248b064..a3c6c5023 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -75,7 +75,7 @@ #include #include -#include +#include #include #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -1301,32 +1301,32 @@ void KviMainWindow::recreateWindowList() // Some accelerators // -void KviMainWindow::switchToPrevWindow(void) +void KviMainWindow::switchToPrevWindow() { m_pWindowList->switchWindow(false, false); } -void KviMainWindow::switchToNextWindow(void) +void KviMainWindow::switchToNextWindow() { m_pWindowList->switchWindow(true, false); } -void KviMainWindow::switchToPrevHighlightedWindow(void) +void KviMainWindow::switchToPrevHighlightedWindow() { m_pWindowList->switchWindow(false, false, true); } -void KviMainWindow::switchToNextHighlightedWindow(void) +void KviMainWindow::switchToNextHighlightedWindow() { m_pWindowList->switchWindow(true, false, true); } -void KviMainWindow::switchToPrevWindowInContext(void) +void KviMainWindow::switchToPrevWindowInContext() { m_pWindowList->switchWindow(false, true); } -void KviMainWindow::switchToNextWindowInContext(void) +void KviMainWindow::switchToNextWindowInContext() { m_pWindowList->switchWindow(true, true); } diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp index c0b1d036c..b013ea719 100644 --- a/src/kvirc/ui/KviMaskEditor.cpp +++ b/src/kvirc/ui/KviMaskEditor.cpp @@ -71,7 +71,7 @@ KviMaskInputDialog::KviMaskInputDialog(const QString & szMask, KviMaskEditor * p { m_pChannel = pChannel; m_pEditor = pEditor; - setModal(1); + setModal(true); m_szOldMask = szMask; setWindowTitle(__tr2qs("Mask Editor - KVIrc")); diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp index 5a05289cd..3e8eafbde 100644 --- a/src/kvirc/ui/KviModeEditor.cpp +++ b/src/kvirc/ui/KviModeEditor.cpp @@ -450,7 +450,7 @@ inline const QString * KviModeEditor::getModeDescription(char cMode) inline bool KviModeEditor::modeNeedsParameterOnlyWhenSet(char cMode) { if(!m_pChannel) - return 0; + return false; KviIrcConnectionServerInfo * pServerInfo = m_pChannel->serverInfo(); if(pServerInfo) return pServerInfo->supportedParameterWhenSetModes().contains(cMode); diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp index 46794891a..2e8dbc62f 100644 --- a/src/kvirc/ui/KviOptionsWidget.cpp +++ b/src/kvirc/ui/KviOptionsWidget.cpp @@ -71,7 +71,7 @@ KviOptionsWidget::~KviOptionsWidget() void KviOptionsWidget::mergeTip(QWidget * w, const QString & tip) { - static QString begin = "
"; + static QString begin = R"(
)"; static QString mid = "
"; static QString end = "
"; diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index f64b3bc00..fb0ab6555 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -200,7 +200,7 @@ QString KviQueryWindow::getInfoLabelText() szTmp += "\n"; - if(connection()->getCommonChannels(m_szName, szChans, 0)) + if(connection()->getCommonChannels(m_szName, szChans, false)) szTmp += __tr2qs("Common channels: %2").arg(szChans); else szTmp += __tr2qs("No common channels"); @@ -629,7 +629,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback) // first part (optimization): quickly find an high index that is _surely_lesser_ // than the correct one - while(1) + while(true) { iC++; szTmp = pEncoder->fromUnicode(szTmpBuffer.left(iPos)); @@ -647,7 +647,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback) // now, do it the simple way: increment our index until we perfectly fit into the // available space - while(1) + while(true) { iC++; diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp index 8aed13490..20f2308dd 100644 --- a/src/kvirc/ui/KviStatusBar.cpp +++ b/src/kvirc/ui/KviStatusBar.cpp @@ -312,7 +312,7 @@ void KviStatusBar::tipRequest(QHelpEvent * e) QString szTip; if(pApplet) { - szTip = ""; + szTip = R"(
" + pApplet->descriptor()->visibleName() + "
"; QString szTipx = pApplet->tipText(pApplet->mapFromGlobal(mapToGlobal(e->pos()))); if(!szTipx.isEmpty()) @@ -322,7 +322,7 @@ void KviStatusBar::tipRequest(QHelpEvent * e) szTip += ""; } - szTip += ""; } @@ -1709,14 +1709,14 @@ void KviUserListView::maybeTip(KviUserListToolTip * pTip, const QPoint & pnt) iSecs = iSecs % 60; int iHours = iMins / 60; iMins = iMins % 60; - szBuffer += ""; } if(pEntry->m_pGlobalData->isIrcOp()) { - szBuffer += ""; } diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index 73776be0d..76a39caa9 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -215,7 +215,7 @@ QSize KviWindowListTitleWidget::sizeHint() const { // if there is no handle there is nothing to paint. if(!KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHandle)) - return QSize(0, 0); + return { 0, 0 }; int h, w; if(m_pParent->features() & QDockWidget::DockWidgetVerticalTitleBar) @@ -840,7 +840,7 @@ KviWindowListItem * KviClassicWindowList::firstItem() return m_pButtonList->first(); } -KviWindowListItem * KviClassicWindowList::lastItem(void) +KviWindowListItem * KviClassicWindowList::lastItem() { return m_pButtonList->last(); } @@ -850,7 +850,7 @@ KviWindowListItem * KviClassicWindowList::nextItem() return m_pButtonList->next(); } -KviWindowListItem * KviClassicWindowList::prevItem(void) +KviWindowListItem * KviClassicWindowList::prevItem() { return m_pButtonList->prev(); } diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 19d6cddd3..d90d4fb35 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -72,7 +72,7 @@ ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v, ActionDa m_pTreeWidget = v; //setFlags(Qt::ItemIsUserSelectable); QString t = "" + m_pActionData->m_szName + ""; - t += "
" + m_pActionData->m_szVisibleName + ""; + t += R"(
)" + m_pActionData->m_szVisibleName + ""; m_szKey = m_pActionData->m_szName.toUpper(); setText(0, t); QPixmap * p = g_pIconManager->getBigIcon(m_pActionData->m_szBigIcon); diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 5ffd5466c..5aa50a1be 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include namespace AddonFunctions { diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index ee93c23b2..634e916a4 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -364,7 +364,7 @@ void AliasEditorWidget::itemRenamed(QTreeWidgetItem * it, int col) bool AliasEditorWidget::hasSelectedItems() { - return m_pTreeWidget->selectedItems().count() ? 1 : 0; + return m_pTreeWidget->selectedItems().count() ? true : false; } bool AliasEditorWidget::itemExists(QTreeWidgetItem * pSearchFor) diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index cee1e3d8c..39c265341 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -461,7 +461,7 @@ void ClassEditorWidget::createFullClass(KviKvsObjectClass * pClass, ClassEditorT bool ClassEditorWidget::hasSelectedItems() { - return m_pTreeWidget->selectedItems().count() ? 1 : 0; + return m_pTreeWidget->selectedItems().count() ? true : false; } bool ClassEditorWidget::classExists(QString & szFullItemName) @@ -2071,7 +2071,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co pLabel = new QLabel(pHBox); pLabel->setObjectName("reminderlabel"); - pLabel->setWordWrap(1); + pLabel->setWordWrap(true); pLabel->setText(__tr2qs_ctx("Please enter the optional reminder string for the member function:", "editor")); m_pReminderLineEdit = new QLineEdit(pHBox); diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index 7de19d38c..34fa1ff34 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -1882,9 +1882,9 @@ QString DccFileTransfer::tipText() { QString s; - s = QString("
)" + pApplet->descriptor()->visibleName() + "
"; + szTip += R"(
)"; szTip += __tr2qs("Shift+Drag or Ctrl+Drag to move the applet around"); szTip += "
"; szTip += __tr2qs("Right-click to see the other options"); diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp index 072a908b6..0394c31d0 100644 --- a/src/kvirc/ui/KviStatusBarApplet.cpp +++ b/src/kvirc/ui/KviStatusBarApplet.cpp @@ -501,7 +501,7 @@ KviStatusBarConnectionTimer::KviStatusBarConnectionTimer(KviStatusBar * pParent, : KviStatusBarApplet(pParent, pDescriptor) { startTimer(1000); - m_bTotal = 0; + m_bTotal = false; QFontMetrics fm(font()); setFixedWidth(fm.width("000 d 00 h 00 m 00 s")); diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index ace4bee2e..e753c0106 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -405,13 +405,13 @@ void KviTopicWidget::updateToolTip() if(!m_szSetBy.isEmpty()) { - txt += "
"; + txt += R"(
)"; txt += __tr2qs("Set by") + cln + space + bb + m_szSetBy + be; txt += "" + enr; if(!m_szSetAt.isEmpty()) { - txt += "
"; + txt += R"(
)"; txt += __tr2qs("Set on") + cln + space + bb + m_szSetAt + be; txt += "" + enr; } @@ -743,7 +743,7 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) return QChar('E'); break; default: - return QChar(control_code); + return { control_code }; break; } } diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp index bd7e98d25..29584ddd5 100644 --- a/src/kvirc/ui/KviTreeWindowList.cpp +++ b/src/kvirc/ui/KviTreeWindowList.cpp @@ -741,5 +741,5 @@ QSize KviTreeWindowListItemDelegate::sizeHint(const QStyleOptionViewItem &, cons if((KVI_OPTION_BOOL(KviOption_boolUseWindowListIrcContextIndicator) || KVI_OPTION_BOOL(KviOption_boolUseWindowListIcons) || KVI_OPTION_BOOL(KviOption_boolUseWindowListActivityMeter)) && iHeight < 20) iHeight = 20; - return QSize(treeWidget->viewport()->size().width(), iHeight); + return { treeWidget->viewport()->size().width(), iHeight }; } diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index b36891fe1..f47a1ba0b 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -1697,7 +1697,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * pTip, const QPoint & pnt) break; } - szBuffer += "
"; + szBuffer += R"(
)"; szBuffer += __tr2qs("Joined on: %1").arg(szTmp); szBuffer += "
"; + szBuffer += R"(
)"; szBuffer += __tr2qs("Quiet for: %1h %2m %3s").arg(iHours).arg(iMins).arg(iSecs); szBuffer += "
"; + szBuffer += R"(
)"; szBuffer += __tr2qs("%1 is an IrcOp").arg(pEntry->m_szNick); szBuffer += "
").arg(m_szDccType.ptr()).arg(id()); + s = QString(R"(
DCC %1 (ID %2)
)").arg(m_szDccType.ptr()).arg(id()); - s += ""; s += "
DCC %1 (ID %2)
"; + s += R"(
)"; s += __tr2qs_ctx("Transfer Log", "dcc"); s += "
"; diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp index fa7d2b0b3..486aa9aee 100644 --- a/src/modules/dcc/DccMarshal.cpp +++ b/src/modules/dcc/DccMarshal.cpp @@ -32,7 +32,7 @@ #include "kvi_socket.h" #include "KviFileUtils.h" -#include //for exit() +#include //for exit() #include diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp index f3b9e0334..de05544e1 100644 --- a/src/modules/dcc/DccVoiceAdpcmCodec.cpp +++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp @@ -53,7 +53,7 @@ #define _ADPCMCODEC_CPP_ #include "DccVoiceAdpcmCodec.h" -#include /*DBG*/ +#include /*DBG*/ #ifndef __STDC__ #define signed diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp index 8f52060a2..1028e7c72 100644 --- a/src/modules/dcc/DccVoiceCodec.cpp +++ b/src/modules/dcc/DccVoiceCodec.cpp @@ -29,8 +29,7 @@ #include DccVoiceCodec::DccVoiceCodec() -{ -} + = default; DccVoiceCodec::~DccVoiceCodec() = default; @@ -95,8 +94,7 @@ int DccVoiceNullCodec::decodedFrameSize() } DccVideoCodec::DccVideoCodec() -{ -} + = default; DccVideoCodec::~DccVideoCodec() = default; diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp index be04e9e83..279823727 100644 --- a/src/modules/dcc/DccVoiceWindow.cpp +++ b/src/modules/dcc/DccVoiceWindow.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include // for open() #include // for ioctl() @@ -1014,7 +1014,7 @@ void DccVoiceWindow::startOrStopTalking(bool bStart) stopTalking(); } -int DccVoiceWindow::getMixerVolume(void) const +int DccVoiceWindow::getMixerVolume() const { #ifndef COMPILE_DISABLE_DCC_VOICE int fd; diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 2e856ac44..f33b1fae1 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -1175,7 +1175,7 @@ static void dccModuleParseDccList(KviDccRequest *) // FIXME! } -typedef void (*dccParseProc)(KviDccRequest *); +using dccParseProc = void (*)(KviDccRequest *); typedef struct _dccParseProcEntry { const char * type; diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index 1ab23e940..ca9ef2cfd 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -48,11 +48,14 @@ #include #include #include +#include extern EventEditorWindow * g_pEventEditorWindow; -EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, const QString & params) - : QTreeWidgetItem(par), m_uEventIdx(uEvIdx), m_szParams(params) +EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, QString params) + : QTreeWidgetItem(par) + , m_uEventIdx(uEvIdx) + , m_szParams(std::move(params)) { setName(name); } @@ -63,8 +66,9 @@ void EventEditorEventTreeWidgetItem::setName(const QString & szName) setText(0, m_szName); } -EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, const QString & buffer, bool bEnabled) - : QTreeWidgetItem(par), m_szBuffer(buffer) +EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, QString buffer, bool bEnabled) + : QTreeWidgetItem(par) + , m_szBuffer(std::move(buffer)) { m_cPos = 0; setEnabled(bEnabled); //this updates the icon too diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h index 670b1e427..5dbfc69fa 100644 --- a/src/modules/eventeditor/EventEditorWindow.h +++ b/src/modules/eventeditor/EventEditorWindow.h @@ -43,7 +43,7 @@ public: QString m_szParams; public: - EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, const QString & params); + EventEditorEventTreeWidgetItem(QTreeWidget * par, unsigned int uEvIdx, const QString & name, QString params); ~EventEditorEventTreeWidgetItem(){}; public: @@ -60,7 +60,7 @@ public: int m_cPos; public: - EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, const QString & buffer, bool bEnabled); + EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par, const QString & name, QString buffer, bool bEnabled); ~EventEditorHandlerTreeWidgetItem(){}; public: diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index d802c2bc1..70dfcd9c3 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -248,7 +248,7 @@ void FileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { // FIXME fixed width - return QSize(((FileTransferWidget *)parent())->viewport()->size().width(), 68); + return { ((FileTransferWidget *)parent())->viewport()->size().width(), 68 }; } FileTransferWindow::FileTransferWindow( diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index 8b7db7720..4e37eca2e 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -45,18 +45,24 @@ #include #include #include -#include +#include #include #include #include +#include QT_BEGIN_NAMESPACE struct Term { Term() = default; - Term(const QString & t, int f, QVector l) : term(t), frequency(f), documents(l) {} + Term(QString t, int f, QVector l) + : term(std::move(t)) + , frequency(f) + , documents(std::move(l)) + { + } QString term; int frequency = -1; QVector documents; @@ -77,8 +83,9 @@ QDataStream & operator<<(QDataStream & s, const Document & l) return s; } -HelpIndex::HelpIndex(const QString & dp, const QString & hp) - : QObject(nullptr), docPath(dp) +HelpIndex::HelpIndex(QString dp, const QString & hp) + : QObject(nullptr) + , docPath(std::move(dp)) { Q_UNUSED(hp); @@ -92,8 +99,9 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp) connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext())); } -HelpIndex::HelpIndex(const QStringList & dl, const QString & hp) - : QObject(nullptr), docList{dl} +HelpIndex::HelpIndex(QStringList dl, const QString & hp) + : QObject(nullptr) + , docList{ std::move(dl) } { Q_UNUSED(hp); diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h index 968640699..5938ec136 100644 --- a/src/modules/help/HelpIndex.h +++ b/src/modules/help/HelpIndex.h @@ -93,8 +93,8 @@ public: QList positions; }; - HelpIndex(const QString & dp, const QString & hp); - HelpIndex(const QStringList & dl, const QString & hp); + HelpIndex(QString dp, const QString & hp); + HelpIndex(QStringList dl, const QString & hp); void writeDict(); void readDict(); void makeIndex(); diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 8ae68e57b..c7140d641 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -186,7 +186,7 @@ void HelpWindow::startSearch() str = str.replace("`", "\""); QString buf = str; str = str.replace("-", " "); - str = str.replace(QRegExp("\\s[\\S]?\\s"), " "); + str = str.replace(QRegExp(R"(\s[\S]?\s)"), " "); m_terms = str.split(" ", QString::SkipEmptyParts); QStringList termSeq; QStringList seqWords; diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index d1112450e..b21b81904 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -304,11 +304,11 @@ int HttpFileTransfer::displayHeight(int iLineSpacing) QString HttpFileTransfer::tipText() { QString s; - s = QString("").arg(id()); + s = QString(R"(
HTTP Transfer (ID %1)
)").arg(id()); if(m_lRequest.count() > 0) { - s += ""; + s += R"()"; s += ""; + s += R"()"; s += "
HTTP Transfer (ID %1)
Request Headers
Request Headers
"; for(QStringList::ConstIterator it = m_lRequest.begin(); it != m_lRequest.end(); ++it) { @@ -321,7 +321,7 @@ QString HttpFileTransfer::tipText() if(m_lHeaders.count() > 0) { - s += "
Response Headers
Response Headers
"; for(QStringList::ConstIterator it = m_lHeaders.begin(); it != m_lHeaders.end(); ++it) { diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index c9149a682..8e08bb427 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -22,7 +22,7 @@ // //============================================================================= -#include +#include #include "libkviiograph.h" #include "KviMainWindow.h" diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp index bbdb67812..35f297f40 100644 --- a/src/modules/language/detector.cpp +++ b/src/modules/language/detector.cpp @@ -23,10 +23,10 @@ // DO NOT EDIT THIS FILE: Edit detector/build_detector.pl instead! // -#include -#include -#include -#include +#include +#include +#include +#include #include "detector.h" diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 392ab9d60..8a52f28e8 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -113,7 +113,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem & sovIt ChannelTreeWidgetItem * item = dynamic_cast(treeWidget->itemFromIndex(index)); if(!item) - return QSize(100, iHeight); + return { 100, iHeight }; QFontMetrics fm(sovItem.font); switch(index.column()) diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index c0cb2590d..f954ad9df 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -58,7 +58,7 @@ #include #include -#include //for INT_MAX +#include //for INT_MAX extern LogViewWindow * g_pLogViewWindow; @@ -739,7 +739,7 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) // insert msgtype icon at start of the current text line KviMessageTypeSettings msg(KVI_OPTION_MSGTYPE(iMsgType)); QString szIcon = g_pIconManager->getSmallIconResourceName((KviIconManager::SmallIcon)msg.pixId()); - szTmp.prepend("\"\" "); + szTmp.prepend(" )"); /* * Check if the nick who has talked is the same of the above line. diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp index 98366a9c7..c85256e40 100644 --- a/src/modules/mediaplayer/MpMp3.cpp +++ b/src/modules/mediaplayer/MpMp3.cpp @@ -239,7 +239,7 @@ int get_first_header(mp3info * mp3, long startpos) long valid_start = 0; fseek(mp3->file, startpos, SEEK_SET); - while(1) + while(true) { while((c = fgetc(mp3->file)) != 255 && (c != EOF)) { diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp index 83910e576..6e9018a0d 100644 --- a/src/modules/notifier/NotifierMessage.cpp +++ b/src/modules/notifier/NotifierMessage.cpp @@ -31,9 +31,11 @@ #include #include +#include -NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText) - : m_szText{szText}, m_pPixmap{pPixmap} +NotifierMessage::NotifierMessage(QPixmap * pPixmap, QString szText) + : m_szText{ std::move(szText) } + , m_pPixmap{ pPixmap } { m_pHBox = new QHBoxLayout(this); m_pHBox->setSpacing(SPACING); diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h index bdc1e7fb9..02c72078a 100644 --- a/src/modules/notifier/NotifierMessage.h +++ b/src/modules/notifier/NotifierMessage.h @@ -52,7 +52,7 @@ public: * \param szText const reference to message text in irc format * \return NotifierMessage */ - NotifierMessage(QPixmap * pPixmap, const QString & szText); + NotifierMessage(QPixmap * pPixmap, QString szText); /** * \brief Destroys the NotifierMessage object */ diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 2a18d54e0..8158b5063 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -1083,7 +1083,7 @@ void NotifierWindow::returnPressed() addMessage(pTab->wnd(), szTmp.ptr(), szHtml, 0); m_pLineEdit->setText(""); - KviUserInput::parse(szTxt, pTab->wnd(), QString(), 1); + KviUserInput::parse(szTxt, pTab->wnd(), QString(), true); } void NotifierWindow::progressUpdate() diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index d1fa8211d..1cf6e0db7 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 +#include /* @doc: list 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_sql.cpp b/src/modules/objects/KvsObject_sql.cpp index 373cee877..3c71eeb2d 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 +#include #include #include #include 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/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 #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 +#include 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 + +#include #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 diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index 6efc60b7a..5d7c5bf76 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -515,7 +515,7 @@ OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar() delete m_pLocalAvatar; } -void OptionsWidget_identityAvatar::commit(void) +void OptionsWidget_identityAvatar::commit() { KviOptionsWidget::commit(); diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp index aff19dc3b..100d2627e 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp +++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * parent) : KviOptionsWidget(parent) diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp index 1ba20c593..9a390bf90 100644 --- a/src/modules/package/libkvipackage.cpp +++ b/src/modules/package/libkvipackage.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include static QString createRandomDir() { diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index ef08d3b67..87b97cfeb 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -415,7 +415,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget * p, KviRegisteredU m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor")); g->addWidget(m_pCustomColorCheck, 5, 0, 1, 2); - m_pCustomColorSelector = new KviColorSelector(p2, QString(), m_pCustomColor, 1); + m_pCustomColorSelector = new KviColorSelector(p2, QString(), m_pCustomColor, true); g->addWidget(m_pCustomColorSelector, 5, 2); QPushButton * pb = new QPushButton(__tr2qs_ctx("All Properties...", "register"), p2); diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index 907119896..d13560d5a 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -219,7 +219,7 @@ QSize RegisteredUsersDialogItemDelegate::sizeHint(const QStyleOptionViewItem & o //users // RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item; - return QSize(300, LVI_ICON_SIZE + 2 * LVI_BORDER); + return { 300, LVI_ICON_SIZE + 2 * LVI_BORDER }; } } @@ -445,9 +445,9 @@ void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup * group) if(ok && !text.isEmpty()) { QString szOldGroup = group->name(); - g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(0); + g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(false); g_pLocalRegisteredUserDataBase->groupDict()->remove(szOldGroup); - g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(1); + g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(true); group->setName(text); g_pLocalRegisteredUserDataBase->groupDict()->insert(text, group); diff --git a/src/modules/rijndael/InitVectorEngine.cpp b/src/modules/rijndael/InitVectorEngine.cpp index 776308260..e0ba47b36 100644 --- a/src/modules/rijndael/InitVectorEngine.cpp +++ b/src/modules/rijndael/InitVectorEngine.cpp @@ -24,7 +24,7 @@ #include "InitVectorEngine.h" -#include +#include #include "KviTimeUtils.h" namespace InitVectorEngine diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp index 199c25fce..fd9cb880e 100644 --- a/src/modules/sharedfile/libkvisharedfile.cpp +++ b/src/modules/sharedfile/libkvisharedfile.cpp @@ -33,7 +33,7 @@ #include "KviMainWindow.h" #include "KviPointerHashTable.h" -#include +#include extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 92ea18fa6..18f0c599b 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #ifdef COMPILE_ESD_SUPPORT #include diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp index 726d0cc85..8d724e766 100644 --- a/src/modules/spaste/SlowPasteController.cpp +++ b/src/modules/spaste/SlowPasteController.cpp @@ -81,7 +81,7 @@ bool SlowPasteController::pasteFileInit(QString & fileName) return true; } -bool SlowPasteController::pasteClipboardInit(void) +bool SlowPasteController::pasteClipboardInit() { if(m_pFile) return false; // can't paste clipboard while pasting a file @@ -103,7 +103,7 @@ bool SlowPasteController::pasteClipboardInit(void) return true; } -void SlowPasteController::pasteFile(void) +void SlowPasteController::pasteFile() { QString line; char data[1024]; @@ -132,7 +132,7 @@ void SlowPasteController::pasteFile(void) } } -void SlowPasteController::pasteClipboard(void) +void SlowPasteController::pasteClipboard() { if(m_pClipBuff->isEmpty() || !g_pApp->windowExists(m_pWindow)) { diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 42adb10b1..2abab2c10 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -41,7 +41,7 @@ #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include -#include +#include #include #endif diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index eda0f371e..d625a9b72 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -113,7 +113,7 @@ SaveThemeDialog::SaveThemeDialog(QWidget * pParent) m_pThemeVersionEdit = new QLineEdit(pPage); m_pThemeVersionEdit->setText(info.version()); - QRegExp rx("\\d{1,2}\\.\\d{1,2}(\\.\\d{1,2})?"); + QRegExp rx(R"(\d{1,2}\.\d{1,2}(\.\d{1,2})?)"); QValidator * validator = new QRegExpValidator(rx, this); m_pThemeVersionEdit->setValidator(validator); diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp index 5341ddc8f..4f63f91ee 100644 --- a/src/modules/torrent/KTorrentDbusInterface.cpp +++ b/src/modules/torrent/KTorrentDbusInterface.cpp @@ -50,8 +50,7 @@ KTorrentDbusInterface::KTorrentDbusInterface() } KTorrentDbusInterface::~KTorrentDbusInterface() -{ -} + = default; bool KTorrentDbusInterface::findRunningApp() { diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp index f7e7f4baa..cc337f972 100644 --- a/src/modules/upnp/Service.cpp +++ b/src/modules/upnp/Service.cpp @@ -36,6 +36,7 @@ #include #include +#include #include "KviNetworkAccessManager.h" @@ -49,8 +50,11 @@ namespace UPnP { // The constructor for information services - Service::Service(const QString & hostname, int port, const QString & informationUrl) - : m_iPendingRequests(0), m_szBaseXmlPrefix("s"), m_szHostname(hostname), m_iPort(port) + Service::Service(QString hostname, int port, const QString & informationUrl) + : m_iPendingRequests(0) + , m_szBaseXmlPrefix("s") + , m_szHostname(std::move(hostname)) + , m_iPort(port) { m_szInformationUrl = informationUrl; qDebug() << "UPnP::Service: created information service url='" << m_szInformationUrl << "'." << endl; diff --git a/src/modules/upnp/Service.h b/src/modules/upnp/Service.h index de81a5ee6..acae54418 100644 --- a/src/modules/upnp/Service.h +++ b/src/modules/upnp/Service.h @@ -71,7 +71,7 @@ namespace UPnP public: // public methods // The constructor for the root service - Service(const QString & hostname, int port, const QString & informationUrl); + Service(QString hostname, int port, const QString & informationUrl); // The constructor for action services Service(const ServiceParameters & params); // The destructor -- cgit v1.3.1-10-gc9f91