From 505d0768f8392e3c4775425dd97f41e1c829ef44 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 30 Apr 2016 18:23:42 +0100 Subject: Apply clang-tidy: modernize-use-nullptr --- src/modules/options/OptionsWidget_textEncoding.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/options/OptionsWidget_textEncoding.cpp') diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index f0084e6e3..d889f8cb6 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -139,7 +139,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) gbox = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Spell Checker Dictionaries", "options")); KviKvsVariant availableDictionaries; - KviKvsScript::evaluate("$spellchecker.availableDictionaries", NULL, NULL, &availableDictionaries); + KviKvsScript::evaluate("$spellchecker.availableDictionaries", nullptr, nullptr, &availableDictionaries); const KviPointerHashTable * hashTable = availableDictionaries.hash()->dict(); KviPointerHashTableIterator iter(*hashTable); QMap dictMap; @@ -240,6 +240,6 @@ void OptionsWidget_textEncoding::commit() } } KVI_OPTION_STRINGLIST(KviOption_stringlistSpellCheckerDictionaries) = wantedDictionaries; - KviKvsScript::run("spellchecker.reloadDictionaries", NULL); + KviKvsScript::run("spellchecker.reloadDictionaries", nullptr); #endif } -- cgit v1.3.1-10-gc9f91 From a37bd1dfeb81c8cd44453e186a43c1b29883ab49 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 30 Apr 2016 18:34:55 +0100 Subject: Apply clang-tidy: modernize-use-default --- src/kvilib/ext/KviCryptEngine.cpp | 3 +-- src/kvilib/ext/KviMessageTypeSettings.cpp | 14 ++--------- src/kvilib/ext/KviProxy.cpp | 3 +-- src/kvilib/ext/KviRegisteredUserGroup.cpp | 3 +-- src/kvilib/ext/KviSharedFile.cpp | 3 +-- src/kvilib/file/KviFile.cpp | 3 +-- src/kvilib/file/KviPackageReader.cpp | 3 +-- src/kvilib/irc/KviIdentityProfile.cpp | 3 +-- src/kvilib/irc/KviIrcServerReconnectInfo.cpp | 3 +-- src/kvilib/irc/KviUserIdentity.cpp | 3 +-- src/kvilib/locale/KviTranslator.cpp | 3 +-- src/kvilib/net/KviDnsResolver.cpp | 3 +-- src/kvilib/net/KviNetworkAccessManager.cpp | 6 ++--- src/kvilib/net/KviSSL.cpp | 3 +-- src/kvilib/net/KviUrl.cpp | 3 +-- src/kvilib/tal/KviTalApplication.cpp | 3 +-- src/kvilib/tal/KviTalFileDialog.cpp | 3 +-- src/kvilib/tal/KviTalGroupBox.cpp | 3 +-- src/kvilib/tal/KviTalHBox.cpp | 3 +-- .../tal/KviTalIconAndRichTextItemDelegate.cpp | 3 +-- src/kvilib/tal/KviTalListWidget.cpp | 6 ++--- src/kvilib/tal/KviTalMainWindow.cpp | 3 +-- src/kvilib/tal/KviTalMenuBar.cpp | 3 +-- src/kvilib/tal/KviTalTabDialog.cpp | 3 +-- src/kvilib/tal/KviTalVBox.cpp | 3 +-- src/kvirc/kernel/KviAction.cpp | 3 +-- src/kvirc/kernel/KviDefaultScript.cpp | 6 ++--- src/kvirc/kernel/KviIconManager.cpp | 3 +-- src/kvirc/kernel/KviIpcSentinel.cpp | 3 +-- .../kernel/KviIrcConnectionAntiCtcpFloodData.cpp | 3 +-- .../KviIrcConnectionNetsplitDetectorData.cpp | 3 +-- src/kvirc/kernel/KviIrcConnectionServerInfo.cpp | 3 +-- src/kvirc/kernel/KviIrcConnectionStateData.cpp | 3 +-- src/kvirc/kernel/KviIrcConnectionStatistics.cpp | 3 +-- src/kvirc/kernel/KviNotifyList.cpp | 3 +-- src/kvirc/kernel/KviTheme.cpp | 3 +-- src/kvirc/kvs/KviKvsAction.cpp | 3 +-- src/kvirc/kvs/KviKvsPopupMenu.cpp | 6 ++--- src/kvirc/kvs/KviKvsRWEvaluationResult.cpp | 3 +-- src/kvirc/kvs/event/KviKvsEventHandler.cpp | 3 +-- .../kvs/object/KviKvsObjectFunctionHandler.cpp | 3 +-- .../kvs/object/KviKvsObjectFunctionHandlerImpl.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp | 3 +-- .../tree/KviKvsTreeNodeArrayReferenceAssert.cpp | 3 +-- .../tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp | 15 ++++-------- .../tree/KviKvsTreeNodeExtendedScopeVariable.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeGlobalVariable.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp | 3 +-- .../tree/KviKvsTreeNodeModuleCallbackCommand.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp | 3 +-- .../KviKvsTreeNodeMultipleParameterIdentifier.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp | 6 ++--- .../kvs/tree/KviKvsTreeNodeParameterCount.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp | 3 +-- .../KviKvsTreeNodeSingleParameterIdentifier.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeSpecialCommand.cpp | 3 +-- .../kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp | 3 +-- .../tree/KviKvsTreeNodeSpecialCommandContinue.cpp | 3 +-- .../tree/KviKvsTreeNodeSpecialCommandSwitch.cpp | 12 ++++------ .../tree/KviKvsTreeNodeThisObjectFunctionCall.cpp | 3 +-- src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp | 3 +-- src/kvirc/module/KviMexLinkFilter.cpp | 3 +-- src/kvirc/module/KviMexServerImport.cpp | 3 +-- src/kvirc/sparser/KviIrcServerParser.cpp | 3 +-- src/kvirc/ui/KviActionDrawer.cpp | 12 ++++------ src/kvirc/ui/KviCryptController.cpp | 3 +-- src/kvirc/ui/KviDynamicToolTip.cpp | 3 +-- src/kvirc/ui/KviFileDialog.cpp | 3 +-- src/kvirc/ui/KviHistoryWindow.cpp | 3 +-- src/kvirc/ui/KviHtmlDialog.cpp | 3 +-- src/kvirc/ui/KviIpEditor.cpp | 3 +-- src/kvirc/ui/KviIrcToolBar.cpp | 3 +-- src/kvirc/ui/KviIrcView_tools.cpp | 6 ++--- src/kvirc/ui/KviMaskEditor.cpp | 9 +++----- src/kvirc/ui/KviModeWidget.cpp | 3 +-- src/kvirc/ui/KviScriptButton.cpp | 3 +-- src/kvirc/ui/KviScriptEditor.cpp | 3 +-- src/kvirc/ui/KviSelectors.cpp | 27 ++++++++-------------- src/kvirc/ui/KviStatusBarApplet.cpp | 18 +++++---------- src/kvirc/ui/KviThemedComboBox.cpp | 3 +-- src/kvirc/ui/KviThemedLabel.cpp | 3 +-- src/kvirc/ui/KviThemedLineEdit.cpp | 3 +-- src/kvirc/ui/KviThemedTreeWidget.cpp | 3 +-- src/kvirc/ui/KviTopicWidget.cpp | 6 ++--- src/kvirc/ui/KviTreeWindowList.cpp | 9 +++----- src/kvirc/ui/KviUserListView.cpp | 6 ++--- src/kvirc/ui/KviWebPackageManagementDialog.cpp | 3 +-- src/kvirc/ui/KviWindowStack.cpp | 3 +-- src/kvirc/ui/KviWindowToolWidget.cpp | 6 ++--- src/modules/actioneditor/ActionEditor.cpp | 9 +++----- src/modules/addon/PackAddonDialog.cpp | 18 +++++---------- src/modules/addon/WebAddonInterfaceDialog.cpp | 3 +-- src/modules/classeditor/ClassEditorWindow.cpp | 6 ++--- src/modules/dcc/DccDialog.cpp | 6 ++--- src/modules/dcc/DccFileTransfer.cpp | 3 +-- src/modules/dcc/DccVoiceCodec.cpp | 12 ++++------ src/modules/editor/ScriptEditorImplementation.cpp | 6 ++--- src/modules/list/ListWindow.cpp | 9 +++----- src/modules/mediaplayer/MpMprisInterface.cpp | 3 +-- src/modules/mediaplayer/MpXmmsInterface.cpp | 3 +-- src/modules/notifier/NotifierWindowBorder.cpp | 3 +-- src/modules/objects/KvsObject_tableWidget.cpp | 3 +-- src/modules/objects/KvsObject_treeWidget.cpp | 3 +-- src/modules/objects/KvsObject_webView.cpp | 3 +-- src/modules/objects/KvsObject_widget.cpp | 3 +-- src/modules/objects/KvsObject_window.cpp | 3 +-- src/modules/objects/KvsObject_wizard.cpp | 3 +-- src/modules/objects/KvsObject_xmlreader.cpp | 4 +--- src/modules/objects/qthttp/qhttp.cpp | 12 ++++------ src/modules/options/OptionsDialog.cpp | 6 ++--- .../OptionsWidget_alertsAndHighlighting.cpp | 9 +++----- src/modules/options/OptionsWidget_antiSpam.cpp | 3 +-- src/modules/options/OptionsWidget_avatar.cpp | 3 +-- src/modules/options/OptionsWidget_away.cpp | 3 +-- src/modules/options/OptionsWidget_channel.cpp | 9 +++----- src/modules/options/OptionsWidget_connection.cpp | 15 ++++-------- src/modules/options/OptionsWidget_ctcp.cpp | 3 +-- .../options/OptionsWidget_ctcpFloodProtection.cpp | 3 +-- src/modules/options/OptionsWidget_dcc.cpp | 24 +++++++------------ src/modules/options/OptionsWidget_general.cpp | 3 +-- src/modules/options/OptionsWidget_identity.cpp | 21 ++++++----------- src/modules/options/OptionsWidget_ignore.cpp | 3 +-- src/modules/options/OptionsWidget_input.cpp | 6 ++--- .../options/OptionsWidget_interfaceFeatures.cpp | 3 +-- src/modules/options/OptionsWidget_irc.cpp | 9 +++----- src/modules/options/OptionsWidget_ircOutput.cpp | 3 +-- src/modules/options/OptionsWidget_ircView.cpp | 12 ++++------ src/modules/options/OptionsWidget_lag.cpp | 3 +-- src/modules/options/OptionsWidget_logging.cpp | 3 +-- src/modules/options/OptionsWidget_mediaTypes.cpp | 6 ++--- src/modules/options/OptionsWidget_message.cpp | 15 ++++-------- src/modules/options/OptionsWidget_nickserv.cpp | 6 ++--- src/modules/options/OptionsWidget_notifier.cpp | 6 ++--- src/modules/options/OptionsWidget_notify.cpp | 3 +-- src/modules/options/OptionsWidget_protection.cpp | 3 +-- src/modules/options/OptionsWidget_proxy.cpp | 3 +-- src/modules/options/OptionsWidget_query.cpp | 3 +-- src/modules/options/OptionsWidget_sound.cpp | 9 +++----- src/modules/options/OptionsWidget_textEncoding.cpp | 3 +-- src/modules/options/OptionsWidget_textIcons.cpp | 3 +-- src/modules/options/OptionsWidget_theme.cpp | 9 +++----- src/modules/options/OptionsWidget_tools.cpp | 3 +-- src/modules/options/OptionsWidget_topicLabel.cpp | 3 +-- src/modules/options/OptionsWidget_tray.cpp | 3 +-- src/modules/options/OptionsWidget_uparser.cpp | 3 +-- src/modules/options/OptionsWidget_urlHandlers.cpp | 3 +-- src/modules/options/OptionsWidget_userList.cpp | 15 ++++-------- src/modules/options/OptionsWidget_windowList.cpp | 18 +++++---------- src/modules/popupeditor/PopupEditorWindow.cpp | 3 +-- src/modules/reguser/RegisteredUserEntryDialog.cpp | 6 ++--- src/modules/reguser/RegisteredUsersDialog.cpp | 3 +-- src/modules/setup/SetupWizard.cpp | 3 +-- .../sharedfileswindow/SharedFilesWindow.cpp | 6 ++--- src/modules/snd/libkvisnd.cpp | 6 ++--- src/modules/theme/PackThemeDialog.cpp | 15 ++++-------- src/modules/theme/SaveThemeDialog.cpp | 3 +-- src/modules/theme/WebThemeInterfaceDialog.cpp | 3 +-- .../toolbareditor/CustomizeToolBarsDialog.cpp | 3 +-- src/modules/torrent/StatusBarApplet.cpp | 3 +-- src/modules/upnp/RootService.cpp | 3 +-- src/modules/upnp/WanConnectionService.cpp | 3 +-- src/modules/url/libkviurl.cpp | 3 +-- 175 files changed, 285 insertions(+), 579 deletions(-) (limited to 'src/modules/options/OptionsWidget_textEncoding.cpp') diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp index d5ff36e44..f31b17cd8 100644 --- a/src/kvilib/ext/KviCryptEngine.cpp +++ b/src/kvilib/ext/KviCryptEngine.cpp @@ -156,8 +156,7 @@ KviCryptEngine::KviCryptEngine() } KviCryptEngine::~KviCryptEngine() -{ -} + = default; #ifdef COMPILE_CRYPT_SUPPORT diff --git a/src/kvilib/ext/KviMessageTypeSettings.cpp b/src/kvilib/ext/KviMessageTypeSettings.cpp index cda5365e2..2b40515e8 100644 --- a/src/kvilib/ext/KviMessageTypeSettings.cpp +++ b/src/kvilib/ext/KviMessageTypeSettings.cpp @@ -50,17 +50,7 @@ KviMessageTypeSettings::KviMessageTypeSettings(const KviMessageTypeSettings & ms } KviMessageTypeSettings::~KviMessageTypeSettings() -{ -} + = default; KviMessageTypeSettings & KviMessageTypeSettings::operator=(const KviMessageTypeSettings & msg) -{ - //if(m_szType.ptr() == msg.m_szType.ptr())return (*this); // self assignment (!!!) - m_szType = msg.m_szType; - m_iPixId = msg.m_iPixId; - m_cForeColor = msg.m_cForeColor; - m_cBackColor = msg.m_cBackColor; - m_bLogEnabled = msg.m_bLogEnabled; - m_iLevel = msg.m_iLevel; - return (*this); -} + = default; diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp index 702f9a120..21fcc9c30 100644 --- a/src/kvilib/ext/KviProxy.cpp +++ b/src/kvilib/ext/KviProxy.cpp @@ -48,8 +48,7 @@ KviProxy::KviProxy(const KviProxy & prx) } KviProxy::~KviProxy() -{ -} + = default; static const QString proxy_protocols_table[3] = { "SOCKSv4", "SOCKSv5", "HTTP" }; diff --git a/src/kvilib/ext/KviRegisteredUserGroup.cpp b/src/kvilib/ext/KviRegisteredUserGroup.cpp index f7254ced0..2bef321c0 100644 --- a/src/kvilib/ext/KviRegisteredUserGroup.cpp +++ b/src/kvilib/ext/KviRegisteredUserGroup.cpp @@ -30,5 +30,4 @@ KviRegisteredUserGroup::KviRegisteredUserGroup(const QString & szName) } KviRegisteredUserGroup::~KviRegisteredUserGroup() -{ -} + = default; diff --git a/src/kvilib/ext/KviSharedFile.cpp b/src/kvilib/ext/KviSharedFile.cpp index c074cb60c..29127bf26 100644 --- a/src/kvilib/ext/KviSharedFile.cpp +++ b/src/kvilib/ext/KviSharedFile.cpp @@ -37,5 +37,4 @@ KviSharedFile::KviSharedFile(const QString & szName, const QString & szAbsPath, } KviSharedFile::~KviSharedFile() -{ -} + = default; diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp index e76d44a56..e285ed13d 100644 --- a/src/kvilib/file/KviFile.cpp +++ b/src/kvilib/file/KviFile.cpp @@ -39,8 +39,7 @@ KviFile::KviFile(const QString & szName) } KviFile::~KviFile() -{ -} + = default; bool KviFile::save(kvi_u8_t t) { diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp index 6da01c703..ed16432c3 100644 --- a/src/kvilib/file/KviPackageReader.cpp +++ b/src/kvilib/file/KviPackageReader.cpp @@ -44,8 +44,7 @@ KviPackageReader::KviPackageReader() } KviPackageReader::~KviPackageReader() -{ -} + = default; bool KviPackageReader::readHeaderInternal(KviFile * pFile, const QString &) { diff --git a/src/kvilib/irc/KviIdentityProfile.cpp b/src/kvilib/irc/KviIdentityProfile.cpp index 943504ee0..4c7c312e2 100644 --- a/src/kvilib/irc/KviIdentityProfile.cpp +++ b/src/kvilib/irc/KviIdentityProfile.cpp @@ -31,8 +31,7 @@ KviIdentityProfile::KviIdentityProfile() } KviIdentityProfile::~KviIdentityProfile() -{ -} + = default; void KviIdentityProfile::copyFrom(const KviIdentityProfile & src) { diff --git a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp index c46fb6fac..354eac588 100644 --- a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp +++ b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp @@ -30,8 +30,7 @@ KviIrcServerReconnectInfo::KviIrcServerReconnectInfo() } KviIrcServerReconnectInfo::~KviIrcServerReconnectInfo() -{ -} + = default; KviIrcServerReconnectInfo::KviIrcServerReconnectInfo(const KviIrcServerReconnectInfo & info) { diff --git a/src/kvilib/irc/KviUserIdentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp index 717c77b81..0e8efe2df 100644 --- a/src/kvilib/irc/KviUserIdentity.cpp +++ b/src/kvilib/irc/KviUserIdentity.cpp @@ -34,8 +34,7 @@ KviUserIdentity::KviUserIdentity() } KviUserIdentity::~KviUserIdentity() -{ -} + = default; bool KviUserIdentity::load(KviConfigurationFile & cfg) { diff --git a/src/kvilib/locale/KviTranslator.cpp b/src/kvilib/locale/KviTranslator.cpp index bc32345ae..f4bff95df 100644 --- a/src/kvilib/locale/KviTranslator.cpp +++ b/src/kvilib/locale/KviTranslator.cpp @@ -33,8 +33,7 @@ KviTranslator::KviTranslator(QObject * pParent) } KviTranslator::~KviTranslator() -{ -} + = default; QString KviTranslator::translate(const char *, const char * pcMessage, const char *) const { diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp index 2e4bc7d29..365b88fc3 100644 --- a/src/kvilib/net/KviDnsResolver.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -88,8 +88,7 @@ KviDnsResolverThread::KviDnsResolverThread(KviDnsResolver * pDns) } KviDnsResolverThread::~KviDnsResolverThread() -{ -} + = default; KviError::Code KviDnsResolverThread::translateDnsError(int iErr) { diff --git a/src/kvilib/net/KviNetworkAccessManager.cpp b/src/kvilib/net/KviNetworkAccessManager.cpp index 1142c355b..c3409afc4 100644 --- a/src/kvilib/net/KviNetworkAccessManager.cpp +++ b/src/kvilib/net/KviNetworkAccessManager.cpp @@ -25,9 +25,7 @@ #include "KviNetworkAccessManager.h" KviNetworkAccessManager::KviNetworkAccessManager() -{ -} + = default; KviNetworkAccessManager::~KviNetworkAccessManager() -{ -} + = default; diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp index 9434e23a0..81bd0df14 100644 --- a/src/kvilib/net/KviSSL.cpp +++ b/src/kvilib/net/KviSSL.cpp @@ -910,8 +910,7 @@ KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c, SSL * s) } KviSSLCipherInfo::~KviSSLCipherInfo() -{ -} + = default; #ifdef COMPILE_ON_WINDOWS diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp index 96ca812c9..6a1779b2d 100644 --- a/src/kvilib/net/KviUrl.cpp +++ b/src/kvilib/net/KviUrl.cpp @@ -47,8 +47,7 @@ KviUrl::KviUrl(const QString & szUrl) } KviUrl::~KviUrl() -{ -} + = default; void KviUrl::parse() { diff --git a/src/kvilib/tal/KviTalApplication.cpp b/src/kvilib/tal/KviTalApplication.cpp index 3ff6964fc..6854c9f50 100644 --- a/src/kvilib/tal/KviTalApplication.cpp +++ b/src/kvilib/tal/KviTalApplication.cpp @@ -39,8 +39,7 @@ KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv) #endif //!defined(COMPILE_KDE4_SUPPORT) KviTalApplication::~KviTalApplication() -{ -} + = default; void KviTalApplication::commitData(QSessionManager & manager) { diff --git a/src/kvilib/tal/KviTalFileDialog.cpp b/src/kvilib/tal/KviTalFileDialog.cpp index 962832322..cb7f88a8f 100644 --- a/src/kvilib/tal/KviTalFileDialog.cpp +++ b/src/kvilib/tal/KviTalFileDialog.cpp @@ -43,8 +43,7 @@ KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & sz #endif //!defined(COMPILE_KDE4_SUPPORT)) KviTalFileDialog::~KviTalFileDialog() -{ -} + = default; void KviTalFileDialog::setFileMode(FileMode m) { diff --git a/src/kvilib/tal/KviTalGroupBox.cpp b/src/kvilib/tal/KviTalGroupBox.cpp index 3030d394a..3e9f80796 100644 --- a/src/kvilib/tal/KviTalGroupBox.cpp +++ b/src/kvilib/tal/KviTalGroupBox.cpp @@ -78,8 +78,7 @@ KviTalGroupBox::KviTalGroupBox(Qt::Orientation orientation, const QString & szTi } KviTalGroupBox::~KviTalGroupBox() -{ -} + = default; void KviTalGroupBox::childEvent(QChildEvent * e) { diff --git a/src/kvilib/tal/KviTalHBox.cpp b/src/kvilib/tal/KviTalHBox.cpp index a43d1dea5..3e019f5ee 100644 --- a/src/kvilib/tal/KviTalHBox.cpp +++ b/src/kvilib/tal/KviTalHBox.cpp @@ -66,8 +66,7 @@ KviTalHBox::KviTalHBox(QWidget * pParent, char * pcName) } KviTalHBox::~KviTalHBox() -{ -} + = default; void KviTalHBox::childEvent(QChildEvent * e) { diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp index fddb43a34..725ddfbff 100644 --- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp @@ -37,8 +37,7 @@ KviTalIconAndRichTextItemDelegate::KviTalIconAndRichTextItemDelegate(QAbstractIt } KviTalIconAndRichTextItemDelegate::~KviTalIconAndRichTextItemDelegate() -{ -} + = default; void KviTalIconAndRichTextItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const { diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp index 6a2191968..85a615d1a 100644 --- a/src/kvilib/tal/KviTalListWidget.cpp +++ b/src/kvilib/tal/KviTalListWidget.cpp @@ -98,8 +98,7 @@ KviTalListWidgetText::KviTalListWidgetText(KviTalListWidget* listbox, const QStr }*/ KviTalListWidgetText::~KviTalListWidgetText() -{ -} + = default; void KviTalListWidgetText::paint(QPainter * painter) { @@ -145,8 +144,7 @@ KviTalListWidgetPixmap::KviTalListWidgetPixmap(const QPixmap & pixmap) // } KviTalListWidgetPixmap::~KviTalListWidgetPixmap() -{ -} + = default; KviTalListWidgetPixmap::KviTalListWidgetPixmap(KviTalListWidget * listbox, const QPixmap & pix, const QString & text) : KviTalListWidgetItem(listbox) diff --git a/src/kvilib/tal/KviTalMainWindow.cpp b/src/kvilib/tal/KviTalMainWindow.cpp index f0f3c92bc..9f05c9a23 100644 --- a/src/kvilib/tal/KviTalMainWindow.cpp +++ b/src/kvilib/tal/KviTalMainWindow.cpp @@ -43,5 +43,4 @@ KviTalMainWindow::KviTalMainWindow(QWidget * pParent, const char * pcName) #endif //!COMPILE_KDE_SUPPORT KviTalMainWindow::~KviTalMainWindow() -{ -} + = default; diff --git a/src/kvilib/tal/KviTalMenuBar.cpp b/src/kvilib/tal/KviTalMenuBar.cpp index 2f9b9ae1b..ff21be92d 100644 --- a/src/kvilib/tal/KviTalMenuBar.cpp +++ b/src/kvilib/tal/KviTalMenuBar.cpp @@ -47,5 +47,4 @@ KviTalMenuBar::KviTalMenuBar(QWidget * pParent, const char * pcName) #endif //!COMPILE_KDE4_SUPPORT KviTalMenuBar::~KviTalMenuBar() -{ -} + = default; diff --git a/src/kvilib/tal/KviTalTabDialog.cpp b/src/kvilib/tal/KviTalTabDialog.cpp index e4589d058..5207bf48f 100644 --- a/src/kvilib/tal/KviTalTabDialog.cpp +++ b/src/kvilib/tal/KviTalTabDialog.cpp @@ -45,8 +45,7 @@ KviTalTabDialog::KviTalTabDialog(QWidget * pParent, const char * name, bool bMod } KviTalTabDialog::~KviTalTabDialog() -{ -} + = default; void KviTalTabDialog::addTab(QWidget * widget, const QString & label) { diff --git a/src/kvilib/tal/KviTalVBox.cpp b/src/kvilib/tal/KviTalVBox.cpp index 91f2a8a8f..bc921e01a 100644 --- a/src/kvilib/tal/KviTalVBox.cpp +++ b/src/kvilib/tal/KviTalVBox.cpp @@ -40,8 +40,7 @@ KviTalVBox::KviTalVBox(QWidget * pParent, char * pcName) } KviTalVBox::~KviTalVBox() -{ -} + = default; void KviTalVBox::childEvent(QChildEvent * e) { diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp index 2712cbdd9..92053adce 100644 --- a/src/kvirc/kernel/KviAction.cpp +++ b/src/kvirc/kernel/KviAction.cpp @@ -41,8 +41,7 @@ KviActionCategory::KviActionCategory(const QString & szName, const QString & szV } KviActionCategory::~KviActionCategory() -{ -} + = default; KviAction::KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory, const QString & szBigIconId, const QString & szSmallIconId, unsigned int uFlags, const QString & szKeySequence) : QObject(pParent), diff --git a/src/kvirc/kernel/KviDefaultScript.cpp b/src/kvirc/kernel/KviDefaultScript.cpp index cec9f5bde..7af06a512 100644 --- a/src/kvirc/kernel/KviDefaultScript.cpp +++ b/src/kvirc/kernel/KviDefaultScript.cpp @@ -76,8 +76,7 @@ KviDefaultScriptManager::KviDefaultScriptManager() } KviDefaultScriptManager::~KviDefaultScriptManager() -{ -} + = default; void KviDefaultScriptManager::init() { @@ -497,8 +496,7 @@ KviDefaultScriptDialog::KviDefaultScriptDialog() } KviDefaultScriptDialog::~KviDefaultScriptDialog() -{ -} + = default; void KviDefaultScriptDialog::toggleAll(bool) { diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index fd08515a0..e6ed00e3d 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -471,8 +471,7 @@ void KviIconWidget::init() } KviIconWidget::~KviIconWidget() -{ -} + = default; void KviIconWidget::closeEvent(QCloseEvent * pEvent) { diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp index 0d69deb9b..74b1de287 100644 --- a/src/kvirc/kernel/KviIpcSentinel.cpp +++ b/src/kvirc/kernel/KviIpcSentinel.cpp @@ -242,8 +242,7 @@ KviIpcSentinel::KviIpcSentinel() } KviIpcSentinel::~KviIpcSentinel() -{ -} + = default; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) diff --git a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp index 6c3cc310f..9ed3b769e 100644 --- a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp @@ -31,5 +31,4 @@ KviIrcConnectionAntiCtcpFloodData::KviIrcConnectionAntiCtcpFloodData() } KviIrcConnectionAntiCtcpFloodData::~KviIrcConnectionAntiCtcpFloodData() -{ -} + = default; diff --git a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp index 67e1225ee..a5868bca0 100644 --- a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp @@ -30,5 +30,4 @@ KviIrcConnectionNetsplitDetectorData::KviIrcConnectionNetsplitDetectorData() } KviIrcConnectionNetsplitDetectorData::~KviIrcConnectionNetsplitDetectorData() -{ -} + = default; diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp index 2361811a2..3171b17e8 100644 --- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp +++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp @@ -296,8 +296,7 @@ KviBasicIrcServerInfo::KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParen } KviBasicIrcServerInfo::~KviBasicIrcServerInfo() -{ -} + = default; //////////////// // User modes diff --git a/src/kvirc/kernel/KviIrcConnectionStateData.cpp b/src/kvirc/kernel/KviIrcConnectionStateData.cpp index 515e90b70..19753bd27 100644 --- a/src/kvirc/kernel/KviIrcConnectionStateData.cpp +++ b/src/kvirc/kernel/KviIrcConnectionStateData.cpp @@ -41,8 +41,7 @@ KviIrcConnectionStateData::KviIrcConnectionStateData() } KviIrcConnectionStateData::~KviIrcConnectionStateData() -{ -} + = default; void KviIrcConnectionStateData::changeEnabledCapList(const QString & szCapList) { diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp index e2217baf2..edf6c7d57 100644 --- a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp +++ b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp @@ -31,5 +31,4 @@ KviIrcConnectionStatistics::KviIrcConnectionStatistics() } KviIrcConnectionStatistics::~KviIrcConnectionStatistics() -{ -} + = default; diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 4db506174..84448c9cb 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -122,8 +122,7 @@ KviNotifyListManager::KviNotifyListManager(KviIrcConnection * pConnection) } KviNotifyListManager::~KviNotifyListManager() -{ -} + = default; void KviNotifyListManager::start() { diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp index fa4f46548..f36187f8e 100644 --- a/src/kvirc/kernel/KviTheme.cpp +++ b/src/kvirc/kernel/KviTheme.cpp @@ -45,8 +45,7 @@ KviThemeInfo::KviThemeInfo() } KviThemeInfo::~KviThemeInfo() -{ -} + = default; void KviThemeInfo::setDirectoryAndLocation(const QString & szDirectory, Location eLocation) { diff --git a/src/kvirc/kvs/KviKvsAction.cpp b/src/kvirc/kvs/KviKvsAction.cpp index 434fbc204..d91d2638c 100644 --- a/src/kvirc/kvs/KviKvsAction.cpp +++ b/src/kvirc/kvs/KviKvsAction.cpp @@ -77,8 +77,7 @@ KviKvsAction::KviKvsAction( } KviKvsAction::~KviKvsAction() -{ -} + = default; const QString & KviKvsAction::scriptCode() { diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp index f25dd85f3..23aeda857 100644 --- a/src/kvirc/kvs/KviKvsPopupMenu.cpp +++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp @@ -132,8 +132,7 @@ KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString & szIte } KviKvsPopupMenuItemSeparator::~KviKvsPopupMenuItemSeparator() -{ -} + = default; void KviKvsPopupMenuItemSeparator::fill(KviKvsPopupMenu * pMenu, KviKvsPopupMenuTopLevelData * pData, int) { @@ -267,8 +266,7 @@ KviKvsPopupMenuItemLabelHelper::KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuIt } KviKvsPopupMenuItemLabelHelper::~KviKvsPopupMenuItemLabelHelper() -{ -} + = default; void KviKvsPopupMenuItemLabelHelper::labelDestroyed() { diff --git a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp index e446394fe..71d4e4dd8 100644 --- a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp +++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp @@ -33,8 +33,7 @@ KviKvsRWEvaluationResult::KviKvsRWEvaluationResult(KviKvsRWEvaluationResult * pP } KviKvsRWEvaluationResult::~KviKvsRWEvaluationResult() -{ -} + = default; KviKvsArrayElement::KviKvsArrayElement(KviKvsRWEvaluationResult * pParent, KviKvsVariant * pVariant, KviKvsArray * pArray, int iKey) : KviKvsRWEvaluationResult(pParent, pVariant) diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp index 4ef01c592..d2fd494a5 100644 --- a/src/kvirc/kvs/event/KviKvsEventHandler.cpp +++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp @@ -30,8 +30,7 @@ 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) diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp index 14639916f..3b99d5d9f 100644 --- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp @@ -31,8 +31,7 @@ KviKvsObjectFunctionHandler::KviKvsObjectFunctionHandler(unsigned int uFlags) } KviKvsObjectFunctionHandler::~KviKvsObjectFunctionHandler() -{ -} + = default; bool KviKvsObjectFunctionHandler::isScriptHandler() { diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp index 7007cd275..efafcc616 100644 --- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp @@ -78,8 +78,7 @@ KviKvsObjectCoreCallFunctionHandler::KviKvsObjectCoreCallFunctionHandler(const K } KviKvsObjectCoreCallFunctionHandler::~KviKvsObjectCoreCallFunctionHandler() -{ -} + = default; KviKvsObjectFunctionHandler * KviKvsObjectCoreCallFunctionHandler::clone() { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp index 3c76aa91f..68130bedd 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp @@ -33,8 +33,7 @@ KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const QChar * p } KviKvsTreeNodeAliasFunctionCall::~KviKvsTreeNodeAliasFunctionCall() -{ -} + = default; void KviKvsTreeNodeAliasFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp index 358d65948..a67932cba 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp @@ -41,8 +41,7 @@ KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const QChar * } KviKvsTreeNodeAliasSimpleCommand::~KviKvsTreeNodeAliasSimpleCommand() -{ -} + = default; void KviKvsTreeNodeAliasSimpleCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp index 9074f842a..8b2a32272 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const QChar * pLocation, KviK } KviKvsTreeNodeArrayCount::~KviKvsTreeNodeArrayCount() -{ -} + = default; void KviKvsTreeNodeArrayCount::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp index 2cf8b4e7b..24a948274 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp @@ -30,8 +30,7 @@ KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar * } KviKvsTreeNodeArrayOrHashElement::~KviKvsTreeNodeArrayOrHashElement() -{ -} + = default; bool KviKvsTreeNodeArrayOrHashElement::isReadOnly() { return m_pSource->isReadOnly(); diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp index f9b0f47cd..f8cdadc01 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp @@ -35,8 +35,7 @@ KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QCh } KviKvsTreeNodeArrayReferenceAssert::~KviKvsTreeNodeArrayReferenceAssert() -{ -} + = default; bool KviKvsTreeNodeArrayReferenceAssert::isReadOnly() { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp index 098feaa05..ec22721d0 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp @@ -33,8 +33,7 @@ KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const } KviKvsTreeNodeBaseObjectFunctionCall::~KviKvsTreeNodeBaseObjectFunctionCall() -{ -} + = default; void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp index 1b37ce593..49e24390f 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp @@ -35,8 +35,7 @@ KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const QChar } KviKvsTreeNodeCoreCallbackCommand::~KviKvsTreeNodeCoreCallbackCommand() -{ -} + = default; void KviKvsTreeNodeCoreCallbackCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp index 4b0d4d935..699fe9bfb 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp @@ -32,8 +32,7 @@ KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const QChar * pLo } KviKvsTreeNodeCoreFunctionCall::~KviKvsTreeNodeCoreFunctionCall() -{ -} + = default; void KviKvsTreeNodeCoreFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp index 5170ab22c..fd5d1e99a 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const QChar * p } KviKvsTreeNodeCoreSimpleCommand::~KviKvsTreeNodeCoreSimpleCommand() -{ -} + = default; void KviKvsTreeNodeCoreSimpleCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp index 4d7e663b8..aa90ceb37 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeData::KviKvsTreeNodeData(const QChar * pLocation) } KviKvsTreeNodeData::~KviKvsTreeNodeData() -{ -} + = default; void KviKvsTreeNodeData::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp index 8f20a00f8..c6b2ace28 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation) } KviKvsTreeNodeExpression::~KviKvsTreeNodeExpression() -{ -} + = default; void KviKvsTreeNodeExpression::contextDescription(QString & szBuffer) { @@ -162,8 +161,7 @@ KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const QChar * } KviKvsTreeNodeExpressionOperator::~KviKvsTreeNodeExpressionOperator() -{ -} + = default; void KviKvsTreeNodeExpressionOperator::contextDescription(QString & szBuffer) { @@ -225,8 +223,7 @@ KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperat } KviKvsTreeNodeExpressionUnaryOperatorNegate::~KviKvsTreeNodeExpressionUnaryOperatorNegate() -{ -} + = default; void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(QString & szBuffer) { @@ -265,8 +262,7 @@ KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOp } KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::~KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot() -{ -} + = default; void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(QString & szBuffer) { @@ -305,8 +301,7 @@ KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOp } KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::~KviKvsTreeNodeExpressionUnaryOperatorLogicalNot() -{ -} + = default; void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp index 5693c51e1..87fee9c94 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp @@ -32,8 +32,7 @@ KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const Q } KviKvsTreeNodeExtendedScopeVariable::~KviKvsTreeNodeExtendedScopeVariable() -{ -} + = default; void KviKvsTreeNodeExtendedScopeVariable::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp index b39f94b81..7ac49af4b 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const QChar * pLocati } KviKvsTreeNodeGlobalVariable::~KviKvsTreeNodeGlobalVariable() -{ -} + = default; void KviKvsTreeNodeGlobalVariable::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp index 53c3f9c35..4a65c991c 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const QChar * pLocation, KviKvs } KviKvsTreeNodeHashCount::~KviKvsTreeNodeHashCount() -{ -} + = default; void KviKvsTreeNodeHashCount::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp index a3f5c73dc..26d3e5d59 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar } KviKvsTreeNodeHashReferenceAssert::~KviKvsTreeNodeHashReferenceAssert() -{ -} + = default; bool KviKvsTreeNodeHashReferenceAssert::isReadOnly() { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp index 4f67df129..de6d1310a 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const QChar * pLocation } KviKvsTreeNodeLocalVariable::~KviKvsTreeNodeLocalVariable() -{ -} + = default; void KviKvsTreeNodeLocalVariable::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp index 984b0cdd6..83b036923 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp @@ -38,8 +38,7 @@ KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const Q } KviKvsTreeNodeModuleCallbackCommand::~KviKvsTreeNodeModuleCallbackCommand() -{ -} + = default; void KviKvsTreeNodeModuleCallbackCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp index 014c3e540..99717ca7b 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp @@ -37,8 +37,7 @@ KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const QChar * } KviKvsTreeNodeModuleFunctionCall::~KviKvsTreeNodeModuleFunctionCall() -{ -} + = default; void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp index 43910279f..200e750cf 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp @@ -38,8 +38,7 @@ KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const QChar } KviKvsTreeNodeModuleSimpleCommand::~KviKvsTreeNodeModuleSimpleCommand() -{ -} + = default; void KviKvsTreeNodeModuleSimpleCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp index 666dacc43..a3a636b4b 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp @@ -34,8 +34,7 @@ KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdenti } KviKvsTreeNodeMultipleParameterIdentifier::~KviKvsTreeNodeMultipleParameterIdentifier() -{ -} + = default; void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp index e7c732f67..b2c33675d 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp @@ -33,8 +33,7 @@ KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const QChar * pLocation, co } KviKvsTreeNodeObjectField::~KviKvsTreeNodeObjectField() -{ -} + = default; void KviKvsTreeNodeObjectField::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp index a331e73c9..b37107860 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp @@ -30,8 +30,7 @@ KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar * } KviKvsTreeNodeObjectFunctionCall::~KviKvsTreeNodeObjectFunctionCall() -{ -} + = default; void KviKvsTreeNodeObjectFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp index 4d7c6fefa..c9b383d68 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp @@ -108,8 +108,7 @@ KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const QChar * } KviKvsTreeNodeOperationDecrement::~KviKvsTreeNodeOperationDecrement() -{ -} + = default; void KviKvsTreeNodeOperationDecrement::contextDescription(QString & szBuffer) { @@ -159,8 +158,7 @@ KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const QChar * } KviKvsTreeNodeOperationIncrement::~KviKvsTreeNodeOperationIncrement() -{ -} + = default; void KviKvsTreeNodeOperationIncrement::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp index 91aa88d17..62fcfb402 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp @@ -32,8 +32,7 @@ KviKvsTreeNodeParameterCount::KviKvsTreeNodeParameterCount(const QChar * pLocati } KviKvsTreeNodeParameterCount::~KviKvsTreeNodeParameterCount() -{ -} + = default; void KviKvsTreeNodeParameterCount::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp index a38403c22..e598c24e3 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const QChar * pLocation } KviKvsTreeNodeSimpleCommand::~KviKvsTreeNodeSimpleCommand() -{ -} + = default; void KviKvsTreeNodeSimpleCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp index 3ad7915eb..c15323d67 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp @@ -33,8 +33,7 @@ KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier } KviKvsTreeNodeSingleParameterIdentifier::~KviKvsTreeNodeSingleParameterIdentifier() -{ -} + = default; void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp index 4fa7981d2..6ef08aa42 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp @@ -30,8 +30,7 @@ KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const QChar * pLocati } KviKvsTreeNodeSpecialCommand::~KviKvsTreeNodeSpecialCommand() -{ -} + = default; void KviKvsTreeNodeSpecialCommand::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp index 6e8c41bcc..58c9a8f53 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp @@ -32,8 +32,7 @@ KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar } KviKvsTreeNodeSpecialCommandBreak::~KviKvsTreeNodeSpecialCommandBreak() -{ -} + = default; void KviKvsTreeNodeSpecialCommandBreak::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp index 9594ae041..744cfc928 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp @@ -32,8 +32,7 @@ KviKvsTreeNodeSpecialCommandContinue::KviKvsTreeNodeSpecialCommandContinue(const } KviKvsTreeNodeSpecialCommandContinue::~KviKvsTreeNodeSpecialCommandContinue() -{ -} + = default; void KviKvsTreeNodeSpecialCommandContinue::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp index 93abbbbb5..c8946414a 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp @@ -70,8 +70,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchL } KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitchLabelCase() -{ -} + = default; void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString & szBuffer) { @@ -165,8 +164,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitch } KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitchLabelMatch() -{ -} + = default; void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString & szBuffer) { @@ -225,8 +223,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitc } KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp() -{ -} + = default; void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString & szBuffer) { @@ -285,8 +282,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwit } KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwitchLabelDefault() -{ -} + = default; void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp index b19463844..1cac36ac8 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const } KviKvsTreeNodeThisObjectFunctionCall::~KviKvsTreeNodeThisObjectFunctionCall() -{ -} + = default; void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(QString & szBuffer) { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp index cd0d8be67..defb33c0c 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp @@ -31,8 +31,7 @@ KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation, const QS } KviKvsTreeNodeVariable::~KviKvsTreeNodeVariable() -{ -} + = default; bool KviKvsTreeNodeVariable::isReadOnly() { diff --git a/src/kvirc/module/KviMexLinkFilter.cpp b/src/kvirc/module/KviMexLinkFilter.cpp index ea1979106..bf547d64c 100644 --- a/src/kvirc/module/KviMexLinkFilter.cpp +++ b/src/kvirc/module/KviMexLinkFilter.cpp @@ -30,5 +30,4 @@ KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d) } KviMexLinkFilter::~KviMexLinkFilter() -{ -} + = default; diff --git a/src/kvirc/module/KviMexServerImport.cpp b/src/kvirc/module/KviMexServerImport.cpp index 6ddb444f6..b0bd23a63 100644 --- a/src/kvirc/module/KviMexServerImport.cpp +++ b/src/kvirc/module/KviMexServerImport.cpp @@ -30,5 +30,4 @@ KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d) } KviMexServerImport::~KviMexServerImport() -{ -} + = default; diff --git a/src/kvirc/sparser/KviIrcServerParser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp index 088cefb8c..e500b2b8a 100644 --- a/src/kvirc/sparser/KviIrcServerParser.cpp +++ b/src/kvirc/sparser/KviIrcServerParser.cpp @@ -43,8 +43,7 @@ KviIrcServerParser::KviIrcServerParser() } KviIrcServerParser::~KviIrcServerParser() -{ -} + = default; void KviIrcServerParser::parseMessage(const char * message, KviIrcConnection * pConnection) { diff --git a/src/kvirc/ui/KviActionDrawer.cpp b/src/kvirc/ui/KviActionDrawer.cpp index b4af502cd..c5f518db8 100644 --- a/src/kvirc/ui/KviActionDrawer.cpp +++ b/src/kvirc/ui/KviActionDrawer.cpp @@ -45,8 +45,7 @@ KviActionDrawer::KviActionDrawer(QWidget * pParent) } KviActionDrawer::~KviActionDrawer() -{ -} + = default; void KviActionDrawer::fill() { @@ -104,8 +103,7 @@ KviActionDrawerPage::KviActionDrawerPage(QWidget * pParent, const QString & szDe } KviActionDrawerPage::~KviActionDrawerPage() -{ -} + = default; void KviActionDrawerPage::add(KviAction * pAction) { @@ -123,8 +121,7 @@ KviActionDrawerPageListWidget::KviActionDrawerPageListWidget(KviActionDrawerPage } KviActionDrawerPageListWidget::~KviActionDrawerPageListWidget() -{ -} + = default; void KviActionDrawerPageListWidget::mousePressEvent(QMouseEvent * e) { @@ -179,5 +176,4 @@ KviActionDrawerPageListWidgetItem::KviActionDrawerPageListWidgetItem(KviTalListW } KviActionDrawerPageListWidgetItem::~KviActionDrawerPageListWidgetItem() -{ -} + = default; diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp index c1da0b4c2..63b8839e9 100644 --- a/src/kvirc/ui/KviCryptController.cpp +++ b/src/kvirc/ui/KviCryptController.cpp @@ -55,8 +55,7 @@ KviEngineListBoxItem::KviEngineListBoxItem(KviTalListWidget * pList, KviCryptEng } KviEngineListBoxItem::~KviEngineListBoxItem() -{ -} + = default; KviCryptController::KviCryptController(QWidget * pParent, KviWindowToolPageButton * pButton, KviWindow * pWnd, KviCryptSessionInfo * pInfo) : KviWindowToolWidget(pParent, pButton) diff --git a/src/kvirc/ui/KviDynamicToolTip.cpp b/src/kvirc/ui/KviDynamicToolTip.cpp index 8b3a3e079..a2121bd48 100644 --- a/src/kvirc/ui/KviDynamicToolTip.cpp +++ b/src/kvirc/ui/KviDynamicToolTip.cpp @@ -31,8 +31,7 @@ KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent, KviDynamicToo } KviDynamicToolTipHelper::~KviDynamicToolTipHelper() -{ -} + = default; void KviDynamicToolTipHelper::maybeTip(const QPoint & pnt) { diff --git a/src/kvirc/ui/KviFileDialog.cpp b/src/kvirc/ui/KviFileDialog.cpp index 4e26a0161..ea52cf968 100644 --- a/src/kvirc/ui/KviFileDialog.cpp +++ b/src/kvirc/ui/KviFileDialog.cpp @@ -45,8 +45,7 @@ KviFileDialog::KviFileDialog(const QString & szDirName, const QString & szFilter } KviFileDialog::~KviFileDialog() -{ -} + = default; /* void KviFileDialog::goKvirc() diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp index 7a5eabf56..86ad584ad 100644 --- a/src/kvirc/ui/KviHistoryWindow.cpp +++ b/src/kvirc/ui/KviHistoryWindow.cpp @@ -260,8 +260,7 @@ KviHistoryWindowWidget::KviHistoryWindowWidget() } KviHistoryWindowWidget::~KviHistoryWindowWidget() -{ -} + = default; void KviHistoryWindowWidget::popup(KviInput * pOwner) { diff --git a/src/kvirc/ui/KviHtmlDialog.cpp b/src/kvirc/ui/KviHtmlDialog.cpp index 07ae9ef23..3e316b441 100644 --- a/src/kvirc/ui/KviHtmlDialog.cpp +++ b/src/kvirc/ui/KviHtmlDialog.cpp @@ -120,8 +120,7 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent, KviHtmlDialogData * pData) } KviHtmlDialog::~KviHtmlDialog() -{ -} + = default; void KviHtmlDialog::button1Pressed() { diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp index 3a4a4e082..e0c4015c2 100644 --- a/src/kvirc/ui/KviIpEditor.cpp +++ b/src/kvirc/ui/KviIpEditor.cpp @@ -53,8 +53,7 @@ KviIpEditor::KviIpEditor(QWidget * parent, AddressType addrType, const QString & } KviIpEditor::~KviIpEditor() -{ -} + = default; void KviIpEditor::setEnabled(bool bEnabled) { diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp index bd89352e7..2b0bc566a 100644 --- a/src/kvirc/ui/KviIrcToolBar.cpp +++ b/src/kvirc/ui/KviIrcToolBar.cpp @@ -205,8 +205,7 @@ KviIrcContextDisplay::KviIrcContextDisplay(QWidget * par, const char * name) } KviIrcContextDisplay::~KviIrcContextDisplay() -{ -} + = default; void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip, const QPoint &) { diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp index c1cf4bacb..a1c78fb9b 100644 --- a/src/kvirc/ui/KviIrcView_tools.cpp +++ b/src/kvirc/ui/KviIrcView_tools.cpp @@ -66,8 +66,7 @@ KviIrcMessageCheckListItem::KviIrcMessageCheckListItem(QTreeWidget * par, KviIrc } KviIrcMessageCheckListItem::~KviIrcMessageCheckListItem() -{ -} + = default; KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent) : QWidget(pParent) @@ -311,8 +310,7 @@ KviIrcViewToolTip::KviIrcViewToolTip(KviIrcView * pView) } KviIrcViewToolTip::~KviIrcViewToolTip() -{ -} + = default; void KviIrcViewToolTip::maybeTip(const QPoint & pnt) { diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp index 6f743e411..8fa50b74b 100644 --- a/src/kvirc/ui/KviMaskEditor.cpp +++ b/src/kvirc/ui/KviMaskEditor.cpp @@ -62,8 +62,7 @@ KviMaskItem::KviMaskItem(QTreeWidget * pParent, KviMaskEntry * pEntry) } KviMaskItem::~KviMaskItem() -{ -} + = default; KviMaskInputDialog::KviMaskInputDialog(const QString & szMask, KviMaskEditor * pEditor, KviChannelWindow * pChannel) : QDialog(pEditor) @@ -95,8 +94,7 @@ KviMaskInputDialog::KviMaskInputDialog(const QString & szMask, KviMaskEditor * p } KviMaskInputDialog::~KviMaskInputDialog() -{ -} + = default; void KviMaskInputDialog::accept() { @@ -235,8 +233,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par, KviChannelWindow * pChannel, KviWind } KviMaskEditor::~KviMaskEditor() -{ -} + = default; void KviMaskEditor::updateOpStatus() { diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp index 76adff238..ab7af4959 100644 --- a/src/kvirc/ui/KviModeWidget.cpp +++ b/src/kvirc/ui/KviModeWidget.cpp @@ -40,8 +40,7 @@ KviModeWidget::KviModeWidget(QWidget * par, KviChannelWindow * chan, const char } KviModeWidget::~KviModeWidget() -{ -} + = default; void KviModeWidget::reset() { diff --git a/src/kvirc/ui/KviScriptButton.cpp b/src/kvirc/ui/KviScriptButton.cpp index 160fe4fc9..70b01cce9 100644 --- a/src/kvirc/ui/KviScriptButton.cpp +++ b/src/kvirc/ui/KviScriptButton.cpp @@ -79,5 +79,4 @@ KviWindowScriptButton::KviWindowScriptButton(QWidget * p, KviWindow * wnd, const } KviWindowScriptButton::~KviWindowScriptButton() -{ -} + = default; diff --git a/src/kvirc/ui/KviScriptEditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp index fd0b962ab..68ee0a423 100644 --- a/src/kvirc/ui/KviScriptEditor.cpp +++ b/src/kvirc/ui/KviScriptEditor.cpp @@ -35,8 +35,7 @@ KviScriptEditor::KviScriptEditor(QWidget * par) } KviScriptEditor::~KviScriptEditor() -{ -} + = default; void KviScriptEditor::setText(const char * txt) { diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp index a87903925..927b6b190 100644 --- a/src/kvirc/ui/KviSelectors.cpp +++ b/src/kvirc/ui/KviSelectors.cpp @@ -145,8 +145,7 @@ KviStringSelector::KviStringSelector(QWidget * par, const QString & txt, QString } KviStringSelector::~KviStringSelector() -{ -} + = default; void KviStringSelector::commit() { @@ -199,8 +198,7 @@ void KviPasswordSelector::checkToggled(int state) } KviPasswordSelector::~KviPasswordSelector() -{ -} + = default; void KviPasswordSelector::commit() { @@ -245,8 +243,7 @@ void KviPasswordLineEdit::checkToggled(int state) } KviPasswordLineEdit::~KviPasswordLineEdit() -{ -} + = default; QString KviPasswordLineEdit::text() { @@ -274,8 +271,7 @@ KviPixmapPreview::KviPixmapPreview(QWidget * par) } KviPixmapPreview::~KviPixmapPreview() -{ -} + = default; void KviPixmapPreview::setPixmap(KviPixmap * pix) { @@ -322,8 +318,7 @@ KviPixmapSelector::KviPixmapSelector(QWidget * par, const QString & txt, KviPixm } KviPixmapSelector::~KviPixmapSelector() -{ -} + = default; void KviPixmapSelector::checkBoxToggled(bool) { @@ -510,8 +505,7 @@ KviStringListSelector::KviStringListSelector(QWidget * par, const QString & txt, } KviStringListSelector::~KviStringListSelector() -{ -} + = default; void KviStringListSelector::itemSelectionChanged() { @@ -738,8 +732,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par, const QString } KviMircTextColorSelector::~KviMircTextColorSelector() -{ -} + = default; void KviMircTextColorSelector::commit() { @@ -815,8 +808,7 @@ KviSoundSelector::KviSoundSelector(QWidget * par, const QString & txt, QString * } KviSoundSelector::~KviSoundSelector() -{ -} + = default; void KviSoundSelector::playSound() { @@ -883,8 +875,7 @@ KviChannelListSelector::KviChannelListSelector(QWidget * par, const QString & tx } KviChannelListSelector::~KviChannelListSelector() -{ -} + = default; void KviChannelListSelector::commit() { diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp index fc7fbee86..866ff762e 100644 --- a/src/kvirc/ui/KviStatusBarApplet.cpp +++ b/src/kvirc/ui/KviStatusBarApplet.cpp @@ -137,8 +137,7 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent, Kvi } KviStatusBarAwayIndicator::~KviStatusBarAwayIndicator() -{ -} + = default; void KviStatusBarAwayIndicator::updateDisplay() { @@ -258,8 +257,7 @@ KviStatusBarLagIndicator::KviStatusBarLagIndicator(KviStatusBar * pParent, KviSt } KviStatusBarLagIndicator::~KviStatusBarLagIndicator() -{ -} + = default; void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent * e) { @@ -382,8 +380,7 @@ KviStatusBarClock::KviStatusBarClock(KviStatusBar * pParent, KviStatusBarAppletD } KviStatusBarClock::~KviStatusBarClock() -{ -} + = default; void KviStatusBarClock::adjustMinWidth() { @@ -543,8 +540,7 @@ KviStatusBarConnectionTimer::KviStatusBarConnectionTimer(KviStatusBar * pParent, } KviStatusBarConnectionTimer::~KviStatusBarConnectionTimer() -{ -} + = default; //g_pApp->topmostConnectedConsole() void KviStatusBarConnectionTimer::timerEvent(QTimerEvent *) { @@ -622,8 +618,7 @@ KviStatusBarSeparator::KviStatusBarSeparator(KviStatusBar * pParent, KviStatusBa } KviStatusBarSeparator::~KviStatusBarSeparator() -{ -} + = default; KviStatusBarApplet * CreateStatusBarSeparator(KviStatusBar * pBar, KviStatusBarAppletDescriptor * pDescriptor) { @@ -657,8 +652,7 @@ KviStatusBarUpdateIndicator::KviStatusBarUpdateIndicator(KviStatusBar * pParent, } KviStatusBarUpdateIndicator::~KviStatusBarUpdateIndicator() -{ -} + = default; void KviStatusBarUpdateIndicator::updateDisplay() { diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp index c13064070..0ad01c966 100644 --- a/src/kvirc/ui/KviThemedComboBox.cpp +++ b/src/kvirc/ui/KviThemedComboBox.cpp @@ -51,8 +51,7 @@ KviThemedComboBox::KviThemedComboBox(QWidget * par, KviWindow * pWindow, const c } KviThemedComboBox::~KviThemedComboBox() -{ -} + = default; void KviThemedComboBox::applyOptions() { diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp index ce9e72d2e..03f60c430 100644 --- a/src/kvirc/ui/KviThemedLabel.cpp +++ b/src/kvirc/ui/KviThemedLabel.cpp @@ -51,8 +51,7 @@ KviThemedLabel::KviThemedLabel(QWidget * par, KviWindow * pWindow, const char * } KviThemedLabel::~KviThemedLabel() -{ -} + = default; void KviThemedLabel::applyOptions() { diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp index b943e8377..d844000be 100644 --- a/src/kvirc/ui/KviThemedLineEdit.cpp +++ b/src/kvirc/ui/KviThemedLineEdit.cpp @@ -62,8 +62,7 @@ KviThemedLineEdit::KviThemedLineEdit(QWidget * par, KviWindow * pWindow, const c } KviThemedLineEdit::~KviThemedLineEdit() -{ -} + = default; void KviThemedLineEdit::applyOptions() { diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp index 26016aae6..ed80a149c 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.cpp +++ b/src/kvirc/ui/KviThemedTreeWidget.cpp @@ -45,8 +45,7 @@ KviThemedTreeWidget::KviThemedTreeWidget(QWidget * par, KviWindow * pWindow, con } KviThemedTreeWidget::~KviThemedTreeWidget() -{ -} + = default; void KviThemedTreeWidget::applyOptions() { diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 3408da5f1..56a80cc4f 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -64,8 +64,7 @@ KviTopicListBoxItemDelegate::KviTopicListBoxItemDelegate(QAbstractItemView * pWi } KviTopicListBoxItemDelegate::~KviTopicListBoxItemDelegate() -{ -} + = default; QSize KviTopicListBoxItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex & index) const { @@ -90,8 +89,7 @@ KviTopicListBoxItem::KviTopicListBoxItem(KviTalListWidget * listbox, const QStri } KviTopicListBoxItem::~KviTopicListBoxItem() -{ -} + = default; int KviTopicListBoxItem::width(const KviTalListWidget * lb) const { diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp index f64efaf5b..d4ef2462c 100644 --- a/src/kvirc/ui/KviTreeWindowList.cpp +++ b/src/kvirc/ui/KviTreeWindowList.cpp @@ -65,8 +65,7 @@ KviTreeWindowListItem::KviTreeWindowListItem(KviTreeWindowListItem * par, KviWin } KviTreeWindowListItem::~KviTreeWindowListItem() -{ -} + = default; void KviTreeWindowListItem::applyOptions() { @@ -209,8 +208,7 @@ KviTreeWindowListTreeWidget::KviTreeWindowListTreeWidget(QWidget * par) } KviTreeWindowListTreeWidget::~KviTreeWindowListTreeWidget() -{ -} + = default; void KviTreeWindowListTreeWidget::mouseMoveEvent(QMouseEvent *) { @@ -396,8 +394,7 @@ KviTreeWindowList::KviTreeWindowList() } KviTreeWindowList::~KviTreeWindowList() -{ -} + = default; void KviTreeWindowList::updatePseudoTransparency() { diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index 6606d2065..f5d4e474e 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -80,8 +80,7 @@ KviUserListToolTip::KviUserListToolTip(KviUserListView * pView, KviUserListViewA } KviUserListToolTip::~KviUserListToolTip() -{ -} + = default; void KviUserListToolTip::maybeTip(const QPoint & pnt) { @@ -1694,8 +1693,7 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * pPar) } KviUserListViewArea::~KviUserListViewArea() -{ -} + = default; void KviUserListViewArea::scrollBarMoved(int iNewVal) { diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp index 37feded05..dbdda58c9 100644 --- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp +++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp @@ -101,8 +101,7 @@ KviWebPackageManagementDialog::KviWebPackageManagementDialog(QWidget * pParent) } KviWebPackageManagementDialog::~KviWebPackageManagementDialog() -{ -} + = default; void KviWebPackageManagementDialog::setPackagePageUrl(const QString & szUrl) { diff --git a/src/kvirc/ui/KviWindowStack.cpp b/src/kvirc/ui/KviWindowStack.cpp index 27a10624a..ab7fef1cd 100644 --- a/src/kvirc/ui/KviWindowStack.cpp +++ b/src/kvirc/ui/KviWindowStack.cpp @@ -71,8 +71,7 @@ KviWindowStack::KviWindowStack(QWidget * parent, const char * pcName) } KviWindowStack::~KviWindowStack() -{ -} + = default; void KviWindowStack::currentWindowChanged(int iIdx) { diff --git a/src/kvirc/ui/KviWindowToolWidget.cpp b/src/kvirc/ui/KviWindowToolWidget.cpp index 5e642fc6f..f88093d0f 100644 --- a/src/kvirc/ui/KviWindowToolWidget.cpp +++ b/src/kvirc/ui/KviWindowToolWidget.cpp @@ -40,8 +40,7 @@ KviWindowToolWidget::KviWindowToolWidget(QWidget * pParent, KviWindowToolPageBut } KviWindowToolWidget::~KviWindowToolWidget() -{ -} + = default; KviWindowToolPageButton::KviWindowToolPageButton(KviIconManager::SmallIcon eIconOff, KviIconManager::SmallIcon eIconOn, const QString & szText, QWidget * pParent, bool bOn) : QToolButton(pParent) @@ -59,5 +58,4 @@ KviWindowToolPageButton::KviWindowToolPageButton(KviIconManager::SmallIcon eIcon } KviWindowToolPageButton::~KviWindowToolPageButton() -{ -} + = default; diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 29e5fa174..e5de318e0 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -292,8 +292,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed) } SingleActionEditor::~SingleActionEditor() -{ -} + = default; void SingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool) { @@ -608,8 +607,7 @@ ActionEditorTreeView::ActionEditorTreeView(QWidget * pParent) } ActionEditorTreeView::~ActionEditorTreeView() -{ -} + = default; void ActionEditorTreeView::resizeEvent(QResizeEvent * e) { @@ -694,8 +692,7 @@ ActionEditor::ActionEditor(QWidget * par) } ActionEditor::~ActionEditor() -{ -} + = default; void ActionEditor::exportActions() { diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp index b56fa3d12..cf416a4c3 100644 --- a/src/modules/addon/PackAddonDialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -119,8 +119,7 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent) } PackAddonDialog::~PackAddonDialog() -{ -} + = default; void PackAddonDialog::accept() { @@ -250,8 +249,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent } PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget() -{ -} + = default; PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent) : QWizardPage(pParent) @@ -276,8 +274,7 @@ PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pPa } PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget() -{ -} + = default; PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent) : QWizardPage(pParent) @@ -303,8 +300,7 @@ PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pPa } PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget() -{ -} + = default; void PackAddonSaveSelectionWidget::initializePage() { @@ -335,8 +331,7 @@ PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent } PackAddonSummaryInfoWidget::~PackAddonSummaryInfoWidget() -{ -} + = default; void PackAddonSummaryInfoWidget::initializePage() { @@ -417,8 +412,7 @@ PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pPare } PackAddonSummaryFilesWidget::~PackAddonSummaryFilesWidget() -{ -} + = default; void PackAddonSummaryFilesWidget::accept() { diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp index b0f990571..ab639093c 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.cpp +++ b/src/modules/addon/WebAddonInterfaceDialog.cpp @@ -46,8 +46,7 @@ WebAddonInterfaceDialog::WebAddonInterfaceDialog(QWidget * par) .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr()))); } WebAddonInterfaceDialog::~WebAddonInterfaceDialog() -{ -} + = default; bool WebAddonInterfaceDialog::installPackage(const QString & szPath, QString & szError) { diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 00c4bd93e..2dc0cc425 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -2051,8 +2051,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz } KviClassEditorDialog::~KviClassEditorDialog() -{ -} + = default; void KviClassEditorDialog::textChanged(const QString & szText) { @@ -2153,8 +2152,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co } KviClassEditorFunctionDialog::~KviClassEditorFunctionDialog() -{ -} + = default; void KviClassEditorFunctionDialog::textChanged(const QString & szText) { diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp index d0d693691..a6d113404 100644 --- a/src/modules/dcc/DccDialog.cpp +++ b/src/modules/dcc/DccDialog.cpp @@ -90,8 +90,7 @@ DccAcceptDialog::DccAcceptDialog(DccBroker * br, DccDescriptor * dcc, const QStr } DccAcceptDialog::~DccAcceptDialog() -{ -} + = default; void DccAcceptDialog::acceptClicked() { @@ -167,8 +166,7 @@ DccRenameDialog::DccRenameDialog(DccBroker * br, DccDescriptor * dcc, const QStr } DccRenameDialog::~DccRenameDialog() -{ -} + = default; void DccRenameDialog::closeEvent(QCloseEvent * e) { diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index f03b8c4ea..a0689d05a 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -2522,8 +2522,7 @@ DccFileTransferBandwidthDialog::DccFileTransferBandwidthDialog(QWidget * pParent } DccFileTransferBandwidthDialog::~DccFileTransferBandwidthDialog() -{ -} + = default; void DccFileTransferBandwidthDialog::okClicked() { diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp index 57be1681e..8b153883a 100644 --- a/src/modules/dcc/DccVoiceCodec.cpp +++ b/src/modules/dcc/DccVoiceCodec.cpp @@ -33,8 +33,7 @@ DccVoiceCodec::DccVoiceCodec() } DccVoiceCodec::~DccVoiceCodec() -{ -} + = default; void DccVoiceCodec::encode(KviDataBuffer *, KviDataBuffer *) { @@ -66,8 +65,7 @@ DccVoiceNullCodec::DccVoiceNullCodec() } DccVoiceNullCodec::~DccVoiceNullCodec() -{ -} + = default; void DccVoiceNullCodec::encode(KviDataBuffer * signal, KviDataBuffer * stream) { @@ -103,8 +101,7 @@ DccVideoCodec::DccVideoCodec() } DccVideoCodec::~DccVideoCodec() -{ -} + = default; void DccVideoCodec::encodeVideo(KviDataBuffer *, KviDataBuffer *) { @@ -140,8 +137,7 @@ DccVideoSJpegCodec::DccVideoSJpegCodec() } DccVideoSJpegCodec::~DccVideoSJpegCodec() -{ -} + = default; void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream) { diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index 27ea922b1..2a6d1cd73 100644 --- a/src/modules/editor/ScriptEditorImplementation.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -635,8 +635,7 @@ ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget } ScriptEditorSyntaxHighlighter::~ScriptEditorSyntaxHighlighter() -{ -} + = default; void ScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat() { @@ -1143,8 +1142,7 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS } ScriptEditorReplaceDialog::~ScriptEditorReplaceDialog() -{ -} + = default; void ScriptEditorReplaceDialog::textChanged(const QString & szText) { diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index c476cd0db..a39703c36 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -63,8 +63,7 @@ ChannelTreeWidgetItemData::ChannelTreeWidgetItemData(const QString & szChan, con } ChannelTreeWidgetItemData::~ChannelTreeWidgetItemData() -{ -} + = default; ChannelTreeWidgetItem::ChannelTreeWidgetItem(ChannelTreeWidgetItemData * pData) : QTreeWidgetItem(), m_pData(pData) @@ -75,8 +74,7 @@ ChannelTreeWidgetItem::ChannelTreeWidgetItem(ChannelTreeWidgetItemData * pData) } ChannelTreeWidgetItem::~ChannelTreeWidgetItem() -{ -} + = default; bool ChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const { @@ -104,8 +102,7 @@ ChannelTreeWidgetItemDelegate::ChannelTreeWidgetItemDelegate(QTreeWidget * pWidg } ChannelTreeWidgetItemDelegate::~ChannelTreeWidgetItemDelegate() -{ -} + = default; #define BORDER 2 diff --git a/src/modules/mediaplayer/MpMprisInterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp index 30367487f..60bcea8de 100644 --- a/src/modules/mediaplayer/MpMprisInterface.cpp +++ b/src/modules/mediaplayer/MpMprisInterface.cpp @@ -67,8 +67,7 @@ MpMprisInterface::MpMprisInterface() } MpMprisInterface::~MpMprisInterface() -{ -} + = default; int MpMprisInterface::detect(bool) { diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp index dc9a8c620..43e213aa3 100644 --- a/src/modules/mediaplayer/MpXmmsInterface.cpp +++ b/src/modules/mediaplayer/MpXmmsInterface.cpp @@ -93,8 +93,7 @@ KviAudaciousClassicInterface::KviAudaciousClassicInterface() } KviAudaciousClassicInterface::~KviAudaciousClassicInterface() -{ -} + = default; bool KviXmmsInterface::loadPlayerLibrary() { diff --git a/src/modules/notifier/NotifierWindowBorder.cpp b/src/modules/notifier/NotifierWindowBorder.cpp index 5f566b55d..6b749ad55 100644 --- a/src/modules/notifier/NotifierWindowBorder.cpp +++ b/src/modules/notifier/NotifierWindowBorder.cpp @@ -36,8 +36,7 @@ NotifierWindowBorder::NotifierWindowBorder(QSize s) } NotifierWindowBorder::~NotifierWindowBorder() -{ -} + = default; void NotifierWindowBorder::loadImages() { diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp index acc0f82c7..901994049 100644 --- a/src/modules/objects/KvsObject_tableWidget.cpp +++ b/src/modules/objects/KvsObject_tableWidget.cpp @@ -872,8 +872,7 @@ KviCellItemDelegate::KviCellItemDelegate(QAbstractItemView * pWidget, KvsObject_ } KviCellItemDelegate::~KviCellItemDelegate() -{ -} + = default; void KviCellItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const { diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp index 2b83cebf5..113b300f8 100644 --- a/src/modules/objects/KvsObject_treeWidget.cpp +++ b/src/modules/objects/KvsObject_treeWidget.cpp @@ -603,8 +603,7 @@ KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWi } KviKvsTreeWidget::~KviKvsTreeWidget() -{ -} + = default; void KviKvsTreeWidget::dragEnterEvent(QDragEnterEvent * e) { diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index af594750c..7abc10e6e 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -1413,6 +1413,5 @@ bool KviKvsWebView::event(QEvent * e) return QWebView::event(e); } KviKvsWebView::~KviKvsWebView() -{ -} + = default; #endif // COMPILE_WEBKIT_SUPPORT diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 8acbc1f54..8f60a145e 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -66,8 +66,7 @@ KviKvsWidget::KviKvsWidget(KvsObject_widget * object, QWidget * par) } KviKvsWidget::~KviKvsWidget() -{ -} + = default; QSize KviKvsWidget::sizeHint() const { diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp index c28af26fa..43fb2aea3 100644 --- a/src/modules/objects/KvsObject_window.cpp +++ b/src/modules/objects/KvsObject_window.cpp @@ -39,8 +39,7 @@ KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName) } KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow() -{ -} + = default; void KviKvsScriptWindowWindow::setCentralWidget(KvsObject_widget * o, QWidget * w) { diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp index e09b9ffa4..f708ffcd1 100644 --- a/src/modules/objects/KvsObject_wizard.cpp +++ b/src/modules/objects/KvsObject_wizard.cpp @@ -374,5 +374,4 @@ void KviKvsMdmWizard::slotBackClicked() m_pParentScript->backClicked(); } KviKvsMdmWizard::~KviKvsMdmWizard() -{ -} + = default; diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp index 1e1c892c6..b7ebafe9f 100644 --- a/src/modules/objects/KvsObject_xmlreader.cpp +++ b/src/modules/objects/KvsObject_xmlreader.cpp @@ -130,9 +130,7 @@ public: { m_pReader = pReader; } - ~KviXmlHandler() override - { - } + ~KviXmlHandler() override = default; private: bool kvsCodeFailure() diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp index 1f22a67ee..dbecaa42e 100644 --- a/src/modules/objects/qthttp/qhttp.cpp +++ b/src/modules/objects/qthttp/qhttp.cpp @@ -76,8 +76,7 @@ public: id = idCounter.fetchAndAddRelaxed(1); } virtual ~QHttpRequest() - { - } + = default; virtual void start(QHttp *) = 0; virtual bool hasRequestHeader(); @@ -324,9 +323,7 @@ public: { } - ~QHttpPGHRequest() override - { - } + ~QHttpPGHRequest() override = default; void start(QHttp *) override; }; @@ -536,7 +533,7 @@ class QHttpHeaderPrivate { Q_DECLARE_PUBLIC(QHttpHeader) public: - inline virtual ~QHttpHeaderPrivate() {} + inline virtual ~QHttpHeaderPrivate() = default; QList> values; bool valid; @@ -662,8 +659,7 @@ QHttpHeader::QHttpHeader(QHttpHeaderPrivate & dd, const QHttpHeader & header) Destructor. */ QHttpHeader::~QHttpHeader() -{ -} + = default; /*! Assigns \a h and returns a reference to this http header. diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index ec5b99811..2d2f54dcf 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -70,8 +70,7 @@ OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget * parent, const QStri } OptionsDialogFrontWidget::~OptionsDialogFrontWidget() -{ -} + = default; OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget * parent, OptionsWidgetInstanceEntry * e) : QTreeWidgetItem() @@ -94,8 +93,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem * paren } OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem() -{ -} + = default; OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal) : QDialog(par) diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp index 2d69b9c71..67002ba08 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp @@ -41,8 +41,7 @@ OptionsWidget_alertsAndHighlighting::OptionsWidget_alertsAndHighlighting(QWidget } OptionsWidget_alertsAndHighlighting::~OptionsWidget_alertsAndHighlighting() -{ -} + = default; OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent) : KviOptionsWidget(parent) @@ -98,8 +97,7 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent) } OptionsWidget_highlighting::~OptionsWidget_highlighting() -{ -} + = default; void OptionsWidget_highlighting::commit() { @@ -140,7 +138,6 @@ OptionsWidget_alerts::OptionsWidget_alerts(QWidget * parent) } OptionsWidget_alerts::~OptionsWidget_alerts() -{ -} + = default; #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp index 8ce261fe4..71d42873b 100644 --- a/src/modules/options/OptionsWidget_antiSpam.cpp +++ b/src/modules/options/OptionsWidget_antiSpam.cpp @@ -51,8 +51,7 @@ OptionsWidget_antispam::OptionsWidget_antispam(QWidget * parent) } OptionsWidget_antispam::~OptionsWidget_antispam() -{ -} + = default; void OptionsWidget_antispam::reenableStuff(bool) { diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp index 3766e6498..4bf45ff99 100644 --- a/src/modules/options/OptionsWidget_avatar.cpp +++ b/src/modules/options/OptionsWidget_avatar.cpp @@ -114,5 +114,4 @@ OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent) } OptionsWidget_avatar::~OptionsWidget_avatar() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp index 8f1879d12..2912b8c44 100644 --- a/src/modules/options/OptionsWidget_away.cpp +++ b/src/modules/options/OptionsWidget_away.cpp @@ -56,8 +56,7 @@ OptionsWidget_away::OptionsWidget_away(QWidget * parent) } OptionsWidget_away::~OptionsWidget_away() -{ -} + = default; void OptionsWidget_away::enableCustomAwayText(bool) { diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index 22da578b1..a79f63d56 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -41,8 +41,7 @@ OptionsWidget_channel::OptionsWidget_channel(QWidget * pParent) } OptionsWidget_channel::~OptionsWidget_channel() -{ -} + = default; OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent) : KviOptionsWidget(pParent) @@ -90,8 +89,7 @@ OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent) } OptionsWidget_channelGeneral::~OptionsWidget_channelGeneral() -{ -} + = default; OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) : KviOptionsWidget(pParent) @@ -165,8 +163,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) } OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced() -{ -} + = default; void OptionsWidget_channelAdvanced::commit() { diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp index 8f3335d76..ca27b9a92 100644 --- a/src/modules/options/OptionsWidget_connection.cpp +++ b/src/modules/options/OptionsWidget_connection.cpp @@ -92,8 +92,7 @@ OptionsWidget_connection::OptionsWidget_connection(QWidget * parent) } OptionsWidget_connection::~OptionsWidget_connection() -{ -} + = default; OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent) : KviOptionsWidget(parent) @@ -138,8 +137,7 @@ OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent) } OptionsWidget_connectionSsl::~OptionsWidget_connectionSsl() -{ -} + = default; OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent) : KviOptionsWidget(parent) @@ -188,8 +186,7 @@ OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent) } OptionsWidget_connectionSocket::~OptionsWidget_connectionSocket() -{ -} + = default; OptionsWidget_identService::OptionsWidget_identService(QWidget * parent) : KviOptionsWidget(parent) @@ -278,8 +275,7 @@ OptionsWidget_identService::OptionsWidget_identService(QWidget * parent) } OptionsWidget_identService::~OptionsWidget_identService() -{ -} + = default; void OptionsWidget_identService::commit() { @@ -306,5 +302,4 @@ OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * par } OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp index 634551ad8..29f71dd40 100644 --- a/src/modules/options/OptionsWidget_ctcp.cpp +++ b/src/modules/options/OptionsWidget_ctcp.cpp @@ -74,5 +74,4 @@ OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent) } OptionsWidget_ctcp::~OptionsWidget_ctcp() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp index d4972b4ca..8f625c57a 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp @@ -107,5 +107,4 @@ OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * p } OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp index 0f4773476..a89dd79d6 100644 --- a/src/modules/options/OptionsWidget_dcc.cpp +++ b/src/modules/options/OptionsWidget_dcc.cpp @@ -35,8 +35,7 @@ OptionsWidget_dcc::OptionsWidget_dcc(QWidget * pParent) } OptionsWidget_dcc::~OptionsWidget_dcc() -{ -} + = default; OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent) : KviOptionsWidget(parent) @@ -54,8 +53,7 @@ OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent) } OptionsWidget_dccGeneral::~OptionsWidget_dccGeneral() -{ -} + = default; OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent) : KviOptionsWidget(parent) @@ -155,8 +153,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent) } OptionsWidget_dccAdvanced::~OptionsWidget_dccAdvanced() -{ -} + = default; OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent) : KviOptionsWidget(parent) @@ -165,8 +162,7 @@ OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent) } OptionsWidget_dccSend::~OptionsWidget_dccSend() -{ -} + = default; OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent) : KviOptionsWidget(parent) @@ -223,8 +219,7 @@ OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent) } OptionsWidget_dccSendGeneral::~OptionsWidget_dccSendGeneral() -{ -} + = default; OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent) : KviOptionsWidget(parent) @@ -326,8 +321,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent) } OptionsWidget_dccSendAdvanced::~OptionsWidget_dccSendAdvanced() -{ -} + = default; OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent) : KviOptionsWidget(parent) @@ -375,8 +369,7 @@ OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent) } OptionsWidget_dccChat::~OptionsWidget_dccChat() -{ -} + = default; OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget * p) : KviOptionsWidget(p) { @@ -419,5 +412,4 @@ OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget * p) : KviOptionsWidget(p } OptionsWidget_dccVoice::~OptionsWidget_dccVoice() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp index 1ead7ce6d..0414981cb 100644 --- a/src/modules/options/OptionsWidget_general.cpp +++ b/src/modules/options/OptionsWidget_general.cpp @@ -45,5 +45,4 @@ OptionsWidget_general::OptionsWidget_general(QWidget * parent) } OptionsWidget_general::~OptionsWidget_general() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index 401142f47..599f447bb 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -105,8 +105,7 @@ NickAlternativesDialog::NickAlternativesDialog(QWidget * par, const QString & n1 } NickAlternativesDialog::~NickAlternativesDialog() -{ -} + = default; void NickAlternativesDialog::fill(QString & n1, QString & n2, QString & n3) { @@ -250,8 +249,7 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par, const QString & szIn } AvatarSelectionDialog::~AvatarSelectionDialog() -{ -} + = default; void AvatarSelectionDialog::okClicked() { @@ -285,8 +283,7 @@ OptionsWidget_identity::OptionsWidget_identity(QWidget * parent) } OptionsWidget_identity::~OptionsWidget_identity() -{ -} + = default; KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) @@ -413,8 +410,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren } KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget() -{ -} + = default; void KviIdentityGeneralOptionsWidget::setNickAlternatives() { @@ -701,8 +697,7 @@ OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent) } OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced() -{ -} + = default; void OptionsWidget_identityAdvanced::commit() { @@ -795,8 +790,7 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) } OptionsWidget_identityProfile::~OptionsWidget_identityProfile() -{ -} + = default; void OptionsWidget_identityProfile::toggleControls() { @@ -982,8 +976,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent) } IdentityProfileEditor::~IdentityProfileEditor() -{ -} + = default; bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile) { diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp index 4715426a1..a12038b15 100644 --- a/src/modules/options/OptionsWidget_ignore.cpp +++ b/src/modules/options/OptionsWidget_ignore.cpp @@ -50,8 +50,7 @@ OptionsWidget_ignore::OptionsWidget_ignore(QWidget * parent) } OptionsWidget_ignore::~OptionsWidget_ignore() -{ -} + = default; void OptionsWidget_ignore::enableVerbose(bool) { diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp index c4431b68a..804d8fafb 100644 --- a/src/modules/options/OptionsWidget_input.cpp +++ b/src/modules/options/OptionsWidget_input.cpp @@ -97,8 +97,7 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent) } OptionsWidget_inputLook::~OptionsWidget_inputLook() -{ -} + = default; void OptionsWidget_inputLook::commit() { @@ -166,5 +165,4 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent) } OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp index e486ed284..90596731a 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp +++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp @@ -72,5 +72,4 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren } OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp index 7f68bb442..c49c8659b 100644 --- a/src/modules/options/OptionsWidget_irc.cpp +++ b/src/modules/options/OptionsWidget_irc.cpp @@ -36,8 +36,7 @@ OptionsWidget_irc::OptionsWidget_irc(QWidget * parent) } OptionsWidget_irc::~OptionsWidget_irc() -{ -} + = default; OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent) : KviOptionsWidget(parent) @@ -50,8 +49,7 @@ OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent) } OptionsWidget_ircGeneral::~OptionsWidget_ircGeneral() -{ -} + = default; OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent) : KviOptionsWidget(parent) @@ -77,5 +75,4 @@ OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent) } OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index 9cff3d256..86bbf5088 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -89,8 +89,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) } OptionsWidget_ircOutput::~OptionsWidget_ircOutput() -{ -} + = default; void OptionsWidget_ircOutput::commit() { diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp index deb2461a1..85319908e 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -36,8 +36,7 @@ OptionsWidget_ircViewTheme::OptionsWidget_ircViewTheme(QWidget * pParent) } OptionsWidget_ircViewTheme::~OptionsWidget_ircViewTheme() -{ -} + = default; OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent) : KviOptionsWidget(parent) @@ -102,8 +101,7 @@ OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent) } OptionsWidget_ircViewLook::~OptionsWidget_ircViewLook() -{ -} + = default; void OptionsWidget_ircViewLook::commit() { @@ -166,8 +164,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent) } OptionsWidget_ircViewFeatures::~OptionsWidget_ircViewFeatures() -{ -} + = default; OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent) : KviOptionsWidget(parent) @@ -198,8 +195,7 @@ OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent) } OptionsWidget_ircViewMarker::~OptionsWidget_ircViewMarker() -{ -} + = default; void OptionsWidget_ircViewMarker::commit() { diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp index 6bb33548c..a58439e70 100644 --- a/src/modules/options/OptionsWidget_lag.cpp +++ b/src/modules/options/OptionsWidget_lag.cpp @@ -71,5 +71,4 @@ OptionsWidget_lag::OptionsWidget_lag(QWidget * parent) } OptionsWidget_lag::~OptionsWidget_lag() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index ab372b4ee..5ece8dadd 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -69,5 +69,4 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent) } OptionsWidget_logging::~OptionsWidget_logging() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp index 866fb7f91..4115e5fff 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.cpp +++ b/src/modules/options/OptionsWidget_mediaTypes.cpp @@ -53,8 +53,7 @@ MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w, KviMediaType * } MediaTypeTreeWidgetItem::~MediaTypeTreeWidgetItem() -{ -} + = default; void MediaTypeTreeWidgetItem::copyData(KviMediaType * t) { @@ -152,8 +151,7 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent) } OptionsWidget_mediaTypes::~OptionsWidget_mediaTypes() -{ -} + = default; void OptionsWidget_mediaTypes::fillTreeWidget() { diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index aa0485040..f28eea533 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -55,8 +55,7 @@ OptionsWidget_message::OptionsWidget_message(QWidget * pParent) } OptionsWidget_message::~OptionsWidget_message() -{ -} + = default; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -123,8 +122,7 @@ void OptionsWidget_privmsg::enableDisableSmartColorSelector(bool) } OptionsWidget_privmsg::~OptionsWidget_privmsg() -{ -} + = default; OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent) : KviOptionsWidget(pParent) @@ -154,8 +152,7 @@ OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent) } OptionsWidget_timestamp::~OptionsWidget_timestamp() -{ -} + = default; void OptionsWidget_timestamp::enableDisableTimestampSelector(bool) { @@ -191,8 +188,7 @@ OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent) } OptionsWidget_standardColors::~OptionsWidget_standardColors() -{ -} + = default; void OptionsWidget_standardColors::resetToDefaults() { @@ -326,8 +322,7 @@ MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b, int } MessageColorListWidgetItem::~MessageColorListWidgetItem() -{ -} + = default; void MessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const { diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp index a98dcd91a..383a371c1 100644 --- a/src/modules/options/OptionsWidget_nickserv.cpp +++ b/src/modules/options/OptionsWidget_nickserv.cpp @@ -143,8 +143,7 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField) } NickServRuleEditor::~NickServRuleEditor() -{ -} + = default; bool NickServRuleEditor::validate() { @@ -298,8 +297,7 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent) } OptionsWidget_nickServ::~OptionsWidget_nickServ() -{ -} + = default; void OptionsWidget_nickServ::editNickServRule() { diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index 70caf034f..95892df8e 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -95,8 +95,7 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent) } OptionsWidget_notifierLook::~OptionsWidget_notifierLook() -{ -} + = default; void OptionsWidget_notifierLook::commit() { @@ -252,8 +251,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) } OptionsWidget_notifier::~OptionsWidget_notifier() -{ -} + = default; #ifdef COMPILE_KDE_SUPPORT void OptionsWidget_notifier::toggleNotifierProtocol(bool) diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp index 461632fe6..c321ecba1 100644 --- a/src/modules/options/OptionsWidget_notify.cpp +++ b/src/modules/options/OptionsWidget_notify.cpp @@ -85,5 +85,4 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent) } OptionsWidget_notify::~OptionsWidget_notify() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp index ce325813a..2c3f4cabd 100644 --- a/src/modules/options/OptionsWidget_protection.cpp +++ b/src/modules/options/OptionsWidget_protection.cpp @@ -39,5 +39,4 @@ OptionsWidget_protection::OptionsWidget_protection(QWidget * parent) } OptionsWidget_protection::~OptionsWidget_protection() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index cd121aa39..c9fbafb5d 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -145,8 +145,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) } OptionsWidget_proxy::~OptionsWidget_proxy() -{ -} + = default; void OptionsWidget_proxy::enableDisableUseProxySelector() { diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp index 1174184d2..de0fa5a4d 100644 --- a/src/modules/options/OptionsWidget_query.cpp +++ b/src/modules/options/OptionsWidget_query.cpp @@ -116,5 +116,4 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent) } OptionsWidget_query::~OptionsWidget_query() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 6dddf8d3a..e5c72ef1f 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -45,8 +45,7 @@ OptionsWidget_sound::OptionsWidget_sound(QWidget * pParent) } OptionsWidget_sound::~OptionsWidget_sound() -{ -} + = default; OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) : KviOptionsWidget(parent) @@ -142,8 +141,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) } OptionsWidget_soundGeneral::~OptionsWidget_soundGeneral() -{ -} + = default; void OptionsWidget_soundGeneral::showEvent(QShowEvent *) { @@ -350,5 +348,4 @@ OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent) } OptionsWidget_sounds::~OptionsWidget_sounds() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index d889f8cb6..50e2289d3 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -184,8 +184,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) } OptionsWidget_textEncoding::~OptionsWidget_textEncoding() -{ -} + = default; void OptionsWidget_textEncoding::commit() { diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index 702fe42a2..4114c036d 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -112,8 +112,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) } OptionsWidget_textIcons::~OptionsWidget_textIcons() -{ -} + = default; void OptionsWidget_textIcons::fillTable() { diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp index 41dfbf985..d2637267e 100644 --- a/src/modules/options/OptionsWidget_theme.cpp +++ b/src/modules/options/OptionsWidget_theme.cpp @@ -48,8 +48,7 @@ OptionsWidget_theme::OptionsWidget_theme(QWidget * parent) } OptionsWidget_theme::~OptionsWidget_theme() -{ -} + = default; OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent) : KviOptionsWidget(parent) @@ -142,8 +141,7 @@ OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * paren } OptionsWidget_themeTransparency::~OptionsWidget_themeTransparency() -{ -} + = default; void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool) { @@ -173,5 +171,4 @@ OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * p } OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp index 9717b7c77..b96344a55 100644 --- a/src/modules/options/OptionsWidget_tools.cpp +++ b/src/modules/options/OptionsWidget_tools.cpp @@ -44,5 +44,4 @@ OptionsWidget_tools::OptionsWidget_tools(QWidget * parent) } OptionsWidget_tools::~OptionsWidget_tools() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp index 137a3c252..1083bcb43 100644 --- a/src/modules/options/OptionsWidget_topicLabel.cpp +++ b/src/modules/options/OptionsWidget_topicLabel.cpp @@ -41,5 +41,4 @@ OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget * p) : KviOptionsWidg } OptionsWidget_topicLabel::~OptionsWidget_topicLabel() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp index 30dc4b660..139cf2587 100644 --- a/src/modules/options/OptionsWidget_tray.cpp +++ b/src/modules/options/OptionsWidget_tray.cpp @@ -73,8 +73,7 @@ OptionsWidget_tray::OptionsWidget_tray(QWidget * parent) } OptionsWidget_tray::~OptionsWidget_tray() -{ -} + = default; void OptionsWidget_tray::setEnabled(bool) { diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp index ad71fec76..e6882cadf 100644 --- a/src/modules/options/OptionsWidget_uparser.cpp +++ b/src/modules/options/OptionsWidget_uparser.cpp @@ -69,5 +69,4 @@ OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent) } OptionsWidget_uparser::~OptionsWidget_uparser() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp index fdc87f9f5..3319d8ff8 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.cpp +++ b/src/modules/options/OptionsWidget_urlHandlers.cpp @@ -95,8 +95,7 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent) } OptionsWidget_urlHandlers::~OptionsWidget_urlHandlers() -{ -} + = default; void OptionsWidget_urlHandlers::toggleEditors(bool bToggled) { diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp index 47bb8e81f..c0595f92a 100644 --- a/src/modules/options/OptionsWidget_userList.cpp +++ b/src/modules/options/OptionsWidget_userList.cpp @@ -37,8 +37,7 @@ OptionsWidget_userList::OptionsWidget_userList(QWidget * parent) } OptionsWidget_userList::~OptionsWidget_userList() -{ -} + = default; OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * parent) : KviOptionsWidget(parent, "userlistlook_foreground_options_widget") @@ -79,8 +78,7 @@ OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * par } OptionsWidget_userListForeground::~OptionsWidget_userListForeground() -{ -} + = default; OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent) : KviOptionsWidget(parent) @@ -111,8 +109,7 @@ OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent) } OptionsWidget_userListGrid::~OptionsWidget_userListGrid() -{ -} + = default; void OptionsWidget_userListGrid::commit() { @@ -184,8 +181,7 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par } OptionsWidget_userListBackground::~OptionsWidget_userListBackground() -{ -} + = default; void OptionsWidget_userListBackground::commit() { @@ -243,5 +239,4 @@ OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent) } OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures() -{ -} + = default; diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp index 41e76b7dd..92d76a024 100644 --- a/src/modules/options/OptionsWidget_windowList.cpp +++ b/src/modules/options/OptionsWidget_windowList.cpp @@ -56,8 +56,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent) } OptionsWidget_windowList::~OptionsWidget_windowList() -{ -} + = default; OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent) : KviOptionsWidget(parent) @@ -66,8 +65,7 @@ OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent) } OptionsWidget_windowListTree::~OptionsWidget_windowListTree() -{ -} + = default; OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(QWidget * parent) : KviOptionsWidget(parent) @@ -93,8 +91,7 @@ OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(Q } OptionsWidget_windowListTreeForeground::~OptionsWidget_windowListTreeForeground() -{ -} + = default; OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(QWidget * parent) : KviOptionsWidget(parent) @@ -161,8 +158,7 @@ OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(Q } OptionsWidget_windowListTreeBackground::~OptionsWidget_windowListTreeBackground() -{ -} + = default; void OptionsWidget_windowListTreeBackground::commit() { @@ -213,8 +209,7 @@ OptionsWidget_windowListTreeFeatures::OptionsWidget_windowListTreeFeatures(QWidg } OptionsWidget_windowListTreeFeatures::~OptionsWidget_windowListTreeFeatures() -{ -} + = default; OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * parent) : KviOptionsWidget(parent) @@ -246,5 +241,4 @@ OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * paren } OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic() -{ -} + = default; diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index 7b5e42c64..015372c1f 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -1125,8 +1125,7 @@ PopupEditorWidget::PopupEditorWidget(QWidget * par) } PopupEditorWidget::~PopupEditorWidget() -{ -} + = default; void PopupEditorWidget::oneTimeSetup() { diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index 8ea921954..3244fbee6 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -124,8 +124,7 @@ RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p, KviP } RegisteredUserPropertiesDialog::~RegisteredUserPropertiesDialog() -{ -} + = default; void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent * e) { @@ -271,8 +270,7 @@ RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p, KviIrcMask * m) } RegisteredUserMaskDialog::~RegisteredUserMaskDialog() -{ -} + = default; void RegisteredUserMaskDialog::closeEvent(QCloseEvent * e) { diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index f544af248..df8cef49f 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -148,8 +148,7 @@ RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par, KviR } RegisteredUsersDialogItem::~RegisteredUsersDialogItem() -{ -} + = default; QString RegisteredUsersDialogItem::key(int, bool) const { diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 819b148aa..61f5813d6 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -126,8 +126,7 @@ SetupPage::SetupPage(SetupWizard * w) } SetupPage::~SetupPage() -{ -} + = default; SetupWizard::SetupWizard() : KviTalWizard(nullptr) diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index 5774d1615..9628daf0e 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -126,8 +126,7 @@ SharedFileEditDialog::SharedFileEditDialog(QWidget * par, KviSharedFile * f) } SharedFileEditDialog::~SharedFileEditDialog() -{ -} + = default; void SharedFileEditDialog::browse() { @@ -205,8 +204,7 @@ SharedFilesTreeWidgetItem::SharedFilesTreeWidgetItem(QTreeWidget * lv, KviShared } SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem() -{ -} + = default; SharedFilesWindow::SharedFilesWindow() : KviWindow(KviWindow::Tool, "shared files window", nullptr) diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 786c05a70..6ad3b5edb 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -455,8 +455,7 @@ KviOssAudiofileSoundThread::KviOssAudiofileSoundThread(const QString & szFileNam } KviOssAudiofileSoundThread::~KviOssAudiofileSoundThread() -{ -} + = default; void KviOssAudiofileSoundThread::play() { @@ -552,8 +551,7 @@ KviOssSoundThread::KviOssSoundThread(const QString & szFileName) } KviOssSoundThread::~KviOssSoundThread() -{ -} + = default; void KviOssSoundThread::play() { diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 73c229c15..4af6d1326 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -242,8 +242,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList * pThemeInfoL } PackThemeDataWidget::~PackThemeDataWidget() -{ -} + = default; PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent) : QWizardPage(pParent) @@ -312,8 +311,7 @@ void PackThemeInfoWidget::initializePage() } PackThemeInfoWidget::~PackThemeInfoWidget() -{ -} + = default; PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent) : QWizardPage(pParent) @@ -340,8 +338,7 @@ PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent) } PackThemeImageWidget::~PackThemeImageWidget() -{ -} + = default; void PackThemeImageWidget::imageSelectionChanged(const QString & szImagePath) { @@ -393,8 +390,7 @@ PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent) } PackThemeSaveWidget::~PackThemeSaveWidget() -{ -} + = default; void PackThemeSaveWidget::initializePage() { @@ -410,8 +406,7 @@ void PackThemeSaveWidget::initializePage() #endif PackThemeDialog::~PackThemeDialog() -{ -} + = default; void PackThemeDialog::accept() { diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index e94ba10e0..eda0f371e 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -207,8 +207,7 @@ SaveThemeDialog::SaveThemeDialog(QWidget * pParent) } SaveThemeDialog::~SaveThemeDialog() -{ -} + = default; void SaveThemeDialog::imageSelectionChanged(const QString & szImagePath) { diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp index a1bf456f2..8e03fbf49 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.cpp +++ b/src/modules/theme/WebThemeInterfaceDialog.cpp @@ -52,8 +52,7 @@ WebThemeInterfaceDialog::WebThemeInterfaceDialog(QWidget * par) .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr()))); } WebThemeInterfaceDialog::~WebThemeInterfaceDialog() -{ -} + = default; bool WebThemeInterfaceDialog::installPackage(const QString & szPath, QString & szError) { diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp index be1baf36e..d7fac04f6 100644 --- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp +++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp @@ -204,8 +204,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p, const } CustomToolBarPropertiesDialog::~CustomToolBarPropertiesDialog() -{ -} + = default; void CustomToolBarPropertiesDialog::iconSelected(const QString & szIconId) { diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp index 9bedd257c..908a75f19 100644 --- a/src/modules/torrent/StatusBarApplet.cpp +++ b/src/modules/torrent/StatusBarApplet.cpp @@ -45,8 +45,7 @@ StatusBarApplet::StatusBarApplet(KviStatusBar * parent, KviStatusBarAppletDescri } StatusBarApplet::~StatusBarApplet() -{ -} + = default; static KviStatusBarApplet * CreateTorrentClientApplet(KviStatusBar * bar, KviStatusBarAppletDescriptor * desc) { diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp index 81cd7b23a..901599bc5 100644 --- a/src/modules/upnp/RootService.cpp +++ b/src/modules/upnp/RootService.cpp @@ -145,8 +145,7 @@ namespace UPnP // The destructor RootService::~RootService() - { - } + = default; // Recursively add all devices and embedded devices to the deviceServices_ map void RootService::addDeviceServices(const QDomNode & device) diff --git a/src/modules/upnp/WanConnectionService.cpp b/src/modules/upnp/WanConnectionService.cpp index 8fa5f1753..efbe87b73 100644 --- a/src/modules/upnp/WanConnectionService.cpp +++ b/src/modules/upnp/WanConnectionService.cpp @@ -45,8 +45,7 @@ namespace UPnP // The destructor WanConnectionService::~WanConnectionService() - { - } + = default; // Add a port mapping void WanConnectionService::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort, diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 21f96dd3e..80b683e69 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -565,8 +565,7 @@ void BanFrame::saveBans(KviConfigurationFile * cfg) } BanFrame::~BanFrame() -{ -} + = default; // ---------------------------- CLASS URLTOOLBAR -------------------------end // -- cgit v1.3.1-10-gc9f91 From 97ecdf6a1b7f95bc1b342b3eaf141cd460249680 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 30 Apr 2016 18:48:40 +0100 Subject: Apply clang-tidy: modernize-loop-convert --- src/kvilib/ext/KviAnimatedPixmapCache.cpp | 4 +- src/kvilib/ext/KviCommandFormatter.cpp | 26 +++++----- src/kvilib/ext/KviConfigurationFile.cpp | 8 ++-- src/kvilib/ext/KviMiscUtils.cpp | 4 +- src/kvilib/ext/KviProxy.cpp | 4 +- src/kvilib/ext/KviStringConversion.cpp | 8 ++-- src/kvilib/file/KviFileUtils.cpp | 8 ++-- src/kvilib/locale/KviMessageCatalogue.cpp | 6 +-- src/kvirc/kernel/KviApplication.cpp | 33 ++++++------- src/kvirc/kernel/KviApplication_filesystem.cpp | 5 +- src/kvirc/kernel/KviIconManager.cpp | 8 ++-- src/kvirc/kernel/KviIrcUrl.cpp | 8 ++-- src/kvirc/kernel/KviNotifyList.cpp | 10 ++-- src/kvirc/kernel/KviOptions.cpp | 14 +++--- src/kvirc/kernel/KviTheme.cpp | 4 +- src/kvirc/kvs/KviKvsCoreFunctions_af.cpp | 6 +-- src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp | 8 ++-- src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp | 9 ++-- src/kvirc/kvs/event/KviKvsEventManager.cpp | 56 +++++++++++----------- src/kvirc/module/KviModuleManager.cpp | 7 ++- src/kvirc/sparser/KviAntiSpam.cpp | 5 +- .../sparser/KviIrcServerParser_numericHandlers.cpp | 3 +- src/kvirc/ui/KviChannelWindow.cpp | 4 +- src/kvirc/ui/KviConsoleWindow.cpp | 32 +++++-------- src/kvirc/ui/KviCustomToolBar.cpp | 12 ++--- src/kvirc/ui/KviInputEditor.cpp | 3 +- src/kvirc/ui/KviIpEditor.cpp | 6 +-- src/kvirc/ui/KviMainWindow.cpp | 3 +- src/kvirc/ui/KviModeWidget.cpp | 8 ++-- src/kvirc/ui/KviQueryWindow.cpp | 6 +-- src/kvirc/ui/KviToolBar.cpp | 8 ++-- src/kvirc/ui/KviTopicWidget.cpp | 8 ++-- src/kvirc/ui/KviUserListView.cpp | 4 +- src/kvirc/ui/KviWindow.cpp | 4 +- src/modules/addon/AddonFunctions.cpp | 8 ++-- src/modules/addon/libkviaddon.cpp | 8 ++-- src/modules/channelsjoin/ChannelsJoinDialog.cpp | 7 ++- src/modules/dcc/requests.cpp | 6 +-- src/modules/dialog/libkvidialog.cpp | 4 +- src/modules/help/HelpIndex.cpp | 42 ++++++++-------- src/modules/help/HelpWindow.cpp | 8 ++-- src/modules/http/HttpFileTransfer.cpp | 4 +- src/modules/logview/LogViewWindow.cpp | 16 +++---- src/modules/objects/KvsObject_colorDialog.cpp | 6 +-- src/modules/objects/KvsObject_hBox.cpp | 6 +-- src/modules/objects/KvsObject_label.cpp | 12 ++--- src/modules/objects/KvsObject_painter.cpp | 6 +-- src/modules/objects/KvsObject_vBox.cpp | 6 +-- src/modules/objects/KvsObject_webView.cpp | 6 +-- src/modules/objects/libkviobjects.cpp | 3 +- src/modules/objects/qthttp/qhttpauthenticator.cpp | 3 +- src/modules/options/OptionsWidget_textEncoding.cpp | 3 +- src/modules/perl/libkviperl.cpp | 4 +- src/modules/perlcore/libkviperlcore.cpp | 3 +- src/modules/rijndael/Rijndael.cpp | 4 +- src/modules/rijndael/UglyBase64.cpp | 4 +- src/modules/system/libkvisystem.cpp | 8 ++-- src/modules/theme/ThemeFunctions.cpp | 4 +- src/modules/url/libkviurl.cpp | 4 +- 59 files changed, 252 insertions(+), 275 deletions(-) (limited to 'src/modules/options/OptionsWidget_textEncoding.cpp') diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp index f283bb225..746b8118e 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp +++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp @@ -229,10 +229,10 @@ void KviAnimatedPixmapCache::timeoutEvent() i = m_timerData.erase(i); } - for(int i = 0; i < processed.size(); ++i) + for(auto i : processed) { // increase the frame index and emit the signal - processed.at(i)->nextFrame(true); + i->nextFrame(true); } // m_timerMutex.unlock(); diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp index 47a60452b..2ce62246d 100644 --- a/src/kvilib/ext/KviCommandFormatter.cpp +++ b/src/kvilib/ext/KviCommandFormatter.cpp @@ -57,11 +57,11 @@ namespace KviCommandFormatter bool hasLeadingChars(QStringList & list, const QChar & c) { bool bGotIt = false; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it).length() < 1) + if(it.length() < 1) continue; - if((*it).at(0) == c) + if(it.at(0) == c) { // found at least one such leading char bGotIt = true; @@ -69,12 +69,12 @@ namespace KviCommandFormatter else { // we pretend this line to be empty - QString szTmp = *it; + QString szTmp = it; szTmp = szTmp.trimmed(); if(!szTmp.isEmpty()) return false; - *it = ""; // set it to empty also in the main buffer + it = ""; // set it to empty also in the main buffer } } return bGotIt; @@ -92,9 +92,9 @@ namespace KviCommandFormatter void trimLeading(QStringList & list) { - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - (*it).remove(0, 1); + it.remove(0, 1); } } @@ -110,9 +110,9 @@ namespace KviCommandFormatter void addLeading(QStringList & list, const QChar & c) { - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - (*it).prepend(c); + it.prepend(c); } } @@ -139,9 +139,9 @@ namespace KviCommandFormatter //szBuffer = list.join("\n"); join implementation sux :D // we WANT the last newline szBuffer = ""; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - szBuffer.append(*it); + szBuffer.append(it); szBuffer.append(QChar('\n')); } } @@ -202,9 +202,9 @@ namespace KviCommandFormatter //szBuffer = list.join("\n"); join implementation sux :D // we WANT the last newline szBuffer = ""; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - szBuffer.append(*it); + szBuffer.append(it); szBuffer.append(QChar('\n')); } } diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp index bbb474fc7..ba016ba33 100644 --- a/src/kvilib/ext/KviConfigurationFile.cpp +++ b/src/kvilib/ext/KviConfigurationFile.cpp @@ -675,10 +675,10 @@ QList KviConfigurationFile::readIntListEntry(const QString & szKey, const Q //qDebug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1()); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { bool bOk; - int iTmp = (*it).toInt(&bOk); + int iTmp = it.toInt(&bOk); if(bOk) ret.append(iTmp); } @@ -691,11 +691,11 @@ void KviConfigurationFile::writeEntry(const QString & szKey, const QList & m_bDirty = true; KviConfigurationFileGroup * p_group = getCurrentGroup(); KviCString szData; - for(QList::ConstIterator it = list.begin(); it != list.end(); ++it) + for(int it : list) { if(szData.hasData()) szData.append(','); - szData.append(KviCString::Format, "%d", *it); + szData.append(KviCString::Format, "%d", it); } //qDebug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr()); diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp index f7cd1a007..3a147ebe4 100644 --- a/src/kvilib/ext/KviMiscUtils.cpp +++ b/src/kvilib/ext/KviMiscUtils.cpp @@ -71,10 +71,10 @@ namespace KviMiscUtils if(sl.isEmpty()) return false; // must all be numbers - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { bool bOk; - int i = (*it).toInt(&bOk); + int i = it.toInt(&bOk); if(!bOk) return false; if(i < 0) diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp index 21fcc9c30..c5729c631 100644 --- a/src/kvilib/ext/KviProxy.cpp +++ b/src/kvilib/ext/KviProxy.cpp @@ -82,8 +82,8 @@ void KviProxy::setNamedProtocol(const char * proto) void KviProxy::getSupportedProtocolNames(QStringList & buf) { - for(int i = 0; i < 3; i++) - buf.append(QString(proxy_protocols_table[i])); + for(const auto & i : proxy_protocols_table) + buf.append(QString(i)); } void KviProxy::normalizeUserAndPass() diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp index 5e5e6b0d1..cfbdf8acb 100644 --- a/src/kvilib/ext/KviStringConversion.cpp +++ b/src/kvilib/ext/KviStringConversion.cpp @@ -87,14 +87,14 @@ namespace KviStringConversion void encodePath(QStringList & buffer) { - for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it) - encodePath(*it); + for(auto & it : buffer) + encodePath(it); } void decodePath(QStringList & buffer) { - for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it) - decodePath(*it); + for(auto & it : buffer) + decodePath(it); } void toString(const bool bValue, QString & szBuffer) diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp index a734715c7..ed1fef7f1 100644 --- a/src/kvilib/file/KviFileUtils.cpp +++ b/src/kvilib/file/KviFileUtils.cpp @@ -450,9 +450,9 @@ namespace KviFileUtils { QString szSrc(szPath); szPath = ""; - for(int i = 0; i < szSrc.length(); i++) + for(const auto & i : szSrc) { - QChar cur = szSrc[i]; + QChar cur = i; if(!(cur.isLetter() || cur.isDigit() || cur == ' ' || cur == '_' || cur == '.' || cur == '#' || cur == '%')) { if(cur.row() != 0) @@ -480,9 +480,9 @@ namespace KviFileUtils { QString szSrc(szPath); szPath = ""; - for(int i = 0; i < szSrc.length(); i++) + for(const auto & i : szSrc) { - QChar cur = szSrc[i]; + QChar cur = i; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(cur.unicode() < 32 || cur == '<' || cur == '>' || cur == ':' || cur == '"' || cur == '/' || cur == '\\' || cur == '|' || cur == '?' || cur == '*') #else diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp index f93840c7d..252ad2717 100644 --- a/src/kvilib/locale/KviMessageCatalogue.cpp +++ b/src/kvilib/locale/KviMessageCatalogue.cpp @@ -123,10 +123,10 @@ static int somePrimeNumbers[90] = { int kvi_getFirstBiggerPrime(int iNumber) { - for(int i = 0; i < 90; i++) + for(int somePrimeNumber : somePrimeNumbers) { - if(somePrimeNumbers[i] >= iNumber) - return somePrimeNumbers[i]; + if(somePrimeNumber >= iNumber) + return somePrimeNumber; } return 9973; //error! } diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index ebc2b0ea3..6d7c2f81d 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -1909,16 +1909,13 @@ void KviApplication::buildRecentChannels() QString szChan, szNet; - for( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).end(); - ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels)) { - if((*it).isEmpty()) + if(it.isEmpty()) continue; - szChan = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0); - szNet = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 1); + szChan = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0); + szNet = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 1); if(szNet.isEmpty()) continue; @@ -1976,11 +1973,11 @@ void KviApplication::fillRecentServersPopup(QMenu * pMenu) { // FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?" pMenu->clear(); - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers)) { - if(*it == "") + if(it == "") continue; - pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), *it); + pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), it); } } @@ -1989,18 +1986,18 @@ void KviApplication::fillRecentNicknamesPopup(QMenu * pMenu, KviConsoleWindow * pMenu->clear(); QAction * pAction; bool bAlreadyFound = false; - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames)) { - if(*it == "") + if(it == "") continue; - pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), *it); + pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), it); if(!pConsole->isConnected()) pAction->setEnabled(false); else { if(!bAlreadyFound) { - bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), *it); + bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), it); pAction->setEnabled(!bIsCurrent); if(bIsCurrent) bAlreadyFound = true; @@ -2016,15 +2013,15 @@ void KviApplication::fillRecentChannelsPopup(QMenu * pMenu, KviConsoleWindow * p QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { - if(*it == "") + if(it == "") continue; // ? - pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), *it); + pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), it); if(!pConsole->isConnected()) pAction->setEnabled(false); else - pAction->setEnabled(!(pConsole->connection()->findChannel(*it))); + pAction->setEnabled(!(pConsole->connection()->findChannel(it))); } } } diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp index cd2ff2364..451bf41aa 100644 --- a/src/kvirc/kernel/KviApplication_filesystem.cpp +++ b/src/kvirc/kernel/KviApplication_filesystem.cpp @@ -423,10 +423,9 @@ void KviApplication::getChannelDumpLogFileName(QString & szStr) bool KviApplication::findImageInImageSearchPath(QString & szRetPath, const QString & filename) { // first lookup the user defined paths - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths)) { - szRetPath = *it; + szRetPath = it; KviQString::ensureLastCharIs(szRetPath, KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); //qDebug("LOOK FOR %s",szRetPath.ptr()); diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index e6ed00e3d..89dd35efa 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -1948,11 +1948,11 @@ void KviIconManager::clearCache() void KviIconManager::reloadImages() { clearCache(); - for(int i = 0; i < KviIconManager::IconCount; i++) + for(auto & m_smallIcon : m_smallIcons) { - if(m_smallIcons[i]) - delete m_smallIcons[i]; - m_smallIcons[i] = nullptr; + if(m_smallIcon) + delete m_smallIcon; + m_smallIcon = nullptr; } } diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp index 6639eccd0..122f011e1 100644 --- a/src/kvirc/kernel/KviIrcUrl.cpp +++ b/src/kvirc/kernel/KviIrcUrl.cpp @@ -173,15 +173,15 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand) if(chans.count() != 0) { - for(QStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it) + for(const auto & chan : chans) { - szCurPass = (*it).section('?', 1); + szCurPass = chan.section('?', 1); if(szCurPass.isEmpty()) { if(!szChannels.isEmpty()) szChannels.append(","); - szCurChan = (*it).section('?', 0, 0); + szCurChan = chan.section('?', 0, 0); if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!')) szCurChan.prepend('#'); szChannels.append(szCurChan); @@ -190,7 +190,7 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand) { if(!szProtectedChannels.isEmpty()) szProtectedChannels.append(","); - szCurChan = (*it).section('?', 0, 0); + szCurChan = chan.section('?', 0, 0); if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!')) szCurChan.prepend('#'); szProtectedChannels.append(szCurChan); diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 84448c9cb..0691eaff3 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -1040,12 +1040,12 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) // ok...check the users that have left irc now... QStringList sl = m_szLastIsOnMsg.isEmpty() ? QStringList() : m_szLastIsOnMsg.split(' ', QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - if(m_pConsole->notifyListView()->findEntry(*it)) + if(m_pConsole->notifyListView()->findEntry(it)) { // has just left irc - notifyOffLine(*it); + notifyOffLine(it); } // else has never been here... } @@ -1146,9 +1146,9 @@ void KviWatchNotifyListManager::buildRegUserDict() { notify = notify.trimmed(); QStringList sl = notify.split(' ', QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - m_pRegUserDict->replace(*it, new QString(u->name())); + m_pRegUserDict->replace(it, new QString(u->name())); } } ++it; diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index bb5308eb5..6e8be48da 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -1087,13 +1087,13 @@ namespace KviTheme QDir d(szPicsPath); QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"), QDir::Files); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto & it : sl) { - KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it); + KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(it); if(p) { QString szPixPath = szThemeDirPath; - szPixPath += *it; + szPixPath += it; if(!KviFileUtils::copyFile(p->path(), szPixPath)) { @@ -1390,13 +1390,13 @@ bool KviApplication::setOptionValue(const QString & optName, const QString & val szBuffer = szVal; } - for(int i = 0; i < KVI_NUM_PIXMAP_OPTIONS; i++) + for(auto & i : g_pixmapOptionsTable) { - if(KviQString::equalCI(optName, g_pixmapOptionsTable[i].name)) + if(KviQString::equalCI(optName, i.name)) { - if(!KviStringConversion::fromString(szBuffer, g_pixmapOptionsTable[i].option)) + if(!KviStringConversion::fromString(szBuffer, i.option)) return false; - optionResetUpdate(g_pixmapOptionsTable[i].flags); + optionResetUpdate(i.flags); return true; } } diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp index f36187f8e..f51a8abe3 100644 --- a/src/kvirc/kernel/KviTheme.cpp +++ b/src/kvirc/kernel/KviTheme.cpp @@ -334,7 +334,7 @@ namespace KviTheme QDir d(szThemePath); QStringList sl = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) - slThemes.append(*it); + for(auto & it : sl) + slThemes.append(it); } }; diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 8c562a7f8..b8ce2558f 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -961,9 +961,9 @@ namespace KviKvsCoreFunctions goto leavenow; } - for(int i = 0; i < szFormat.size(); i++) + for(auto i : szFormat) { - ushort ch = szFormat.at(i).unicode(); + ushort ch = i.unicode(); iLength = 2; iVal = 0x8000000; cDiv = ' '; @@ -1126,7 +1126,7 @@ namespace KviKvsCoreFunctions //case 'Z': // TZ abbrev. // szFmtTime += default: - szFmtTime += szFormat.at(i); + szFmtTime += i; } if(iVal != 0x8000000) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp index 8c5b0cb7a..674bb4c6b 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp @@ -411,13 +411,13 @@ namespace KviKvsCoreSimpleCommands QStringList slChans = szChans.split(",", QString::SkipEmptyParts); QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); - for(QStringList::Iterator it = slChans.begin(); it != slChans.end(); ++it) + for(auto & slChan : slChans) { - if(!(*it).isEmpty()) + if(!slChan.isEmpty()) { bool bFound = false; int id = 0; - QChar f = (*it)[0]; + QChar f = slChan[0]; while((id < szChanTypes.length()) && !bFound) { if(f == szChanTypes[id]) @@ -425,7 +425,7 @@ namespace KviKvsCoreSimpleCommands id++; } if(!bFound) - (*it).prepend("#"); + slChan.prepend("#"); } } diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index b13558ae4..dc31ed177 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -844,9 +844,9 @@ namespace KviKvsCoreSimpleCommands if(!(KVSCSC_pConnection->sendFmtData("PART %s :%s", szEncodedChans.data(), szText.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto & it : sl) { - KviChannelWindow * ch = KVSCSC_pConnection->findChannel(*it); + KviChannelWindow * ch = KVSCSC_pConnection->findChannel(it); if(ch) { ch->partMessageSent(!KVSCSC_pSwitches->find('k', "keep"), !KVSCSC_pSwitches->find('s', "silent")); @@ -854,7 +854,7 @@ namespace KviKvsCoreSimpleCommands else { if(!KVSCSC_pSwitches->find('q', "quiet")) - KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), (*it).toUtf8().data()); + KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), it.toUtf8().data()); } } @@ -1090,9 +1090,8 @@ namespace KviKvsCoreSimpleCommands KviQueryWindow * query; QStringList sl = szTargets.split(",", QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto szNick : sl) { - QString szNick = *it; if(szNick.isEmpty()) KVSCSC_pContext->warning(__tr2qs_ctx("Empty target specified", "kvs")); else diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp index 9b5e099b1..7f72aa96c 100644 --- a/src/kvirc/kvs/event/KviKvsEventManager.cpp +++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp @@ -91,8 +91,8 @@ KviKvsEventManager * KviKvsEventManager::m_pInstance = nullptr; KviKvsEventManager::KviKvsEventManager() { m_pInstance = this; - for(int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) - m_rawEventTable[i] = nullptr; + for(auto & i : m_rawEventTable) + i = nullptr; } KviKvsEventManager::~KviKvsEventManager() @@ -273,14 +273,14 @@ bool KviKvsEventManager::removeModuleAppHandler(unsigned int uEvIdx, KviKvsModul void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIface) { KviKvsEventHandler * h; - for(unsigned int i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - if(!m_appEventTable[i].handlers()) + if(!i.handlers()) continue; KviPointerList l; l.setAutoDelete(false); - for(h = m_appEventTable[i].handlers()->first(); h; h = m_appEventTable[i].handlers()->next()) + for(h = i.handlers()->first(); h; h = i.handlers()->next()) { if(h->type() == KviKvsEventHandler::Module) { @@ -302,21 +302,21 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIfa // END COMPAT } for(h = l.first(); h; h = l.next()) - m_appEventTable[i].removeHandler(h); + i.removeHandler(h); } } void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIface) { KviKvsEventHandler * h; - for(unsigned int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(!m_rawEventTable[i]) + if(!i) continue; KviPointerList l; l.setAutoDelete(false); - for(h = m_rawEventTable[i]->first(); h; h = m_rawEventTable[i]->next()) + for(h = i->first(); h; h = i->next()) { if(h->type() == KviKvsEventHandler::Module) { @@ -338,11 +338,11 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIfa // END COMPAT } for(h = l.first(); h; h = l.next()) - m_rawEventTable[i]->removeRef(h); - if(m_rawEventTable[i]->isEmpty()) + i->removeRef(h); + if(i->isEmpty()) { - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + delete i; + i = nullptr; } } } @@ -433,22 +433,22 @@ void KviKvsEventManager::removeAllModuleHandlers(KviKvsModuleInterface * pIface) void KviKvsEventManager::removeAllScriptAppHandlers() { - for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - m_appEventTable[i].clearScriptHandlers(); + i.clearScriptHandlers(); } } void KviKvsEventManager::removeAllScriptRawHandlers() { - for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(m_rawEventTable[i]) + if(i) { KviPointerList dl; dl.setAutoDelete(false); KviKvsEventHandler * e; - for(e = m_rawEventTable[i]->first(); e; e = m_rawEventTable[i]->next()) + for(e = i->first(); e; e = i->next()) { if(e->type() == KviKvsEventHandler::Script) dl.append(e); @@ -456,13 +456,13 @@ void KviKvsEventManager::removeAllScriptRawHandlers() for(e = dl.first(); e; e = dl.next()) { - m_rawEventTable[i]->removeRef(e); + i->removeRef(e); } - if(m_rawEventTable[i]->isEmpty()) + if(i->isEmpty()) { - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + delete i; + i = nullptr; } } } @@ -470,19 +470,19 @@ void KviKvsEventManager::removeAllScriptRawHandlers() void KviKvsEventManager::clearRawEvents() { - for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(m_rawEventTable[i]) - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + if(i) + delete i; + i = nullptr; } } void KviKvsEventManager::clearAppEvents() { - for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - m_appEventTable[i].clear(); + i.clear(); } } diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp index 7faa2c2d9..c9e3b0a49 100644 --- a/src/kvirc/module/KviModuleManager.cpp +++ b/src/kvirc/module/KviModuleManager.cpp @@ -68,9 +68,8 @@ void KviModuleManager::loadModulesByCaps(const QString & caps, const QString & d // FIXME: maybe check timestamps ? (old modules) QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto modname : sl) { - QString modname = *it; KviQString::cutToLast(modname, KVI_PATH_SEPARATOR_CHAR); getModule(modname); } @@ -98,9 +97,9 @@ void KviModuleManager::completeModuleNames(const QString & path, const QString & // FIXME: maybe check timestamps ? (old modules) QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - QString * modname = new QString(*it); + QString * modname = new QString(it); KviQString::cutToLast(*modname, KVI_PATH_SEPARATOR_CHAR); KviQString::cutToFirst(*modname, "kvi"); if(KviQString::equalCIN(word, *modname, word.length())) diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp index 2c301ac21..faa16bc90 100644 --- a/src/kvirc/sparser/KviAntiSpam.cpp +++ b/src/kvirc/sparser/KviAntiSpam.cpp @@ -104,12 +104,11 @@ bool kvi_mayBeSpam(KviCString * msg, KviCString & spamWord) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords)) { // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) - const char * aux = (*it).toLatin1(); + const char * aux = it.toLatin1(); if(aux) { if(msg->findFirstIdx(aux, false) != -1) diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index 716291f70..45aa7f5b4 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -1688,9 +1688,8 @@ void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage * msg) QStringList sl = szChans.split(" ", QString::SkipEmptyParts); QString szChanList; - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto szCur : sl) { - QString szCur = *it; // deals with [#channel] and [##channel] int len = szCur.length(); int i = 0; diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index 10ad80230..5f1cf5350 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -174,9 +174,9 @@ KviChannelWindow::KviChannelWindow(KviConsoleWindow * lpConsole, const QString & szListModes = pServerInfo->supportedListModes(); szListModes.remove('b'); - for(int i = 0; i < szListModes.size(); ++i) + for(auto szListMode : szListModes) { - char cMode = szListModes.at(i).unicode(); + char cMode = szListMode.unicode(); QString szDescription = pServerInfo->getChannelModeDescription(cMode); if(szDescription.isEmpty()) szDescription = __tr2qs("Mode \"%1\" masks").arg(cMode); diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index ab2afb54f..143195085 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -154,12 +154,9 @@ void KviConsoleWindow::recentUrlsChanged() { QString cur = m_pAddressEdit->currentText(); m_pAddressEdit->clear(); - for( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); - ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls)) { - m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), *it); + m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), it); } int i = m_pAddressEdit->findText(cur); @@ -233,20 +230,18 @@ void KviConsoleWindow::completeChannel(const QString & word, KviPointerListrecentChannelsForNetwork(currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { - if(KviQString::equalCIN((*it), word, word.length())) - matches->append(new QString(*it)); + if(KviQString::equalCIN(it, word, word.length())) + matches->append(new QString(it)); } } } void KviConsoleWindow::completeServer(const QString & word, KviPointerList * matches) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(auto srv : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers)) { - QString srv((*it)); - KviQString::cutToFirst(srv, '/'); while(srv.startsWith("/")) srv.remove(0, 1); @@ -645,28 +640,27 @@ int KviConsoleWindow::applyHighlighting(KviWindow * wnd, int type, const QString if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords)) { - if((*it).isEmpty()) + if(it.isEmpty()) continue; if(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)) { - if(szStripMsg.contains(*it, cs)) - return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it); + if(szStripMsg.contains(it, cs)) + return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it); } else { if(!szPattern.isEmpty()) rgxHlite.setPattern( - QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(*it))); + QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(it))); else rgxHlite.setPattern( - QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(*it))); + QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(it))); rgxHlite.setCaseSensitivity(cs); if(szStripMsg.contains(rgxHlite)) - return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it); + return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it); } } } diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp index 56361b695..3e78806ad 100644 --- a/src/kvirc/ui/KviCustomToolBar.cpp +++ b/src/kvirc/ui/KviCustomToolBar.cpp @@ -130,10 +130,10 @@ void KviCustomToolBar::beginCustomize() m_pFilteredChildren->setAutoDelete(true); // filter the events for all the children QList list = children(); - for(QList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it)->isWidgetType()) - filterChild(*it); + if(it->isWidgetType()) + filterChild(it); } } @@ -141,10 +141,10 @@ void KviCustomToolBar::endCustomize() { // stop filtering events QList list = children(); - for(QList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it)->isWidgetType()) - unfilterChild(*it); + if(it->isWidgetType()) + unfilterChild(it); } if(m_pFilteredChildren) diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index d2fe07d6c..7ee0fa697 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -273,9 +273,8 @@ void KviInputEditor::dropEvent(QDropEvent * e) if(list.isEmpty()) return; - for(QList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto url : list) { - QUrl url = *it; QString szPath = url.toLocalFile(); if(szPath.endsWith(KVI_FILEEXTENSION_SCRIPT, Qt::CaseInsensitive)) { diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp index e0c4015c2..0e49e0596 100644 --- a/src/kvirc/ui/KviIpEditor.cpp +++ b/src/kvirc/ui/KviIpEditor.cpp @@ -90,11 +90,11 @@ KviIpEditor::AddressType KviIpEditor::addressType() const bool KviIpEditor::hasEmptyFields() const { bool bHasEF = false; - for(int i = 0; i < 8; i++) + for(auto i : m_pEdit) { - if(m_pEdit[i]) + if(i) { - if(m_pEdit[i]->text().isEmpty()) + if(i->text().isEmpty()) bHasEF = true; } } diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 41031ab71..e588a3698 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -254,9 +254,8 @@ void KviMainWindow::unregisterModuleExtensionToolBar(KviMexToolBar * t) void KviMainWindow::restoreModuleExtensionToolBars() { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end(); ++it) + for(auto szEntry : KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars)) { - QString szEntry = *it; int idx = szEntry.indexOf(':'); if(idx != -1) { diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp index ab7af4959..f95a75cfd 100644 --- a/src/kvirc/ui/KviModeWidget.cpp +++ b/src/kvirc/ui/KviModeWidget.cpp @@ -117,9 +117,9 @@ void KviModeWidget::editorReturnPressed() { // first part: parameterless modes QString szCurModes = szOldModes.count() ? szOldModes.at(0) : ""; - for(int j = 0; j < szSubstring.length(); ++j) + for(auto j : szSubstring) { - char cMode = szSubstring.at(j).unicode(); + char cMode = j.unicode(); if(!szCurModes.contains(cMode)) { // was not set, has to be inserted @@ -167,9 +167,9 @@ void KviModeWidget::editorReturnPressed() { // first part: parameterless modes QString szNewParameterLessModes = szNewModes.count() ? szNewModes.at(0) : ""; - for(int j = 0; j < szSubstring.length(); ++j) + for(auto j : szSubstring) { - char cMode = szSubstring.at(j).unicode(); + char cMode = j.unicode(); if(!szNewParameterLessModes.contains(cMode)) { // was set, has to be unset diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 392e51bb5..35f6de933 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -771,12 +771,12 @@ void KviQueryWindow::pasteLastLog() bool bGzip; QString szFileName; - for(QStringList::Iterator it = logList.begin(); it != logList.end(); ++it) + for(auto & it : logList) { int iLogYear, iLogMonth, iLogDay; - szFileName = (*it); - QString szTmpName = (*it); + szFileName = it; + QString szTmpName = it; QFileInfo fi(szTmpName); bGzip = false; diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp index 6d9c30a87..3b13f57f0 100644 --- a/src/kvirc/ui/KviToolBar.cpp +++ b/src/kvirc/ui/KviToolBar.cpp @@ -120,9 +120,9 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) QAction * pTmp = nullptr; IconSizes iconSize; - for(uint i = 0; i < VALID_ICONSIZES_NUM; i++) + for(auto & valid_iconsize : valid_iconsizes) { - iconSize = valid_iconsizes[i]; + iconSize = valid_iconsize; pTmp = pIconSizeGroup->addAction(g_pToolBarIconSizesPopup->addAction(__tr2qs(iconSize.pcName))); pTmp->setData((uint)iconSize.uSize); @@ -138,9 +138,9 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) pTmp = nullptr; ButtonStyles buttonStyle; - for(uint i = 0; i < VALID_BUTTONSTYLES_NUM; i++) + for(auto & valid_buttonstyle : valid_buttonstyles) { - buttonStyle = valid_buttonstyles[i]; + buttonStyle = valid_buttonstyle; pTmp = pButtonStyleGroup->addAction(g_pToolBarButtonStylePopup->addAction(__tr2qs(buttonStyle.pcName))); pTmp->setData((uint)buttonStyle.uStyle); diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 56a80cc4f..a7d53c6d8 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -322,9 +322,9 @@ void KviTopicWidget::setTopic(const QString & topic) m_pLabel->setText(KviHtmlGenerator::convertToHtml(KviQString::toHtmlEscaped(m_szTopic))); bool bFound = false; - for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it) + for(auto & it : *g_pRecentTopicList) { - if(*it == m_szTopic) + if(it == m_szTopic) { bFound = true; break; @@ -641,8 +641,8 @@ void KviTopicWidget::historyClicked() m_pCompletionBox->installEventFilter(this); m_pCompletionBox->clear(); - for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it) - new KviTopicListBoxItem(m_pCompletionBox, *it); + for(auto & it : *g_pRecentTopicList) + new KviTopicListBoxItem(m_pCompletionBox, it); m_pCompletionBox->resize(m_pInput->width(), 6 * m_pCompletionBox->fontMetrics().height() + 20); QPoint point = m_pInput->mapToGlobal(QPoint(0, 0)); diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index f5d4e474e..09b339b7a 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -1411,9 +1411,9 @@ void KviUserListView::partAllButOne(const QString & szWhoNot) list.append(it.currentKey()); ++it; } - for(QStringList::Iterator it2 = list.begin(); it2 != list.end(); it2++) + for(auto & it2 : list) { - part(*it2); + part(it2); } } diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index d43c07f3c..33fa5049e 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -489,8 +489,8 @@ void KviWindow::setProgress(int iProgress) void KviWindow::listWindowTypes() { outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("List of window types available in this release of KVIrc:")); - for(int i = 0; i < KviWindow::TypeCount; i++) - outputNoFmt(KVI_OUT_SYSTEMMESSAGE, m_typeTable[i]); + for(auto & i : m_typeTable) + outputNoFmt(KVI_OUT_SYSTEMMESSAGE, i); } void KviWindow::getConfigGroupName(QString & szBuffer) diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 88a7b0fdd..5ffd5466c 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -91,9 +91,9 @@ namespace AddonFunctions return notAValidAddonPackage(szError); // make sure the default fields exist - for(int i = 0; i < 6; i++) + for(auto & check_field : check_fields) { - pValue = pInfoFields->find(check_fields[i]); + pValue = pInfoFields->find(check_field); if(!pValue) return notAValidAddonPackage(szError); } @@ -340,10 +340,8 @@ namespace AddonFunctions return false; } - for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it) + for(auto & inf : ls) { - const QFileInfo & inf = *it; - if(inf.isDir()) { if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName()))) diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 6b96a0cf0..bc3ce94e2 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -730,9 +730,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) KviFileUtils::makeDir(szTargetPath); - for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it) + for(auto & lExpandedEntrie : lExpandedEntries) { - QFileInfo inf(*it); + QFileInfo inf(lExpandedEntrie); if(!inf.exists()) { qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data()); @@ -743,9 +743,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry); if(!bQuiet) - c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(lExpandedEntrie).arg(szTargetPath)); - KviFileUtils::copyFile(*it, szTargetPath); + KviFileUtils::copyFile(lExpandedEntrie, szTargetPath); a->addInstalledFile(szEntry); } diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 6e89eb6c0..6055c8703 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -209,10 +209,10 @@ void ChannelsJoinDialog::fillListView() hdr->setText(0, __tr2qs("Current Network")); hdr->setExpanded(true); - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { chld = new QTreeWidgetItem(hdr, RecentChannelItem); - chld->setText(0, *it); + chld->setText(0, it); chld->setIcon(0, *(g_pIconManager->getSmallIcon(KviIconManager::Channel))); } hdr->sortChildren(0, Qt::AscendingOrder); @@ -234,9 +234,8 @@ void ChannelsJoinDialog::fillListView() for(QStringList * pChans = pDict->first(); pChans; pChans = pDict->next()) { - for(QStringList::Iterator it = pChans->begin(); it != pChans->end(); ++it) + for(auto chan : *pChans) { - QString chan = *it; if(hNoDuplicates.contains(chan.toLower())) continue; hNoDuplicates.insert(chan.toLower(), 1); diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index b48f14ce2..2fa80d575 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -1246,11 +1246,11 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest * dcc) { dcc->szType.toUpper(); - for(int i = 0; i < KVI_NUM_KNOWN_DCC_TYPES; i++) + for(auto & i : dccParseProcTable) { - if(kvi_strEqualCS(dccParseProcTable[i].type, dcc->szType.ptr())) + if(kvi_strEqualCS(i.type, dcc->szType.ptr())) { - (dccParseProcTable[i].proc)(dcc); + (i.proc)(dcc); return; } } diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 0e813837f..bd36697f6 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -592,9 +592,9 @@ void KviKvsCallbackFileDialog::done(int code) KviKvsArray * a = new KviKvsArray(); QStringList sl = selectedFiles(); int idx = 0; - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - a->set(idx, new KviKvsVariant(*it)); + a->set(idx, new KviKvsVariant(it)); idx++; } params.append(new KviKvsVariant(a)); diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index bd5d772be..2504d1dc8 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -349,18 +349,18 @@ void HelpIndex::readDocumentList() QStringList HelpIndex::query(const QStringList & terms, const QStringList & termSeq, const QStringList & seqWords) { QList termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if((*it).contains(QLatin1Char('*'))) + if(term.contains(QLatin1Char('*'))) { - QVector wcts = setupDummyTerm(getWildcardTerms(*it)); + QVector wcts = setupDummyTerm(getWildcardTerms(term)); termList.append(Term(QLatin1String("dummy"), wcts.count(), wcts)); } - else if(dict[*it]) + else if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } else { @@ -372,9 +372,9 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(termList); QVector minDocs = termList.takeFirst().documents; - for(QList::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector docs = t->documents; for(QVector::Iterator minDoc_it = minDocs.begin(); minDoc_it != minDocs.end();) { @@ -399,15 +399,15 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(minDocs); if(termSeq.isEmpty()) { - for(QVector::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) - results << docList.at((int)(*it).docNumber); + for(auto & minDoc : minDocs) + results << docList.at((int)minDoc.docNumber); return results; } QString fileName; - for(QVector::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) + for(auto & minDoc : minDocs) { - fileName = docList[(int)(*it).docNumber]; + fileName = docList[(int)minDoc.docNumber]; if(searchForPattern(termSeq, seqWords, fileName)) results << fileName; } @@ -531,13 +531,13 @@ QStringList HelpIndex::split(const QString & str) QVector HelpIndex::setupDummyTerm(const QStringList & terms) { QList termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if(dict[*it]) + if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } } QVector maxList(0); @@ -546,14 +546,14 @@ QVector HelpIndex::setupDummyTerm(const QStringList & terms) qSort(termList); maxList = termList.takeLast().documents; - for(QList::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector docs = t->documents; - for(QVector::iterator docIt = docs.begin(); docIt != docs.end(); ++docIt) + for(auto & doc : docs) { - if(maxList.indexOf(*docIt) == -1) - maxList.append(*docIt); + if(maxList.indexOf(doc) == -1) + maxList.append(doc); } } return maxList; diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 541ca1ca8..0f1803eca 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -249,9 +249,9 @@ void HelpWindow::startSearch() m_terms.clear(); bool isPhrase = false; QString s = ""; - for(int i = 0; i < (int)buf.length(); ++i) + for(const auto & i : buf) { - if(buf[i] == '\"') + if(i == '\"') { isPhrase = !isPhrase; s = s.simplified(); @@ -259,7 +259,7 @@ void HelpWindow::startSearch() m_terms << s; s = ""; } - else if(buf[i] == ' ' && !isPhrase) + else if(i == ' ' && !isPhrase) { s = s.simplified(); if(!s.isEmpty()) @@ -267,7 +267,7 @@ void HelpWindow::startSearch() s = ""; } else - s += buf[i]; + s += i; } if(!s.isEmpty()) m_terms << s; diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 09b666b97..33ccd583e 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -396,10 +396,10 @@ void HttpFileTransfer::requestSent(const QStringList & requestHeaders) if(!m_bNoOutput) out->output(KVI_OUT_GENERICSTATUS, __tr2qs_ctx("[HTTP %d]: Request data sent:", "http"), id()); - for(QStringList::ConstIterator it = requestHeaders.begin(); it != requestHeaders.end(); ++it) + for(const auto & requestHeader : requestHeaders) { if(!m_bNoOutput) - out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]: %s", id(), (*it).toUtf8().data()); + out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]: %s", id(), requestHeader.toUtf8().data()); } m_lRequest = requestHeaders; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 287c2c513..68d02d51f 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -425,16 +425,16 @@ void LogViewWindow::itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *) QStringList lines = szText.split('\n'); bool bOk; int iMsgType; - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - QString szNum = (*it).section(' ', 0, 0); + QString szNum = line.section(' ', 0, 0); iMsgType = szNum.toInt(&bOk); if(iMsgType < 0 || iMsgType > (KVI_NUM_MSGTYPE_OPTIONS - 1)) iMsgType = 0; if(bOk) - outputNoFmt(iMsgType, (*it).section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + outputNoFmt(iMsgType, line.section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp); else - outputNoFmt(0, *it, KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + outputNoFmt(0, line, KviIrcView::NoRepaint | KviIrcView::NoTimestamp); } m_pIrcView->repaint(); } @@ -633,9 +633,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) szLog += ".txt"; // Scan the file - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - szTmp = (*it); + szTmp = line; szLine = KviControlCodes::stripControlBytes(szTmp); // Remove icons' code @@ -710,9 +710,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) szOutputBuffer += "

" + szTitle + "

\n

Date: " + szDate + "

\n"; // Scan the file - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - szTmp = (*it); + szTmp = line; // Find who has talked QString szTmpNick = szTmp.section(" ", 2, 2); diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp index a13f29c20..43dcc3918 100644 --- a/src/modules/objects/KvsObject_colorDialog.cpp +++ b/src/modules/objects/KvsObject_colorDialog.cpp @@ -170,12 +170,12 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions) if(!widget()) return true; int colorDialogOption, sum = 0; - for(QStringList::Iterator it = szOptions.begin(); it != szOptions.end(); ++it) + for(auto & szOption : szOptions) { colorDialogOption = 0; for(unsigned int j = 0; j < option_num; j++) { - if(KviQString::equalCI((*it), option_tbl[j])) + if(KviQString::equalCI(szOption, option_tbl[j])) { colorDialogOption = option_cod[j]; break; @@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions) if(colorDialogOption) sum = sum | colorDialogOption; else - c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &szOption); } ((QColorDialog *)widget())->setOptions(QColorDialog::ColorDialogOptions(sum)); return true; diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp index 7ee0e4f59..de7325f34 100644 --- a/src/modules/objects/KvsObject_hBox.cpp +++ b/src/modules/objects/KvsObject_hBox.cpp @@ -176,13 +176,13 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment) return true; } int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -191,7 +191,7 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum); return true; diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp index 3c3baff78..6d9ebf848 100644 --- a/src/modules/objects/KvsObject_label.cpp +++ b/src/modules/objects/KvsObject_label.cpp @@ -245,13 +245,13 @@ KVSO_CLASS_FUNCTION(label, setAlignment) KVSO_PARAMETER("alignment", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, alignment) KVSO_PARAMETERS_END(c) int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(label, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } ((QLabel *)widget())->setAlignment((Qt::Alignment)sum); return true; @@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle) if(!widget()) return true; int framestyle, sum = 0; - for(QStringList::Iterator it = style.begin(); it != style.end(); ++it) + for(auto & it : style) { framestyle = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), frame_tbl[j])) + if(KviQString::equalCI(it, frame_tbl[j])) { framestyle = frame_cod[j]; break; @@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle) if(framestyle) sum = sum | framestyle; else - c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &it); } ((QLabel *)widget())->setFrameStyle(sum); return true; diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index bcc61fd1c..bc16dc8a7 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -1323,12 +1323,12 @@ KVSO_CLASS_FUNCTION(painter, drawText) int align, sum = 0; if(szAlignList.count()) { - for(QStringList::Iterator it = szAlignList.begin(); it != szAlignList.end(); ++it) + for(auto & it : szAlignList) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -1337,7 +1337,7 @@ KVSO_CLASS_FUNCTION(painter, drawText) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } } QRect rect; diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp index a8a17d282..76f750fc1 100644 --- a/src/modules/objects/KvsObject_vBox.cpp +++ b/src/modules/objects/KvsObject_vBox.cpp @@ -192,13 +192,13 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment) } int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &it); } if(widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum); diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index 7abc10e6e..89d07f0fe 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -821,12 +821,12 @@ KVSO_CLASS_FUNCTION(webView, findText) KVSO_PARAMETERS_END(c) int findflag = 0; int sum = 0; - for(QStringList::Iterator it = szFindFlag.begin(); it != szFindFlag.end(); ++it) + for(auto & it : szFindFlag) { findflag = 0; for(unsigned int j = 0; j < findflag_num; j++) { - if(KviQString::equalCI((*it), findflag_tbl[j])) + if(KviQString::equalCI(it, findflag_tbl[j])) { findflag = findflag_cod[j]; break; @@ -835,7 +835,7 @@ KVSO_CLASS_FUNCTION(webView, findText) if(findflag) sum = sum | findflag; else - c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &it); } ((QWebView *)widget())->findText(szName, (QWebPage::FindFlags)findflag); return true; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 99c348974..8d741cf65 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -518,9 +518,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c) QDir d(szPath); QStringList sl; sl = d.entryList(QDir::Files); - for(QStringList::Iterator it2 = sl.begin(); it2 != sl.end(); ++it2) + for(auto szName : sl) { - QString szName = *it2; szName.replace("--", "::"); if(szName != ".." && szName != ".") classdict->insert(szName.left(szName.length() - 4), &bFake); diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp index 9cb7b8d6a..c6063c6c4 100644 --- a/src/modules/objects/qthttp/qhttpauthenticator.cpp +++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp @@ -388,9 +388,8 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList & current = values.at(i); if(current.first.toLower() != search) continue; QByteArray str = current.second.toLower(); diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index 50e2289d3..dd33758d8 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -117,9 +117,8 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) i = 0; int iMatch = 0; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto szTmp : list) { - QString szTmp = *it; szTmp.replace("kvirc_", ""); szTmp.replace(".mo", ""); m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(), szTmp); diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index c4016abdd..2284e7214 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -457,8 +457,8 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) if(!ex.lWarnings.isEmpty()) { - for(QStringList::Iterator it = ex.lWarnings.begin(); it != ex.lWarnings.end(); ++it) - c->warning(*it); + for(auto & lWarning : ex.lWarnings) + c->warning(lWarning); } if(!ex.bExitOk) diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index d0680d110..3f96bacc5 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -268,9 +268,8 @@ bool KviPerlInterpreter::execute( // set the args in the _ arry av_unshift(pArgs, (I32)args.count()); int idx = 0; - for(QStringList::Iterator it = args.begin(); it != args.end(); ++it) + for(auto tmp : args) { - QString tmp = *it; const char * val = tmp.toUtf8().data(); if(val) { diff --git a/src/modules/rijndael/Rijndael.cpp b/src/modules/rijndael/Rijndael.cpp index e708f6a91..b8b0fc6d9 100644 --- a/src/modules/rijndael/Rijndael.cpp +++ b/src/modules/rijndael/Rijndael.cpp @@ -989,9 +989,9 @@ void Rijndael::updateInitVector(UINT8 * initVector) else { // zero init vector - for(int i = 0; i < MAX_IV_SIZE; i++) + for(unsigned char & i : m_initVector) { - m_initVector[i] = 0; + i = 0; } } } diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp index ec1248222..8c075d6e3 100644 --- a/src/modules/rijndael/UglyBase64.cpp +++ b/src/modules/rijndael/UglyBase64.cpp @@ -53,8 +53,8 @@ namespace UglyBase64 if(!didinit) { // initialize base64unmap - for(int i = 0; i < 255; ++i) - base64unmap[i] = 0; + for(char & i : base64unmap) + i = 0; for(int i = 0; i < 64; ++i) base64unmap[fake_base64[i]] = i; didinit = true; diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 9404b5a26..44258827d 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -514,9 +514,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) QList ds; - for(QStringList::Iterator it = parms.begin(); it != parms.end(); ++it) + for(auto & parm : parms) { - KviCString tmp = *it; + KviCString tmp = parm; if(tmp.isEmpty()) { @@ -605,9 +605,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) QStringList csl(v.toStringList()); KviKvsArray * arry = new KviKvsArray(); int idx = 0; - for(QStringList::Iterator iter = csl.begin(); iter != csl.end(); ++iter) + for(auto & iter : csl) { - arry->set(idx, new KviKvsVariant(*iter)); + arry->set(idx, new KviKvsVariant(iter)); idx++; } c->returnValue()->setArray(arry); diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index 90e5a3bdc..0f9b92de4 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -91,9 +91,9 @@ namespace ThemeFunctions return notAValidThemePackage(szError); // make sure the default fields exist - for(int i = 0; i < 6; i++) + for(auto & check_field : check_fields) { - pValue = pInfoFields->find(check_fields[i]); + pValue = pInfoFields->find(check_field); if(!pValue) return notAValidThemePackage(szError); } diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 80b683e69..1fb53202a 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -469,8 +469,8 @@ void ConfigDialog::closeEvent(QCloseEvent *) ConfigDialog::~ConfigDialog() { - for(int i = 0; i < cbnum; i++) - delete cb[i]; + for(auto & i : cb) + delete i; g_pConfigDialog = nullptr; } -- cgit v1.3.1-10-gc9f91