diff options
Diffstat (limited to 'src/modules')
150 files changed, 1054 insertions, 1054 deletions
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp index 8c8e48239..2f177a253 100644 --- a/src/modules/about/AboutDialog.cpp +++ b/src/modules/about/AboutDialog.cpp @@ -74,7 +74,7 @@ extern AboutDialog * g_pAboutDialog; #include "abouttext.inc" AboutDialog::AboutDialog() - : KviTalTabDialog(0) + : KviTalTabDialog(nullptr) { setWindowTitle(__tr2qs_ctx("About KVIrc", "about")); setOkButton(__tr2qs_ctx("Close", "about")); @@ -239,7 +239,7 @@ AboutDialog::AboutDialog() AboutDialog::~AboutDialog() { - g_pAboutDialog = 0; + g_pAboutDialog = nullptr; } void AboutDialog::closeEvent(QCloseEvent * e) diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp index 05ed81adb..910503cca 100644 --- a/src/modules/about/libkviabout.cpp +++ b/src/modules/about/libkviabout.cpp @@ -30,7 +30,7 @@ #include "KviModule.h" #include "KviLocale.h" -AboutDialog * g_pAboutDialog = 0; +AboutDialog * g_pAboutDialog = nullptr; /* @doc: about.kvirc @@ -84,7 +84,7 @@ static bool about_module_cleanup(KviModule *) { if(g_pAboutDialog) delete g_pAboutDialog; - g_pAboutDialog = 0; + g_pAboutDialog = nullptr; return true; } diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 925061a31..29e5fa174 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -94,7 +94,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed) : QWidget(par) { m_pActionEditor = ed; - m_pActionData = 0; + m_pActionData = nullptr; QGridLayout * g = new QGridLayout(this); @@ -650,8 +650,8 @@ ActionEditor::ActionEditor(QWidget * par) m_pSingleActionEditor = new SingleActionEditor(m_pSplitter, this); - ActionEditorTreeWidgetItem * last = 0; - ActionEditorTreeWidgetItem * first = 0; + ActionEditorTreeWidgetItem * last = nullptr; + ActionEditorTreeWidgetItem * first = nullptr; KviPointerHashTableIterator<QString, KviAction> it(*(KviActionManager::instance()->actions())); while(KviAction * a = it.current()) @@ -668,7 +668,7 @@ ActionEditor::ActionEditor(QWidget * par) a->smallIconId(), a->flags(), a->keySequence(), - 0); + nullptr); ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad); ad->m_pItem = lvi; if(ad->m_szName == g_szLastEditedAction) @@ -689,7 +689,7 @@ ActionEditor::ActionEditor(QWidget * par) } else { - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } } @@ -765,7 +765,7 @@ void ActionEditor::deleteActions() for(ActionEditorTreeWidgetItem * i = l.first(); i; i = l.next()) { if(m_pSingleActionEditor->actionData() == i->actionData()) - m_pSingleActionEditor->setActionData(0); + m_pSingleActionEditor->setActionData(nullptr); delete i; } } @@ -807,7 +807,7 @@ void ActionEditor::newAction() QString(), 0, QString(), - 0); + nullptr); ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad); ad->m_pItem = lvi; @@ -835,7 +835,7 @@ void ActionEditor::currentItemChanged(QTreeWidgetItem * i, QTreeWidgetItem *) ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)i; if(!it) { - m_pSingleActionEditor->setActionData(0); + m_pSingleActionEditor->setActionData(nullptr); m_pDeleteActionsButton->setEnabled(false); m_pExportActionsButton->setEnabled(false); return; @@ -879,7 +879,7 @@ void ActionEditor::commit() } ActionEditorWindow::ActionEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "actioneditor", 0) + : KviWindow(KviWindow::ScriptEditor, "actioneditor", nullptr) { g_pActionEditorWindow = this; setFixedCaption(__tr2qs_ctx("Action Editor", "editor")); @@ -911,7 +911,7 @@ ActionEditorWindow::ActionEditorWindow() ActionEditorWindow::~ActionEditorWindow() { - g_pActionEditorWindow = 0; + g_pActionEditorWindow = nullptr; } void ActionEditorWindow::okClicked() diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp index a83450a03..a9da1c6c5 100644 --- a/src/modules/actioneditor/libkviactioneditor.cpp +++ b/src/modules/actioneditor/libkviactioneditor.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "KviMainWindow.h" -ActionEditorWindow * g_pActionEditorWindow = 0; +ActionEditorWindow * g_pActionEditorWindow = nullptr; /* @doc: actioneditor.open @@ -59,20 +59,20 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall *) static bool actioneditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m, "open", actioneditor_kvs_cmd_open); - g_pActionEditorWindow = 0; + g_pActionEditorWindow = nullptr; return true; } static bool actioneditor_module_can_unload(KviModule *) { - return (g_pActionEditorWindow == 0); + return (g_pActionEditorWindow == nullptr); } static bool actioneditor_module_cleanup(KviModule *) { if(g_pActionEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pActionEditorWindow); - g_pActionEditorWindow = 0; + g_pActionEditorWindow = nullptr; return true; } diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 487681942..88a7b0fdd 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -102,7 +102,7 @@ namespace AddonFunctions // load its picture pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) - pix.loadFromData(*pByteArray, 0, 0); + pix.loadFromData(*pByteArray, nullptr, nullptr); if(pix.isNull()) { @@ -241,7 +241,7 @@ namespace AddonFunctions } if(!KviFileUtils::deleteDir(szUnpackPath)) - QMessageBox::warning(NULL, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath)); + QMessageBox::warning(nullptr, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath)); return true; } @@ -323,7 +323,7 @@ namespace AddonFunctions } QByteArray * pba = new QByteArray(); - QBuffer bufferz(pba, 0); + QBuffer bufferz(pba, nullptr); bufferz.open(QIODevice::WriteOnly); pix.save(&bufferz, "PNG"); diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp index 3b96e47c4..754ef6ad7 100644 --- a/src/modules/addon/AddonManagementDialog.cpp +++ b/src/modules/addon/AddonManagementDialog.cpp @@ -60,7 +60,7 @@ #include "WebAddonInterfaceDialog.h" #endif //COMPILE_WEBKIT_SUPPORT -AddonManagementDialog * AddonManagementDialog::m_pInstance = 0; +AddonManagementDialog * AddonManagementDialog::m_pInstance = nullptr; extern QRect g_rectManagementDialogGeometry; AddonListViewItem::AddonListViewItem(KviTalListWidget * v, KviKvsScriptAddon * a) @@ -99,7 +99,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons))); #ifdef COMPILE_WEBKIT_SUPPORT - m_pWebInterfaceDialog = NULL; + m_pWebInterfaceDialog = nullptr; #endif //COMPILE_WEBKIT_SUPPORT m_pInstance = this; @@ -172,7 +172,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) fillListView(); - currentChanged(0, 0); + currentChanged(nullptr, nullptr); connect(m_pListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(currentChanged(QListWidgetItem *, QListWidgetItem *))); m_pListWidget->setCurrentItem(m_pListWidget->item(0)); @@ -205,7 +205,7 @@ AddonManagementDialog::~AddonManagementDialog() delete m_pWebInterfaceDialog; #endif //COMPILE_WEBKIT_SUPPORT g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); - m_pInstance = NULL; + m_pInstance = nullptr; } void AddonManagementDialog::fillListView() @@ -280,14 +280,14 @@ void AddonManagementDialog::uninstallScript() if(QMessageBox::question( this, __tr2qs_ctx("Confirm Addon Uninstallation - KVIrc", "addon"), - txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), 0, 1) + txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), nullptr, 1) != 0) return; KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(), g_pActiveWindow); fillListView(); - currentChanged(0, 0); + currentChanged(nullptr, nullptr); } void AddonManagementDialog::getMoreScripts() @@ -344,7 +344,7 @@ void AddonManagementDialog::installScript() } fillListView(); - currentChanged(0, 0); + currentChanged(nullptr, nullptr); //m_pListWidget->publicUpdateContents(); //m_pListWidget->triggerUpdate(); @@ -360,7 +360,7 @@ void AddonManagementDialog::cleanup() if(!m_pInstance) return; delete m_pInstance; - m_pInstance = 0; + m_pInstance = nullptr; } void AddonManagementDialog::display(bool bTopLevel) @@ -371,7 +371,7 @@ void AddonManagementDialog::display(bool bTopLevel) { if(m_pInstance->parent()) { - m_pInstance->setParent(0); + m_pInstance->setParent(nullptr); } } else @@ -386,7 +386,7 @@ void AddonManagementDialog::display(bool bTopLevel) { if(bTopLevel) { - m_pInstance = new AddonManagementDialog(0); + m_pInstance = new AddonManagementDialog(nullptr); } else { diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index 665a0ed62..66ee94d7b 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -60,7 +60,7 @@ extern AliasEditorWindow * g_pAliasEditorWindow; extern KviModule * g_pAliasEditorModule; AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName) - : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(0) + : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(nullptr) { setName(szName); m_cPos = 0; @@ -120,8 +120,8 @@ AliasEditorWidget::AliasEditorWidget(QWidget * par) m_pAliases->setAutoDelete(false); m_bSaving = false; - m_pLastEditedItem = 0; - m_pLastClickedItem = 0; + m_pLastEditedItem = nullptr; + m_pLastClickedItem = nullptr; m_szDir = QDir::homePath(); QGridLayout * l = new QGridLayout(this); @@ -156,7 +156,7 @@ AliasEditorWidget::AliasEditorWidget(QWidget * par) oneTimeSetup(); - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } AliasEditorWidget::~AliasEditorWidget() @@ -206,24 +206,24 @@ QString AliasEditorWidget::buildFullItemName(AliasEditorTreeWidgetItem * it) //FIXME this should be called something like "findNamespace" AliasEditorTreeWidgetItem * AliasEditorWidget::findTopLevelItem(const QString & szName) { - AliasEditorTreeWidgetItem * pItem = 0; + AliasEditorTreeWidgetItem * pItem = nullptr; for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { pItem = (AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); if(pItem->text(0) == szName && pItem->isNamespace()) return (AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); } - return 0; + return nullptr; } AliasEditorTreeWidgetItem * AliasEditorWidget::findItem(const QString & szFullName) { QStringList lNamespaces = szFullName.split("::"); if(!lNamespaces.count()) - return 0; + return nullptr; AliasEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0)); if(!pItem) - return 0; + return nullptr; bool bFound; int i; int j; @@ -240,7 +240,7 @@ AliasEditorTreeWidgetItem * AliasEditorWidget::findItem(const QString & szFullNa } } if(!bFound) - return 0; + return nullptr; } return (AliasEditorTreeWidgetItem *)pItem; } @@ -249,7 +249,7 @@ AliasEditorTreeWidgetItem * AliasEditorWidget::createFullItem(const QString & sz { QStringList lNamespaces = szFullName.split("::"); if(!lNamespaces.count()) - return 0; + return nullptr; if(lNamespaces.count() == 1) return new AliasEditorTreeWidgetItem(m_pTreeWidget, AliasEditorTreeWidgetItem::Alias, lNamespaces.at(0)); AliasEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0)); @@ -305,7 +305,7 @@ void AliasEditorWidget::aliasRefresh(const QString & szName) { if(m_bSaving) return; - AliasEditorTreeWidgetItem * item = 0; + AliasEditorTreeWidgetItem * item = nullptr; KviKvsScript * alias = KviKvsAliasManager::instance()->aliasDict()->find(szName); // search for old alias with same name @@ -332,7 +332,7 @@ void AliasEditorWidget::aliasRefresh(const QString & szName) return; } if( - QMessageBox::warning(0, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"), + QMessageBox::warning(nullptr, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"), __tr2qs_ctx("An external script has changed the alias you are currently editing. Do you want to accept the external changes?", "editor"), QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape) != QMessageBox::Yes) @@ -493,8 +493,8 @@ void AliasEditorWidget::renameItem() bool bYesToAll = true; removeItem(m_pLastEditedItem, &bYesToAll, true); - m_pLastEditedItem = 0; // make sure it's true (but it already should be because of removeItem()) - m_pLastClickedItem = 0; // make sure it's true (but it already should be because of removeItem()) + m_pLastEditedItem = nullptr; // make sure it's true (but it already should be because of removeItem()) + m_pLastClickedItem = nullptr; // make sure it's true (but it already should be because of removeItem()) AliasEditorTreeWidgetItem * pItem = createFullItem(szNewName); if(bAlias) { @@ -1000,9 +1000,9 @@ bool AliasEditorWidget::removeItem(AliasEditorTreeWidgetItem * it, bool * pbYesT } if(it == m_pLastEditedItem) - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; if(it == m_pLastClickedItem) - m_pLastClickedItem = 0; + m_pLastClickedItem = nullptr; if(it->childCount()) removeItemChildren(it); delete it; @@ -1197,7 +1197,7 @@ void AliasEditorWidget::newItem(QString & szName, AliasEditorTreeWidgetItem::Typ { if(m_pLastClickedItem) if(!itemExists(m_pLastClickedItem)) - m_pLastClickedItem = 0; + m_pLastClickedItem = nullptr; if(m_pLastClickedItem) buildFullItemPath(m_pLastClickedItem, szName); int idx = 1; @@ -1237,7 +1237,7 @@ void AliasEditorWidget::commit() } AliasEditorWindow::AliasEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "aliaseditor", 0) + : KviWindow(KviWindow::ScriptEditor, "aliaseditor", nullptr) { g_pAliasEditorWindow = this; @@ -1270,7 +1270,7 @@ AliasEditorWindow::AliasEditorWindow() AliasEditorWindow::~AliasEditorWindow() { - g_pAliasEditorWindow = 0; + g_pAliasEditorWindow = nullptr; } void AliasEditorWindow::okClicked() diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp index e7c0fbbab..9ec3cb0ac 100644 --- a/src/modules/aliaseditor/libkvialiaseditor.cpp +++ b/src/modules/aliaseditor/libkvialiaseditor.cpp @@ -28,8 +28,8 @@ #include "KviLocale.h" #include "KviMainWindow.h" -AliasEditorWindow * g_pAliasEditorWindow = 0; -KviModule * g_pAliasEditorModule = 0; +AliasEditorWindow * g_pAliasEditorWindow = nullptr; +KviModule * g_pAliasEditorModule = nullptr; /* @doc: aliaseditor.open @@ -61,21 +61,21 @@ static bool aliaseditor_kvs_cmd_open(KviKvsModuleCommandCall *) static bool aliaseditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m, "open", aliaseditor_kvs_cmd_open); - g_pAliasEditorWindow = 0; + g_pAliasEditorWindow = nullptr; g_pAliasEditorModule = m; return true; } static bool aliaseditor_module_can_unload(KviModule *) { - return (g_pAliasEditorWindow == 0); + return (g_pAliasEditorWindow == nullptr); } static bool aliaseditor_module_cleanup(KviModule *) { if(g_pAliasEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pAliasEditorWindow); - g_pAliasEditorWindow = 0; + g_pAliasEditorWindow = nullptr; return true; } diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 7f4f1fbca..244103018 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -55,7 +55,7 @@ #include <QCloseEvent> #include <QByteArray> -static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0; +static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = nullptr; extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par, const QString & szInitialPath, KviIrcConnection * c) @@ -308,8 +308,8 @@ static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c) return true; } - e->setAvatar(0); - c->window()->console()->avatarChanged(0, + e->setAvatar(nullptr); + c->window()->console()->avatarChanged(nullptr, c->window()->connection()->userInfo()->nickName(), c->window()->connection()->userInfo()->userName(), c->window()->connection()->userInfo()->hostName(), @@ -397,12 +397,12 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c) KviIrcServerParser::encodeCtcpParameter(szTmp.toUtf8().data(), avatar); } - KviSharedFile * o = 0; + KviSharedFile * o = nullptr; if((!absPath.isEmpty()) && (!avatar.isEmpty())) { bool bTargetIsChan = (szTarget.contains('#') || szTarget.contains('&') || szTarget.contains('!') || szTarget.contains('+')); if(bTargetIsChan) - o = g_pSharedFilesManager->lookupSharedFile(avatar, 0); + o = g_pSharedFilesManager->lookupSharedFile(avatar, nullptr); else { KviIrcMask u(szTarget); diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 119339c2d..e1c374f6d 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -54,7 +54,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS { if(!bNoWarnings) c->warning(__tr2qs("Can't find the window with ID '%Q'"), &szChan); - return 0; + return nullptr; } if(w->type() == KviWindow::Channel) return (KviChannelWindow *)w; @@ -63,7 +63,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS if(!bNoWarnings) c->warning(__tr2qs("The specified window (%Q) is not a channel"), &szChan); } - return 0; + return nullptr; } /* @@ -1925,7 +1925,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("context_id", KVS_PT_UINT, KVS_PF_OPTIONAL, iContextId) KVSM_PARAMETERS_END(c) - KviConsoleWindow * pConsole = NULL; + KviConsoleWindow * pConsole = nullptr; if(c->parameterCount() > 1) pConsole = g_pApp->findConsole(iContextId); else diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 343c55c88..6e89eb6c0 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -61,7 +61,7 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name) setWindowTitle(__tr2qs("Join Channels - KVIrc")); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Channel))); - m_pConsole = 0; + m_pConsole = nullptr; QGridLayout * g = new QGridLayout(this); @@ -152,7 +152,7 @@ ChannelsJoinDialog::~ChannelsJoinDialog() KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc) = m_pShowAtStartupCheck->isChecked(); g_rectChannelsJoinGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); - g_pChannelsWindow = 0; + g_pChannelsWindow = nullptr; } void ChannelsJoinDialog::setConsole(KviConsoleWindow * pConsole) diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp index 2d1fca457..073c040fd 100644 --- a/src/modules/channelsjoin/libkvichannelsjoin.cpp +++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp @@ -32,7 +32,7 @@ #include <QSplitter> -ChannelsJoinDialog * g_pChannelsWindow = 0; +ChannelsJoinDialog * g_pChannelsWindow = nullptr; QRect g_rectChannelsJoinGeometry; /* @@ -87,7 +87,7 @@ static bool channelsjoin_module_cleanup(KviModule * m) if(g_pChannelsWindow) delete g_pChannelsWindow; - g_pChannelsWindow = 0; + g_pChannelsWindow = nullptr; return true; } diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index ec54bfe20..00c4bd93e 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -168,8 +168,8 @@ ClassEditorWidget::ClassEditorWidget(QWidget * pParent) { m_pClasses = new KviPointerHashTable<QString, ClassEditorTreeWidgetItem>(100, false); m_pClasses->setAutoDelete(false); - m_pLastEditedItem = 0; - m_pLastClickedItem = 0; + m_pLastEditedItem = nullptr; + m_pLastClickedItem = nullptr; m_szDir = QDir::homePath(); QGridLayout * pLayout = new QGridLayout(this); @@ -222,7 +222,7 @@ ClassEditorWidget::ClassEditorWidget(QWidget * pParent) oneTimeSetup(); m_pTreeWidget->setSortingEnabled(true); - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } ClassEditorWidget::~ClassEditorWidget() @@ -313,7 +313,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullItem(const QString & sz QStringList lNamespaces = szFullName.split("::"); if(lNamespaces.count() == 0) - return 0; + return nullptr; if(lNamespaces.count() == 1) { ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0)); @@ -394,7 +394,7 @@ void ClassEditorWidget::oneTimeSetup() while(KviKvsObjectClass * pClass = it.current()) { if(pClass->isBuiltin()) - m_pClasses->insert(it.currentKey(), 0); + m_pClasses->insert(it.currentKey(), nullptr); else { QString szTmp; @@ -860,7 +860,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI KviPointerHashTable<QString, ClassEditorTreeWidgetItem> lFunctions; lFunctions.setAutoDelete(false); - ClassEditorTreeWidgetItem * pItem = 0; + ClassEditorTreeWidgetItem * pItem = nullptr; for(int i = 0; i < pTree->childCount(); i++) { pItem = ((ClassEditorTreeWidgetItem *)pTree->child(i)); @@ -1419,9 +1419,9 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer } if(pItem == m_pLastEditedItem) - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; if(pItem == m_pLastClickedItem) - m_pLastClickedItem = 0; + m_pLastClickedItem = nullptr; if(pItem->childCount()) removeItemChildren(pItem, lRemovedItems); if(pItem->isClass()) @@ -1873,7 +1873,7 @@ void ClassEditorWidget::searchInheritedClasses(const QString szClass, KviPointer } ClassEditorWindow::ClassEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "classeditor", 0) + : KviWindow(KviWindow::ScriptEditor, "classeditor", nullptr) { g_pClassEditorWindow = this; @@ -1906,7 +1906,7 @@ ClassEditorWindow::ClassEditorWindow() ClassEditorWindow::~ClassEditorWindow() { - g_pClassEditorWindow = 0; + g_pClassEditorWindow = nullptr; } void ClassEditorWindow::buildClicked() diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp index 20b628aa1..94457a28e 100644 --- a/src/modules/classeditor/libkviclasseditor.cpp +++ b/src/modules/classeditor/libkviclasseditor.cpp @@ -28,8 +28,8 @@ #include "KviLocale.h" #include "KviMainWindow.h" -ClassEditorWindow * g_pClassEditorWindow = 0; -KviModule * g_pClassEditorModule = 0; +ClassEditorWindow * g_pClassEditorWindow = nullptr; +KviModule * g_pClassEditorModule = nullptr; /* @doc: classeditor.open @@ -60,21 +60,21 @@ static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall *) static bool classeditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m, "open", classeditor_kvs_cmd_open); - g_pClassEditorWindow = 0; + g_pClassEditorWindow = nullptr; g_pClassEditorModule = m; return true; } static bool classeditor_module_can_unload(KviModule *) { - return (g_pClassEditorWindow == 0); + return (g_pClassEditorWindow == nullptr); } static bool classeditor_module_cleanup(KviModule *) { if(g_pClassEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pClassEditorWindow); - g_pClassEditorWindow = 0; + g_pClassEditorWindow = nullptr; return true; } diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp index 1a1d3d9dd..30018012c 100644 --- a/src/modules/codetester/CodeTesterWindow.cpp +++ b/src/modules/codetester/CodeTesterWindow.cpp @@ -80,7 +80,7 @@ void CodeTesterWidget::execute() } CodeTesterWindow::CodeTesterWindow() - : KviWindow(KviWindow::ScriptEditor, "codetester", 0) + : KviWindow(KviWindow::ScriptEditor, "codetester", nullptr) { g_pCodeTesterWindowList->append(this); diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp index 665e06119..bae8fbc3d 100644 --- a/src/modules/codetester/libkvicodetester.cpp +++ b/src/modules/codetester/libkvicodetester.cpp @@ -29,7 +29,7 @@ #include "KviMainWindow.h" #include "KviPointerList.h" -KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList = 0; +KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList = nullptr; /* @doc: codetester.open diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp index f8dc47e80..3a355dc67 100644 --- a/src/modules/config/libkviconfig.cpp +++ b/src/modules/config/libkviconfig.cpp @@ -30,7 +30,7 @@ #include "KviLocale.h" #include "KviPointerHashTable.h" -static KviPointerHashTable<QString, KviConfigurationFile> * g_pConfigDict = 0; +static KviPointerHashTable<QString, KviConfigurationFile> * g_pConfigDict = nullptr; static int g_iNextConfigId = 0; /* @@ -901,7 +901,7 @@ static bool config_module_init(KviModule * m) static bool config_module_cleanup(KviModule *) { delete g_pConfigDict; - g_pConfigDict = 0; + g_pConfigDict = nullptr; return true; } diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index d8c1b87c6..ab6a874b1 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -671,7 +671,7 @@ static bool context_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c) return true; #else - KviConsoleWindow * pConsole = NULL; + KviConsoleWindow * pConsole = nullptr; if(c->parameterCount() > 2) pConsole = g_pApp->findConsole(uContextId); else diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp index 08e9373d8..efe4d36ac 100644 --- a/src/modules/dcc/DccBroker.cpp +++ b/src/modules/dcc/DccBroker.cpp @@ -60,7 +60,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; //#warning "The broker might lookup the remote host name" DccBroker::DccBroker() - : QObject(0) + : QObject(nullptr) { setObjectName("dcc_broker"); DccFileTransfer::init(); @@ -81,7 +81,7 @@ DccBroker::~DccBroker() while(m_pBoxList->first()) delete m_pBoxList->first(); delete m_pBoxList; - m_pBoxList = 0; + m_pBoxList = nullptr; while(m_pDccWindowList->first()) delete m_pDccWindowList->first(); delete m_pDccWindowList; @@ -106,12 +106,12 @@ KviDccZeroPortTag * DccBroker::findZeroPortTag(const QString & szTag) { KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag); if(!t) - return 0; + return nullptr; if(t->m_tTimestamp.secsTo(QDateTime::currentDateTime()) > 180) { // too late man... m_pZeroPortTags->remove(szTag); - return 0; + return nullptr; } return t; } @@ -140,7 +140,7 @@ void DccBroker::unregisterDccBox(DccDialog * box) void DccBroker::cancelDcc(DccDescriptor * dcc) { delete dcc; - dcc = 0; + dcc = nullptr; } void DccBroker::cancelDcc(DccDialog * box, DccDescriptor * dcc) @@ -148,7 +148,7 @@ void DccBroker::cancelDcc(DccDialog * box, DccDescriptor * dcc) if(box) box->forgetDescriptor(); delete dcc; - dcc = 0; + dcc = nullptr; } /////////////////////////////////////////////////////////////////////////////// @@ -160,7 +160,7 @@ void DccBroker::rsendManage(DccDescriptor * dcc) // We need the filename... QFileInfo fi(dcc->szLocalFileName); if(fi.exists()) - rsendExecute(0, dcc); + rsendExecute(nullptr, dcc); else rsendAskForFileName(dcc); } @@ -326,7 +326,7 @@ void DccBroker::handleChatRequest(DccDescriptor * dcc) else { // auto accept - executeChat(0, dcc); + executeChat(nullptr, dcc); } } @@ -380,7 +380,7 @@ void DccBroker::activeVoiceManage(DccDescriptor * dcc) else { // auto accept - activeVoiceExecute(0, dcc); + activeVoiceExecute(nullptr, dcc); } } @@ -584,7 +584,7 @@ void DccBroker::recvFileManage(DccDescriptor * dcc) { if(size >= KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize)) { - cancelDcc(0, dcc); + cancelDcc(nullptr, dcc); return; } } @@ -659,7 +659,7 @@ void DccBroker::recvFileManage(DccDescriptor * dcc) &(dcc->szType), &(dcc->szNick), &(dcc->szUser), &(dcc->szHost), &(dcc->szFileName)); } - chooseSaveFileName(0, dcc); + chooseSaveFileName(nullptr, dcc); } } @@ -737,7 +737,7 @@ void DccBroker::chooseSaveFileName(DccDialog * box, DccDescriptor * dcc) true, g_pMainWindow)) { - renameOverwriteResume(0, dcc); + renameOverwriteResume(nullptr, dcc); } else { @@ -758,7 +758,7 @@ void DccBroker::chooseSaveFileName(DccDialog * box, DccDescriptor * dcc) &(dcc->szType), &(dcc->szFileName), &(dcc->szLocalFileName)); } - renameOverwriteResume(0, dcc); + renameOverwriteResume(nullptr, dcc); } } @@ -834,17 +834,17 @@ void DccBroker::renameOverwriteResume(DccDialog * box, DccDescriptor * dcc) { // yep, auto resume... dcc->bResume = true; - recvFileExecute(0, dcc); + recvFileExecute(nullptr, dcc); } else if(iRemoteSize == (quint64)fi.size()) { dcc->console()->output(KVI_OUT_DCCMSG, "Transfer aborted: file %Q already completed", &(dcc->szLocalFileName)); - cancelDcc(0, dcc); + cancelDcc(nullptr, dcc); } else { // otherwise auto rename - renameDccSendFile(0, dcc); + renameDccSendFile(nullptr, dcc); } return; } @@ -852,7 +852,7 @@ void DccBroker::renameOverwriteResume(DccDialog * box, DccDescriptor * dcc) dcc->szLocalFileSize = "0"; // everything OK - recvFileExecute(0, dcc); + recvFileExecute(nullptr, dcc); } void DccBroker::renameDccSendFile(DccDialog * box, DccDescriptor * dcc) @@ -894,7 +894,7 @@ void DccBroker::renameDccSendFile(DccDialog * box, DccDescriptor * dcc) dcc->szLocalFileSize = "0"; // 0 for sure - recvFileExecute(0, dcc); + recvFileExecute(nullptr, dcc); } void DccBroker::recvFileExecute(DccDialog * box, DccDescriptor * dcc) @@ -940,7 +940,7 @@ void DccBroker::sendFileManage(DccDescriptor * dcc) if(d->szLocalFileName.isEmpty()) cancelDcc(d); else - sendFileExecute(0, d); + sendFileExecute(nullptr, d); } delete dcc; } diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index 4e9a3c50e..53f4d4894 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -105,7 +105,7 @@ DccChatWindow::DccChatWindow(DccDescriptor * dcc, const char * name) //setFocusHandler(m_pInput,this); - m_pSlaveThread = 0; + m_pSlaveThread = nullptr; if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat)) m_pIrcView->startLogging(); @@ -119,7 +119,7 @@ DccChatWindow::DccChatWindow(DccDescriptor * dcc, const char * name) connect(m_pMarshal, SIGNAL(sslError(const char *)), this, SLOT(sslError(const char *))); #endif - m_pSlaveThread = 0; + m_pSlaveThread = nullptr; startConnection(); } @@ -131,7 +131,7 @@ DccChatWindow::~DccChatWindow() { m_pSlaveThread->terminate(); delete m_pSlaveThread; - m_pSlaveThread = 0; + m_pSlaveThread = nullptr; } KviThreadManager::killPendingEvents(this); } @@ -628,7 +628,7 @@ void DccChatThread::run() { KviDccThreadIncomingData data; data.iLen = 0; - data.buffer = 0; + data.buffer = nullptr; for(;;) { @@ -728,7 +728,7 @@ void DccChatThread::run() else { KviMemory::free(data.buffer); - data.buffer = 0; + data.buffer = nullptr; } if(!handleInvalidSocketRead(readLen)) @@ -753,7 +753,7 @@ out_of_the_loop: if(m_pSSL) { KviSSLMaster::freeSSL(m_pSSL); - m_pSSL = 0; + m_pSSL = nullptr; } #endif @@ -801,7 +801,7 @@ bool DccChatThread::handleIncomingData(KviDccThreadIncomingData * data, bool bCr // no more data in the buffer KVI_ASSERT(data->iLen == 0); KviMemory::free(data->buffer); - data->buffer = end = aux = 0; + data->buffer = end = aux = nullptr; } postEvent(parent(), e); } @@ -823,7 +823,7 @@ bool DccChatThread::handleIncomingData(KviDccThreadIncomingData * data, bool bCr e->setData(s); data->iLen = 0; KviMemory::free(data->buffer); - data->buffer = 0; + data->buffer = nullptr; postEvent(parent(), e); } } diff --git a/src/modules/dcc/DccDescriptor.cpp b/src/modules/dcc/DccDescriptor.cpp index a1db30716..5e2abe9e8 100644 --- a/src/modules/dcc/DccDescriptor.cpp +++ b/src/modules/dcc/DccDescriptor.cpp @@ -32,7 +32,7 @@ #include "KviApplication.h" static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id -static KviPointerHashTable<int, DccDescriptor> * g_pDescriptorDict = 0; +static KviPointerHashTable<int, DccDescriptor> * g_pDescriptorDict = nullptr; KviPointerHashTable<int, DccDescriptor> * DccDescriptor::descriptorDict() { @@ -47,8 +47,8 @@ DccDescriptor::DccDescriptor(const DccDescriptor & src) DccDescriptor::DccDescriptor(KviConsoleWindow * pConsole) { m_pConsole = pConsole; - m_pDccWindow = 0; - m_pDccTransfer = 0; + m_pDccWindow = nullptr; + m_pDccTransfer = nullptr; m_uId = g_uNextDescriptorId; g_uNextDescriptorId++; @@ -112,7 +112,7 @@ DccDescriptor::~DccDescriptor() if(g_pDescriptorDict->count() < 1) { delete g_pDescriptorDict; - g_pDescriptorDict = 0; + g_pDescriptorDict = nullptr; } } } @@ -139,7 +139,7 @@ void DccDescriptor::triggerCreationEvent() DccDescriptor * DccDescriptor::find(unsigned int uId) { if(!g_pDescriptorDict) - return 0; + return nullptr; return g_pDescriptorDict->find((long)uId); } diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp index 151422d87..d0d693691 100644 --- a/src/modules/dcc/DccDialog.cpp +++ b/src/modules/dcc/DccDialog.cpp @@ -48,17 +48,17 @@ DccDialog::~DccDialog() { if(m_pDescriptor) delete m_pDescriptor; - m_pDescriptor = 0; + m_pDescriptor = nullptr; m_pBroker->unregisterDccBox(this); } void DccDialog::forgetDescriptor() { - m_pDescriptor = 0; + m_pDescriptor = nullptr; } DccAcceptDialog::DccAcceptDialog(DccBroker * br, DccDescriptor * dcc, const QString & text, const QString & capt) - : QWidget(0), DccDialog(br, dcc) + : QWidget(nullptr), DccDialog(br, dcc) { setObjectName("dcc_accept_box"); //QVBoxLayout * vb = new QVBoxLayout(this,4,4); @@ -126,7 +126,7 @@ void DccAcceptDialog::showEvent(QShowEvent * e) } DccRenameDialog::DccRenameDialog(DccBroker * br, DccDescriptor * dcc, const QString & text, bool bDisableResume) - : QWidget(0), DccDialog(br, dcc) + : QWidget(nullptr), DccDialog(br, dcc) { setObjectName("dcc_rename_box"); //QVBoxLayout * vb = new QVBoxLayout(this,4,4); diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index ab5692539..f03b8c4ea 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -83,8 +83,8 @@ extern DccBroker * g_pDccBroker; extern KVIRC_API KviMediaManager * g_pMediaManager; // KviApplication.cpp -static KviPointerList<DccFileTransfer> * g_pDccFileTransfers = 0; -static QPixmap * g_pDccFileTransferIcon = 0; +static KviPointerList<DccFileTransfer> * g_pDccFileTransfers = nullptr; +static QPixmap * g_pDccFileTransferIcon = nullptr; //#warning "The events that have a KviCString data pointer should become real classes, that take care of deleting the data pointer!" //#warning "Otherwise, when left undispatched we will be leaking memory (event class destroyed but not the data ptr)" @@ -99,7 +99,7 @@ DccRecvThread::DccRecvThread(QObject * par, kvi_socket_t fd, KviDccRecvThreadOpt m_uTotalReceivedBytes = 0; m_uInstantReceivedBytes = 0; - m_pFile = 0; + m_pFile = nullptr; m_pTimeInterval = new KviMSecTimeInterval(); m_uStartTime = 0; m_uInstantSpeedInterval = 0; @@ -577,14 +577,14 @@ exit_dcc: { m_pFile->close(); delete m_pFile; - m_pFile = 0; + m_pFile = nullptr; } #ifdef COMPILE_SSL_SUPPORT if(m_pSSL) { KviSSLMaster::freeSSL(m_pSSL); - m_pSSL = 0; + m_pSSL = nullptr; } #endif @@ -1164,13 +1164,13 @@ exit_dcc: KviMemory::free(buffer); pFile->close(); delete pFile; - pFile = 0; + pFile = nullptr; #ifdef COMPILE_SSL_SUPPORT if(m_pSSL) { KviSSLMaster::freeSSL(m_pSSL); - m_pSSL = 0; + m_pSSL = nullptr; } #endif kvi_socket_close(m_fd); @@ -1193,8 +1193,8 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc) init(); // ensure we're initialized g_pDccFileTransfers->append(this); - m_pResumeTimer = 0; - m_pBandwidthDialog = 0; + m_pResumeTimer = nullptr; + m_pBandwidthDialog = nullptr; m_szTransferIdString = QString(__tr2qs_ctx("TRANSFER %1", "dcc")).arg(id()); @@ -1218,8 +1218,8 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc) if(dcc->bIsSSL) m_szDccType.prepend("S"); #endif - m_pSlaveRecvThread = 0; - m_pSlaveSendThread = 0; + m_pSlaveRecvThread = nullptr; + m_pSlaveSendThread = nullptr; m_tTransferStartTime = 0; m_tTransferEndTime = 0; @@ -1253,14 +1253,14 @@ DccFileTransfer::~DccFileTransfer() { m_pSlaveRecvThread->terminate(); delete m_pSlaveRecvThread; - m_pSlaveRecvThread = 0; + m_pSlaveRecvThread = nullptr; } if(m_pSlaveSendThread) { m_pSlaveSendThread->terminate(); delete m_pSlaveSendThread; - m_pSlaveSendThread = 0; + m_pSlaveSendThread = nullptr; } KviThreadManager::killPendingEvents(this); @@ -1271,7 +1271,7 @@ DccFileTransfer::~DccFileTransfer() void DccFileTransfer::bandwidthDialogDestroyed() { - m_pBandwidthDialog = 0; + m_pBandwidthDialog = nullptr; } KviWindow * DccFileTransfer::eventWindow() @@ -1375,7 +1375,7 @@ void DccFileTransfer::resumeTimedOut() if(m_pResumeTimer) { delete m_pResumeTimer; - m_pResumeTimer = 0; + m_pResumeTimer = nullptr; } handleMarshalError(KviError::ConnectionTimedOut); } @@ -1915,7 +1915,7 @@ void DccFileTransfer::init() if(pix) g_pDccFileTransferIcon = new QPixmap(*pix); else - g_pDccFileTransferIcon = 0; + g_pDccFileTransferIcon = nullptr; } void DccFileTransfer::done() @@ -1925,10 +1925,10 @@ void DccFileTransfer::done() while(DccFileTransfer * t = g_pDccFileTransfers->first()) delete t; delete g_pDccFileTransfers; - g_pDccFileTransfers = 0; + g_pDccFileTransfers = nullptr; if(g_pDccFileTransferIcon) delete g_pDccFileTransferIcon; - g_pDccFileTransferIcon = 0; + g_pDccFileTransferIcon = nullptr; } unsigned int DccFileTransfer::transferCount() @@ -1941,7 +1941,7 @@ unsigned int DccFileTransfer::transferCount() DccFileTransfer * DccFileTransfer::nonFailedTransferWithLocalFileName(const QString & szLocalFileName) { if(!g_pDccFileTransfers) - return 0; + return nullptr; for(DccFileTransfer * t = g_pDccFileTransfers->first(); t; t = g_pDccFileTransfers->next()) { #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -1955,7 +1955,7 @@ DccFileTransfer * DccFileTransfer::nonFailedTransferWithLocalFileName(const QStr return t; } } - return 0; + return nullptr; } unsigned int DccFileTransfer::runningTransfersCount() @@ -2355,7 +2355,7 @@ bool DccFileTransfer::resumeAccepted(const char * filename, const char * port, c } delete m_pResumeTimer; - m_pResumeTimer = 0; + m_pResumeTimer = nullptr; outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1", "dcc").arg(m_pDescriptor->szLocalFileSize)); diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp index 9f7b9af34..fa7d2b0b3 100644 --- a/src/modules/dcc/DccMarshal.cpp +++ b/src/modules/dcc/DccMarshal.cpp @@ -37,16 +37,16 @@ #include <QTimer> DccMarshal::DccMarshal(DccMarshalOutputContext * ctx) - : QObject(0) + : QObject(nullptr) { setObjectName("dcc_marshal"); - m_pSn = 0; + m_pSn = nullptr; m_fd = KVI_INVALID_SOCKET; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; m_bIPv6 = false; m_pOutputContext = ctx; #ifdef COMPILE_SSL_SUPPORT - m_pSSL = 0; + m_pSSL = nullptr; #endif m_szIp = ""; m_szPort = ""; @@ -70,7 +70,7 @@ kvi_socket_t DccMarshal::releaseSocket() KviSSL * DccMarshal::releaseSSL() { KviSSL * theSSL = m_pSSL; - m_pSSL = 0; + m_pSSL = nullptr; return theSSL; } #endif @@ -80,7 +80,7 @@ void DccMarshal::reset() if(m_pSn) { delete m_pSn; - m_pSn = 0; + m_pSn = nullptr; } if(m_fd != KVI_INVALID_SOCKET) { @@ -93,13 +93,13 @@ void DccMarshal::reset() { // qDebug("MARSHAL CLEARING THE SSL"); KviSSLMaster::freeSSL(m_pSSL); - m_pSSL = 0; + m_pSSL = nullptr; } #endif if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } m_bIPv6 = false; } @@ -119,7 +119,7 @@ KviError::Code DccMarshal::dccListen(const QString & ip, const QString & port, b if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } #ifdef COMPILE_SSL_SUPPORT @@ -287,7 +287,7 @@ void DccMarshal::doListen() if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } if(m_bUseTimeout) @@ -329,7 +329,7 @@ void DccMarshal::doConnect() if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } // Check the address type if(!KviNetUtils::isValidStringIp(m_szIp)) @@ -432,7 +432,7 @@ void DccMarshal::doConnect() if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } if(m_bUseTimeout) @@ -453,7 +453,7 @@ void DccMarshal::snActivated(int) if(m_pTimeoutTimer) { delete m_pTimeoutTimer; - m_pTimeoutTimer = 0; + m_pTimeoutTimer = nullptr; } #ifdef COMPILE_IPV6_SUPPORT struct sockaddr_in6 hostSockAddr6; @@ -493,7 +493,7 @@ void DccMarshal::snActivated(int) } //Successfully connected... delete m_pSn; - m_pSn = 0; + m_pSn = nullptr; // get the local address if(!kvi_socket_getsockname(m_fd, addr, &size)) { @@ -528,7 +528,7 @@ void DccMarshal::snActivated(int) { // Connected delete m_pSn; - m_pSn = 0; + m_pSn = nullptr; #ifdef COMPILE_IPV6_SUPPORT if(m_bIPv6) { @@ -591,7 +591,7 @@ void DccMarshal::doSSLHandshake(int) if(m_pSn) { delete m_pSn; - m_pSn = 0; + m_pSn = nullptr; } if(!m_pSSL) diff --git a/src/modules/dcc/DccThread.cpp b/src/modules/dcc/DccThread.cpp index d3ec9af52..45e393b44 100644 --- a/src/modules/dcc/DccThread.cpp +++ b/src/modules/dcc/DccThread.cpp @@ -44,7 +44,7 @@ DccThread::DccThread(QObject * par, kvi_socket_t fd) m_pMutex = new KviMutex(); #ifdef COMPILE_SSL_SUPPORT // qDebug("CLEARING SSL IN DccThread constructor"); - m_pSSL = 0; + m_pSSL = nullptr; #endif } @@ -53,7 +53,7 @@ DccThread::~DccThread() #ifdef COMPILE_SSL_SUPPORT if(m_pSSL) KviSSLMaster::freeSSL(m_pSSL); - m_pSSL = 0; + m_pSSL = nullptr; #endif if(m_fd != KVI_INVALID_SOCKET) kvi_socket_close(m_fd); diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp index 0a353bfaf..6b5e524af 100644 --- a/src/modules/dcc/DccVoiceWindow.cpp +++ b/src/modules/dcc/DccVoiceWindow.cpp @@ -446,7 +446,7 @@ bool DccVoiceThread::soundStep() // have stuff to play, but it's not enough to fill the pre-buffer // struct timeval tv; - gettimeofday(&tv, 0); + gettimeofday(&tv, nullptr); long int sigBufferTime = (tv.tv_sec * 1000) + (tv.tv_usec / 1000); @@ -487,7 +487,7 @@ bool DccVoiceThread::soundStep() struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 10; - int ret = select(m_soundFd + 1, &rs, 0, 0, &tv); + int ret = select(m_soundFd + 1, &rs, nullptr, nullptr, &tv); if(ret > 0) { // This is rather easy... @@ -693,7 +693,7 @@ DccVoiceWindow::DccVoiceWindow(DccDescriptor * dcc, const char * name) : DccWindow(KviWindow::DccVoice, name, dcc) { m_pDescriptor = dcc; - m_pSlaveThread = 0; + m_pSlaveThread = nullptr; m_pSplitter = new KviTalSplitter(Qt::Horizontal, this); m_pSplitter->setObjectName("dcc_window_splitter"); @@ -772,7 +772,7 @@ DccVoiceWindow::~DccVoiceWindow() { m_pSlaveThread->terminate(); delete m_pSlaveThread; - m_pSlaveThread = 0; + m_pSlaveThread = nullptr; } KviThreadManager::killPendingEvents(this); diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp index e9eb2c597..1e07848a1 100644 --- a/src/modules/dcc/DccWindow.cpp +++ b/src/modules/dcc/DccWindow.cpp @@ -31,7 +31,7 @@ DccWindow::DccWindow(KviWindow::Type eType, const char * name, DccDescriptor * d { m_pDescriptor = d; m_pDescriptor->setWindow(this); - m_pMarshal = 0; + m_pMarshal = nullptr; m_pButtonBox = new KviTalHBox(this); createTextEncodingButton(m_pButtonBox); } diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index aa8bc979d..40bd0d98c 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -61,7 +61,7 @@ //extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; -DccBroker * g_pDccBroker = 0; +DccBroker * g_pDccBroker = nullptr; static void dcc_module_set_dcc_type(DccDescriptor * d, const char * szBaseType) { @@ -80,7 +80,7 @@ static bool dcc_kvs_parse_default_parameters(DccDescriptor * d, KviKvsModuleComm KviKvsVariant * pSw = c->switches()->find('m', "minimize"); - if(pSw != 0) + if(pSw != nullptr) d->bOverrideMinimize = pSw->asBoolean(); else d->bOverrideMinimize = false; @@ -455,7 +455,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c) //c->window()->output(0,"%Q %Q %Q",&(d->szIp),&(d->szPort),&(d->szListenIp)); d->triggerCreationEvent(); - g_pDccBroker->executeChat(0, d); + g_pDccBroker->executeChat(nullptr, d); return true; } @@ -608,7 +608,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c) d->szNick = szTarget; // we always specify the nickname QString szTmp; - KviKvsVariant * pSw = 0; + KviKvsVariant * pSw = nullptr; if((pSw = c->switches()->find('g', "get"))) { @@ -637,10 +637,10 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c) d->szUser = __tr2qs_ctx("unknown", "dcc"); // username is always unknown d->szHost = d->szUser; // host is always unknown - d->bRecvFile = pSw != 0; + d->bRecvFile = pSw != nullptr; d->bNoAcks = c->switches()->find('b', "blind") || c->switches()->find('t', "tdcc"); d->bResume = false; - d->bAutoAccept = pSw != 0; + d->bAutoAccept = pSw != nullptr; d->bIsIncomingAvatar = false; if(!dcc_kvs_parse_default_parameters(d, c)) @@ -680,7 +680,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c) d->triggerCreationEvent(); if(!d->szLocalFileName.isEmpty()) { - g_pDccBroker->sendFileExecute(0, d); + g_pDccBroker->sendFileExecute(nullptr, d); } else { @@ -1155,7 +1155,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c) d->bActive = true; d->triggerCreationEvent(); - g_pDccBroker->activeVoiceExecute(0, d); + g_pDccBroker->activeVoiceExecute(nullptr, d); } else { @@ -1621,7 +1621,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c) static DccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t & uId, KviKvsModuleRunTimeCall * c, bool bWarn = true) { - DccDescriptor * dcc = 0; + DccDescriptor * dcc = nullptr; if(uId == 0) { if(c->window()->inherits("DccWindow")) @@ -2646,7 +2646,7 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("window_id", KVS_PT_STRING, KVS_PF_OPTIONAL, szWinId) KVSM_PARAMETERS_END(c) - DccDescriptor * dcc = 0; + DccDescriptor * dcc = nullptr; if(szWinId.isEmpty()) { if(c->window()->inherits("DccWindow")) @@ -2853,7 +2853,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c) return true; } - DccThread * pSlaveThread = 0; + DccThread * pSlaveThread = nullptr; if(dcc->window()) pSlaveThread = dcc->window()->getSlaveThread(); else if(dcc->transfer()) @@ -3002,7 +3002,7 @@ static bool dcc_module_init(KviModule * m) static bool dcc_module_cleanup(KviModule *) { delete g_pDccBroker; - g_pDccBroker = 0; + g_pDccBroker = nullptr; #ifdef COMPILE_USE_GSM kvi_gsm_codec_done(); #endif diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index d27ea9b65..b48f14ce2 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -307,7 +307,7 @@ static void dccModuleParseDccChat(KviDccRequest * dcc) } d->setZeroPortRequestTag(dcc->szParam4.ptr()); QString tmp; - if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp)) + if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp)) d->szListenIp = "0.0.0.0"; else d->szListenIp = tmp; @@ -521,7 +521,7 @@ static void dccModuleParseDccSend(KviDccRequest * dcc) } d->setZeroPortRequestTag(dcc->szParam5.ptr()); QString tmp; - if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp)) + if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp)) d->szListenIp = "0.0.0.0"; else d->szListenIp = QString(tmp); @@ -706,7 +706,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc) d->bActive = true; dcc_module_set_dcc_type(d, "SEND"); d->triggerCreationEvent(); - g_pDccBroker->sendFileExecute(0, d); + g_pDccBroker->sendFileExecute(nullptr, d); return; } @@ -801,7 +801,7 @@ static void dccModuleParseDccRSend(KviDccRequest * dcc) d->szIp = __tr2qs_ctx("(unknown)", "dcc"); d->szPort = d->szIp; QString tmp; - if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp)) + if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp)) { d->console()->output(KVI_OUT_DCCMSG, __tr2qs_ctx("No suitable interface to listen on, trying to continue anyway...", "dcc")); @@ -949,7 +949,7 @@ static void dccModuleParseDccGet(KviDccRequest * dcc) dcc_fill_local_nick_user_host(d, dcc); QString tmp; - if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp)) + if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp)) { d->console()->output(KVI_OUT_DCCMSG, __tr2qs_ctx("No suitable interface to listen on, trying to continue anyway...", "dcc")); @@ -992,7 +992,7 @@ static void dccModuleParseDccGet(KviDccRequest * dcc) &(o->absFilePath()), &(d->szType)); } d->triggerCreationEvent(); - g_pDccBroker->sendFileExecute(0, d); + g_pDccBroker->sendFileExecute(nullptr, d); } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 6b636528e..0e813837f 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -59,7 +59,7 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox( const QString & szCode, KviKvsVariantList * pMagicParams, KviWindow * pWindow, bool modal) - : QMessageBox(0), + : QMessageBox(nullptr), KviKvsCallbackObject("dialog.message", pWindow, szCode, pMagicParams, 0) { setObjectName("dialog_message"); @@ -561,8 +561,8 @@ KviKvsCallbackFileDialog::KviKvsCallbackFileDialog( : KviFileDialog( szInitialSelection, szFilter, - NULL, // parent - 0, + nullptr, // parent + nullptr, modal), KviKvsCallbackObject("dialog.file", pWindow, szCode, pMagicParams, 0) { @@ -704,7 +704,7 @@ KviKvsCallbackImageDialog::KviKvsCallbackImageDialog( const QString & szCode, KviKvsVariantList * pMagicParams, KviWindow * pWindow, bool modal) - : KviImageDialog(0, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0) + : KviImageDialog(nullptr, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0) { g_pDialogModuleDialogList->append(this); setObjectName("dialog_image"); @@ -956,7 +956,7 @@ static bool dialog_module_cleanup(KviModule *) while(g_pDialogModuleDialogList->first()) delete g_pDialogModuleDialogList->first(); delete g_pDialogModuleDialogList; - g_pDialogModuleDialogList = 0; + g_pDialogModuleDialogList = nullptr; return true; } diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index afc49e8d9..27ea922b1 100644 --- a/src/modules/editor/ScriptEditorImplementation.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -95,7 +95,7 @@ static bool bCompleterReady = false; ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent) : QTextEdit(pParent) { - m_pSyntaxHighlighter = 0; + m_pSyntaxHighlighter = nullptr; setTabStopWidth(48); setAcceptRichText(false); setWordWrapMode(QTextOption::NoWrap); @@ -103,7 +103,7 @@ ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent) m_szHelp = "Nothing"; updateOptions(); m_szFind = ""; - m_pCompleter = 0; + m_pCompleter = nullptr; QStringList szListFunctionsCommands; QString tmp("kvscompleter.idx"); iModulesCount = 0; @@ -146,7 +146,7 @@ void ScriptEditorWidget::checkReadyCompleter() { m_pStartTimer->stop(); delete m_pStartTimer; - m_pStartTimer = 0; + m_pStartTimer = nullptr; loadCompleterFromFile(); } } @@ -198,7 +198,7 @@ void ScriptEditorWidget::asyncCompleterCreation() { m_pStartTimer->stop(); m_pStartTimer->deleteLater(); - m_pStartTimer = 0; + m_pStartTimer = nullptr; QString szTmp("kvscompleter.idx"); QString szPath; g_pApp->getLocalKvircDirectory(szPath, KviApplication::ConfigPlugins, szTmp); @@ -304,7 +304,7 @@ void ScriptEditorWidget::disableSyntaxHighlighter() { if(m_pSyntaxHighlighter) delete m_pSyntaxHighlighter; - m_pSyntaxHighlighter = 0; + m_pSyntaxHighlighter = nullptr; } void ScriptEditorWidget::updateOptions() @@ -801,7 +801,7 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par) : KviScriptEditor(par) { - m_pOptionsDialog = 0; + m_pOptionsDialog = nullptr; if(g_pScriptEditorWindowList->isEmpty()) loadOptions(); g_pScriptEditorWindowList->append(this); @@ -863,7 +863,7 @@ ScriptEditorImplementation::~ScriptEditorImplementation() if(m_pOptionsDialog) { m_pOptionsDialog->deleteLater(); - m_pOptionsDialog = 0; + m_pOptionsDialog = nullptr; } g_pScriptEditorWindowList->removeRef(this); if(g_pScriptEditorWindowList->isEmpty()) diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index 1a71de977..72fbf9403 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -27,9 +27,9 @@ #include "KviModule.h" #include "KviWindow.h" -KviModule * g_pEditorModulePointer = 0; +KviModule * g_pEditorModulePointer = nullptr; -KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = 0; +KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = nullptr; static bool editor_module_init(KviModule * m) { @@ -69,14 +69,14 @@ static bool editor_module_cleanup(KviModule *) } delete g_pScriptEditorWindowList; - g_pScriptEditorWindowList = 0; + g_pScriptEditorWindowList = nullptr; return true; } static bool editor_module_can_unload(KviModule *) { - return ((g_pScriptEditorWindowList == 0) || (g_pScriptEditorWindowList->count() == 0)); + return ((g_pScriptEditorWindowList == nullptr) || (g_pScriptEditorWindowList->count() == 0)); } KVIRC_MODULE( diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index 8136f69d9..1012de596 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -116,7 +116,7 @@ EventEditor::EventEditor(QWidget * par) m_pEditor = KviScriptEditor::createInstance(box); m_pEditor->setFocus(); m_bOneTimeSetupDone = false; - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; } EventEditor::~EventEditor() @@ -280,7 +280,7 @@ void EventEditor::addHandlerForCurrentEvent() { QTreeWidgetItem * it = m_pTreeWidget->selectedItems().first(); - if(it->parent() == 0) + if(it->parent() == nullptr) { if(it->childCount() == 0) it->setIcon(0, QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Event)))); @@ -301,7 +301,7 @@ void EventEditor::removeCurrentHandler() { QTreeWidgetItem * it = m_pLastEditedItem; QTreeWidgetItem * parent = m_pLastEditedItem->parent(); - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; delete it; if(parent) @@ -322,7 +322,7 @@ void EventEditor::toggleCurrentHandlerEnabled() { m_pLastEditedItem->setEnabled(!(m_pLastEditedItem->m_bEnabled)); m_pTreeWidget->repaint(m_pTreeWidget->visualItemRect(m_pLastEditedItem)); - currentItemChanged(m_pLastEditedItem, 0); + currentItemChanged(m_pLastEditedItem, nullptr); } } @@ -407,7 +407,7 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) } else { - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; m_pNameEditor->setEnabled(false); m_pNameEditor->setText(""); m_pEditor->setEnabled(false); @@ -525,7 +525,7 @@ void EventEditor::exportAllEvents() } EventEditorWindow::EventEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "eventeditor", 0) + : KviWindow(KviWindow::ScriptEditor, "eventeditor", nullptr) { g_pEventEditorWindow = this; @@ -555,7 +555,7 @@ EventEditorWindow::EventEditorWindow() EventEditorWindow::~EventEditorWindow() { - g_pEventEditorWindow = 0; + g_pEventEditorWindow = nullptr; } void EventEditorWindow::okClicked() diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp index a2ce4d8fa..04c4b1600 100644 --- a/src/modules/eventeditor/libkvieventeditor.cpp +++ b/src/modules/eventeditor/libkvieventeditor.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "KviMainWindow.h" -EventEditorWindow * g_pEventEditorWindow = 0; +EventEditorWindow * g_pEventEditorWindow = nullptr; /* @doc: eventeditor.open @@ -61,20 +61,20 @@ static bool eventeditor_module_init(KviModule * m) KVSM_REGISTER_SIMPLE_COMMAND(m, "open", eventeditor_kvs_cmd_open); - g_pEventEditorWindow = 0; + g_pEventEditorWindow = nullptr; return true; } static bool eventeditor_module_can_unload(KviModule *) { - return (g_pEventEditorWindow == 0); + return (g_pEventEditorWindow == nullptr); } static bool eventeditor_module_cleanup(KviModule *) { if(g_pEventEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pEventEditorWindow); - g_pEventEditorWindow = 0; + g_pEventEditorWindow = nullptr; return true; } diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 9e25b7740..51e566502 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -271,7 +271,7 @@ static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c) static bool file_kvs_cmd_writeBytes(KviKvsModuleCommandCall * c) { QString szFileName; - KviKvsArray * pArray = NULL; + KviKvsArray * pArray = nullptr; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("filename", KVS_PT_NONEMPTYSTRING, 0, szFileName) @@ -759,7 +759,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c) return true; } - QFlags<QDir::Filter> iFlags = 0; + QFlags<QDir::Filter> iFlags = nullptr; if(szFlags.isEmpty()) iFlags = QDir::Dirs | QDir::Files | QDir::NoSymLinks | QDir::Readable | QDir::Writable | QDir::Executable | QDir::Hidden | QDir::System; else @@ -782,7 +782,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c) iFlags |= QDir::System; } - QFlags<QDir::SortFlag> iSort = 0; + QFlags<QDir::SortFlag> iSort = nullptr; if(szFlags.isEmpty()) iSort = QDir::Unsorted; else @@ -1573,7 +1573,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) } EVP_MD_CTX_init(&mdctx); - EVP_DigestInit_ex(&mdctx, pMD, NULL); + EVP_DigestInit_ex(&mdctx, pMD, nullptr); EVP_DigestUpdate(&mdctx, content.constData(), content.size()); EVP_DigestFinal_ex(&mdctx, ucMDValue, &uMDLen); EVP_MD_CTX_cleanup(&mdctx); diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 5eb2ba172..9d3a7adab 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -86,7 +86,7 @@ FileTransferItem::FileTransferItem(FileTransferWidget * v, KviFileTransfer * t) FileTransferItem::~FileTransferItem() { - m_pTransfer->setDisplayItem(0); + m_pTransfer->setDisplayItem(nullptr); delete col1Item; delete col2Item; } @@ -94,7 +94,7 @@ FileTransferItem::~FileTransferItem() void FileTransferItem::displayUpdate() { //FIXME this hurts - int dummy = (int)time(NULL); + int dummy = (int)time(nullptr); tableWidget()->model()->setData(tableWidget()->model()->index(row(), 0), dummy, Qt::DisplayRole); tableWidget()->model()->setData(tableWidget()->model()->index(row(), 1), dummy, Qt::DisplayRole); tableWidget()->model()->setData(tableWidget()->model()->index(row(), 2), dummy, Qt::DisplayRole); @@ -254,7 +254,7 @@ FileTransferWindow::FileTransferWindow( KviModuleExtensionDescriptor * d #endif ) - : KviWindow(KviWindow::Tool, "file transfer window", 0) + : KviWindow(KviWindow::Tool, "file transfer window", nullptr) #if 0 , KviModuleExtension(d) #endif @@ -262,9 +262,9 @@ FileTransferWindow::FileTransferWindow( g_pFileTransferWindow = this; setAutoFillBackground(false); - m_pContextPopup = 0; - m_pLocalFilePopup = 0; - m_pOpenFilePopup = 0; + m_pContextPopup = nullptr; + m_pLocalFilePopup = nullptr; + m_pOpenFilePopup = nullptr; m_pTimer = new QTimer(this); connect(m_pTimer, SIGNAL(timeout()), this, SLOT(heartbeat())); @@ -311,8 +311,8 @@ FileTransferWindow::FileTransferWindow( FileTransferWindow::~FileTransferWindow() { - KviFileTransferManager::instance()->setTransferWindow(0); - g_pFileTransferWindow = 0; + KviFileTransferManager::instance()->setTransferWindow(nullptr); + g_pFileTransferWindow = nullptr; } bool FileTransferWindow::eventFilter(QObject * obj, QEvent * ev) @@ -375,7 +375,7 @@ FileTransferItem * FileTransferWindow::findItem(KviFileTransfer * t) if(it->transfer() == t) return it; } - return 0; + return nullptr; } void FileTransferWindow::transferRegistered(KviFileTransfer * t) @@ -391,7 +391,7 @@ void FileTransferWindow::transferUnregistering(KviFileTransfer * t) if(it) { delete it; - it = 0; + it = nullptr; } } @@ -545,10 +545,10 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem * it, const QPoint KviFileTransfer * FileTransferWindow::selectedTransfer() { if(m_pTableWidget->selectedItems().count() == 0) - return 0; + return nullptr; FileTransferItem * it = (FileTransferItem *)m_pTableWidget->selectedItems().first(); if(!it) - return 0; + return nullptr; FileTransferItem * i = (FileTransferItem *)it; return i->transfer(); } @@ -781,7 +781,7 @@ void FileTransferWindow::heartbeat() int i; QModelIndex index; FileTransferItem * it; - int dummy = (int)time(NULL); + int dummy = (int)time(nullptr); for(i = 0; i <= m_pTableWidget->rowCount(); i++) { diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index c7b332d1c..0c1a2db3a 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -32,7 +32,7 @@ #include <QSplitter> -FileTransferWindow * g_pFileTransferWindow = NULL; +FileTransferWindow * g_pFileTransferWindow = nullptr; static FileTransferWindow * filetransferwindow_alloc(bool bCreateMinimized, bool bNoRaise) { @@ -115,7 +115,7 @@ static bool filetransferwindow_module_cleanup(KviModule *) { if(g_pFileTransferWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pFileTransferWindow); - g_pFileTransferWindow = 0; + g_pFileTransferWindow = nullptr; return true; } diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index 9abcd9597..113d7fff9 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -63,7 +63,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; #include <openssl/ssl.h> #include <openssl/sha.h> -DH * g_fish_dh = 0; +DH * g_fish_dh = nullptr; // ### new sophie-germain 1080bit prime number ### // const char *g_fish_prime1080_bin="++ECLiPSE+is+proud+to+present+latest+FiSH+release+featuring+even+more+security+for+you+++shouts+go+out+to+TMG+for+helping+to+generate+this+cool+sophie+germain+prime+number++++/C32L"; @@ -134,7 +134,7 @@ bool fish_event_onQueryNotice(KviKvsModuleEventCall * c) if(!szMessage.startsWith("DH1080_", Qt::CaseSensitive)) return true; - unsigned char * szMyPubKey = 0; + unsigned char * szMyPubKey = nullptr; QByteArray szHisPubKey, szTmp; int iMyPubKeyLen, *pMyPubKeyLen = &iMyPubKeyLen; if(!fish_DH1080_gen(&szMyPubKey, pMyPubKeyLen)) @@ -212,7 +212,7 @@ bool fish_event_onQueryNotice(KviKvsModuleEventCall * c) #if defined(COMPILE_SSL_SUPPORT) unsigned char * secret = (unsigned char *)KviMemory::allocate(DH_size(g_fish_dh)); int secretLen; - BIGNUM * bn = BN_bin2bn((unsigned char *)szHisPubKey.data(), szHisPubKey.size(), NULL); + BIGNUM * bn = BN_bin2bn((unsigned char *)szHisPubKey.data(), szHisPubKey.size(), nullptr); if(-1 == (secretLen = DH_compute_key(secret, bn, g_fish_dh))) { c->warning(__tr2qs("FiSH: error verifying peer public key (size=%1)").arg(szHisPubKey.size())); @@ -274,7 +274,7 @@ static bool fish_cmd_keyx(KviKvsModuleCommandCall * c) KVSM_PARAMETER("target", KVS_PT_NONEMPTYSTRING, 0, szTarget) KVSM_PARAMETERS_END(c) - unsigned char * szMyPubKey = 0; + unsigned char * szMyPubKey = nullptr; KviCString szHisPubKey, szTmp; int iMyPubKeyLen, *pMyPubKeyLen = &iMyPubKeyLen; if(!fish_DH1080_gen(&szMyPubKey, pMyPubKeyLen)) diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index 3fba3c74d..bd5d772be 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -77,7 +77,7 @@ QDataStream & operator<<(QDataStream & s, const Document & l) } HelpIndex::HelpIndex(const QString & dp, const QString & hp) - : QObject(0), docPath(dp) + : QObject(nullptr), docPath(dp) { Q_UNUSED(hp); @@ -93,7 +93,7 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp) } HelpIndex::HelpIndex(const QStringList & dl, const QString & hp) - : QObject(0) + : QObject(nullptr) { Q_UNUSED(hp); docList = dl; @@ -172,7 +172,7 @@ void HelpIndex::insertInDict(const QString & str, int docNum) { if(str == QLatin1String("amp") || str == QLatin1String("nbsp")) return; - Entry * e = 0; + Entry * e = nullptr; if(dict.count()) e = dict[str]; @@ -351,7 +351,7 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term QList<Term> termList; for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) { - Entry * e = 0; + Entry * e = nullptr; if((*it).contains(QLatin1Char('*'))) { QVector<Document> wcts = setupDummyTerm(getWildcardTerms(*it)); @@ -533,7 +533,7 @@ QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms) QList<Term> termList; for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) { - Entry * e = 0; + Entry * e = nullptr; if(dict[*it]) { e = dict[*it]; diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index bdf6ec329..d8e3dbd33 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -59,8 +59,8 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone) g_pHelpWidgetList->append(this); m_bIsStandalone = bIsStandalone; - new QShortcut(QKeySequence::Copy, this, SLOT(slotCopy()), 0, Qt::WidgetWithChildrenShortcut); - new QShortcut(QKeySequence::Find, this, SLOT(slotShowHideFind()), 0, bIsStandalone ? Qt::WidgetWithChildrenShortcut : Qt::WindowShortcut); + new QShortcut(QKeySequence::Copy, this, SLOT(slotCopy()), nullptr, Qt::WidgetWithChildrenShortcut); + new QShortcut(QKeySequence::Find, this, SLOT(slotShowHideFind()), nullptr, bIsStandalone ? Qt::WidgetWithChildrenShortcut : Qt::WindowShortcut); // layout m_pLayout = new QVBoxLayout(this); diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index c5dde5b99..d526c77a5 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -36,9 +36,9 @@ #include <QFileInfo> #include <QSplitter> -HelpIndex * g_pDocIndex = 0; -KviPointerList<HelpWidget> * g_pHelpWidgetList = 0; -KviPointerList<HelpWindow> * g_pHelpWindowList = 0; +HelpIndex * g_pDocIndex = nullptr; +KviPointerList<HelpWidget> * g_pHelpWidgetList = nullptr; +KviPointerList<HelpWindow> * g_pHelpWindowList = nullptr; /* @doc: help.open @@ -246,11 +246,11 @@ static bool help_module_cleanup(KviModule *) while(g_pHelpWidgetList->first()) delete g_pHelpWidgetList->first(); delete g_pHelpWidgetList; - g_pHelpWidgetList = 0; + g_pHelpWidgetList = nullptr; while(g_pHelpWindowList->first()) g_pHelpWindowList->first()->close(); delete g_pHelpWindowList; - g_pHelpWindowList = 0; + g_pHelpWindowList = nullptr; return true; } diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 2719bc611..09b666b97 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -37,8 +37,8 @@ #include <QPainter> #include <QMenu> -static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = 0; -static QPixmap * g_pHttpIcon = 0; +static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = nullptr; +static QPixmap * g_pHttpIcon = nullptr; HttpFileTransfer::HttpFileTransfer() : KviFileTransfer() @@ -52,7 +52,7 @@ HttpFileTransfer::HttpFileTransfer() m_bNotifyCompletion = true; m_bAutoClean = false; - m_pAutoCleanTimer = 0; + m_pAutoCleanTimer = nullptr; m_bNoOutput = false; m_pHttpRequest = new KviHttpRequest(); @@ -359,7 +359,7 @@ void HttpFileTransfer::init() if(pix) g_pHttpIcon = new QPixmap(*pix); else - g_pHttpIcon = 0; + g_pHttpIcon = nullptr; } void HttpFileTransfer::done() @@ -369,11 +369,11 @@ void HttpFileTransfer::done() while(HttpFileTransfer * t = g_pHttpFileTransfers->first()) delete t; delete g_pHttpFileTransfers; - g_pHttpFileTransfers = 0; + g_pHttpFileTransfers = nullptr; if(g_pHttpIcon) { delete g_pHttpIcon; - g_pHttpIcon = 0; + g_pHttpIcon = nullptr; } } diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 8ec10f718..dcfe35ebf 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -39,8 +39,8 @@ // FIXME: Should have a timeout on the requests!!! -static KviIdentDaemon * g_pIdentDaemon = 0; -static KviIdentSentinel * g_pIdentSentinel = 0; +static KviIdentDaemon * g_pIdentDaemon = nullptr; +static KviIdentSentinel * g_pIdentSentinel = nullptr; extern KVIRC_API int g_iIdentDaemonRunningUsers; @@ -67,12 +67,12 @@ void stopIdentService() // qDebug("Stopping"); if(g_pIdentDaemon) delete g_pIdentDaemon; - g_pIdentDaemon = 0; + g_pIdentDaemon = nullptr; // qDebug("Stopped"); } KviIdentSentinel::KviIdentSentinel() - : QObject(0) + : QObject(nullptr) { } @@ -144,7 +144,7 @@ KviIdentRequest::KviIdentRequest(kvi_socket_t sock, const char * host, kvi_u32_t m_sock = sock; m_szHost = host; m_uPort = uPort; - m_tStart = time(0); + m_tStart = time(nullptr); } KviIdentRequest::~KviIdentRequest() @@ -175,7 +175,7 @@ KviIdentDaemon::~KviIdentDaemon() terminate(); g_iIdentDaemonRunningUsers = 0; - g_pIdentDaemon = 0; + g_pIdentDaemon = nullptr; // qDebug("Destructor gone"); } @@ -230,31 +230,31 @@ void KviIdentDaemon::run() if(m_sock == KVI_INVALID_SOCKET) { - postMessage(__tr("Can't start the Ident service : socket() failed"), 0); + postMessage(__tr("Can't start the Ident service : socket() failed"), nullptr); goto exit_thread; } if(!kvi_socket_setNonBlocking(m_sock)) { - postMessage(__tr("Can't start the Ident service : async setting failed"), 0); + postMessage(__tr("Can't start the Ident service : async setting failed"), nullptr); goto exit_thread; } if(!sa.socketAddress()) { - postMessage(__tr("Can't enable the Ident service : can't setup the listen address"), 0); + postMessage(__tr("Can't enable the Ident service : can't setup the listen address"), nullptr); goto exit_thread; } if(!kvi_socket_bind(m_sock, sa.socketAddress(), ((int)(sa.addressLength())))) { - postMessage(__tr("Can't start the Ident service : bind() failed"), 0); + postMessage(__tr("Can't start the Ident service : bind() failed"), nullptr); goto exit_thread; } if(!kvi_socket_listen(m_sock, 128)) { - postMessage(__tr("Can't start the Ident service : listen() failed"), 0); + postMessage(__tr("Can't start the Ident service : listen() failed"), nullptr); goto exit_thread; } @@ -267,13 +267,13 @@ void KviIdentDaemon::run() if(m_sock6 == KVI_INVALID_SOCKET) { - postMessage(__tr("Can't start the Ident service on IPv6 : socket() failed"), 0); + postMessage(__tr("Can't start the Ident service on IPv6 : socket() failed"), nullptr); goto ipv6_failure; } if(!kvi_socket_setNonBlocking(m_sock6)) { - postMessage(__tr("Can't start the Ident service on IPv6 : async setting failed"), 0); + postMessage(__tr("Can't start the Ident service on IPv6 : async setting failed"), nullptr); kvi_socket_close(m_sock6); m_sock6 = KVI_INVALID_SOCKET; goto ipv6_failure; @@ -294,7 +294,7 @@ void KviIdentDaemon::run() #endif if(!sa6.socketAddress()) { - postMessage(__tr("Can't enable the Ident service on IPv6 : can't setup the listen address"), 0); + postMessage(__tr("Can't enable the Ident service on IPv6 : can't setup the listen address"), nullptr); kvi_socket_close(m_sock6); m_sock6 = KVI_INVALID_SOCKET; goto ipv6_failure; @@ -302,7 +302,7 @@ void KviIdentDaemon::run() if(!kvi_socket_bind(m_sock6, sa6.socketAddress(), ((int)(sa6.addressLength())))) { - postMessage(__tr("Can't start the Ident service on IPv6 : bind() failed"), 0); + postMessage(__tr("Can't start the Ident service on IPv6 : bind() failed"), nullptr); kvi_socket_close(m_sock6); m_sock6 = KVI_INVALID_SOCKET; goto ipv6_failure; @@ -310,7 +310,7 @@ void KviIdentDaemon::run() if(!kvi_socket_listen(m_sock6, 128)) { - postMessage(__tr("Can't start the Ident service on IPv6 : listen() failed"), 0); + postMessage(__tr("Can't start the Ident service on IPv6 : listen() failed"), nullptr); kvi_socket_close(m_sock6); m_sock6 = KVI_INVALID_SOCKET; goto ipv6_failure; @@ -326,18 +326,18 @@ ipv6_failure: if(m_sock6 != KVI_INVALID_SOCKET) { if(_OUTPUT_PARANOIC) - postMessage(__tr("Starting Ident service (IPv4/v6 on separate namespaces)"), 0); + postMessage(__tr("Starting Ident service (IPv4/v6 on separate namespaces)"), nullptr); } else { if(_OUTPUT_PARANOIC) - postMessage(__tr("Starting Ident service (IPv4/v6 in IPv6 namespace)"), 0); + postMessage(__tr("Starting Ident service (IPv4/v6 in IPv6 namespace)"), nullptr); } } else { if(_OUTPUT_PARANOIC) - postMessage(__tr("Starting Ident service (IPv4)"), 0); + postMessage(__tr("Starting Ident service (IPv4)"), nullptr); } #else //!COMPILE_IPV6_SUPPORT if(_OUTPUT_PARANOIC) @@ -386,7 +386,7 @@ ipv6_failure: // FIXME: SO_REUSEADDR ? - int ret = kvi_socket_select(nmax + 1, &rs, 0, 0, &t); + int ret = kvi_socket_select(nmax + 1, &rs, nullptr, nullptr, &t); if(ret == 0) msleep(100); @@ -522,7 +522,7 @@ ipv6_failure: } } - time_t curTime = time(0); + time_t curTime = time(nullptr); for(r = m_pRequestList->first(); r; r = m_pRequestList->next()) { @@ -554,7 +554,7 @@ exit_thread: if(m_sock6 != KVI_INVALID_SOCKET) kvi_socket_close(m_sock6); delete m_pRequestList; - m_pRequestList = 0; + m_pRequestList = nullptr; // qDebug("RUN EXITING"); } @@ -621,7 +621,7 @@ static bool ident_module_cleanup(KviModule *) { stopIdentService(); delete g_pIdentSentinel; - g_pIdentSentinel = 0; + g_pIdentSentinel = nullptr; return true; } diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 7589676f9..c9149a682 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -40,7 +40,7 @@ extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground; #endif -KviIOGraphWindow * g_pIOGraphWindow = 0; +KviIOGraphWindow * g_pIOGraphWindow = nullptr; KviIOGraphWindow::KviIOGraphWindow(const char * name) : KviWindow(KviWindow::IOGraph, name) @@ -53,9 +53,9 @@ KviIOGraphWindow::~KviIOGraphWindow() { if(m_pIOGraph) delete m_pIOGraph; - m_pIOGraph = 0; + m_pIOGraph = nullptr; - g_pIOGraphWindow = 0; + g_pIOGraphWindow = nullptr; } QPixmap * KviIOGraphWindow::myIconPtr() @@ -285,7 +285,7 @@ static bool iograph_module_cmd_open(KviKvsModuleCommandCall * c) static bool iograph_module_init(KviModule * m) { - g_pIOGraphWindow = 0; + g_pIOGraphWindow = nullptr; KVSM_REGISTER_SIMPLE_COMMAND(m, "open", iograph_module_cmd_open); return true; @@ -295,7 +295,7 @@ static bool iograph_module_cleanup(KviModule *) { if(g_pIOGraphWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pIOGraphWindow); - g_pIOGraphWindow = 0; + g_pIOGraphWindow = nullptr; return true; } diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index b56e7f74c..c3e5cd2f1 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -47,7 +47,7 @@ #include "KviPointerList.h" #include "KviCryptEngineDescription.h" -static KviPointerList<KviCryptEngine> * g_pEngineList = 0; +static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr; KviLamerizerEngine::KviLamerizerEngine(bool bLight) : KviCryptEngine() @@ -236,7 +236,7 @@ static bool lamerizer_module_cleanup(KviModule * m) while(g_pEngineList->first()) delete g_pEngineList->first(); delete g_pEngineList; - g_pEngineList = 0; + g_pEngineList = nullptr; m->unregisterCryptEngines(); return true; #else diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp index 2a641f0d5..99bf92d46 100644 --- a/src/modules/language/detector.cpp +++ b/src/modules/language/detector.cpp @@ -48,7 +48,7 @@ typedef struct _DetectorDescriptor DetectorNGram * ngram_hash[256]; } DetectorDescriptor; -static DetectorNGram X[] = { { 0, 0 } }; +static DetectorNGram X[] = { { nullptr, 0 } }; /////////////////////////////////////////////////////////////////////////////// // DEFINES THAT SAVE (A LOT OF) SPACE @@ -18747,10 +18747,10 @@ void detect_language_and_encoding(const char * data, LanguageAndEncodingResult * DetectorDescriptor * match[DLE_NUM_BEST_MATCHES]; for(i = 0; i < DLE_NUM_BEST_MATCHES; i++) { - retBuffer->match[i].szLanguage = 0; - retBuffer->match[i].szEncoding = 0; + retBuffer->match[i].szLanguage = nullptr; + retBuffer->match[i].szEncoding = nullptr; retBuffer->match[i].dScore = -99999999999.9; - match[i] = 0; + match[i] = nullptr; } retBuffer->dAccuracy = 0.0; diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index c29bd1ede..089ef86ef 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -101,7 +101,7 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole) LinksWindow::~LinksWindow() { g_pLinksWindowList->removeRef(this); - m_pConsole->context()->setLinksWindowPointer(0); + m_pConsole->context()->setLinksWindowPointer(nullptr); delete m_pLinkList; delete m_pHostPopup; } @@ -193,8 +193,8 @@ void LinksWindow::endOfLinks() outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Received end of links.")); outputNoFmt(KVI_OUT_SYSTEMMESSAGE, "======================"); - QTreeWidgetItem * it = 0; - QTreeWidgetItem * root = 0; + QTreeWidgetItem * it = nullptr; + QTreeWidgetItem * root = nullptr; int totalHosts = 0; int totalHops = 0; @@ -342,11 +342,11 @@ void LinksWindow::endOfLinks() QTreeWidgetItem * LinksWindow::insertLink(KviLink * l) { KVI_ASSERT(l->hops > 0); - QTreeWidgetItem * i = getItemByHost(l->parent.ptr(), 0); - QTreeWidgetItem * it = 0; + QTreeWidgetItem * i = getItemByHost(l->parent.ptr(), nullptr); + QTreeWidgetItem * it = nullptr; if(!i) { - return 0; + return nullptr; } else { @@ -387,7 +387,7 @@ QTreeWidgetItem * LinksWindow::getItemByHost(const char * host, QTreeWidgetItem return ch; } } - return 0; + return nullptr; } void LinksWindow::showHostPopup(QTreeWidgetItem * i, const QPoint & p) diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp index b35d9a846..16f5d7068 100644 --- a/src/modules/links/libkvilinks.cpp +++ b/src/modules/links/libkvilinks.cpp @@ -31,7 +31,7 @@ #include <QSplitter> -KviPointerList<LinksWindow> * g_pLinksWindowList = 0; +KviPointerList<LinksWindow> * g_pLinksWindowList = nullptr; /* @doc: links.open @@ -93,7 +93,7 @@ static bool links_module_cleanup(KviModule *) while(g_pLinksWindowList->first()) g_pLinksWindowList->first()->die(); delete g_pLinksWindowList; - g_pLinksWindowList = 0; + g_pLinksWindowList = nullptr; return true; } diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index c323d12cd..c476cd0db 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -176,7 +176,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole) { g_pListWindowList->append(this); - m_pFlushTimer = 0; + m_pFlushTimer = nullptr; m_pItemList = new KviPointerList<ChannelTreeWidgetItemData>; m_pItemList->setAutoDelete(false); @@ -270,7 +270,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole) ListWindow::~ListWindow() { g_pListWindowList->removeRef(this); - m_pConsole->context()->setListWindowPointer(0); + m_pConsole->context()->setListWindowPointer(nullptr); if(m_pFlushTimer) delete m_pFlushTimer; @@ -366,7 +366,7 @@ void ListWindow::exportList() { if(!m_pTreeWidget->topLevelItemCount()) { - QMessageBox::warning(0, __tr2qs("Warning While Exporting - KVIrc"), __tr2qs("You can't export an empty list!")); + QMessageBox::warning(nullptr, __tr2qs("Warning While Exporting - KVIrc"), __tr2qs("You can't export an empty list!")); return; } @@ -472,7 +472,7 @@ void ListWindow::endOfList() if(m_pFlushTimer) { delete m_pFlushTimer; - m_pFlushTimer = 0; + m_pFlushTimer = nullptr; } m_pRequestButton->setEnabled(true); outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Channels list download finished")); @@ -494,7 +494,7 @@ void ListWindow::liveSearch(const QString & szText) { QRegExp res(szText, Qt::CaseInsensitive, QRegExp::Wildcard); - ChannelTreeWidgetItem * pItem = 0; + ChannelTreeWidgetItem * pItem = nullptr; for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { pItem = (ChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp index a20948673..63dd0a923 100644 --- a/src/modules/list/libkvilist.cpp +++ b/src/modules/list/libkvilist.cpp @@ -31,7 +31,7 @@ #include <QSplitter> -KviPointerList<ListWindow> * g_pListWindowList = 0; +KviPointerList<ListWindow> * g_pListWindowList = nullptr; /* @doc: list.open @@ -82,7 +82,7 @@ static bool list_module_cleanup(KviModule *) while(g_pListWindowList->first()) g_pListWindowList->first()->die(); delete g_pListWindowList; - g_pListWindowList = 0; + g_pListWindowList = nullptr; return true; } diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp index 5de6f3078..cf90ffa74 100644 --- a/src/modules/logview/LogViewWidget.cpp +++ b/src/modules/logview/LogViewWidget.cpp @@ -51,13 +51,13 @@ LogListViewItem::LogListViewItem(QTreeWidget * pPar, LogFile::Type eType, LogFil } LogListViewItemFolder::LogListViewItemFolder(QTreeWidgetItem * pPar, const QString & szLabel) - : LogListViewItem(pPar, LogFile::Other, 0) + : LogListViewItem(pPar, LogFile::Other, nullptr) { setText(0, szLabel); } LogListViewItemType::LogListViewItemType(QTreeWidget * pPar, LogFile::Type eType) - : LogListViewItem(pPar, eType, 0) + : LogListViewItem(pPar, eType, nullptr) { QIcon icon; QString szText; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 0c5f0b9d6..287c2c513 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -211,7 +211,7 @@ LogViewWindow::LogViewWindow() LogViewWindow::~LogViewWindow() { - g_pLogViewWindow = 0; + g_pLogViewWindow = nullptr; } void LogViewWindow::keyPressEvent(QKeyEvent * pEvent) @@ -286,8 +286,8 @@ void LogViewWindow::setupItemList() m_pProgressBar->setRange(0, m_logList.count()); m_pProgressBar->setValue(0); - m_pLastCategory = 0; - m_pLastGroupItem = 0; + m_pLastCategory = nullptr; + m_pLastGroupItem = nullptr; m_logList.first(); m_pTimer->start(); //singleshot } @@ -344,7 +344,7 @@ void LogViewWindow::filterNext() { if(m_pLastCategory->m_eType != pFile->type()) { - m_pLastCategory = 0; + m_pLastCategory = nullptr; for(int i = 0; i < m_pListView->topLevelItemCount(); ++i) { LogListViewItemType * pTmp = (LogListViewItemType *)m_pListView->topLevelItem(i); @@ -368,7 +368,7 @@ void LogViewWindow::filterNext() if(m_szLastGroup != szCurGroup) { m_szLastGroup = szCurGroup; - m_pLastGroupItem = 0; + m_pLastGroupItem = nullptr; for(int i = 0; i < m_pLastCategory->childCount(); ++i) { LogListViewItemFolder * pTmp = (LogListViewItemFolder *)m_pLastCategory->child(i); @@ -474,7 +474,7 @@ void LogViewWindow::deleteCurrent() this, __tr2qs_ctx("Confirm Current User Log Deletion", "log"), __tr2qs_ctx("Do you really wish to delete this log?", "log"), - __tr2qs("Yes"), __tr2qs("No"), 0, 1) + __tr2qs("Yes"), __tr2qs("No"), nullptr, 1) != 0) return; @@ -492,7 +492,7 @@ void LogViewWindow::deleteCurrent() this, __tr2qs_ctx("Confirm Current User Logs Deletion", "log"), __tr2qs_ctx("Do you really wish to delete all these logs?", "log"), - __tr2qs("Yes"), __tr2qs("No"), 0, 1) + __tr2qs("Yes"), __tr2qs("No"), nullptr, 1) != 0) return; KviPointerList<LogListViewItem> itemsList; diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp index 165973955..3304ddc8b 100644 --- a/src/modules/logview/libkvilogview.cpp +++ b/src/modules/logview/libkvilogview.cpp @@ -34,7 +34,7 @@ #include "KviApplication.h" static QRect g_rectLogViewGeometry; -LogViewWindow * g_pLogViewWindow = 0; +LogViewWindow * g_pLogViewWindow = nullptr; #define LOGVIEW_MODULE_EXTENSION_NAME "Log viewer extension" @@ -78,7 +78,7 @@ static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c) static bool logview_module_init(KviModule * m) { - g_pLogViewWindow = 0; + g_pLogViewWindow = nullptr; KVSM_REGISTER_SIMPLE_COMMAND(m, "open", logview_kvs_cmd_open); @@ -89,7 +89,7 @@ static bool logview_module_cleanup(KviModule *) { if(g_pLogViewWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pLogViewWindow); - g_pLogViewWindow = 0; + g_pLogViewWindow = nullptr; return true; } diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp index caf35b8e7..98366a9c7 100644 --- a/src/modules/mediaplayer/MpMp3.cpp +++ b/src/modules/mediaplayer/MpMp3.cpp @@ -178,7 +178,7 @@ const char * emphasis_text[] = { void resetmp3infoStruct(mp3info * i) { - i->file = 0; + i->file = nullptr; i->datasize = 0; i->header_isvalid = 0; memset(&i->header, 0, sizeof(i->header)); diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp index ef7c119c2..dc9a8c620 100644 --- a/src/modules/mediaplayer/MpXmmsInterface.cpp +++ b/src/modules/mediaplayer/MpXmmsInterface.cpp @@ -54,7 +54,7 @@ static const char * xmms_lib_names[] = { "/usr/lib/libxmms.so.1", "/usr/local/lib/libxmms.so", "/usr/local/lib/libxmms.so.1", - 0 + nullptr }; static const char * audacious_lib_names[] = { @@ -64,13 +64,13 @@ static const char * audacious_lib_names[] = { "/usr/lib/libaudacious.so.4", "/usr/local/lib/libaudacious.so", "/usr/local/lib/libaudacious.so.4", - 0 + nullptr }; KviXmmsInterface::KviXmmsInterface() : MpInterface() { - m_pPlayerLibrary = 0; + m_pPlayerLibrary = nullptr; m_szPlayerLibraryName = "libxmms.so"; m_pLibraryPaths = xmms_lib_names; } @@ -81,7 +81,7 @@ KviXmmsInterface::~KviXmmsInterface() { m_pPlayerLibrary->unload(); delete m_pPlayerLibrary; - m_pPlayerLibrary = 0; + m_pPlayerLibrary = nullptr; } } @@ -111,7 +111,7 @@ bool KviXmmsInterface::loadPlayerLibrary() return true; } delete m_pPlayerLibrary; - m_pPlayerLibrary = 0; + m_pPlayerLibrary = nullptr; lib_name++; } return false; @@ -125,7 +125,7 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName) { QString szTmp = QString(__tr2qs_ctx("Can't load the player library (%1)", "mediaplayer")).arg(m_szPlayerLibraryName); setLastError(szTmp); - return 0; + return nullptr; } } void * symptr = (void *)m_pPlayerLibrary->resolve(szSymbolName); diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index a1a15acea..cc39006c0 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -36,16 +36,16 @@ #include "kvi_out.h" #include <QUrl> -static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = 0; +static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = nullptr; -static MpInterface * g_pMPInterface = 0; +static MpInterface * g_pMPInterface = nullptr; -static MpInterface * auto_detect_player(KviWindow * pOut = 0) +static MpInterface * auto_detect_player(KviWindow * pOut = nullptr) { int iBest = 0; - MpInterface * pBest = 0; + MpInterface * pBest = nullptr; MpInterfaceDescriptor * d; - MpInterfaceDescriptor * pDBest = 0; + MpInterfaceDescriptor * pDBest = nullptr; for(d = g_pDescriptorList->first(); d; d = g_pDescriptorList->next()) { MpInterface * i = d->instance(); @@ -426,7 +426,7 @@ MP_KVS_SIMPLE_COMMAND(pause, pause) MP_KVS_COMMAND(detect) { - g_pMPInterface = auto_detect_player(c->hasSwitch('q', "quiet") ? 0 : c->window()); + g_pMPInterface = auto_detect_player(c->hasSwitch('q', "quiet") ? nullptr : c->window()); return true; } @@ -1629,7 +1629,7 @@ static bool mediaplayer_module_init(KviModule * m) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmipInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface)); #endif - g_pMPInterface = 0; + g_pMPInterface = nullptr; if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto") { @@ -1736,7 +1736,7 @@ static bool mediaplayer_module_ctrl(KviModule *, const char * operation, void * } if(kvi_strEqualCI(operation, "detectMediaPlayer")) { - auto_detect_player(0); + auto_detect_player(nullptr); return true; } return false; diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index b9ffc8862..037177609 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -38,8 +38,8 @@ #include <QDir> #include <QPushButton> -KviMircServersIniImport * g_pMircServersIniImport = 0; -KviRemoteMircServersIniImport * g_pRemoteMircServersIniImport = 0; +KviMircServersIniImport * g_pMircServersIniImport = nullptr; +KviRemoteMircServersIniImport * g_pRemoteMircServersIniImport = nullptr; KviMircServersIniImport::KviMircServersIniImport(KviModuleExtensionDescriptor * d) : KviMexServerImport(d) @@ -48,7 +48,7 @@ KviMircServersIniImport::KviMircServersIniImport(KviModuleExtensionDescriptor * KviMircServersIniImport::~KviMircServersIniImport() { - g_pMircServersIniImport = 0; + g_pMircServersIniImport = nullptr; } int KviMircServersIniImport::doImport(const QString & filename) @@ -117,7 +117,7 @@ int KviMircServersIniImport::doImport(const QString & filename) else { QString szTmp = QString(__tr2qs("%1 doesn't look like a servers.ini file.\nImport failed.")).arg(filename); - QMessageBox::warning(0, __tr2qs("File Import - KVIrc"), szTmp); + QMessageBox::warning(nullptr, __tr2qs("File Import - KVIrc"), szTmp); } return iCount; } @@ -126,7 +126,7 @@ void KviMircServersIniImport::start() { //KviCString buffer; QString buffer; - if(!KviFileDialog::askForOpenFileName(buffer, __tr("Select a File - KVIrc"), 0, KVI_FILTER_INI, false, true, g_pMainWindow)) + if(!KviFileDialog::askForOpenFileName(buffer, __tr("Select a File - KVIrc"), nullptr, KVI_FILTER_INI, false, true, g_pMainWindow)) return; doImport(buffer); @@ -141,14 +141,14 @@ void KviMircServersIniImport::die() #define KVI_WWWMIRCCOUK_SERVERSINI "http://www.mirc.co.uk/servers.ini" KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircServersIniImport * f) - : KviTalWizard(0) + : KviTalWizard(nullptr) { QString capt = __tr2qs("Remote mIRC servers.ini - Import Wizard"); setWindowTitle(capt); setModal(true); - m_pRequest = 0; + m_pRequest = nullptr; m_pFilter = f; QLabel * l = new QLabel(this); @@ -228,7 +228,7 @@ void KviRemoteMircServerImportWizard::start() if(!m_pRequest->get(KviUrl(url), KviHttpRequest::StoreToFile, m_szTmpFileName)) { delete m_pRequest; - m_pRequest = 0; + m_pRequest = nullptr; m_pOutput->setText(__tr2qs("Failed to start the server list transfer :(")); finishButton()->setEnabled(true); } @@ -265,7 +265,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess) m_pOutput->setText(m_pRequest->lastError()); delete m_pRequest; - m_pRequest = 0; + m_pRequest = nullptr; cancelButton()->setEnabled(false); finishButton()->setEnabled(true); } @@ -273,14 +273,14 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess) KviRemoteMircServersIniImport::KviRemoteMircServersIniImport(KviModuleExtensionDescriptor * d) : KviMircServersIniImport(d) { - m_pWizard = 0; + m_pWizard = nullptr; } KviRemoteMircServersIniImport::~KviRemoteMircServersIniImport() { if(m_pWizard) delete m_pWizard; - g_pRemoteMircServersIniImport = 0; + g_pRemoteMircServersIniImport = nullptr; } void KviRemoteMircServersIniImport::start() @@ -315,14 +315,14 @@ static KviModuleExtension * mircimport_remote_filter_alloc(KviModuleExtensionAll static bool mircimport_module_init(KviModule * m) { QString szPath; - QPixmap * pix = 0; + QPixmap * pix = nullptr; if(g_pApp->findImage(szPath, "kvi_mircimport.png")) { pix = new QPixmap(szPath); if(pix->isNull()) { delete pix; - pix = 0; + pix = nullptr; } } @@ -353,8 +353,8 @@ static bool mircimport_module_cleanup(KviModule *) delete g_pMircServersIniImport; if(g_pRemoteMircServersIniImport) delete g_pRemoteMircServersIniImport; - g_pMircServersIniImport = 0; - g_pRemoteMircServersIniImport = 0; + g_pMircServersIniImport = nullptr; + g_pRemoteMircServersIniImport = nullptr; return true; } diff --git a/src/modules/my/Idle.cpp b/src/modules/my/Idle.cpp index bdb6f8fbb..1acd57b06 100644 --- a/src/modules/my/Idle.cpp +++ b/src/modules/my/Idle.cpp @@ -24,7 +24,7 @@ #include <QDateTime> #include <QTimer> -static IdlePlatform * platform = 0; +static IdlePlatform * platform = nullptr; static int platform_ref = 0; Idle::Idle() @@ -56,7 +56,7 @@ Idle::~Idle() if(platform_ref == 0) { delete platform; - platform = 0; + platform = nullptr; } } delete d; diff --git a/src/modules/my/Idle_x11.cpp b/src/modules/my/Idle_x11.cpp index 593843362..2913369e0 100644 --- a/src/modules/my/Idle_x11.cpp +++ b/src/modules/my/Idle_x11.cpp @@ -36,7 +36,7 @@ int IdlePlatform::secondsIdle() const { return 0; } #include <X11/Xutil.h> #include <X11/extensions/scrnsaver.h> -static XErrorHandler old_handler = 0; +static XErrorHandler old_handler = nullptr; extern "C" int xerrhandler(Display * dpy, XErrorEvent * err) { if(err->error_code == BadDrawable) @@ -53,7 +53,7 @@ public: Private() { // make coverity happy - ss_info = 0; + ss_info = nullptr; } }; @@ -69,7 +69,7 @@ IdlePlatform::~IdlePlatform() if(old_handler) { XSetErrorHandler(old_handler); - old_handler = 0; + old_handler = nullptr; } delete d; } diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp index de1aa3e78..43ea72c1c 100644 --- a/src/modules/my/libkvimy.cpp +++ b/src/modules/my/libkvimy.cpp @@ -394,7 +394,7 @@ static bool my_kvs_fnc_network(KviKvsModuleFunctionCall * c) static bool my_module_init(KviModule * m) { - g_pIdle = 0; + g_pIdle = nullptr; KVSM_REGISTER_FUNCTION(m, "nick", my_kvs_fnc_nick); KVSM_REGISTER_FUNCTION(m, "user", my_kvs_fnc_user); KVSM_REGISTER_FUNCTION(m, "host", my_kvs_fnc_host); @@ -415,7 +415,7 @@ static bool my_module_cleanup(KviModule *) { if(g_pIdle) delete g_pIdle; - g_pIdle = 0; + g_pIdle = nullptr; return true; } diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp index 8154c23ef..fed24e816 100644 --- a/src/modules/notifier/NotifierMessage.cpp +++ b/src/modules/notifier/NotifierMessage.cpp @@ -34,8 +34,8 @@ NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText) { - m_pLabel0 = 0; - m_pLabel1 = 0; + m_pLabel0 = nullptr; + m_pLabel1 = nullptr; m_szText = szText; m_pPixmap = pPixmap; @@ -80,7 +80,7 @@ void NotifierMessage::updateGui() } else { - m_pLabel0 = 0; + m_pLabel0 = nullptr; } m_pLabel1 = new QLabel(this); diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index b0f4e703d..4ce8ea027 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -52,7 +52,7 @@ extern NotifierWindow * g_pNotifierWindow; NotifierWindow::NotifierWindow() - : QWidget(0, + : QWidget(nullptr, #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint) #else @@ -69,11 +69,11 @@ NotifierWindow::NotifierWindow() m_eState = Hidden; m_dOpacity = 0.0; - m_pShowHideTimer = 0; - m_pBlinkTimer = 0; + m_pShowHideTimer = nullptr; + m_pBlinkTimer = nullptr; m_tAutoHideAt = 0; m_tStartedAt = 0; - m_pAutoHideTimer = 0; + m_pAutoHideTimer = nullptr; m_pWndBorder = new NotifierWindowBorder(); @@ -94,8 +94,8 @@ NotifierWindow::NotifierWindow() m_bDiagonalResizing = false; m_bResizing = false; - m_pContextPopup = 0; - m_pDisablePopup = 0; + m_pContextPopup = nullptr; + m_pDisablePopup = nullptr; m_bDragging = false; @@ -123,7 +123,7 @@ NotifierWindow::NotifierWindow() m_pProgressBar->setMaximumWidth(8); m_pProgressBar->installEventFilter(this); - m_pLineEdit = new KviThemedLineEdit(this, 0, "notifier_lineedit"); + m_pLineEdit = new KviThemedLineEdit(this, nullptr, "notifier_lineedit"); QPalette palette = m_pLineEdit->palette(); palette.setColor(m_pLineEdit->backgroundRole(), Qt::transparent); m_pLineEdit->setPalette(palette); @@ -173,14 +173,14 @@ void NotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId, con QString szMessage = szText; szMessage.replace(QRegExp("\r([^\r])*\r([^\r])+\r"), "\\2"); if(szImageId.isEmpty()) - pIcon = 0; + pIcon = nullptr; else pIcon = g_pIconManager->getImage(szImageId); - NotifierMessage * pMessage = new NotifierMessage(pIcon ? new QPixmap(*pIcon) : 0, szMessage); + NotifierMessage * pMessage = new NotifierMessage(pIcon ? new QPixmap(*pIcon) : nullptr, szMessage); //search for an existing tab - NotifierWindowTab *pTab = 0, *pTmp = 0; + NotifierWindowTab *pTab = nullptr, *pTmp = nullptr; for(int i = 0; i < m_pWndTabs->count(); ++i) { pTmp = (NotifierWindowTab *)m_pWndTabs->widget(i); @@ -238,7 +238,7 @@ void NotifierWindow::stopShowHideTimer() if(!m_pShowHideTimer) return; delete m_pShowHideTimer; - m_pShowHideTimer = 0; + m_pShowHideTimer = nullptr; } void NotifierWindow::stopBlinkTimer() @@ -246,7 +246,7 @@ void NotifierWindow::stopBlinkTimer() if(!m_pBlinkTimer) return; delete m_pBlinkTimer; - m_pBlinkTimer = 0; + m_pBlinkTimer = nullptr; } void NotifierWindow::stopAutoHideTimer() @@ -254,7 +254,7 @@ void NotifierWindow::stopAutoHideTimer() if(!m_pAutoHideTimer) return; delete m_pAutoHideTimer; - m_pAutoHideTimer = 0; + m_pAutoHideTimer = nullptr; m_pProgressBar->setValue(0); } diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp index 4fb6d0199..fa21755df 100644 --- a/src/modules/notifier/libkvinotifier.cpp +++ b/src/modules/notifier/libkvinotifier.cpp @@ -38,7 +38,7 @@ #include <QSplitter> -NotifierWindow * g_pNotifierWindow = 0; +NotifierWindow * g_pNotifierWindow = nullptr; kvi_time_t g_tNotifierDisabledUntil = 0; /* @@ -279,7 +279,7 @@ static bool notifier_module_cleanup(KviModule *) if(g_pNotifierWindow) { delete g_pNotifierWindow; - g_pNotifierWindow = 0; + g_pNotifierWindow = nullptr; } return true; } diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp index b3bdfe825..12078282b 100644 --- a/src/modules/objects/KvsObject_button.cpp +++ b/src/modules/objects/KvsObject_button.cpp @@ -157,6 +157,6 @@ KVSO_CLASS_FUNCTION(button, clickEvent) // slots void KvsObject_button::slotClicked() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "clickEvent", params); } diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp index f4c7044ea..73eab6c59 100644 --- a/src/modules/objects/KvsObject_dateTimeEdit.cpp +++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp @@ -167,7 +167,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, setTime) // slots void KvsObject_dateTimeEdit::slotDateTimeChanged(const QDateTime &) { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "dateTimeChangedEvent", params); } @@ -186,7 +186,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, timeChangedEvent) // slots void KvsObject_dateTimeEdit::slotTimeChanged(const QTime &) { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "timeChangedEvent", params); } @@ -199,6 +199,6 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, dateChangedEvent) // slots void KvsObject_dateTimeEdit::slotDateChanged(const QDate &) { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "dateChangedEvent", params); } diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp index 66fe4a5f4..c90cfa27c 100644 --- a/src/modules/objects/KvsObject_dockWindow.cpp +++ b/src/modules/objects/KvsObject_dockWindow.cpp @@ -88,7 +88,7 @@ KVSO_CLASS_FUNCTION(dockWindow, addWidget) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("widget", KVS_PT_HOBJECT, 0, hWidget) KVSO_PARAMETERS_END(c) - if(hWidget == (kvs_hobject_t)0) + if(hWidget == (kvs_hobject_t) nullptr) { // null widget ? c->warning(__tr2qs_ctx("Can't add a null object", "objects")); diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index 183edcdb0..54bd9a990 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -291,7 +291,7 @@ void KvsObject_ftp::slotCommandFinished(int iId, bool bError) lParams.append(new KviKvsVariant(bError)); if(bError) lParams.append(new KviKvsVariant(m_pFtp->errorString())); - callFunction(this, "commandFinishedEvent", 0, &lParams); + callFunction(this, "commandFinishedEvent", nullptr, &lParams); } void KvsObject_ftp::slotCommandStarted(int) @@ -303,7 +303,7 @@ void KvsObject_ftp::slotDataTransferProgress(qint64 done, qint64 total) KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)done)); lParams.append(new KviKvsVariant((kvs_int_t)total)); - callFunction(this, "dataTransferProgressEvent", 0, &lParams); + callFunction(this, "dataTransferProgressEvent", nullptr, &lParams); } KVSO_CLASS_FUNCTION(ftp, dataTransferProgressEvent) @@ -320,7 +320,7 @@ void KvsObject_ftp::slotListInfo(const QUrlInfo & i) { KviKvsVariantList lParams; lParams.append(new KviKvsVariant(i.name())); - callFunction(this, "listInfoEvent", 0, &lParams); + callFunction(this, "listInfoEvent", nullptr, &lParams); } KVSO_CLASS_FUNCTION(ftp, listInfoEvent) @@ -354,7 +354,7 @@ void KvsObject_ftp::slotStateChanged(int state) szState = "Closing"; KviKvsVariantList lParams; lParams.append(new KviKvsVariant(szState)); - callFunction(this, "stateChangedEvent", 0, &lParams); + callFunction(this, "stateChangedEvent", nullptr, &lParams); } KVSO_CLASS_FUNCTION(ftp, stateChangedEvent) diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index 2840b08d3..1340a89db 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -291,7 +291,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall * c) KVSO_PARAMETER("local_filename", KVS_PT_STRING, KVS_PF_OPTIONAL, szDest) KVSO_PARAMETERS_END(c) - QFile * pFile = 0; + QFile * pFile = nullptr; if(!szDest.isEmpty()) { pFile = new QFile(szDest); @@ -324,7 +324,7 @@ bool KvsObject_http::functionPost(KviKvsObjectFunctionCall * c) KVSO_PARAMETER("post_data", KVS_PT_STRING, 0, szData) KVSO_PARAMETER("local_filename", KVS_PT_STRING, 0, szDest) KVSO_PARAMETERS_END(c) - QFile * pFile = 0; + QFile * pFile = nullptr; if(!szDest.isEmpty()) { pFile = new QFile(szDest); @@ -409,7 +409,7 @@ void KvsObject_http::slotRequestFinished(int id, bool error) KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)id)); lParams.append(new KviKvsVariant(error)); - callFunction(this, "requestFinishedEvent", 0, &lParams); + callFunction(this, "requestFinishedEvent", nullptr, &lParams); } bool KvsObject_http::functionRequestStartedEvent(KviKvsObjectFunctionCall * c) @@ -421,7 +421,7 @@ void KvsObject_http::slotRequestStarted(int id) { KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)id)); - callFunction(this, "requestStartedEvent", 0, &lParams); + callFunction(this, "requestStartedEvent", nullptr, &lParams); } void KvsObject_http::slotDataReadProgress(int done, int total) @@ -429,7 +429,7 @@ void KvsObject_http::slotDataReadProgress(int done, int total) KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)done)); lParams.append(new KviKvsVariant((kvs_int_t)total)); - callFunction(this, "dataReadProgressEvent", 0, &lParams); + callFunction(this, "dataReadProgressEvent", nullptr, &lParams); } bool KvsObject_http::functionDataReadProgressEvent(KviKvsObjectFunctionCall * c) { @@ -441,7 +441,7 @@ void KvsObject_http::slotDataSendProgress(int done, int total) KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)done)); lParams.append(new KviKvsVariant((kvs_int_t)total)); - callFunction(this, "dataSendProgressEvent", 0, &lParams); + callFunction(this, "dataSendProgressEvent", nullptr, &lParams); } bool KvsObject_http::functionDataSendProgressEvent(KviKvsObjectFunctionCall * c) { @@ -457,7 +457,7 @@ void KvsObject_http::slotDone(bool error) { KviKvsVariantList lParams; lParams.append(new KviKvsVariant(error)); - callFunction(this, "doneEvent", 0, &lParams); + callFunction(this, "doneEvent", nullptr, &lParams); } bool KvsObject_http::functionResponseHeaderReceivedEvent(KviKvsObjectFunctionCall * c) @@ -474,7 +474,7 @@ void KvsObject_http::redirect(QString & file, const QHttpResponseHeader & r) { QUrl url(r.value("location")); m_pHttp->setHost(url.host()); - QFile * pFile = 0; + QFile * pFile = nullptr; pFile = new QFile(file); pFile->open(QIODevice::WriteOnly); int id = m_pHttp->get(url.path(), pFile); @@ -512,7 +512,7 @@ void KvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader & r) } KviKvsVariantList lParams; lParams.append(new KviKvsVariant(szResponse)); - callFunction(this, "responseHeaderReceivedEvent", 0, &lParams); + callFunction(this, "responseHeaderReceivedEvent", nullptr, &lParams); } void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r) { @@ -540,7 +540,7 @@ void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r) } KviKvsVariantList lParams; lParams.append(new KviKvsVariant(szResponse)); - callFunction(this, "readyreadEvent", 0, &lParams); + callFunction(this, "readyreadEvent", nullptr, &lParams); } void KvsObject_http::slotStateChanged(int state) @@ -563,7 +563,7 @@ void KvsObject_http::slotStateChanged(int state) szState = "Closing"; KviKvsVariantList lParams; lParams.append(new KviKvsVariant(szState)); - callFunction(this, "stateChangedEvent", 0, &lParams); + callFunction(this, "stateChangedEvent", nullptr, &lParams); } bool KvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall * c) { @@ -581,7 +581,7 @@ bool KvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *) } void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors) { - KviKvsArray * pArray = 0; + KviKvsArray * pArray = nullptr; pArray = new KviKvsArray(); for(int i = 0; i < sslerrors.count(); i++) { @@ -589,7 +589,7 @@ void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors) } KviKvsVariantList lParams; lParams.append(new KviKvsVariant(pArray)); - callFunction(this, "sslErrorEvent", 0, &lParams); + callFunction(this, "sslErrorEvent", nullptr, &lParams); } bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall * c) diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp index a843a6928..db302cc8c 100644 --- a/src/modules/objects/KvsObject_lineEdit.cpp +++ b/src/modules/objects/KvsObject_lineEdit.cpp @@ -225,14 +225,14 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit, setInputValidator) KVSO_END_REGISTERCLASS(KvsObject_lineEdit) KVSO_BEGIN_CONSTRUCTOR(KvsObject_lineEdit, KvsObject_widget) -m_pCompleter = 0; +m_pCompleter = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_lineEdit) KVSO_BEGIN_DESTRUCTOR(KvsObject_lineEdit) if(m_pCompleter) { delete m_pCompleter; - m_pCompleter = 0; + m_pCompleter = nullptr; } KVSO_END_CONSTRUCTOR(KvsObject_lineEdit) @@ -496,7 +496,7 @@ KVSO_CLASS_FUNCTION(lineEdit, enableCompleter) KVSO_CLASS_FUNCTION(lineEdit, disableCompleter) { CHECK_INTERNAL_POINTER(widget()) - ((QLineEdit *)widget())->setCompleter(0); + ((QLineEdit *)widget())->setCompleter(nullptr); return true; } KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter) @@ -504,9 +504,9 @@ KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter) CHECK_INTERNAL_POINTER(widget()) if(m_pCompleter) { - ((QLineEdit *)widget())->setCompleter(0); + ((QLineEdit *)widget())->setCompleter(nullptr); delete m_pCompleter; - m_pCompleter = 0; + m_pCompleter = nullptr; } return true; } @@ -519,7 +519,7 @@ KVSO_CLASS_FUNCTION(lineEdit, returnPressedEvent) void KvsObject_lineEdit::slotreturnPressed() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "returnPressedEvent", params); } @@ -531,7 +531,7 @@ KVSO_CLASS_FUNCTION(lineEdit, lostFocusEvent) void KvsObject_lineEdit::slotlostFocus() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "lostFocusEvent", params); } diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index f5996d173..25ccf5dfc 100644 --- a/src/modules/objects/KvsObject_list.cpp +++ b/src/modules/objects/KvsObject_list.cpp @@ -146,7 +146,7 @@ KVSO_END_CONSTRUCTOR(KvsObject_list) KVSO_BEGIN_DESTRUCTOR(KvsObject_list) delete m_pDataList; -m_pDataList = 0; +m_pDataList = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_list) KVSO_CLASS_FUNCTION(list, current) @@ -168,35 +168,35 @@ KVSO_CLASS_FUNCTION(list, current) KVSO_CLASS_FUNCTION(list, eof) { CHECK_INTERNAL_POINTER(m_pDataList) - c->returnValue()->setBoolean(m_pDataList->current() != 0); + c->returnValue()->setBoolean(m_pDataList->current() != nullptr); return true; } KVSO_CLASS_FUNCTION(list, moveLast) { CHECK_INTERNAL_POINTER(m_pDataList) - c->returnValue()->setBoolean(m_pDataList->last() != 0); + c->returnValue()->setBoolean(m_pDataList->last() != nullptr); return true; } KVSO_CLASS_FUNCTION(list, movePrev) { CHECK_INTERNAL_POINTER(m_pDataList) - c->returnValue()->setBoolean(m_pDataList->prev() != 0); + c->returnValue()->setBoolean(m_pDataList->prev() != nullptr); return true; } KVSO_CLASS_FUNCTION(list, moveNext) { CHECK_INTERNAL_POINTER(m_pDataList) - c->returnValue()->setBoolean(m_pDataList->next() != 0); + c->returnValue()->setBoolean(m_pDataList->next() != nullptr); return true; } KVSO_CLASS_FUNCTION(list, moveFirst) { CHECK_INTERNAL_POINTER(m_pDataList) - c->returnValue()->setBoolean(m_pDataList->first() != 0); + c->returnValue()->setBoolean(m_pDataList->first() != nullptr); return true; } diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp index 80115a989..807eed373 100644 --- a/src/modules/objects/KvsObject_listWidget.cpp +++ b/src/modules/objects/KvsObject_listWidget.cpp @@ -349,7 +349,7 @@ KVSO_CLASS_FUNCTION(listWidget, setIcon) if(!pItem) return true; - QPixmap * pix = 0; + QPixmap * pix = nullptr; if(vPixmap->isEmpty()) { pItem->setIcon(QIcon()); @@ -696,26 +696,26 @@ KVSO_CLASS_FUNCTION(listWidget, itemEnteredEvent) void KvsObject_listWidget::currentItemChanged(QListWidgetItem * currentItem, QListWidgetItem *) { if(!currentItem) - callFunction(this, "currentItemChangedEvent", 0, 0); + callFunction(this, "currentItemChangedEvent", nullptr, nullptr); else { KviKvsVariantList params(new KviKvsVariant(currentItem->text())); - callFunction(this, "currentItemChangedEvent", 0, ¶ms); + callFunction(this, "currentItemChangedEvent", nullptr, ¶ms); } } void KvsObject_listWidget::selectionChanged() { - callFunction(this, "selectionChangedEvent", 0, 0); + callFunction(this, "selectionChangedEvent", nullptr, nullptr); } void KvsObject_listWidget::slotItemEntered(QListWidgetItem * item) { KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item))); - callFunction(this, "itemEnteredEvent", 0, ¶ms); + callFunction(this, "itemEnteredEvent", nullptr, ¶ms); } void KvsObject_listWidget::slotItemChanged(QListWidgetItem * item) { KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item))); - callFunction(this, "itemChangedEvent", 0, ¶ms); + callFunction(this, "itemChangedEvent", nullptr, ¶ms); } diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index 1ab46746c..bcc61fd1c 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -611,10 +611,10 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter, KviKvsObject) m_pPainter = new QPainter(); bDonotdeleteinternalqpainter = false; -m_pPrinter = 0; -m_pDeviceObject = 0; -m_pPainterPath = 0; -m_pGradient = 0; +m_pPrinter = nullptr; +m_pDeviceObject = nullptr; +m_pPainterPath = nullptr; +m_pGradient = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_painter) @@ -622,16 +622,16 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_painter) if(m_pPainterPath) delete m_pPainterPath; -m_pPainterPath = 0; +m_pPainterPath = nullptr; if(m_pGradient) delete m_pGradient; -m_pGradient = 0; +m_pGradient = nullptr; if(m_pPainter && !bDonotdeleteinternalqpainter) delete m_pPainter; -m_pPainter = 0; +m_pPainter = nullptr; if(m_pPrinter) delete m_pPrinter; -m_pPrinter = 0; +m_pPrinter = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_painter) @@ -1193,7 +1193,7 @@ KVSO_CLASS_FUNCTION(painter, begin) } else { - QPrintDialog printDialog(m_pPrinter, 0); + QPrintDialog printDialog(m_pPrinter, nullptr); if(printDialog.exec() == QDialog::Accepted) { qDebug("papersize %d", m_pPrinter->paperSize()); @@ -1202,7 +1202,7 @@ KVSO_CLASS_FUNCTION(painter, begin) } else { - m_pPrinter = 0; + m_pPrinter = nullptr; return true; } } @@ -1267,9 +1267,9 @@ void KvsObject_painter::detachDevice() if(m_pPrinter) { delete m_pPrinter; - m_pPrinter = 0; + m_pPrinter = nullptr; } - m_pDeviceObject = 0; + m_pDeviceObject = nullptr; } KVSO_CLASS_FUNCTION(painter, end) @@ -1282,7 +1282,7 @@ KVSO_CLASS_FUNCTION(painter, end) if(m_pPrinter) { delete m_pPrinter; - m_pPrinter = 0; + m_pPrinter = nullptr; } } else @@ -1964,7 +1964,7 @@ KVSO_CLASS_FUNCTION(painter, clearGradient) Q_UNUSED(c); if(!m_pGradient) delete m_pGradient; - m_pGradient = 0; + m_pGradient = nullptr; return true; } @@ -2151,7 +2151,7 @@ KVSO_CLASS_FUNCTION(painter, resetPath) if(m_pPainterPath) { delete m_pPainterPath; - m_pPainterPath = 0; + m_pPainterPath = nullptr; } return true; } diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index 8505b606f..fd618fcea 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -107,10 +107,10 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, frameChangedEvent) KVSO_END_REGISTERCLASS(KvsObject_pixmap) KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap, KviKvsObject) -m_pAnimatedPixmap = 0; +m_pAnimatedPixmap = nullptr; m_currentType = Image; -m_pPixmap = 0; -m_pImage = 0; +m_pPixmap = nullptr; +m_pImage = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_pixmap) KVSO_BEGIN_DESTRUCTOR(KvsObject_pixmap) @@ -181,17 +181,17 @@ KVSO_CLASS_FUNCTION(pixmap, fill) m_pPixmap = new QPixmap(); *m_pPixmap = QPixmap::fromImage(*m_pImage); delete m_pImage; - m_pImage = 0; + m_pImage = nullptr; } else { - m_pPixmap = 0; + m_pPixmap = nullptr; } } else if(m_currentType == AnimatedPixmap) { delete m_pAnimatedPixmap; - m_pAnimatedPixmap = 0; + m_pAnimatedPixmap = nullptr; } m_currentType = Pixmap; if(!m_pPixmap) @@ -213,7 +213,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize) if(m_pImage) { delete m_pImage; - m_pImage = 0; + m_pImage = nullptr; } } else if(m_currentType == AnimatedPixmap) @@ -221,7 +221,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize) if(m_pAnimatedPixmap) { delete m_pAnimatedPixmap; - m_pAnimatedPixmap = 0; + m_pAnimatedPixmap = nullptr; } } else if(m_pPixmap) @@ -339,7 +339,7 @@ KVSO_CLASS_FUNCTION(pixmap, pixel) m_pImage = new QImage(); *m_pImage = m_pPixmap->toImage(); delete m_pPixmap; - m_pPixmap = 0; + m_pPixmap = nullptr; } m_currentType = Image; QRgb rgb = m_pImage->pixel(iX, iY); @@ -521,12 +521,12 @@ KVSO_CLASS_FUNCTION(pixmap, loadAnimation) if(m_pAnimatedPixmap) { delete m_pAnimatedPixmap; - m_pAnimatedPixmap = 0; + m_pAnimatedPixmap = nullptr; } if(m_pPixmap) { delete m_pPixmap; - m_pPixmap = 0; + m_pPixmap = nullptr; } m_pAnimatedPixmap = new KviAnimatedPixmap(szFile); connect(m_pAnimatedPixmap, SIGNAL(frameChanged()), this, SLOT(frameChanged())); @@ -658,7 +658,7 @@ KVSO_CLASS_FUNCTION(pixmap, loadFromMemoryBuffer) if(m_pAnimatedPixmap) { delete m_pAnimatedPixmap; - m_pAnimatedPixmap = 0; + m_pAnimatedPixmap = nullptr; } if(!m_pPixmap) m_pPixmap = new QPixmap(); @@ -680,7 +680,7 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget) if(m_pAnimatedPixmap) { delete m_pAnimatedPixmap; - m_pAnimatedPixmap = 0; + m_pAnimatedPixmap = nullptr; } if(!m_pPixmap) m_pPixmap = new QPixmap(); @@ -744,6 +744,6 @@ KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent) // slots void KvsObject_pixmap::frameChanged() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "frameChangedEvent", params); } diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp index 9a5531835..f2075ab7c 100644 --- a/src/modules/objects/KvsObject_popupMenu.cpp +++ b/src/modules/objects/KvsObject_popupMenu.cpp @@ -232,8 +232,8 @@ KVSO_CLASS_FUNCTION(popupMenu, insertItem) KVSO_PARAMETER("icon_id", KVS_PT_STRING, KVS_PF_OPTIONAL, szIcon) KVSO_PARAMETERS_END(c) - QPixmap * pix = 0; - QAction * pAction = 0; + QPixmap * pix = nullptr; + QAction * pAction = nullptr; if(!szIcon.isEmpty()) { pix = g_pIconManager->getImage(szIcon); diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp index 73a8ed92a..706454f37 100644 --- a/src/modules/objects/KvsObject_process.cpp +++ b/src/modules/objects/KvsObject_process.cpp @@ -308,12 +308,12 @@ KVSO_CLASS_FUNCTION(process, normalExit) void KvsObject_process::slotReadStdout() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "readyReadStdoutEvent", params); } void KvsObject_process::slotReadStderr() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "readyReadStderrEvent", params); } diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp index 0d386d3cb..e72a369b4 100644 --- a/src/modules/objects/KvsObject_socket.cpp +++ b/src/modules/objects/KvsObject_socket.cpp @@ -664,13 +664,13 @@ void KvsObject_socket::slotReadyRead() void KvsObject_socket::slotConnected() { - KviKvsVariantList * lParams = 0; + KviKvsVariantList * lParams = nullptr; callFunction(this, "connectedEvent", lParams); } void KvsObject_socket::slotDisconnected() { - KviKvsVariantList * lParams = 0; + KviKvsVariantList * lParams = nullptr; callFunction(this, "disconnectedEvent", lParams); } @@ -684,7 +684,7 @@ void KvsObject_socket::slotError(QAbstractSocket::SocketError socketError) void KvsObject_socket::slotHostFound() { - KviKvsVariantList * lParams = 0; + KviKvsVariantList * lParams = nullptr; callFunction(this, "hostFoundEvent", lParams); } diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp index e4de050f1..7fd68c240 100644 --- a/src/modules/objects/KvsObject_sql.cpp +++ b/src/modules/objects/KvsObject_sql.cpp @@ -133,13 +133,13 @@ KVSO_END_REGISTERCLASS(KvsObject_sql) KVSO_BEGIN_CONSTRUCTOR(KvsObject_sql, KviKvsObject) -m_pCurrentSQlQuery = 0; +m_pCurrentSQlQuery = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_sql) KVSO_BEGIN_DESTRUCTOR(KvsObject_sql) if(m_pCurrentSQlQuery) delete m_pCurrentSQlQuery; -m_pCurrentSQlQuery = 0; +m_pCurrentSQlQuery = nullptr; KVSO_END_DESTRUCTOR(KvsObject_sql) KVSO_CLASS_FUNCTION(sql, setConnection) @@ -179,7 +179,7 @@ KVSO_CLASS_FUNCTION(sql, setConnection) m_pCurrentSQlQuery = new QSqlQuery(db); } else - m_pCurrentSQlQuery = 0; + m_pCurrentSQlQuery = nullptr; c->returnValue()->setBoolean(bOk); return true; } @@ -303,7 +303,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection) if(m_pCurrentSQlQuery) { delete m_pCurrentSQlQuery; - m_pCurrentSQlQuery = 0; + m_pCurrentSQlQuery = nullptr; } QSqlDatabase::removeDatabase(szConnectionName); return true; @@ -311,7 +311,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection) if(m_pCurrentSQlQuery) { delete m_pCurrentSQlQuery; - m_pCurrentSQlQuery = 0; + m_pCurrentSQlQuery = nullptr; } QSqlDatabase::removeDatabase(mSzConnectionName); return true; @@ -465,7 +465,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord) QSqlRecord record = m_pCurrentSQlQuery->record(); for(int i = 0; i < record.count(); i++) { - KviKvsVariant * pValue = 0; + KviKvsVariant * pValue = nullptr; QVariant value = record.value(i); if(value.type() == QVariant::LongLong) pValue = new KviKvsVariant((kvs_int_t)value.toLongLong()); @@ -475,7 +475,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord) { KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("memoryBuffer"); KviKvsVariantList params(new KviKvsVariant(QString())); - KviKvsObject * pObject = pClass->allocateInstance(0, "", c->context(), ¶ms); + KviKvsObject * pObject = pClass->allocateInstance(nullptr, "", c->context(), ¶ms); *((KvsObject_memoryBuffer *)pObject)->pBuffer() = value.toByteArray(); pValue = new KviKvsVariant(pObject->handle()); } diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp index 018ed70b1..1029ecc62 100644 --- a/src/modules/objects/KvsObject_tabWidget.cpp +++ b/src/modules/objects/KvsObject_tabWidget.cpp @@ -250,7 +250,7 @@ KVSO_CLASS_FUNCTION(tabWidget, widgetAt) KVSO_PARAMETER("index", KVS_PT_INTEGER, 0, iIndex) KVSO_PARAMETERS_END(c) if(iIndex >= tabsList.count() || iIndex < 0) - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); else c->returnValue()->setHObject(tabsList.at(iIndex)); return true; diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp index 63e9cd49e..acc0f82c7 100644 --- a/src/modules/objects/KvsObject_tableWidget.cpp +++ b/src/modules/objects/KvsObject_tableWidget.cpp @@ -477,7 +477,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setIcon) KVSO_PARAMETER("col", KVS_PT_UNSIGNEDINTEGER, 0, uCol) KVSO_PARAMETER("icon", KVS_PT_VARIANT, 0, vPixmap) KVSO_PARAMETERS_END(c) - QPixmap * pix = 0; + QPixmap * pix = nullptr; if(vPixmap->isHObject()) { vPixmap->asHObject(obHpixmap); @@ -809,7 +809,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setItemFlags) void KvsObject_tableWidget::slotItemEntered(QTableWidgetItem * i) { KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i->row()), new KviKvsVariant((kvs_int_t)i->column())); - callFunction(this, "itemEnteredEvent", 0, ¶ms); + callFunction(this, "itemEnteredEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent) @@ -821,7 +821,7 @@ KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent) void KvsObject_tableWidget::cellActivated(int iRow, int iCol) { KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol)); - callFunction(this, "cellActivatedEvent", 0, ¶ms); + callFunction(this, "cellActivatedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent) @@ -833,7 +833,7 @@ KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent) void KvsObject_tableWidget::cellDoubleClicked(int iRow, int iCol) { KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol)); - callFunction(this, "cellDoubleClickedEvent", 0, ¶ms); + callFunction(this, "cellDoubleClickedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(tableWidget, cellDoubleClickedEvent) @@ -846,7 +846,7 @@ bool KvsObject_tableWidget::paint(QPainter * p, const QStyleOptionViewItem & opt p->save(); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter"); KviKvsVariantList params; - KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, ¶ms); + KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, ¶ms); ((KvsObject_painter *)pObject)->setInternalPainter(p); p->setClipRect(option.rect); p->translate(option.rect.x(), option.rect.y()); diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp index be89766f2..97263b046 100644 --- a/src/modules/objects/KvsObject_textBrowser.cpp +++ b/src/modules/objects/KvsObject_textBrowser.cpp @@ -138,7 +138,7 @@ KVSO_CLASS_FUNCTION(textBrowser, reload) void KvsObject_textBrowser::anchorClicked(const QUrl & url) { KviKvsVariantList parms(new KviKvsVariant(url.path())); - callFunction(this, "linkClickedEvent", 0, &parms); + callFunction(this, "linkClickedEvent", nullptr, &parms); } KVSO_CLASS_FUNCTION(textBrowser, linkClickedEvent) diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp index 6ada08c2d..fa0be17eb 100644 --- a/src/modules/objects/KvsObject_toolButton.cpp +++ b/src/modules/objects/KvsObject_toolButton.cpp @@ -334,6 +334,6 @@ KVSO_CLASS_FUNCTION(toolButton, clickEvent) void KvsObject_toolButton::slotClicked() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "clickEvent", params); } diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp index 2b0211c76..127be0065 100644 --- a/src/modules/objects/KvsObject_trayIcon.cpp +++ b/src/modules/objects/KvsObject_trayIcon.cpp @@ -105,7 +105,7 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon, messageClickedEvent) KVSO_END_REGISTERCLASS(KvsObject_trayIcon) KVSO_BEGIN_CONSTRUCTOR(KvsObject_trayIcon, KviKvsObject) -m_pTrayIcon = new QSystemTrayIcon(0); +m_pTrayIcon = new QSystemTrayIcon(nullptr); connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(slotActivated(QSystemTrayIcon::ActivationReason))); connect(m_pTrayIcon, SIGNAL(messageClicked()), this, SLOT(slotMessageClicked())); @@ -221,8 +221,8 @@ KVSO_CLASS_FUNCTION(trayIcon, messageClickedEvent) } void KvsObject_trayIcon::slotMessageClicked() { - KviKvsVariantList * lParams = 0; - callFunction(this, "messageClickedEvent", 0, lParams); + KviKvsVariantList * lParams = nullptr; + callFunction(this, "messageClickedEvent", nullptr, lParams); } void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason) @@ -240,5 +240,5 @@ void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason) szReason = "MiddleClick"; KviKvsVariantList lParams; lParams.append(new KviKvsVariant(szReason)); - callFunction(this, "activatedEvent", 0, &lParams); + callFunction(this, "activatedEvent", nullptr, &lParams); } diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp index d8be9006e..2b83cebf5 100644 --- a/src/modules/objects/KvsObject_treeWidget.cpp +++ b/src/modules/objects/KvsObject_treeWidget.cpp @@ -254,7 +254,7 @@ KVSO_CLASS_FUNCTION(treeWidget, topLevelItem) KVSO_PARAMETERS_END(c) QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->topLevelItem(iIdx); if(!pItem) - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); else c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem)); return true; @@ -271,7 +271,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemAt) QPoint pPoint = ((QTreeWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos, iYpos)); QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->itemAt(pPoint); if(!pItem) - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); else c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem)); return true; @@ -335,7 +335,7 @@ KVSO_CLASS_FUNCTION(treeWidget, selectedItems) pArray->set(i, new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)list.at(i)))); } else - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); return true; } @@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(treeWidget, firstChild) if(widget()) c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->topLevelItem(0))); else - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); return true; } @@ -353,7 +353,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentItem) if(widget()) c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem())); else - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); return true; } /* @@ -484,7 +484,7 @@ void KvsObject_treeWidget::slotClicked(QTreeWidgetItem * i, int col) KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column); - callFunction(this, "itemClickedEvent", 0, ¶ms); + callFunction(this, "itemClickedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, selectionChangedEvent) @@ -499,12 +499,12 @@ void KvsObject_treeWidget::slotSelectionChanged() { QTreeWidgetItem * it = (QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem(); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(it))); - callFunction(this, "selectionChangedEvent", 0, ¶ms); + callFunction(this, "selectionChangedEvent", nullptr, ¶ms); } else { - KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t)0)); - callFunction(this, "selectionChangedEvent", 0, ¶ms); + KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t) nullptr)); + callFunction(this, "selectionChangedEvent", nullptr, ¶ms); } } @@ -517,7 +517,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentChangedEvent) void KvsObject_treeWidget::slotCurrentChanged(QTreeWidgetItem * i, QTreeWidgetItem * prev) { KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(prev))); - callFunction(this, "currentChangedEvent", 0, ¶ms); + callFunction(this, "currentChangedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, itemActivatedEvent) @@ -530,7 +530,7 @@ void KvsObject_treeWidget::slotItemActivated(QTreeWidgetItem * i, int col) { KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column); - callFunction(this, "itemActivatedEvent", 0, ¶ms); + callFunction(this, "itemActivatedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, onItemEvent) @@ -544,7 +544,7 @@ void KvsObject_treeWidget::slotOnItemEntered(QTreeWidgetItem * i, int col) KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column); - callFunction(this, "onItemEvent", 0, ¶ms); + callFunction(this, "onItemEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent) @@ -556,7 +556,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent) void KvsObject_treeWidget::slotItemExpanded(QTreeWidgetItem * i) { KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i))); - callFunction(this, "itemExpandedEvent", 0, ¶ms); + callFunction(this, "itemExpandedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent) @@ -568,7 +568,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent) void KvsObject_treeWidget::slotItemCollapsed(QTreeWidgetItem * i) { KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i))); - callFunction(this, "itemCollapsedEvent", 0, ¶ms); + callFunction(this, "itemCollapsedEvent", nullptr, ¶ms); } KVSO_CLASS_FUNCTION(treeWidget, itemChangedEvent) @@ -581,14 +581,14 @@ void KvsObject_treeWidget::slotItemChanged(QTreeWidgetItem * item, int col) { KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), column); - callFunction(this, "itemChangedEvent", 0, ¶ms); + callFunction(this, "itemChangedEvent", nullptr, ¶ms); } void KvsObject_treeWidget::fileDropped(QString & szFile, QTreeWidgetItem * item) { KviKvsVariant * file = new KviKvsVariant(szFile); KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), file); - callFunction(this, "fileDroppedEvent", 0, ¶ms); + callFunction(this, "fileDroppedEvent", nullptr, ¶ms); } KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWidget * parent) diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp index ad4a37e26..508b1cf01 100644 --- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp +++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp @@ -145,7 +145,7 @@ KVSO_END_REGISTERCLASS(KvsObject_treeWidgetItem) KVSO_BEGIN_CONSTRUCTOR(KvsObject_treeWidgetItem, KviKvsObject) -m_pTreeWidgetItem = 0; +m_pTreeWidgetItem = nullptr; KVSO_END_CONSTRUCTOR(KvsObject_treeWidgetItem) @@ -183,9 +183,9 @@ bool KvsObject_treeWidgetItem::init(KviKvsRunTimeContext * pContext, KviKvsVaria void KvsObject_treeWidgetItem::childDestroyed() { - if(m_pTreeWidgetItem == 0) + if(m_pTreeWidgetItem == nullptr) return; - m_pTreeWidgetItem = 0; + m_pTreeWidgetItem = nullptr; die(); } @@ -208,11 +208,11 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem() kvs_hobject_t KvsObject_treeWidgetItem::itemToHandle(QTreeWidgetItem * it) { if(!it) - return (kvs_hobject_t)0; + return (kvs_hobject_t) nullptr; KvsObject_treeWidgetItem * pObject; pObject = ((KviKvsStandardTreeWidgetItem *)it)->masterObject(); if(!pObject) - return (kvs_hobject_t)0; + return (kvs_hobject_t) nullptr; return pObject->handle(); } @@ -393,7 +393,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem, setPixmap) KVSO_PARAMETER("column", KVS_PT_UNSIGNEDINTEGER, 0, uCol) KVSO_PARAMETER("pixmap", KVS_PT_VARIANT, 0, vPixmap) KVSO_PARAMETERS_END(c) - QPixmap * pix = 0; + QPixmap * pix = nullptr; if(vPixmap->isEmpty()) { m_pTreeWidgetItem->setIcon(uCol, QIcon()); diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index 41a774b80..af594750c 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -65,9 +65,9 @@ void KviKvsDownloadHandler::slotReplyFinished() m_pParentScript->callFunction(m_pParentScript, "downloadCompletedEvent", ¶ms); m_pFile->close(); delete m_pFile; - m_pFile = 0; + m_pFile = nullptr; m_pReply->deleteLater(); - m_pReply = 0; + m_pReply = nullptr; this->deleteLater(); } @@ -77,12 +77,12 @@ KviKvsDownloadHandler::~KviKvsDownloadHandler() { m_pFile->close(); delete m_pFile; - m_pFile = 0; + m_pFile = nullptr; } if(m_pReply) { delete m_pReply; - m_pReply = 0; + m_pReply = nullptr; } } void KviKvsDownloadHandler::slotReadyRead() @@ -449,7 +449,7 @@ QWebFrame * KvsObject_webView::findFrame(QWebFrame * pCurFrame, QString & szFram return pCurFrame; } } - return 0; + return nullptr; } KVSO_CLASS_FUNCTION(webView, setLinkDelegationPolicy) @@ -518,7 +518,7 @@ KVSO_CLASS_FUNCTION(webView, makePreview) painter.end(); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap"); KviKvsVariantList params; - KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), ¶ms); + KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), ¶ms); ((KvsObject_pixmap *)pObject)->setInternalImage(pImage); c->returnValue()->setHObject(pObject->handle()); return true; @@ -1169,7 +1169,7 @@ KVSO_CLASS_FUNCTION(webView, appendWebViewActionToMenu) c->warning(__tr2qs_ctx("Can't add a non-popupmenu object", "objects")); return true; } - QAction * pAction = 0; + QAction * pAction = nullptr; for(unsigned int i = 0; i < actions_num; i++) { if(KviQString::equalCI(szActionName, actions_tbl[i])) @@ -1311,7 +1311,7 @@ void KvsObject_webView::slotLoadFinished(bool bOk) void KvsObject_webView::slotLoadStarted() { - KviKvsVariantList * lParams = 0; + KviKvsVariantList * lParams = nullptr; callFunction(this, "loadStartedEvent", lParams); } diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index c6fcfaca8..8acbc1f54 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -750,7 +750,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e) QRect rect = ((QPaintEvent *)e)->rect(); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter"); KviKvsVariantList params; - KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, ¶ms); + KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, ¶ms); QPainter p(widget()); ((KvsObject_painter *)pObject)->setInternalPainter(&p); p.setClipRect(rect); @@ -870,7 +870,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e) } KviKvsVariantList params(new KviKvsVariant(tmp)); - callFunction(this, "keyPressEvent", 0, ¶ms); + callFunction(this, "keyPressEvent", nullptr, ¶ms); } break; case QEvent::MouseButtonPress: @@ -926,7 +926,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e) lParams.append(new KviKvsVariant((kvs_int_t)aparam)); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x())); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())); - if(!callFunction(this, "mouseDoubleClickEvent", 0, &lParams)) + if(!callFunction(this, "mouseDoubleClickEvent", nullptr, &lParams)) brokenhandler = true; // ignore results of a broken event handler } @@ -936,16 +936,16 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e) KviKvsVariantList lParams; lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x())); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())); - if(!callFunction(this, "mouseMoveEvent", 0, &lParams)) + if(!callFunction(this, "mouseMoveEvent", nullptr, &lParams)) brokenhandler = true; // ignore results of a broken event handler } break; case QEvent::FocusIn: - if(!callFunction(this, "focusInEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "focusInEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::FocusOut: - if(!callFunction(this, "focusOutEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "focusOutEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Resize: @@ -958,27 +958,27 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e) break; } case QEvent::Move: - if(!callFunction(this, "moveEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "moveEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Close: - if(!callFunction(this, "closeEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "closeEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Enter: - if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Leave: - if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Show: - if(!callFunction(this, "showEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "showEvent", &oReturnBuffer, nullptr)) brokenhandler = true; break; case QEvent::Hide: - if(!callFunction(this, "hideEvent", &oReturnBuffer, 0)) + if(!callFunction(this, "hideEvent", &oReturnBuffer, nullptr)) ret = false; break; default: @@ -1434,7 +1434,7 @@ KVSO_CLASS_FUNCTION(widget, parentWidget) if(parentScriptWidget()) c->returnValue()->setHObject(parentObject()->handle()); else - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); return true; } @@ -1733,10 +1733,10 @@ KVSO_CLASS_FUNCTION(widget, setWFlags) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("widget_flags", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, wflags) KVSO_PARAMETERS_END(c) - Qt::WindowFlags flag, sum = 0; + Qt::WindowFlags flag, sum = nullptr; for(auto & it : wflags) { - flag = 0; + flag = nullptr; for(size_t j{}; j < widgettypes_num; j++) { if(KviQString::equalCI(it, widgettypes_tbl[j])) @@ -1843,7 +1843,7 @@ KVSO_CLASS_FUNCTION(widget, setParent) if(!ob) { - widget()->setParent(0); + widget()->setParent(nullptr); return true; } else if(!ob->object()->isWidgetType()) @@ -2066,7 +2066,7 @@ KVSO_CLASS_FUNCTION(widget, grab) *pPixmap = QPixmap::grabWidget(((QWidget *)(ob->object()))); KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap"); KviKvsVariantList params; - KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), ¶ms); + KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), ¶ms); ((KvsObject_pixmap *)pObject)->setInternalPixmap(pPixmap); c->returnValue()->setHObject(pObject->handle()); return true; diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp index 34ede2ed8..c28af26fa 100644 --- a/src/modules/objects/KvsObject_window.cpp +++ b/src/modules/objects/KvsObject_window.cpp @@ -34,8 +34,8 @@ KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName) : KviWindow(KviWindow::ScriptObject, szName) { - m_pCentralWidget = 0; - m_pIcon = 0; + m_pCentralWidget = nullptr; + m_pIcon = nullptr; } KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow() @@ -56,14 +56,14 @@ void KviKvsScriptWindowWindow::resizeEvent(QResizeEvent *) void KviKvsScriptWindowWindow::centralWidgetObjectDestroyed() { - m_pCentralWidget = 0; - m_pCentralWidgetObject = 0; + m_pCentralWidget = nullptr; + m_pCentralWidgetObject = nullptr; } void KviKvsScriptWindowWindow::centralWidgetDestroyed() { - m_pCentralWidget = 0; - m_pCentralWidgetObject = 0; + m_pCentralWidget = nullptr; + m_pCentralWidgetObject = nullptr; } QPixmap * KviKvsScriptWindowWindow::myIconPtr() diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp index 509ae7ecd..e09b9ffa4 100644 --- a/src/modules/objects/KvsObject_wizard.cpp +++ b/src/modules/objects/KvsObject_wizard.cpp @@ -315,14 +315,14 @@ KVSO_CLASS_FUNCTION(wizard, setFinishBtnText) } bool KvsObject_wizard::accept() { - KviKvsVariantList * pParams = 0; - callFunction(this, "acceptEvent", 0, pParams); + KviKvsVariantList * pParams = nullptr; + callFunction(this, "acceptEvent", nullptr, pParams); return true; } bool KvsObject_wizard::reject() { - KviKvsVariantList * pParams = 0; - callFunction(this, "rejectEvent", 0, pParams); + KviKvsVariantList * pParams = nullptr; + callFunction(this, "rejectEvent", nullptr, pParams); return true; } KVSO_CLASS_FUNCTION(wizard, nextClickedEvent) @@ -333,7 +333,7 @@ KVSO_CLASS_FUNCTION(wizard, nextClickedEvent) void KvsObject_wizard::nextClicked() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "nextClickedEvent", params); } KVSO_CLASS_FUNCTION(wizard, backClickedEvent) @@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(wizard, backClickedEvent) void KvsObject_wizard::backClicked() { - KviKvsVariantList * params = 0; + KviKvsVariantList * params = nullptr; callFunction(this, "backClickedEvent", params); } KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard * parent) diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp index c0413f703..9d984c5c3 100644 --- a/src/modules/objects/KvsObject_workspace.cpp +++ b/src/modules/objects/KvsObject_workspace.cpp @@ -190,7 +190,7 @@ if(pWidgetDict) { pWidgetDict->clear(); delete pWidgetDict; - pWidgetDict = 0; + pWidgetDict = nullptr; } KVSO_END_CONSTRUCTOR(KvsObject_workspace) @@ -300,7 +300,7 @@ KVSO_CLASS_FUNCTION(workspace, activeWindow) } } else - c->returnValue()->setHObject((kvs_hobject_t)0); + c->returnValue()->setHObject((kvs_hobject_t) nullptr); return true; } diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp index 585014d5e..e3c23c1aa 100644 --- a/src/modules/objects/KvsObject_wrapper.cpp +++ b/src/modules/objects/KvsObject_wrapper.cpp @@ -172,14 +172,14 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext, KviKvsVariantList if(!pParams) return false; - QWidget * pWidget = NULL; + QWidget * pWidget = nullptr; unsigned int i = 0; while(i < pParams->count()) { QString szClass; QString szName; - QString s = 0; + QString s = nullptr; pParams->at(i)->asString(s); i++; @@ -283,7 +283,7 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c { QWidgetList list = g_pApp->topLevelWidgets(); if(list.isEmpty()) - return NULL; + return nullptr; Q_FOREACH(QWidget * w, list) { @@ -305,14 +305,14 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c } } - return NULL; + return nullptr; } QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QString & szName, QWidget * pParent, bool bRecursive) { QList<QObject *> list = pParent->children(); if(list.isEmpty()) - return NULL; + return nullptr; Q_FOREACH(QObject * obj, list) { @@ -340,5 +340,5 @@ QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QSt } } - return NULL; + return nullptr; } diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp index 2f048985e..565172619 100644 --- a/src/modules/objects/qtftp/qftp.cpp +++ b/src/modules/objects/qtftp/qftp.cpp @@ -69,7 +69,7 @@ class QFtpCommand { public: QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba); - QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = 0); + QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = nullptr); ~QFtpCommand(); int id; @@ -115,7 +115,7 @@ QFtpCommand::~QFtpCommand() * *********************************************************************/ QFtpDTP::QFtpDTP(QFtpPI * p, QObject * parent) : QObject(parent), - socket(0), + socket(nullptr), listener(this), pi(p), callWriteData(false) @@ -151,7 +151,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port) if(socket) { delete socket; - socket = 0; + socket = nullptr; } socket = new QTcpSocket(this); #ifndef QT_NO_BEARERMANAGEMENT @@ -276,7 +276,7 @@ void QFtpDTP::writeData() } // do we continue uploading? - callWriteData = data.dev != 0; + callWriteData = data.dev != nullptr; } } @@ -657,7 +657,7 @@ void QFtpDTP::setupSocket() void QFtpDTP::clearData() { is_ba = false; - data.dev = 0; + data.dev = nullptr; } /********************************************************************** @@ -669,7 +669,7 @@ QFtpPI::QFtpPI(QObject * parent) : QObject(parent), rawCommand(false), transferConnectionExtended(true), dtp(this), - commandSocket(0), + commandSocket(nullptr), state(Begin), abortState(None), currentCmd(QString()), waitForDtpToConnect(false), @@ -2067,10 +2067,10 @@ QFtp::Command QFtp::currentCommand() const QIODevice * QFtp::currentDevice() const { if(d->pending.isEmpty()) - return 0; + return nullptr; QFtpCommand * c = d->pending.first(); if(c->is_ba) - return 0; + return nullptr; return c->data.dev; } diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp index 9e7849354..2df6adfdb 100644 --- a/src/modules/objects/qtftp/qurlinfo.cpp +++ b/src/modules/objects/qtftp/qurlinfo.cpp @@ -126,7 +126,7 @@ public: QUrlInfo::QUrlInfo() { - d = 0; + d = nullptr; } /*! @@ -142,7 +142,7 @@ QUrlInfo::QUrlInfo(const QUrlInfo & ui) } else { - d = 0; + d = nullptr; } } @@ -442,7 +442,7 @@ QUrlInfo & QUrlInfo::operator=(const QUrlInfo & ui) else { delete d; - d = 0; + d = nullptr; } return *this; } @@ -684,7 +684,7 @@ bool QUrlInfo::equal(const QUrlInfo & i1, const QUrlInfo & i2, bool QUrlInfo::operator==(const QUrlInfo & other) const { if(!d) - return other.d == 0; + return other.d == nullptr; if(!other.d) return false; @@ -710,7 +710,7 @@ bool QUrlInfo::operator==(const QUrlInfo & other) const */ bool QUrlInfo::isValid() const { - return d != 0; + return d != nullptr; } QT_END_NAMESPACE diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp index f6de5e6a5..ad865d31a 100644 --- a/src/modules/objects/qthttp/qhttp.cpp +++ b/src/modules/objects/qthttp/qhttp.cpp @@ -99,10 +99,10 @@ public: Q_DECLARE_PUBLIC(QHttp) inline QHttpPrivate(QHttp * parent) - : socket(0), reconnectAttempts(2), + : socket(nullptr), reconnectAttempts(2), deleteSocket(0), state(QHttp::Unconnected), error(QHttp::NoError), port(0), mode(QHttp::ConnectionModeHttp), - toDevice(0), postDevice(0), bytesDone(0), chunkedSize(-1), + toDevice(nullptr), postDevice(nullptr), bytesDone(0), chunkedSize(-1), repost(false), pendingPost(false), q_ptr(parent) { } @@ -245,7 +245,7 @@ private: void QHttpNormalRequest::start(QHttp * http) { if(!http->d->socket) - http->d->setSock(0); + http->d->setSock(nullptr); http->d->header = header; if(is_ba) @@ -254,7 +254,7 @@ void QHttpNormalRequest::start(QHttp * http) if(http->d->buffer.size() >= 0) http->d->header.setContentLength(http->d->buffer.size()); - http->d->postDevice = 0; + http->d->postDevice = nullptr; } else { @@ -268,14 +268,14 @@ void QHttpNormalRequest::start(QHttp * http) } else { - http->d->postDevice = 0; + http->d->postDevice = nullptr; } } if(to && (to->isOpen() || to->open(QIODevice::WriteOnly))) http->d->toDevice = to; else - http->d->toDevice = 0; + http->d->toDevice = nullptr; http->d->reconnectAttempts = 2; http->d->_q_slotSendRequest(); @@ -294,7 +294,7 @@ QHttpRequestHeader QHttpNormalRequest::requestHeader() QIODevice * QHttpNormalRequest::sourceDevice() { if(is_ba) - return 0; + return nullptr; return data.dev; } @@ -358,11 +358,11 @@ public: QIODevice * sourceDevice() { - return 0; + return nullptr; } QIODevice * destinationDevice() { - return 0; + return nullptr; } private: @@ -407,11 +407,11 @@ public: QIODevice * sourceDevice() { - return 0; + return nullptr; } QIODevice * destinationDevice() { - return 0; + return nullptr; } private: @@ -456,11 +456,11 @@ public: inline QIODevice * sourceDevice() { - return 0; + return nullptr; } inline QIODevice * destinationDevice() { - return 0; + return nullptr; } private: @@ -486,11 +486,11 @@ public: QIODevice * sourceDevice() { - return 0; + return nullptr; } QIODevice * destinationDevice() { - return 0; + return nullptr; } private: @@ -519,11 +519,11 @@ public: QIODevice * sourceDevice() { - return 0; + return nullptr; } QIODevice * destinationDevice() { - return 0; + return nullptr; } }; @@ -1963,7 +1963,7 @@ qint64 QHttp::bytesAvailable() const */ qint64 QHttp::read(char * data, qint64 maxlen) { - if(data == 0 && maxlen != 0) + if(data == nullptr && maxlen != 0) { qWarning("QHttp::read: Null pointer error"); return -1; @@ -2059,7 +2059,7 @@ QHttpResponseHeader QHttp::lastResponse() const QIODevice * QHttp::currentSourceDevice() const { if(d->pending.isEmpty()) - return 0; + return nullptr; return d->pending.first()->sourceDevice(); } @@ -2076,7 +2076,7 @@ QIODevice * QHttp::currentSourceDevice() const QIODevice * QHttp::currentDestinationDevice() const { if(d->pending.isEmpty()) - return 0; + return nullptr; return d->pending.first()->destinationDevice(); } @@ -2285,7 +2285,7 @@ int QHttp::get(const QString & path, QIODevice * to) { QHttpRequestHeader header(QLatin1String("GET"), path); header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive")); - return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, to)); + return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, to)); } /*! @@ -2359,7 +2359,7 @@ int QHttp::head(const QString & path) { QHttpRequestHeader header(QLatin1String("HEAD"), path); header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive")); - return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, 0)); + return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, nullptr)); } /*! @@ -2688,7 +2688,7 @@ void QHttpPrivate::_q_slotClosed() finishedWithError(QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Server closed connection unexpectedly")), QHttp::UnexpectedClose); } - postDevice = 0; + postDevice = nullptr; if(state != QHttp::Closing) setState(QHttp::Closing); QMetaObject::invokeMethod(q, "_q_slotDoFinished", Qt::QueuedConnection); @@ -2741,7 +2741,7 @@ void QHttpPrivate::_q_slotConnected() void QHttpPrivate::_q_slotError(QAbstractSocket::SocketError err) { Q_Q(QHttp); - postDevice = 0; + postDevice = nullptr; if(state == QHttp::Connecting || state == QHttp::Reading || state == QHttp::Sending) { @@ -2830,7 +2830,7 @@ void QHttpPrivate::postMoreData() } if(postDevice->atEnd()) { - postDevice = 0; + postDevice = nullptr; } socket->write(arr, n); @@ -3023,7 +3023,7 @@ void QHttpPrivate::_q_slotReadyRead() else { qint64 n = socket->bytesAvailable(); - QByteArray * arr = 0; + QByteArray * arr = nullptr; if(chunkedSize != -1) { // transfer-encoding is chunked @@ -3138,7 +3138,7 @@ void QHttpPrivate::_q_slotReadyRead() qint64 bytesWritten; bytesWritten = toDevice->write(*arr, n); delete arr; - arr = 0; + arr = nullptr; // if writing to the device does not succeed, quit with error if(bytesWritten == -1 || bytesWritten < n) { @@ -3161,7 +3161,7 @@ void QHttpPrivate::_q_slotReadyRead() char * ptr = rba.reserve(arr->size()); memcpy(ptr, arr->data(), arr->size()); delete arr; - arr = 0; + arr = nullptr; #if defined(QHTTP_DEBUG) qDebug("QHttp::_q_slotReadyRead(): read %lld bytes (%lld bytes done)", n, bytesDone + q->bytesAvailable()); #endif @@ -3262,7 +3262,7 @@ void QHttpPrivate::closeConn() if(state == QHttp::Closing || state == QHttp::Unconnected) return; - postDevice = 0; + postDevice = nullptr; setState(QHttp::Closing); // Already closed ? @@ -3288,7 +3288,7 @@ void QHttpPrivate::setSock(QTcpSocket * sock) delete socket; // use the new QTcpSocket socket, or create one if socket is 0. - deleteSocket = (sock == 0); + deleteSocket = (sock == nullptr); socket = sock; if(!socket) { diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp index afe462a98..9cb7b8d6a 100644 --- a/src/modules/objects/qthttp/qhttpauthenticator.cpp +++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp @@ -132,7 +132,7 @@ static QByteArray qNtlmPhase3(QHttpAuthenticatorPrivate * ctx, const QByteArray Constructs an empty authentication object */ QHttpAuthenticator::QHttpAuthenticator() - : d(0) + : d(nullptr) { } @@ -443,7 +443,7 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByteArray QHttpAuthenticatorPrivate::calculateResponse(const QByteArray & requestMethod, const QByteArray & path) { QByteArray response; - const char * methodString = 0; + const char * methodString = nullptr; switch(method) { case QHttpAuthenticatorPrivate::None: @@ -1219,7 +1219,7 @@ QByteArray qEncodeHmacMd5(QByteArray & key, const QByteArray & message) static QByteArray qCreatev2Hash(const QHttpAuthenticatorPrivate * ctx, QNtlmPhase3Block * phase3) { - Q_ASSERT(phase3 != 0); + Q_ASSERT(phase3 != nullptr); // since v2 Hash is need for both NTLMv2 and LMv2 it is calculated // only once and stored and reused if(phase3->v2Hash.size() == 0) @@ -1277,7 +1277,7 @@ static QByteArray qEncodeNtlmv2Response(const QHttpAuthenticatorPrivate * ctx, const QNtlmPhase2Block & ch, QNtlmPhase3Block * phase3) { - Q_ASSERT(phase3 != 0); + Q_ASSERT(phase3 != nullptr); // return value stored in phase3 qCreatev2Hash(ctx, phase3); @@ -1352,7 +1352,7 @@ static QByteArray qEncodeLmv2Response(const QHttpAuthenticatorPrivate * ctx, const QNtlmPhase2Block & ch, QNtlmPhase3Block * phase3) { - Q_ASSERT(phase3 != 0); + Q_ASSERT(phase3 != nullptr); // return value stored in phase3 qCreatev2Hash(ctx, phase3); diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index e8e349c36..ec5b99811 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -77,7 +77,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget * parent, O : QTreeWidgetItem() { m_pInstanceEntry = e; - m_pOptionsWidget = 0; + m_pOptionsWidget = nullptr; setText(0, e->szName); setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertTopLevelItem(0, this); @@ -87,7 +87,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem * paren : QTreeWidgetItem() { m_pInstanceEntry = e; - m_pOptionsWidget = 0; + m_pOptionsWidget = nullptr; setText(0, e->szName); setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertChild(0, this); @@ -184,7 +184,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal m_pTreeWidget->setRootIsDecorated(true); m_pTreeWidget->setSortingEnabled(false); m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - m_pTreeWidget->setCurrentItem(NULL); + m_pTreeWidget->setCurrentItem(nullptr); connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *))); @@ -259,7 +259,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal g1->setRowStretch(0, 1); g1->setColumnStretch(1, 1); - fillTreeWidget(0, g_pOptionsInstanceManager->instanceEntryTree(), szGroup); + fillTreeWidget(nullptr, g_pOptionsInstanceManager->instanceEntryTree(), szGroup); if(!parent()) { @@ -633,7 +633,7 @@ void OptionsDialog::apply(bool bDialogAboutToClose) it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem(); if(it) { - treeWidgetItemSelectionChanged(it, 0); + treeWidgetItemSelectionChanged(it, nullptr); if(curTab > 0 && it->m_pOptionsWidget) if(it->m_pOptionsWidget->tabWidget()) it->m_pOptionsWidget->tabWidget()->setCurrentIndex(curTab); @@ -677,7 +677,7 @@ void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem * it) { it->m_pOptionsWidget->commit(); delete it->m_pOptionsWidget; - it->m_pOptionsWidget = 0; + it->m_pOptionsWidget = nullptr; } //refreshTreeWidget(); // <-- this tends to jump into infinite recursion } diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index 2ed928724..f7ece29cf 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -651,7 +651,7 @@ static const char * g_szName_OptionsWidget_windowListClassic = KVI_OPTIONS_WIDGE static const char * g_szClassName_OptionsWidget_windowListClassic = "OptionsWidget_windowListClassic"; OptionsInstanceManager::OptionsInstanceManager() - : QObject(0) + : QObject(nullptr) { //qDebug("Instantiating"); @@ -662,7 +662,7 @@ OptionsInstanceManager::OptionsInstanceManager() OptionsWidgetInstanceEntry * e0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_connection_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_connection; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection @@ -701,7 +701,7 @@ OptionsInstanceManager::OptionsInstanceManager() OptionsWidgetInstanceEntry * e1; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced @@ -740,7 +740,7 @@ OptionsInstanceManager::OptionsInstanceManager() OptionsWidgetInstanceEntry * e2; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_connectionSsl; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl @@ -772,11 +772,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_connectionSsl; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSsl, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_connectionSocket; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket @@ -808,11 +808,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_connectionSocket; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSocket, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_identService_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_identService; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService @@ -844,11 +844,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_identService; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identService, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_proxy_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_proxy; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy @@ -880,11 +880,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_proxy; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_proxy, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_dcc_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_dcc; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc @@ -922,7 +922,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_dccGeneral; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral @@ -954,11 +954,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_dccGeneral; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccGeneral, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced @@ -990,11 +990,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_dccAdvanced; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccAdvanced, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_dccSend_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_dccSend; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend @@ -1032,7 +1032,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral @@ -1064,11 +1064,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_dccSendGeneral; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendGeneral, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced @@ -1100,11 +1100,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_dccSendAdvanced; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendAdvanced, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_dccChat_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_dccChat; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat @@ -1136,11 +1136,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_dccChat; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccChat, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_dccVoice; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice @@ -1172,11 +1172,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_dccVoice; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccVoice, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_general_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_general; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general @@ -1214,7 +1214,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_mediaTypes; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes @@ -1246,11 +1246,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_mediaTypes; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_mediaTypes, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_sound_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_sound; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound @@ -1288,7 +1288,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_soundGeneral; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral @@ -1320,11 +1320,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_soundGeneral; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_soundGeneral, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_sounds_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_sounds; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds @@ -1356,11 +1356,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_sounds; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sounds, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_textEncoding; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding @@ -1392,11 +1392,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_textEncoding; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textEncoding, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_uparser_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_uparser; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser @@ -1428,11 +1428,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_uparser; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_uparser, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_urlHandlers; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers @@ -1464,11 +1464,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_urlHandlers; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_urlHandlers, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_identity_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_identity; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity @@ -1506,7 +1506,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget @@ -1538,11 +1538,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_identityAvatar; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar @@ -1574,11 +1574,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_identityAvatar; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAvatar, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced @@ -1610,11 +1610,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_identityAdvanced; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAdvanced, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_identityProfile; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile @@ -1646,11 +1646,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_identityProfile; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityProfile, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_inputLook_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_inputLook; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook @@ -1682,11 +1682,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_inputLook; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputLook, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_interfaceFeatures_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_interfaceFeatures; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures @@ -1724,7 +1724,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_inputFeatures; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures @@ -1756,11 +1756,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_inputFeatures; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputFeatures, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_notifier_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_notifier; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier @@ -1792,11 +1792,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_notifier; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifier, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_tray_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_tray; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray @@ -1828,11 +1828,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_tray; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tray, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_irc_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_irc; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc @@ -1870,7 +1870,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_channel_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_channel; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel @@ -1908,7 +1908,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_channelGeneral; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral @@ -1940,11 +1940,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_channelGeneral; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelGeneral, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced @@ -1976,11 +1976,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_channelAdvanced; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelAdvanced, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircGeneral; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral @@ -2012,11 +2012,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircGeneral; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircGeneral, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced @@ -2048,11 +2048,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircAdvanced; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircAdvanced, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircOutput; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput @@ -2084,11 +2084,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircOutput; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircOutput, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_protection_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_protection; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection @@ -2126,7 +2126,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_antispam_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_antispam; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam @@ -2158,11 +2158,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_antispam; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_antispam, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection @@ -2194,11 +2194,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_ctcpFloodProtection; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcpFloodProtection, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_ignore_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_ignore; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore @@ -2230,11 +2230,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_ignore; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ignore, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_query_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_query; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query @@ -2266,11 +2266,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_query; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_query, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_tools_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_tools; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools @@ -2308,7 +2308,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting @@ -2347,7 +2347,7 @@ OptionsInstanceManager::OptionsInstanceManager() OptionsWidgetInstanceEntry * e3; e3 = new OptionsWidgetInstanceEntry; e3->createProc = &classOptionsWidget_highlighting_createInstanceProc; - e3->pWidget = 0; + e3->pWidget = nullptr; e3->szClassName = g_szClassName_OptionsWidget_highlighting; e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting @@ -2379,11 +2379,11 @@ OptionsInstanceManager::OptionsInstanceManager() e3->szNameNoLocale = g_szName_OptionsWidget_highlighting; e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_highlighting, "options"); e2->pChildList->append(e3); - e3->pChildList = 0; + e3->pChildList = nullptr; e3 = new OptionsWidgetInstanceEntry; e3->createProc = &classOptionsWidget_alerts_createInstanceProc; - e3->pWidget = 0; + e3->pWidget = nullptr; e3->szClassName = g_szClassName_OptionsWidget_alerts; e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts @@ -2415,11 +2415,11 @@ OptionsInstanceManager::OptionsInstanceManager() e3->szNameNoLocale = g_szName_OptionsWidget_alerts; e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alerts, "options"); e2->pChildList->append(e3); - e3->pChildList = 0; + e3->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_avatar_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_avatar; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar @@ -2451,11 +2451,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_avatar; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_avatar, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_away_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_away; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away @@ -2487,11 +2487,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_away; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_away, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_ctcp_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_ctcp; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp @@ -2523,11 +2523,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_ctcp; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcp, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_lag_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_lag; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag @@ -2559,11 +2559,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_lag; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_lag, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_logging_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_logging; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging @@ -2595,11 +2595,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_logging; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_logging, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_nickServ_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_nickServ; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ @@ -2631,11 +2631,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_nickServ; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_nickServ, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_notify_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_notify; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify @@ -2667,11 +2667,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_notify; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notify, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_textIcons_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_textIcons; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons @@ -2703,11 +2703,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_textIcons; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textIcons, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_ircViewTheme_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_ircViewTheme; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme @@ -2745,7 +2745,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircViewLook; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook @@ -2777,11 +2777,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircViewLook; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewLook, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures @@ -2813,11 +2813,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircViewFeatures; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewFeatures, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker @@ -2849,11 +2849,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_ircViewMarker; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewMarker, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_message_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_message; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message @@ -2891,7 +2891,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_privmsg_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_privmsg; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg @@ -2923,11 +2923,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_privmsg; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_privmsg, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_timestamp_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_timestamp; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp @@ -2959,11 +2959,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_timestamp; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_timestamp, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_messageColors_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_messageColors; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors @@ -2995,11 +2995,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_messageColors; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_messageColors, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_standardColors_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_standardColors; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors @@ -3031,11 +3031,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_standardColors; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_standardColors, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_notifierLook_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_notifierLook; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook @@ -3067,11 +3067,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_notifierLook; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifierLook, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_servers_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_servers; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers @@ -3103,11 +3103,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_servers; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_servers, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_theme_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_theme; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme @@ -3139,11 +3139,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_theme; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_theme, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_themeTransparency_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_themeTransparency; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency @@ -3175,11 +3175,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_themeTransparency; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeTransparency, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_themeToolBarApplets_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_themeToolBarApplets; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets @@ -3211,11 +3211,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_themeToolBarApplets; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeToolBarApplets, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_topicLabel_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_topicLabel; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel @@ -3247,11 +3247,11 @@ OptionsInstanceManager::OptionsInstanceManager() e0->szNameNoLocale = g_szName_OptionsWidget_topicLabel; e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_topicLabel, "options"); m_pInstanceTree->append(e0); - e0->pChildList = 0; + e0->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_userList_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_userList; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList @@ -3289,7 +3289,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_userListBackground; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground @@ -3321,11 +3321,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_userListBackground; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListBackground, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_userListForeground; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground @@ -3357,11 +3357,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_userListForeground; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListForeground, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_userListGrid; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid @@ -3393,11 +3393,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_userListGrid; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListGrid, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_userListFeatures; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures @@ -3429,11 +3429,11 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_userListFeatures; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListFeatures, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_windowList_createInstanceProc; - e0->pWidget = 0; + e0->pWidget = nullptr; e0->szClassName = g_szClassName_OptionsWidget_windowList; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList @@ -3471,7 +3471,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_windowListTree; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree @@ -3509,7 +3509,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground @@ -3541,11 +3541,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeForeground; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeForeground, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground @@ -3577,11 +3577,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeBackground; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeBackground, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e2 = new OptionsWidgetInstanceEntry; e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc; - e2->pWidget = 0; + e2->pWidget = nullptr; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures; e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures @@ -3613,11 +3613,11 @@ OptionsInstanceManager::OptionsInstanceManager() e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeFeatures; e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeFeatures, "options"); e1->pChildList->append(e2); - e2->pChildList = 0; + e2->pChildList = nullptr; e1 = new OptionsWidgetInstanceEntry; e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc; - e1->pWidget = 0; + e1->pWidget = nullptr; e1->szClassName = g_szClassName_OptionsWidget_windowListClassic; e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic @@ -3649,7 +3649,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->szNameNoLocale = g_szName_OptionsWidget_windowListClassic; e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListClassic, "options"); e0->pChildList->append(e1); - e1->pChildList = 0; + e1->pChildList = nullptr; } void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList) @@ -3664,7 +3664,7 @@ void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInst { disconnect(pEntry->pWidget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed())); delete pEntry->pWidget->parent(); - pEntry->pWidget = 0; + pEntry->pWidget = nullptr; } else { @@ -3687,14 +3687,14 @@ OptionsInstanceManager::~OptionsInstanceManager() void OptionsInstanceManager::cleanup(KviModule *) { deleteInstanceTree(m_pInstanceTree); - m_pInstanceTree = 0; + m_pInstanceTree = nullptr; } void OptionsInstanceManager::widgetDestroyed() { OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(), m_pInstanceTree); if(pEntry) - pEntry->pWidget = 0; + pEntry->pWidget = nullptr; if(g_iOptionWidgetInstances > 0) g_iOptionWidgetInstances--; } @@ -3702,7 +3702,7 @@ void OptionsInstanceManager::widgetDestroyed() KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar) { if(!pEntry) - return NULL; + return nullptr; #if 0 if(pEntry->pWidget) @@ -3786,7 +3786,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QOb } } } - return 0; + return nullptr; } OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList) @@ -3805,7 +3805,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha } } } - return 0; + return nullptr; } OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName) diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 5b891fb8e..04afa1040 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -48,7 +48,7 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal) setObjectName("container"); - m_pOptionsWidget = NULL; + m_pOptionsWidget = nullptr; if(bModal) setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal); @@ -76,7 +76,7 @@ void OptionsWidgetContainer::setNextToLeft(QWidget * pWidget) void OptionsWidgetContainer::optionsWidgetDestroyed() { - m_pOptionsWidget = NULL; + m_pOptionsWidget = nullptr; } void OptionsWidgetContainer::childEvent(QChildEvent * e) @@ -89,7 +89,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e) if(e->child() == static_cast<QObject *>(m_pOptionsWidget)) { QObject::disconnect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed())); - m_pOptionsWidget = NULL; + m_pOptionsWidget = nullptr; } } diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index 62159e7fb..401142f47 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -665,9 +665,9 @@ void OptionsWidget_identityAvatar::chooseAvatar() OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent) : KviOptionsWidget(parent) { - m_pISelector = 0; - m_pWSelector = 0; - m_pSSelector = 0; + m_pISelector = nullptr; + m_pWSelector = nullptr; + m_pSSelector = nullptr; m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode); m_bI = m_sModeStr.contains('i'); @@ -721,7 +721,7 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) : KviOptionsWidget(pParent) { setObjectName("identity_profiles_option_widget"); - m_pEditor = 0; + m_pEditor = nullptr; m_iCurrentEditedProfile = -1; createLayout(); diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp index 19fe5dd5c..866fb7f91 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.cpp +++ b/src/modules/options/OptionsWidget_mediaTypes.cpp @@ -146,7 +146,7 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent) layout()->setColumnStretch(2, 1); layout()->setRowStretch(0, 1); - m_pLastItem = 0; + m_pLastItem = nullptr; fillTreeWidget(); } @@ -241,7 +241,7 @@ void OptionsWidget_mediaTypes::delMediaType() if(m_pLastItem) { MediaTypeTreeWidgetItem * it = m_pLastItem; - m_pLastItem = 0; + m_pLastItem = nullptr; delete it; } } diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index 881700613..aa0485040 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -372,7 +372,7 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) createLayout(); int i; - m_pLastItem = 0; + m_pLastItem = nullptr; m_pListView = new MessageListWidget(this); m_pListViewItemDelegate = new MessageListWidgetItemDelegate(m_pListView); @@ -525,7 +525,7 @@ void OptionsWidget_messageColors::itemChanged() if(m_pLastItem) saveLastItem(); - m_pLastItem = 0; // do NOT save in this routine + m_pLastItem = nullptr; // do NOT save in this routine m_pForeListWidget->setEnabled(it); m_pBackListWidget->setEnabled(it); diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp index ebffe0fc5..a98dcd91a 100644 --- a/src/modules/options/OptionsWidget_nickserv.cpp +++ b/src/modules/options/OptionsWidget_nickserv.cpp @@ -115,7 +115,7 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField) } else { - m_pServerMaskEdit = 0; + m_pServerMaskEdit = nullptr; } l = new QLabel(__tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help", "options"), this); diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 8bebd95f2..cd121aa39 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -134,7 +134,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) #ifndef COMPILE_IPV6_SUPPORT m_pIPv6Check->setEnabled(false); #endif - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; fillProxyList(); @@ -177,7 +177,7 @@ void OptionsWidget_proxy::fillProxyList() } } if(!(g_pProxyDataBase->currentProxy())) - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); enableDisableUseProxySelector(); } @@ -357,7 +357,7 @@ void OptionsWidget_proxy::removeCurrent() if(m_pLastEditedItem) { QTreeWidgetItem * tmp = m_pLastEditedItem; - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; delete tmp; QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(0); @@ -367,7 +367,7 @@ void OptionsWidget_proxy::removeCurrent() } else { - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } } } diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 11b85ba22..64a96a712 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -77,28 +77,28 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork * setModal(true); setObjectName("network_details"); - m_pOnConnectEditor = NULL; - m_pOnLoginEditor = NULL; + m_pOnConnectEditor = nullptr; + m_pOnLoginEditor = nullptr; - m_pUserEditor = NULL; - m_pPassEditor = NULL; - m_pNickEditor = NULL; - m_pAlternativeNickEditor = NULL; - m_pRealEditor = NULL; - m_pDescEditor = NULL; + m_pUserEditor = nullptr; + m_pPassEditor = nullptr; + m_pNickEditor = nullptr; + m_pAlternativeNickEditor = nullptr; + m_pRealEditor = nullptr; + m_pDescEditor = nullptr; - m_pEncodingEditor = NULL; - m_pTextEncodingEditor = NULL; + m_pEncodingEditor = nullptr; + m_pTextEncodingEditor = nullptr; - m_pAutoConnectCheck = NULL; + m_pAutoConnectCheck = nullptr; - m_pNickServTreeWidget = NULL; - m_pNickServCheck = NULL; - m_pAddRuleButton = NULL; - m_pDelRuleButton = NULL; - m_pEditRuleButton = NULL; + m_pNickServTreeWidget = nullptr; + m_pNickServCheck = nullptr; + m_pAddRuleButton = nullptr; + m_pDelRuleButton = nullptr; + m_pEditRuleButton = nullptr; - m_pChannelListSelector = NULL; + m_pChannelListSelector = nullptr; QGridLayout * g = new QGridLayout(this); @@ -482,7 +482,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) m_pChannelListSelector->commit(); if(m_lstChannels.isEmpty()) - n->setAutoJoinChannelList(0); + n->setAutoJoinChannelList(nullptr); else n->setAutoJoinChannelList(new QStringList(m_lstChannels)); @@ -501,7 +501,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) n->setNickServRuleSet(rs); } else - n->setNickServRuleSet(0); + n->setNickServRuleSet(nullptr); } if(m_pOnConnectEditor) @@ -1225,7 +1225,7 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) if(m_pChannelListSelector) m_pChannelListSelector->commit(); if(m_lstChannels.isEmpty()) - s->setAutoJoinChannelList(0); + s->setAutoJoinChannelList(nullptr); else s->setAutoJoinChannelList(new QStringList(m_lstChannels)); @@ -1250,7 +1250,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget * par : QTreeWidgetItem(parent) { setIcon(0, QIcon(pm)); - m_pServerData = 0; + m_pServerData = nullptr; m_pNetworkData = new KviIrcNetwork(*n); setText(0, n->name()); setText(1, n->description()); @@ -1263,7 +1263,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem * m_pServerData = new KviIrcServer(*s); setText(0, s->hostName()); setText(1, s->description()); - m_pNetworkData = 0; + m_pNetworkData = nullptr; } IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem() @@ -1303,9 +1303,9 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) connect(m_pImportPopup, SIGNAL(aboutToShow()), this, SLOT(importPopupAboutToShow())); connect(m_pImportPopup, SIGNAL(triggered(QAction *)), this, SLOT(importPopupActivated(QAction *))); - m_pServerDetailsDialog = 0; - m_pNetworkDetailsDialog = 0; - m_pImportFilter = 0; + m_pServerDetailsDialog = nullptr; + m_pNetworkDetailsDialog = nullptr; + m_pImportFilter = nullptr; m_pFilterLabel = new QLabel(__tr2qs_ctx("Filter:", "options"), this); addWidgetToLayout(m_pFilterLabel, 0, 0, 0, 0); @@ -1433,7 +1433,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) KviTalToolTip::add(tb, __tr2qs_ctx("This button shows a list of recently used servers.<br>It allows you to quickly find them in the list.", "options")); - m_pShowThisDialogAtStartupSelector = NULL; + m_pShowThisDialogAtStartupSelector = nullptr; // The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog if(parent->inherits("OptionsWidgetContainer")) @@ -1498,12 +1498,12 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) } else { - m_pConnectCurrent = NULL; + m_pConnectCurrent = nullptr; } - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; - m_pClipboard = 0; + m_pClipboard = nullptr; m_bShowingFavoritesOnly = KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly); @@ -1519,9 +1519,9 @@ OptionsWidget_servers::~OptionsWidget_servers() { if(m_pImportFilter) { - disconnect(m_pImportFilter, 0, this, 0); + disconnect(m_pImportFilter, nullptr, this, nullptr); m_pImportFilter->die(); - m_pImportFilter = 0; + m_pImportFilter = nullptr; } if(m_pClipboard) @@ -1539,7 +1539,7 @@ void OptionsWidget_servers::slotShowThisDialogAtStartupSelectorDestroyed() KVI_ASSERT(m_pShowThisDialogAtStartupSelector); removeSelector(m_pShowThisDialogAtStartupSelector); - m_pShowThisDialogAtStartupSelector = NULL; + m_pShowThisDialogAtStartupSelector = nullptr; } void OptionsWidget_servers::recentServersPopupAboutToShow() @@ -1585,7 +1585,7 @@ void OptionsWidget_servers::selectBestServerByUrl(const QString & szUrl) int uCount = m_pTreeWidget->topLevelItemCount(); int uIdx = 0; - IrcServerOptionsTreeWidgetItem * pBestCandidate = NULL; + IrcServerOptionsTreeWidgetItem * pBestCandidate = nullptr; kvi_u32_t uBestCandidateScore = 0; while(uIdx < uCount) @@ -1658,7 +1658,7 @@ void OptionsWidget_servers::fillServerList() { IrcServerOptionsTreeWidgetItem * net; IrcServerOptionsTreeWidgetItem * srv; - IrcServerOptionsTreeWidgetItem * cur = 0; + IrcServerOptionsTreeWidgetItem * cur = nullptr; KviPointerHashTableIterator<QString, KviIrcNetwork> it(*(g_pServerDataBase->recordDict())); @@ -1961,9 +1961,9 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction) if(m_pImportFilter) { - disconnect(m_pImportFilter, 0, this, 0); + disconnect(m_pImportFilter, nullptr, this, nullptr); m_pImportFilter->die(); - m_pImportFilter = 0; + m_pImportFilter = nullptr; } bool bOk = false; @@ -1971,7 +1971,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction) if(!bOk) return; - m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, 0); + m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, nullptr); if(!m_pImportFilter) { @@ -1987,7 +1987,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction) void OptionsWidget_servers::importerDead() { - m_pImportFilter = 0; + m_pImportFilter = nullptr; } void OptionsWidget_servers::importServer(const KviIrcServer & s, const QString & network) @@ -2203,7 +2203,7 @@ IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QStrin if(KviQString::equalCI(it->text(0), netname)) return it; } - return 0; + return nullptr; } void OptionsWidget_servers::clearList() @@ -2216,13 +2216,13 @@ void OptionsWidget_servers::clearList() if(QMessageBox::question(this, __tr2qs_ctx("Confirm Clearing Server List - KVIrc", "options"), txt, - __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), 0, 1) + __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), nullptr, 1) != 0) return; m_pTreeWidget->clear(); - m_pLastEditedItem = 0; - currentItemChanged(0, 0); + m_pLastEditedItem = nullptr; + currentItemChanged(nullptr, nullptr); } void OptionsWidget_servers::detailsClicked() @@ -2249,7 +2249,7 @@ void OptionsWidget_servers::detailsClicked() } delete m_pServerDetailsDialog; - m_pServerDetailsDialog = 0; + m_pServerDetailsDialog = nullptr; return; } if(m_pLastEditedItem->m_pNetworkData) @@ -2272,6 +2272,6 @@ void OptionsWidget_servers::detailsClicked() } delete m_pNetworkDetailsDialog; - m_pNetworkDetailsDialog = 0; + m_pNetworkDetailsDialog = nullptr; } } diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index e22cdbf7f..6dddf8d3a 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -197,7 +197,7 @@ void OptionsWidget_soundGeneral::soundAutoDetect() g_pApp->setOverrideCursor(Qt::WaitCursor); - m->ctrl("detectSoundSystem", 0); + m->ctrl("detectSoundSystem", nullptr); soundFillBox(); g_pApp->restoreOverrideCursor(); @@ -211,7 +211,7 @@ void OptionsWidget_soundGeneral::mediaAutoDetect() g_pApp->setOverrideCursor(Qt::WaitCursor); - m->ctrl("detectMediaPlayer", 0); + m->ctrl("detectMediaPlayer", nullptr); mediaFillBox(); g_pApp->restoreOverrideCursor(); 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<QString, KviKvsVariant> * hashTable = availableDictionaries.hash()->dict(); KviPointerHashTableIterator<QString, KviKvsVariant> iter(*hashTable); QMap<QString, QString> 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 } diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index e07d6923e..702fe42a2 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -70,9 +70,9 @@ void TextIconTableItem::setId(int id) OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) : KviOptionsWidget(parent) { - m_pPopup = 0; + m_pPopup = nullptr; m_iLastEditedRow = -1; - m_pCurrentIconButton = 0; + m_pCurrentIconButton = nullptr; setObjectName("texticons_options_widget"); createLayout(); @@ -169,7 +169,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon) m_pCurrentItem->icon()->setId(eIcon); m_pCurrentItem->setIcon(QIcon(*m_pCurrentItem->icon()->pixmap())); - KviTalHBox * pBox = new KviTalHBox(0); + KviTalHBox * pBox = new KviTalHBox(nullptr); pBox->setSpacing(0); pBox->setMargin(0); @@ -230,10 +230,10 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW { QWidget * pOldWidget = m_pTable->cellWidget(prev->row(), 1); if(pOldWidget) - m_pTable->setCellWidget(prev->row(), 1, NULL); + m_pTable->setCellWidget(prev->row(), 1, nullptr); } - m_pCurrentItem = NULL; + m_pCurrentItem = nullptr; if(!cur) return; @@ -244,7 +244,7 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW m_pCurrentItem = (TextIconTableItem *)cur; - KviTalHBox * pBox = new KviTalHBox(0); + KviTalHBox * pBox = new KviTalHBox(nullptr); pBox->setSpacing(0); pBox->setMargin(0); @@ -266,7 +266,7 @@ void OptionsWidget_textIcons::addClicked() { m_pTable->setRowCount(m_pTable->rowCount() + 1); m_pTable->setItem(m_pTable->rowCount() - 1, 0, new QTableWidgetItem(__tr2qs_ctx("unnamed", "options"))); - m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, 0)); + m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, nullptr)); m_pTable->scrollToBottom(); m_pDel->setEnabled(true); } diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index ff958f594..0461eea58 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -38,9 +38,9 @@ #include <QSplitter> -KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = 0; +KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = nullptr; -OptionsInstanceManager * g_pOptionsInstanceManager = 0; +OptionsInstanceManager * g_pOptionsInstanceManager = nullptr; extern int g_iOptionWidgetInstances; @@ -111,7 +111,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) { if(d->parent()) { - d->setParent(0); + d->setParent(nullptr); d->setGeometry(0, 0, d->width(), d->height()); } } @@ -349,11 +349,11 @@ static bool options_module_cleanup(KviModule * m) for(d = l.first(); d; d = l.next()) delete d; delete g_pOptionsDialogDict; - g_pOptionsDialogDict = 0; + g_pOptionsDialogDict = nullptr; g_pOptionsInstanceManager->cleanup(m); delete g_pOptionsInstanceManager; - g_pOptionsInstanceManager = 0; + g_pOptionsInstanceManager = nullptr; return true; } diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index 70fe63521..c4016abdd 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -34,7 +34,7 @@ #ifdef COMPILE_PERL_SUPPORT #include "../perlcore/perlcoreinterface.h" -static KviModule * g_pPerlCoreModule = 0; +static KviModule * g_pPerlCoreModule = nullptr; #endif // COMPILE_PERL_SUPPORT #ifdef COMPILE_PERL_SUPPORT diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index 5b84aa7f3..d0680d110 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -73,7 +73,7 @@ #include "KviKvsRunTimeContext.h" -static KviKvsRunTimeContext * g_pCurrentKvsContext = 0; +static KviKvsRunTimeContext * g_pCurrentKvsContext = nullptr; static bool g_bExecuteQuiet = false; static KviCString g_szLastReturnValue(""); static QStringList g_lWarningList; @@ -125,7 +125,7 @@ protected: KviPerlInterpreter::KviPerlInterpreter(const QString & szContextName) { m_szContextName = szContextName; - m_pInterpreter = 0; + m_pInterpreter = nullptr; } KviPerlInterpreter::~KviPerlInterpreter() @@ -177,7 +177,7 @@ bool KviPerlInterpreter::init() PERL_SET_CONTEXT(m_pInterpreter); PL_perl_destruct_level = 1; perl_construct(m_pInterpreter); - perl_parse(m_pInterpreter, xs_init, 4, (char **)daArgs, NULL); + perl_parse(m_pInterpreter, xs_init, 4, (char **)daArgs, nullptr); QString szInitCode; // this part of the code seems to be unnecessary @@ -221,7 +221,7 @@ void KviPerlInterpreter::done() PL_perl_destruct_level = 1; perl_destruct(m_pInterpreter); perl_free(m_pInterpreter); - m_pInterpreter = 0; + m_pInterpreter = nullptr; } QString KviPerlInterpreter::svToQString(SV * sv) @@ -320,7 +320,7 @@ bool KviPerlInterpreter::execute( return true; } -static KviPointerHashTable<QString, KviPerlInterpreter> * g_pInterpreters = 0; +static KviPointerHashTable<QString, KviPerlInterpreter> * g_pInterpreters = nullptr; static KviPerlInterpreter * perlcore_get_interpreter(const QString & szContextName) { @@ -331,7 +331,7 @@ static KviPerlInterpreter * perlcore_get_interpreter(const QString & szContextNa if(!i->init()) { delete i; - return 0; + return nullptr; } g_pInterpreters->replace(szContextName, i); return i; @@ -411,7 +411,7 @@ static bool perlcore_module_init(KviModule *) g_pInterpreters->setAutoDelete(false); int daArgc = 4; const char * daArgs[] = { "yo", "-e", "0", "-w" }; - char ** daEnv = NULL; + char ** daEnv = nullptr; PERL_SYS_INIT3(&daArgc, (char ***)&daArgs, &daEnv); return true; #else // !COMPILE_PERL_SUPPORT @@ -424,7 +424,7 @@ static bool perlcore_module_cleanup(KviModule *) #ifdef COMPILE_PERL_SUPPORT perlcore_destroy_all_interpreters(); delete g_pInterpreters; - g_pInterpreters = 0; + g_pInterpreters = nullptr; // ifdef workaround for #842 #ifndef COMPILE_ON_MAC PERL_SYS_TERM(); diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp index 6338d6411..f28f42722 100644 --- a/src/modules/popup/libkvipopup.cpp +++ b/src/modules/popup/libkvipopup.cpp @@ -825,7 +825,7 @@ static bool popup_kvs_cmd_show(KviKvsModuleCommandCall * c) if(!pMenu) { delete pPopupParams; - pPopupParams = 0; + pPopupParams = nullptr; c->error(__tr2qs_ctx("Popup %Q is not defined", "kvs"), &szPopupName); return false; } @@ -833,7 +833,7 @@ static bool popup_kvs_cmd_show(KviKvsModuleCommandCall * c) if(pMenu->isSoftLocked()) { delete pPopupParams; - pPopupParams = 0; + pPopupParams = nullptr; c->error(__tr2qs_ctx("A popup menu can't be popped up twice", "kvs")); return false; } diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index 6faee9739..7b5e42c64 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -355,7 +355,7 @@ not_this_one: return found; } - return 0; + return nullptr; } void SinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it) @@ -583,14 +583,14 @@ PopupTreeWidgetItem * SinglePopupEditor::newItem(PopupTreeWidgetItem * par, Popu PopupTreeWidgetItem * SinglePopupEditor::newItemBelow(PopupTreeWidgetItem * it, PopupTreeWidgetItem::Type t) { if(!it) - return newItem(0, 0, t); + return newItem(nullptr, nullptr, t); return newItem((PopupTreeWidgetItem *)it->parent(), it, t); } PopupTreeWidgetItem * SinglePopupEditor::newItemAbove(PopupTreeWidgetItem * it, PopupTreeWidgetItem::Type t) { if(!it) - return newItem(0, 0, t); + return newItem(nullptr, nullptr, t); return newItem((PopupTreeWidgetItem *)it->parent(), (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(it), t); } @@ -608,7 +608,7 @@ PopupTreeWidgetItem * SinglePopupEditor::newItemInside(PopupTreeWidgetItem * it, void SinglePopupEditor::contextNewPrologue() { - PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0; + PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr; // if(!findPrologue(it)) // { m_pTreeWidget->setCurrentItem(newItem(it, it, PopupTreeWidgetItem::Prologue)); @@ -617,7 +617,7 @@ void SinglePopupEditor::contextNewPrologue() void SinglePopupEditor::contextNewEpilogue() { - PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0; + PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr; // if(!findEpilogue(it)) // { PopupTreeWidgetItem * after = it ? (PopupTreeWidgetItem *)it->child(0) : (PopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(0); @@ -672,7 +672,7 @@ void SinglePopupEditor::contextPasteBelow() { if(!m_pClipboard) return; - PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0; + PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr; populateMenu(m_pClipboard, par, m_pLastSelectedItem); } @@ -680,8 +680,8 @@ void SinglePopupEditor::contextPasteAbove() { if(!m_pClipboard) return; - PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0; - PopupTreeWidgetItem * above = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : 0; + PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr; + PopupTreeWidgetItem * above = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : nullptr; populateMenu(m_pClipboard, par, above); } @@ -698,7 +698,7 @@ void SinglePopupEditor::contextPasteInside() } m_pLastSelectedItem->setExpanded(true); } - populateMenu(m_pClipboard, m_pLastSelectedItem, 0); + populateMenu(m_pClipboard, m_pLastSelectedItem, nullptr); } void SinglePopupEditor::saveLastSelectedItem() @@ -852,7 +852,7 @@ void SinglePopupEditor::selectionChanged() if(m_pTreeWidget->selectedItems().empty()) { - it = 0; + it = nullptr; } else { @@ -1012,7 +1012,7 @@ void SinglePopupEditor::populateMenu(KviKvsPopupMenu * pop, PopupTreeWidgetItem theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString()); theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString()); theItem->setId(item->name()); - populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(), theItem, 0); + populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(), theItem, nullptr); break; default: break; @@ -1045,7 +1045,7 @@ void SinglePopupEditor::edit(MenuTreeWidgetItem * it) if(it) { m_pNameEditor->setText(it->m_pPopup->popupName()); - populateMenu(it->m_pPopup, 0, 0); + populateMenu(it->m_pPopup, nullptr, nullptr); } else { @@ -1121,7 +1121,7 @@ PopupEditorWidget::PopupEditorWidget(QWidget * par) spl->setStretchFactor(0, 20); spl->setStretchFactor(1, 80); - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } PopupEditorWidget::~PopupEditorWidget() @@ -1178,7 +1178,7 @@ void PopupEditorWidget::popupRefresh(const QString & szName) if(ch == m_pLastEditedItem) { if( - QMessageBox::warning(0, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"), + QMessageBox::warning(nullptr, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"), __tr2qs_ctx("An external script has changed the popup you are currently editing. Do you want to accept the external changes?", "editor"), QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape) != QMessageBox::Yes) @@ -1326,14 +1326,14 @@ void PopupEditorWidget::removeCurrentPopup() m_pLastEditedItem = nullptr; delete it; if(!m_pLastEditedItem) - currentItemChanged(0, 0); + currentItemChanged(nullptr, nullptr); } } void PopupEditorWidget::newPopup() { QString newName; - getUniquePopupName(0, newName); + getUniquePopupName(nullptr, newName); MenuTreeWidgetItem * it = new MenuTreeWidgetItem(m_pTreeWidget, new KviKvsPopupMenu(newName)); m_pTreeWidget->setCurrentItem(it); } @@ -1445,7 +1445,7 @@ void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem * item, QString & } PopupEditorWindow::PopupEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "popupeditor", 0) + : KviWindow(KviWindow::ScriptEditor, "popupeditor", nullptr) { g_pPopupEditorWindow = this; diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp index 720ce5143..171d03097 100644 --- a/src/modules/popupeditor/libkvipopupeditor.cpp +++ b/src/modules/popupeditor/libkvipopupeditor.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "KviMainWindow.h" -PopupEditorWindow * g_pPopupEditorWindow = 0; +PopupEditorWindow * g_pPopupEditorWindow = nullptr; /* @doc: popupeditor.open @@ -59,20 +59,20 @@ static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall *) static bool popupeditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m, "open", popupeditor_kvs_cmd_open); - g_pPopupEditorWindow = 0; + g_pPopupEditorWindow = nullptr; return true; } static bool popupeditor_module_can_unload(KviModule *) { - return (g_pPopupEditorWindow == 0); + return (g_pPopupEditorWindow == nullptr); } static bool popupeditor_module_cleanup(KviModule *) { if(g_pPopupEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pPopupEditorWindow); - g_pPopupEditorWindow = 0; + g_pPopupEditorWindow = nullptr; return true; } diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp index f35589143..235e3545a 100644 --- a/src/modules/pythoncore/kvircmodule.cpp +++ b/src/modules/pythoncore/kvircmodule.cpp @@ -76,11 +76,11 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s|is", &pcText, &iColorSet, &pcWinId)) - return 0; + return nullptr; if(pcText) { @@ -113,11 +113,11 @@ static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s|s", &pcText, &pcWinId)) - return 0; + return nullptr; if(pcText) { @@ -151,11 +151,11 @@ static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &pcText)) - return 0; + return nullptr; if(pcText && !g_bExecuteQuiet) { @@ -175,11 +175,11 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &szVarName)) - return 0; + return nullptr; if(g_pCurrentKvsContext) { @@ -194,7 +194,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs) return Py_BuildValue("s", ""); } } - return 0; + return nullptr; } static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs) @@ -206,11 +206,11 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue)) - return 0; + return nullptr; if(g_pCurrentKvsContext) { @@ -225,7 +225,7 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs) } return Py_BuildValue("i", 1); } - return 0; + return nullptr; } static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs) @@ -237,11 +237,11 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &szVarName)) - return 0; + return nullptr; if(g_pCurrentKvsContext) { @@ -256,7 +256,7 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs) return Py_BuildValue("s", ""); } } - return 0; + return nullptr; } static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs) @@ -268,11 +268,11 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue)) - return 0; + return nullptr; if(g_pCurrentKvsContext) { @@ -287,7 +287,7 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs) } return Py_BuildValue("i", 1); } - return 0; + return nullptr; } static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs) @@ -300,11 +300,11 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &pcCode)) - return 0; + return nullptr; if(pcCode) { @@ -319,7 +319,7 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs) { KviKvsVariant ret; QString szRet; - if(KviKvsScript::run(QString::fromUtf8(pcCode), pWnd, 0, &ret)) + if(KviKvsScript::run(QString::fromUtf8(pcCode), pWnd, nullptr, &ret)) { ret.asString(szRet); pcRetVal = szRet.toUtf8().data(); @@ -338,11 +338,11 @@ static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &pcText)) - return 0; + return nullptr; if(pcText && !g_bExecuteQuiet) g_lWarningList.append(QString(pcText)); @@ -358,11 +358,11 @@ static PyObject * PyKVIrc_error(PyObject * pSelf, PyObject * pArgs) if(QThread::currentThread() != g_pApp->thread()) { qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread"); - return 0; // Sorry, we're NOT thread safe + return nullptr; // Sorry, we're NOT thread safe } if(!PyArg_ParseTuple(pArgs, "s", &pcText)) - return 0; + return nullptr; if(pcText) g_lError.append(pcText); diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp index ba40666ad..8de305fc2 100644 --- a/src/modules/raweditor/RawEditorWindow.cpp +++ b/src/modules/raweditor/RawEditorWindow.cpp @@ -103,7 +103,7 @@ RawEditorWidget::RawEditorWidget(QWidget * par) m_pEditor = KviScriptEditor::createInstance(box); m_bOneTimeSetupDone = false; - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; } RawEditorWidget::~RawEditorWidget() @@ -252,7 +252,7 @@ void RawEditorWidget::addHandlerForCurrentRaw() RawTreeWidgetItem * it = (RawTreeWidgetItem *)m_pTreeWidget->currentItem(); if(it) { - if(it->parent() == 0) + if(it->parent() == nullptr) { QString buffer = __tr2qs_ctx("default", "editor"); getUniqueHandlerName((RawTreeWidgetItem *)it, buffer); @@ -273,7 +273,7 @@ void RawEditorWidget::removeCurrentHandler() { QTreeWidgetItem * it = m_pLastEditedItem; RawTreeWidgetItem * parent = (RawTreeWidgetItem *)it->parent(); - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; delete it; m_pEditor->setEnabled(false); m_pNameEditor->setEnabled(false); @@ -363,7 +363,7 @@ void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem * } else { - m_pLastEditedItem = 0; + m_pLastEditedItem = nullptr; m_pNameEditor->setEnabled(false); m_pNameEditor->setText(""); m_pEditor->setEnabled(false); @@ -474,7 +474,7 @@ void RawEditorWidget::exportAllEvents() } RawEditorWindow::RawEditorWindow() - : KviWindow(KviWindow::ScriptEditor, "raweditor", 0) + : KviWindow(KviWindow::ScriptEditor, "raweditor", nullptr) { g_pRawEditorWindow = this; @@ -505,7 +505,7 @@ RawEditorWindow::RawEditorWindow() RawEditorWindow::~RawEditorWindow() { - g_pRawEditorWindow = 0; + g_pRawEditorWindow = nullptr; } void RawEditorWindow::okClicked() diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp index acfc7ea86..5670771d4 100644 --- a/src/modules/raweditor/libkviraweditor.cpp +++ b/src/modules/raweditor/libkviraweditor.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "KviMainWindow.h" -RawEditorWindow * g_pRawEditorWindow = 0; +RawEditorWindow * g_pRawEditorWindow = nullptr; /* @doc: raweditor.open @@ -58,20 +58,20 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall *) static bool raweditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m, "open", raweditor_kvs_cmd_open); - g_pRawEditorWindow = 0; + g_pRawEditorWindow = nullptr; return true; } static bool raweditor_module_can_unload(KviModule *) { - return (g_pRawEditorWindow == 0); + return (g_pRawEditorWindow == nullptr); } static bool raweditor_module_cleanup(KviModule *) { if(g_pRawEditorWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pRawEditorWindow); - g_pRawEditorWindow = 0; + g_pRawEditorWindow = nullptr; return true; } diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index 1eb24c37d..8ea921954 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -394,7 +394,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget * p, KviRegisteredU f->setFrameStyle(QFrame::HLine | QFrame::Sunken); g->addWidget(f, 2, 0, 1, 3); - m_pAvatar = 0; + m_pAvatar = nullptr; if(r) { const QString av = r->getProperty("avatar"); diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index 30b5860b1..f544af248 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -346,10 +346,10 @@ RegisteredUsersDialog::~RegisteredUsersDialog() KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry(); #endif - g_pRegisteredUsersDialog = 0; + g_pRegisteredUsersDialog = nullptr; delete g_pLocalRegisteredUserDataBase; - g_pLocalRegisteredUserDataBase = 0; + g_pLocalRegisteredUserDataBase = nullptr; } void RegisteredUsersDialog::itemPressed(QTreeWidgetItem * it, int c) @@ -584,7 +584,7 @@ void RegisteredUsersDialog::cancelClicked() void RegisteredUsersDialog::addClicked() { - RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, 0); + RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, nullptr); int ret = dlg->exec(); delete dlg; @@ -669,7 +669,7 @@ void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i) { KviRegisteredUser * u = i->user(); - i->setUser(0); + i->setUser(nullptr); QString szName = u->name(); @@ -747,7 +747,7 @@ void RegisteredUsersDialog::exportClicked() QString buffer; - if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), 0, 0, true, true, true, this)) + if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), nullptr, nullptr, true, true, true, this)) return; if(!g_pRegisteredUsersDialog) diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index 16ac88c82..392ffa2e7 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -50,9 +50,9 @@ extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; -KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = 0; +KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = nullptr; -RegisteredUsersDialog * g_pRegisteredUsersDialog = 0; +RegisteredUsersDialog * g_pRegisteredUsersDialog = nullptr; /* @doc: reguser @@ -115,7 +115,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c) { if(g_pRegisteredUsersDialog->parent()) { - g_pRegisteredUsersDialog->setParent(0); + g_pRegisteredUsersDialog->setParent(nullptr); } } else @@ -130,7 +130,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c) { if(c->hasSwitch('t', "toplevel")) { - g_pRegisteredUsersDialog = new RegisteredUsersDialog(0); + g_pRegisteredUsersDialog = new RegisteredUsersDialog(nullptr); } else { @@ -205,7 +205,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c) c->switches()->getAsStringIfExisting('g', "group", group); u->setGroup(group); } - if(u == 0) + if(u == nullptr) { if(c->hasSwitch('f', "force")) { @@ -224,7 +224,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c) { KviIrcMask * m = new KviIrcMask(szMask); u = g_pRegisteredUserDataBase->addMask(u, m); - if(u != 0) + if(u != nullptr) { if(!c->hasSwitch('q', "quiet")) c->warning(__tr2qs_ctx("Mask %Q is already used to identify user %s", "register"), &szMask, u->name().toUtf8().data()); @@ -365,7 +365,7 @@ static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c) u = g_pRegisteredUserDataBase->addMask(u, mk); - if(u != 0) + if(u != nullptr) c->warning(__tr2qs_ctx("Mask %Q already used to identify user %Q", "register"), &szMask, &(u->name())); return true; } @@ -1217,7 +1217,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c) static bool reguser_module_init(KviModule * m) { - g_pLocalRegisteredUserDataBase = 0; + g_pLocalRegisteredUserDataBase = nullptr; g_pRegistrationWizardList = new KviPointerList<RegistrationWizard>; g_pRegistrationWizardList->setAutoDelete(true); @@ -1248,12 +1248,12 @@ static bool reguser_module_cleanup(KviModule *) { if(g_pRegisteredUsersDialog) delete g_pRegisteredUsersDialog; - g_pRegisteredUsersDialog = 0; + g_pRegisteredUsersDialog = nullptr; while(RegistrationWizard * w = g_pRegistrationWizardList->first()) delete w; delete g_pRegistrationWizardList; - g_pRegistrationWizardList = 0; + g_pRegistrationWizardList = nullptr; // FIXME: UNREGISTER THE METAOBJECTS return true; @@ -1261,7 +1261,7 @@ static bool reguser_module_cleanup(KviModule *) static bool reguser_module_can_unload(KviModule *) { - return ((g_pRegistrationWizardList->isEmpty()) && (g_pRegisteredUsersDialog == 0)); + return ((g_pRegistrationWizardList->isEmpty()) && (g_pRegisteredUsersDialog == nullptr)); } KVIRC_MODULE( diff --git a/src/modules/rijndael/Rijndael.cpp b/src/modules/rijndael/Rijndael.cpp index b60ef9182..e708f6a91 100644 --- a/src/modules/rijndael/Rijndael.cpp +++ b/src/modules/rijndael/Rijndael.cpp @@ -1070,7 +1070,7 @@ int Rijndael::blockEncrypt(const UINT8 * input, int inputLen, UINT8 * outBuffer, if(m_direction != Encrypt) return RIJNDAEL_BAD_DIRECTION; - if(input == 0 || inputLen <= 0) + if(input == nullptr || inputLen <= 0) return 0; numBlocks = inputLen / 128; @@ -1163,7 +1163,7 @@ int Rijndael::padEncrypt(const UINT8 * input, int inputOctets, UINT8 * outBuffer if(m_direction != Encrypt) return RIJNDAEL_NOT_INITIALIZED; - if(input == 0 || inputOctets <= 0) + if(input == nullptr || inputOctets <= 0) return 0; numBlocks = inputOctets / 16; @@ -1230,7 +1230,7 @@ int Rijndael::blockDecrypt(const UINT8 * input, int inputLen, UINT8 * outBuffer, if((m_mode != CFB1) && (m_direction == Encrypt)) return RIJNDAEL_BAD_DIRECTION; - if(input == 0 || inputLen <= 0) + if(input == nullptr || inputLen <= 0) return 0; numBlocks = inputLen / 128; @@ -1339,7 +1339,7 @@ int Rijndael::padDecrypt(const UINT8 * input, int inputOctets, UINT8 * outBuffer if(m_direction != Decrypt) return RIJNDAEL_BAD_DIRECTION; - if(input == 0 || inputOctets <= 0) + if(input == nullptr || inputOctets <= 0) return 0; if((inputOctets % 16) != 0) diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index ef57e5431..a9fcfdb64 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -65,14 +65,14 @@ #include "KviPointerList.h" #include "KviCryptEngineDescription.h" -static KviPointerList<KviCryptEngine> * g_pEngineList = 0; +static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr; KviRijndaelEngine::KviRijndaelEngine() : KviCryptEngine() { g_pEngineList->append(this); - m_pEncryptCipher = 0; - m_pDecryptCipher = 0; + m_pEncryptCipher = nullptr; + m_pDecryptCipher = nullptr; } KviRijndaelEngine::~KviRijndaelEngine() @@ -89,12 +89,12 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de if(m_pEncryptCipher) { delete m_pEncryptCipher; - m_pEncryptCipher = 0; + m_pEncryptCipher = nullptr; } if(m_pDecryptCipher) { delete m_pDecryptCipher; - m_pDecryptCipher = 0; + m_pDecryptCipher = nullptr; } if(encKey && (encKeyLen > 0)) @@ -172,7 +172,7 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de if(retVal != RIJNDAEL_SUCCESS) { delete m_pEncryptCipher; - m_pEncryptCipher = 0; + m_pEncryptCipher = nullptr; setLastErrorFromRijndaelErrorCode(retVal); return false; } @@ -186,9 +186,9 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de if(retVal != RIJNDAEL_SUCCESS) { delete m_pEncryptCipher; - m_pEncryptCipher = 0; + m_pEncryptCipher = nullptr; delete m_pDecryptCipher; - m_pDecryptCipher = 0; + m_pDecryptCipher = nullptr; setLastErrorFromRijndaelErrorCode(retVal); return false; } @@ -239,7 +239,7 @@ KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText, } int len = (int)kvi_strLen(plainText); char * buf = (char *)KviMemory::allocate(len + 16); // needed for the eventual padding - unsigned char * iv = 0; + unsigned char * iv = nullptr; if(m_bEncryptMode == CBC) { iv = (unsigned char *)KviMemory::allocate(MAX_IV_SIZE); @@ -312,7 +312,7 @@ KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * inBuffer, return KviCryptEngine::DecryptError; char * buf = (char *)KviMemory::allocate(len + 1); - unsigned char * iv = 0; + unsigned char * iv = nullptr; if(m_bEncryptMode == CBC) { // extract the IV from the cyphered string @@ -360,7 +360,7 @@ bool KviRijndaelHexEngine::asciiToBinary(const char * inBuffer, int * len, char } else { - if(len > 0) + if(len > nullptr) { *outBuffer = (char *)KviMemory::allocate(*len); KviMemory::move(*outBuffer, tmpBuf, *len); @@ -388,7 +388,7 @@ bool KviRijndaelBase64Engine::asciiToBinary(const char * inBuffer, int * len, ch } else { - if(len > 0) + if(len > nullptr) { *outBuffer = (char *)KviMemory::allocate(*len); KviMemory::move(*outBuffer, tmpBuf, *len); @@ -610,7 +610,7 @@ bool KviMircryptionEngine::doEncryptECB(KviCString & plain, KviCString & encoded bool KviMircryptionEngine::doDecryptECB(KviCString & encoded, KviCString & plain) { - unsigned char * buf = 0; + unsigned char * buf = nullptr; int len; UglyBase64::decode(encoded, &buf, &len); @@ -803,7 +803,7 @@ static bool rijndael_module_cleanup(KviModule * m) while(g_pEngineList->first()) delete g_pEngineList->first(); delete g_pEngineList; - g_pEngineList = 0; + g_pEngineList = nullptr; m->unregisterCryptEngines(); return true; #else diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp index f57858980..1e0a0a96b 100644 --- a/src/modules/rot13/libkvirot13.cpp +++ b/src/modules/rot13/libkvirot13.cpp @@ -47,7 +47,7 @@ #include "KviPointerList.h" #include "KviCryptEngineDescription.h" -static KviPointerList<KviCryptEngine> * g_pEngineList = 0; +static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr; KviRot13Engine::KviRot13Engine() : KviCryptEngine() @@ -133,7 +133,7 @@ static bool rot13_module_cleanup(KviModule * m) while(g_pEngineList->first()) delete g_pEngineList->first(); delete g_pEngineList; - g_pEngineList = 0; + g_pEngineList = nullptr; m->unregisterCryptEngines(); return true; #else diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 153af8767..819b148aa 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -130,7 +130,7 @@ SetupPage::~SetupPage() } SetupWizard::SetupWizard() - : KviTalWizard(0) + : KviTalWizard(nullptr) { setWindowTitle(__tr2qs("Setup Wizard - KVIrc")); @@ -205,7 +205,7 @@ SetupWizard::SetupWizard() setHelpEnabled(m_pLicense, false); #else - m_pLicense = 0; + m_pLicense = nullptr; #endif ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Directories diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp index ba60faf9a..199c25fce 100644 --- a/src/modules/sharedfile/libkvisharedfile.cpp +++ b/src/modules/sharedfile/libkvisharedfile.cpp @@ -221,7 +221,7 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c) o->userMask().toUtf8().data()); if(o->expireTime() > 0) { - int secs = ((int)(o->expireTime())) - ((int)(time(0))); + int secs = ((int)(o->expireTime())) - ((int)(time(nullptr))); int hour = secs / 3600; secs = secs % 3600; int mins = secs / 60; diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index acbf3b8d6..5774d1615 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -209,7 +209,7 @@ SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem() } SharedFilesWindow::SharedFilesWindow() - : KviWindow(KviWindow::Tool, "shared files window", 0) + : KviWindow(KviWindow::Tool, "shared files window", nullptr) { g_pSharedFilesWindow = this; m_pSplitter = new KviTalSplitter(Qt::Horizontal, this); @@ -253,7 +253,7 @@ SharedFilesWindow::SharedFilesWindow() SharedFilesWindow::~SharedFilesWindow() { - g_pSharedFilesWindow = 0; + g_pSharedFilesWindow = nullptr; } void SharedFilesWindow::enableButtons() @@ -274,7 +274,7 @@ void SharedFilesWindow::removeClicked() void SharedFilesWindow::addClicked() { - SharedFileEditDialog dlg(0); + SharedFileEditDialog dlg(nullptr); if(dlg.exec() != QDialog::Accepted) return; @@ -290,7 +290,7 @@ void SharedFilesWindow::editClicked() if(!it) return; - SharedFileEditDialog dlg(0, it->readOnlySharedFilePointer()); + SharedFileEditDialog dlg(nullptr, it->readOnlySharedFilePointer()); if(dlg.exec() != QDialog::Accepted) return; diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index 5a4891b45..c471e1db3 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -34,7 +34,7 @@ #define KVI_SHARED_FILES_WINDOW_EXTENSION_NAME "Shared files window extension" -SharedFilesWindow * g_pSharedFilesWindow = 0; +SharedFilesWindow * g_pSharedFilesWindow = nullptr; /* @doc: sharedfileswindow.open @@ -84,7 +84,7 @@ static bool sharedfileswindow_module_cleanup(KviModule *) { if(g_pSharedFilesWindow && g_pMainWindow) g_pMainWindow->closeWindow(g_pSharedFilesWindow); - g_pSharedFilesWindow = 0; + g_pSharedFilesWindow = nullptr; return true; } diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index a3af9bea0..786c05a70 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -78,7 +78,7 @@ #endif //COMPILE_OSS_SUPPORT #endif -static KviSoundPlayer * g_pSoundPlayer = 0; +static KviSoundPlayer * g_pSoundPlayer = nullptr; KviSoundPlayer::KviSoundPlayer() : QObject() @@ -87,10 +87,10 @@ KviSoundPlayer::KviSoundPlayer() m_pThreadList->setAutoDelete(true); #ifdef COMPILE_PHONON_SUPPORT - m_pPhononPlayer = NULL; + m_pPhononPlayer = nullptr; #endif //!COMPILE_PHONON_SUPPORT - m_pLastUsedSoundPlayerEntry = NULL; + m_pLastUsedSoundPlayerEntry = nullptr; m_pSoundSystemDict = new KviPointerHashTable<QString, KviSoundPlayerEntry>(17, false); m_pSoundSystemDict->setAutoDelete(true); @@ -137,7 +137,7 @@ KviSoundPlayer::~KviSoundPlayer() delete m_pPhononPlayer; #endif //COMPILE_PHONON_SUPPORT - g_pSoundPlayer = 0; + g_pSoundPlayer = nullptr; } void KviSoundPlayer::stopAllSoundThreads() @@ -159,7 +159,7 @@ void KviSoundPlayer::cleanupAfterLastPlayerEntry() SoundSystemCleanupRoutine r = m_pLastUsedSoundPlayerEntry->cleanupRoutine(); if(r) (this->*r)(); - m_pLastUsedSoundPlayerEntry = NULL; + m_pLastUsedSoundPlayerEntry = nullptr; } void KviSoundPlayer::getAvailableSoundSystems(QStringList * l) @@ -281,7 +281,7 @@ void KviSoundPlayer::cleanupPhonon() if(!m_pPhononPlayer) return; delete m_pPhononPlayer; // must be stopped - m_pPhononPlayer = NULL; + m_pPhononPlayer = nullptr; } #endif //!COMPILE_PHONON_SUPPORT @@ -468,7 +468,7 @@ void KviOssAudiofileSoundThread::play() float frameSize; void * buffer; - file = afOpenFile(m_szFileName.toUtf8().data(), "r", NULL); + file = afOpenFile(m_szFileName.toUtf8().data(), "r", nullptr); if(!file) { qDebug("libaudiofile could not open the file %s", m_szFileName.toUtf8().data()); @@ -806,7 +806,7 @@ static bool snd_module_init(KviModule * m) static bool snd_module_cleanup(KviModule *) { delete g_pSoundPlayer; - g_pSoundPlayer = 0; + g_pSoundPlayer = nullptr; return true; } diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp index 81995cc5f..9ecaa2863 100644 --- a/src/modules/socketspy/libkvisocketspy.cpp +++ b/src/modules/socketspy/libkvisocketspy.cpp @@ -30,7 +30,7 @@ #include <QSplitter> -KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = 0; +KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = nullptr; /* @doc: socketspy.open @@ -71,7 +71,7 @@ static bool socketspy_module_cleanup(KviModule *) while(g_pSocketSpyWindowList->first()) g_pSocketSpyWindowList->first()->die(); delete g_pSocketSpyWindowList; - g_pSocketSpyWindowList = 0; + g_pSocketSpyWindowList = nullptr; return true; } diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp index 99ec083a0..4f432b0a6 100644 --- a/src/modules/spaste/SlowPasteController.cpp +++ b/src/modules/spaste/SlowPasteController.cpp @@ -39,7 +39,7 @@ extern KviPointerList<SlowPasteController> * g_pControllerList; SlowPasteController::SlowPasteController(KviWindow * w, int id) - : m_pClipBuff(NULL), m_pFile(NULL), m_pId(id), m_pWindow(w) + : m_pClipBuff(nullptr), m_pFile(nullptr), m_pId(id), m_pWindow(w) { g_pControllerList->append(this); //m_pWindow = w; @@ -73,7 +73,7 @@ bool SlowPasteController::pasteFileInit(QString & fileName) if(!m_pFile->open(QIODevice::ReadOnly)) return false; //avoid double connection - disconnect(m_pTimer, SIGNAL(timeout()), 0, 0); + disconnect(m_pTimer, SIGNAL(timeout()), nullptr, nullptr); connect(m_pTimer, SIGNAL(timeout()), this, SLOT(pasteFile())); //avoid timer reset if always active if(!m_pTimer->isActive()) @@ -95,7 +95,7 @@ bool SlowPasteController::pasteClipboardInit(void) m_pClipBuff = new QStringList(tmp.isEmpty() ? QStringList() : tmp.split("\n", QString::KeepEmptyParts)); } //avoid double connection - disconnect(m_pTimer, SIGNAL(timeout()), 0, 0); + disconnect(m_pTimer, SIGNAL(timeout()), nullptr, nullptr); connect(m_pTimer, SIGNAL(timeout()), this, SLOT(pasteClipboard())); //avoid timer reset if always active if(!m_pTimer->isActive()) diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index c47f9bfa8..233ae97d1 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -42,7 +42,7 @@ #include <unistd.h> #endif -KviPointerList<SlowPasteController> * g_pControllerList = 0; +KviPointerList<SlowPasteController> * g_pControllerList = nullptr; int ctrlId = 0; static SlowPasteController * spaste_find_controller(KviWindow * w) @@ -52,7 +52,7 @@ static SlowPasteController * spaste_find_controller(KviWindow * w) if(spc->window() == w) return spc; } - return 0; + return nullptr; } static KviWindow * spaste_kvs_find_window(QString & win, KviKvsModuleCommandCall * c) @@ -65,12 +65,12 @@ static KviWindow * spaste_kvs_find_window(QString & win, KviKvsModuleCommandCall if(!w) { c->warning(__tr("Window with ID '%Q' not found"), &win); - return 0; + return nullptr; } if((w->type() == KviWindow::Channel) || (w->type() == KviWindow::Query) || (w->type() == KviWindow::DccChat)) return w; c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"), &win); - return 0; + return nullptr; } /* @@ -231,7 +231,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) } else { - while((item = it.current()) != 0) + while((item = it.current()) != nullptr) { ++it; if(KviQString::equalCS(item->window()->id(), c->window()->id())) @@ -242,7 +242,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) else { //Delete the spaste with the given id - while((item = it.current()) != 0) + while((item = it.current()) != nullptr) { ++it; if(item->getId() == (kvs_int_t)iId) @@ -277,7 +277,7 @@ static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c) KviPointerListIterator<SlowPasteController> it(*g_pControllerList); SlowPasteController * item; - while((item = it.current()) != 0) + while((item = it.current()) != nullptr) { ++it; QString szWinId = item->window()->id(); @@ -332,7 +332,7 @@ static bool spaste_module_cleanup(KviModule *) while(g_pControllerList->first()) delete g_pControllerList->first(); delete g_pControllerList; - g_pControllerList = 0; + g_pControllerList = nullptr; return true; } diff --git a/src/modules/spellchecker/libkvispellchecker.cpp b/src/modules/spellchecker/libkvispellchecker.cpp index 55cb3f19c..d87e641ea 100644 --- a/src/modules/spellchecker/libkvispellchecker.cpp +++ b/src/modules/spellchecker/libkvispellchecker.cpp @@ -28,8 +28,8 @@ #include <enchant.h> #include <enchant-provider.h> -static EnchantBroker * g_pEnchantBroker = NULL; -static KviPointerList<EnchantDict> * g_pEnchantDicts = NULL; +static EnchantBroker * g_pEnchantBroker = nullptr; +static KviPointerList<EnchantDict> * g_pEnchantDicts = nullptr; /* @doc: spellchecker.available_dictionaries @@ -208,9 +208,9 @@ static bool spellchecker_module_cleanup(KviModule *) enchant_broker_free_dict(g_pEnchantBroker, g_pEnchantDicts->takeFirst()); delete g_pEnchantDicts; - g_pEnchantDicts = NULL; + g_pEnchantDicts = nullptr; enchant_broker_free(g_pEnchantBroker); - g_pEnchantBroker = NULL; + g_pEnchantBroker = nullptr; return true; } diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 8e5b1eead..1825d2e0a 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -928,14 +928,14 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c) " ", "#", "$", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", - "{", "|", "}", 0 + "{", "|", "}", nullptr }; const char * const newStr[] = { "%20", "%23", "%24", "%2F", "%3A", "%3C", "%3D", "%3E", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", - "%7B", "%7C", "%7D", 0 + "%7B", "%7C", "%7D", nullptr }; while(toReplace[idx]) @@ -1409,7 +1409,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c) } EVP_MD_CTX_init(&mdctx); - EVP_DigestInit_ex(&mdctx, md, NULL); + EVP_DigestInit_ex(&mdctx, md, nullptr); EVP_DigestUpdate(&mdctx, szString.toUtf8().data(), szString.toUtf8().length()); EVP_DigestFinal_ex(&mdctx, md_value, &md_len); EVP_MD_CTX_cleanup(&mdctx); @@ -2285,9 +2285,9 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c) KviSSL::globalSSLInit(); EVP_MD_CTX md_ctx; - EVP_PKEY * pKey = 0; + EVP_PKEY * pKey = nullptr; unsigned int len = 0; - unsigned char * sig = 0; + unsigned char * sig = nullptr; if(szCert.isEmpty()) { @@ -2308,7 +2308,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c) } szPass = KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass).toUtf8(); - PEM_read_PrivateKey(f, &pKey, NULL, szPass.data()); + PEM_read_PrivateKey(f, &pKey, nullptr, szPass.data()); fclose(f); @@ -2324,7 +2324,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c) // get from parameter (with optional password) BIO * in; in = BIO_new_mem_buf((unsigned char *)szCert.data(), szCert.size()); - PEM_read_bio_PrivateKey(in, &pKey, NULL, szPass.data()); + PEM_read_bio_PrivateKey(in, &pKey, nullptr, szPass.data()); BIO_free(in); if(!pKey) @@ -2422,8 +2422,8 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) const char * message = szMessage.data(); EVP_MD_CTX md_ctx; - EVP_PKEY * pKey = 0; - X509 * cert = 0; + EVP_PKEY * pKey = nullptr; + X509 * cert = nullptr; int err = -1; if(szCert.isEmpty()) @@ -2445,7 +2445,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) } szPass = KVI_OPTION_STRING(KviOption_stringSSLCertificatePass).toUtf8(); - PEM_read_X509(f, &cert, NULL, szPass.data()); + PEM_read_X509(f, &cert, nullptr, szPass.data()); fclose(f); @@ -2466,7 +2466,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) { // get from parameter (with optional password) BIO * in = BIO_new_mem_buf((unsigned char *)szCert.data(), szCert.size()); - PEM_read_bio_X509(in, &cert, 0, szPass.data()); + PEM_read_bio_X509(in, &cert, nullptr, szPass.data()); if(cert) { @@ -2475,7 +2475,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) } else { - pKey = PEM_read_bio_PUBKEY(in, NULL, 0, szPass.data()); + pKey = PEM_read_bio_PUBKEY(in, nullptr, nullptr, szPass.data()); } BIO_free(in); diff --git a/src/modules/system/Plugin.cpp b/src/modules/system/Plugin.cpp index 29c5db05b..3d579c083 100644 --- a/src/modules/system/Plugin.cpp +++ b/src/modules/system/Plugin.cpp @@ -123,7 +123,7 @@ Plugin * Plugin::load(const QString & szFileName) if(!pLibrary->load()) { delete pLibrary; - return 0; + return nullptr; } Plugin * pPlugin = new Plugin(pLibrary, KviFileUtils::extractFileName(szFileName)); @@ -279,7 +279,7 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall * c) pArgvBuffer = (char *)malloc(iSize); i = 2; - char * x = 0; + char * x = nullptr; x = pArgvBuffer; while(i < (iArgc + 2)) { @@ -296,8 +296,8 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall * c) else { //Avoid using unfilled variables - ppArgv = 0; - pArgvBuffer = 0; + ppArgv = nullptr; + pArgvBuffer = nullptr; iArgc = 0; } @@ -414,7 +414,7 @@ bool PluginManager::loadPlugin(const QString & szPluginPath) { if(isPluginLoaded(szPluginPath)) { - return getPlugin(szPluginPath) != 0; + return getPlugin(szPluginPath) != nullptr; } else { diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp index f08890bd1..d17ec09ea 100644 --- a/src/modules/term/libkviterm.cpp +++ b/src/modules/term/libkviterm.cpp @@ -38,7 +38,7 @@ KviPointerList<TermWidget> * g_pTermWidgetList = 0; KviPointerList<TermWindow> * g_pTermWindowList = 0; #endif -KviModule * g_pTermModule = 0; +KviModule * g_pTermModule = nullptr; /* @doc: term.open diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp index abf0ec610..55f15374b 100644 --- a/src/modules/texticons/libkvitexticons.cpp +++ b/src/modules/texticons/libkvitexticons.cpp @@ -47,7 +47,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c) { QString szIcon; - KviTextIcon * pIcon = 0; + KviTextIcon * pIcon = nullptr; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("iconName", KVS_PT_NONEMPTYSTRING, KVS_PF_OPTIONAL, szIcon) KVSM_PARAMETERS_END(c) @@ -107,7 +107,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c) static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c) { QString szName, szIcon; - KviTextIcon * pIcon = 0; + KviTextIcon * pIcon = nullptr; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("iconName", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETER("iconIdOrFile", KVS_PT_STRING, KVS_PF_OPTIONAL, szIcon) diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 65c56984b..73c229c15 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -144,7 +144,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL QString szPackageAuthor; QString szPackageDescription; QString szPackageVersion; - KviThemeInfo * pThemeInfo = 0; + KviThemeInfo * pThemeInfo = nullptr; bool bPackagePathSet = false; QString szPackagePath = QDir::homePath(); diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index b2b8aa22d..90e5a3bdc 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -115,7 +115,7 @@ namespace ThemeFunctions // load its picture pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) - pix.loadFromData(*pByteArray, 0, 0); + pix.loadFromData(*pByteArray, nullptr, nullptr); if(pix.isNull()) { @@ -182,7 +182,7 @@ namespace ThemeFunctions QPixmap pixScreenshot; pByteArray = r.binaryInfoFields()->find(szTmp); if(pByteArray) - pixScreenshot.loadFromData(*pByteArray, 0, 0); + pixScreenshot.loadFromData(*pByteArray, nullptr, nullptr); if(szThemeName.isEmpty() || szThemeVersion.isEmpty() || szThemeSubdirectory.isEmpty() || szThemeEngineVersion.isEmpty()) bValid = false; @@ -442,7 +442,7 @@ namespace ThemeFunctions if(!out.isNull()) { QByteArray * pba = new QByteArray(); - QBuffer buffer(pba, 0); + QBuffer buffer(pba, nullptr); buffer.open(QIODevice::WriteOnly); out.save(&buffer, "PNG"); buffer.close(); @@ -493,7 +493,7 @@ namespace ThemeFunctions szTmp = QString("Theme%1Screenshot").arg(iIdx); QByteArray * pba = new QByteArray(); - QBuffer bufferz(pba, 0); + QBuffer bufferz(pba, nullptr); bufferz.open(QIODevice::WriteOnly); pixScreenshot.save(&bufferz, "PNG"); bufferz.close(); diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index 1358961b6..14e36ba28 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -109,14 +109,14 @@ ThemeListWidgetItem::~ThemeListWidgetItem() delete m_pThemeInfo; } -ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0; +ThemeManagementDialog * ThemeManagementDialog::m_pInstance = nullptr; ThemeManagementDialog::ThemeManagementDialog(QWidget * parent) : QWidget(parent) { - m_pItemDelegate = NULL; + m_pItemDelegate = nullptr; #ifdef COMPILE_WEBKIT_SUPPORT - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; #endif setObjectName("theme_options_widget"); setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc", "theme")); @@ -252,12 +252,12 @@ ThemeManagementDialog::~ThemeManagementDialog() if(m_pItemDelegate) delete m_pItemDelegate; g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); - m_pInstance = 0; + m_pInstance = nullptr; #ifdef COMPILE_WEBKIT_SUPPORT if(m_pWebThemeInterfaceDialog) { m_pWebThemeInterfaceDialog->deleteLater(); - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; } #endif //COMPILE_WEBKIT_SUPPORT } @@ -265,7 +265,7 @@ ThemeManagementDialog::~ThemeManagementDialog() void ThemeManagementDialog::closeClicked() { deleteLater(); - m_pInstance = 0; + m_pInstance = nullptr; } void ThemeManagementDialog::display(bool bTopLevel) @@ -276,7 +276,7 @@ void ThemeManagementDialog::display(bool bTopLevel) { if(m_pInstance->parent()) { - m_pInstance->setParent(0); + m_pInstance->setParent(nullptr); } } else @@ -291,7 +291,7 @@ void ThemeManagementDialog::display(bool bTopLevel) { if(bTopLevel) { - m_pInstance = new ThemeManagementDialog(0); + m_pInstance = new ThemeManagementDialog(nullptr); } else { @@ -308,7 +308,7 @@ void ThemeManagementDialog::cleanup() if(!m_pInstance) return; delete m_pInstance; - m_pInstance = 0; + m_pInstance = nullptr; } void ThemeManagementDialog::packTheme() @@ -329,7 +329,7 @@ void ThemeManagementDialog::packTheme() void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) { ThemeListWidgetItem * pItem = dynamic_cast<ThemeListWidgetItem *>(m_pListWidget->itemAt(pos)); - if(pItem != 0) + if(pItem != nullptr) { m_pListWidget->setCurrentItem(pItem); m_pContextPopup->clear(); @@ -453,7 +453,7 @@ void ThemeManagementDialog::getMoreThemes() void ThemeManagementDialog::webThemeInterfaceDialogDestroyed() { #ifdef COMPILE_WEBKIT_SUPPORT - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; #endif fillThemeBox(); } diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index d17c843a4..f913ca14d 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -37,7 +37,7 @@ #include <QDesktopWidget> #include <QCloseEvent> -TipWindow * g_pTipWindow = 0; +TipWindow * g_pTipWindow = nullptr; TipFrame::TipFrame(QWidget * par) : QFrame(par) @@ -62,7 +62,7 @@ TipFrame::TipFrame(QWidget * par) TipFrame::~TipFrame() { - g_pTipWindow = 0; + g_pTipWindow = nullptr; } void TipFrame::setText(const QString & text) @@ -75,7 +75,7 @@ void TipFrame::setText(const QString & text) TipWindow::TipWindow() { setObjectName("kvirc_tip_window"); - m_pConfig = 0; + m_pConfig = nullptr; m_pTipFrame = new TipFrame(this); QPushButton * pb = new QPushButton("<<", this); @@ -147,7 +147,7 @@ void TipWindow::closeConfig() g_pApp->getLocalKvircDirectory(buffer, KviApplication::ConfigPlugins, m_szConfigFileName); m_pConfig->setSavePath(buffer); delete m_pConfig; - m_pConfig = 0; + m_pConfig = nullptr; } void TipWindow::nextTip() @@ -277,7 +277,7 @@ static bool tip_module_cleanup(KviModule *) static bool tip_module_can_unload(KviModule *) { - return (g_pTipWindow == 0); + return (g_pTipWindow == nullptr); } KVIRC_MODULE( diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp index 0e9a7b93b..be1baf36e 100644 --- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp +++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp @@ -55,7 +55,7 @@ #include <QDesktopWidget> #include <QMimeData> -CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = 0; +CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = nullptr; extern QRect g_rectToolBarEditorDialogGeometry; TrashcanLabel::TrashcanLabel(QWidget * p) @@ -68,7 +68,7 @@ TrashcanLabel::TrashcanLabel(QWidget * p) setAlignment(Qt::AlignCenter); setMinimumSize(40, 40); m_uFlashCount = 0; - m_pFlashTimer = 0; + m_pFlashTimer = nullptr; m_clrOriginal = palette().color(backgroundRole()); setAutoFillBackground(true); //needed for flashing connect(KviActionManager::instance(), SIGNAL(removeActionsHintRequest()), this, SLOT(flash())); @@ -113,7 +113,7 @@ void TrashcanLabel::heartbeat() { m_pFlashTimer->stop(); delete m_pFlashTimer; - m_pFlashTimer = 0; + m_pFlashTimer = nullptr; } } @@ -363,7 +363,7 @@ CustomizeToolBarsDialog::~CustomizeToolBarsDialog() g_rectToolBarEditorDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); KviActionManager::instance()->customizeToolBarsDialogDestroyed(); - m_pInstance = 0; + m_pInstance = nullptr; } void CustomizeToolBarsDialog::currentToolBarChanged() @@ -543,7 +543,7 @@ void CustomizeToolBarsDialog::cleanup() if(!m_pInstance) return; delete m_pInstance; - m_pInstance = 0; + m_pInstance = nullptr; } void CustomizeToolBarsDialog::display(bool bTopLevel) @@ -554,7 +554,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel) { if(m_pInstance->parent()) { - m_pInstance->setParent(0); + m_pInstance->setParent(nullptr); } } else @@ -569,7 +569,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel) { if(bTopLevel) { - m_pInstance = new CustomizeToolBarsDialog(0); + m_pInstance = new CustomizeToolBarsDialog(nullptr); } else { diff --git a/src/modules/torrent/TorrentInterface.cpp b/src/modules/torrent/TorrentInterface.cpp index 4752ca9c0..ba6f053a2 100644 --- a/src/modules/torrent/TorrentInterface.cpp +++ b/src/modules/torrent/TorrentInterface.cpp @@ -28,4 +28,4 @@ #include "KviLocale.h" -TorrentInterface * TorrentInterface::m_selected = 0; +TorrentInterface * TorrentInterface::m_selected = nullptr; diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp index 46365584e..7b1dca983 100644 --- a/src/modules/torrent/libkvitorrent.cpp +++ b/src/modules/torrent/libkvitorrent.cpp @@ -32,16 +32,16 @@ #include "KviLocale.h" #include "kvi_out.h" -static KviPointerList<TorrentInterfaceDescriptor> * g_pDescriptorList = 0; +static KviPointerList<TorrentInterfaceDescriptor> * g_pDescriptorList = nullptr; -static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = 0) +static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = nullptr) { int iBest = 0; - TorrentInterface * pBest = 0; + TorrentInterface * pBest = nullptr; TorrentInterfaceDescriptor * d; - TorrentInterfaceDescriptor * pDBest = 0; + TorrentInterfaceDescriptor * pDBest = nullptr; - for(d = g_pDescriptorList->first(); d != 0; d = g_pDescriptorList->next()) + for(d = g_pDescriptorList->first(); d != nullptr; d = g_pDescriptorList->next()) { // instance gets deleted by descriptor later TorrentInterface * i = d->instance(); @@ -296,7 +296,7 @@ static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = 0) TC_KVS_COMMAND(detect) { - TorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q', "quiet") ? 0 : c->window())); + TorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q', "quiet") ? nullptr : c->window())); return true; } @@ -873,7 +873,7 @@ static bool torrent_module_init(KviModule * m) g_pDescriptorList->append(new KTorrentDbusInterfaceDescriptor); #endif // COMPILE_KDE_SUPPORT - TorrentInterface::select(0); + TorrentInterface::select(nullptr); if(g_pMainWindow->mainStatusBar()) StatusBarApplet::selfRegister(g_pMainWindow->mainStatusBar()); diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index f08cb0a5d..b9b2b77f1 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -71,7 +71,7 @@ KviTrayIconWidget::KviTrayIconWidget() : QSystemTrayIcon(g_pMainWindow), m_CurrentPixmap(ICON_SIZE, ICON_SIZE), m_Tip(g_pMainWindow, "dock_tooltip") { g_pTrayIcon = this; - m_pContextPopup = new QMenu(0); + m_pContextPopup = new QMenu(nullptr); setContextMenu(m_pContextPopup); m_iConsoles = 0; @@ -87,7 +87,7 @@ KviTrayIconWidget::KviTrayIconWidget() g_pMainWindow->setTrayIcon(this); - m_pAwayPopup = new QMenu(0); + m_pAwayPopup = new QMenu(nullptr); #ifndef COMPILE_ON_MAC m_pTitleLabel = new QLabel(__tr2qs("<b><center>KVIrc Tray Options</center></b>"), m_pContextPopup); @@ -128,7 +128,7 @@ KviTrayIconWidget::KviTrayIconWidget() KviTrayIconWidget::~KviTrayIconWidget() { g_pTrayIcon = nullptr; - g_pMainWindow->setTrayIcon(0); + g_pMainWindow->setTrayIcon(nullptr); delete m_pAwayPopup; #ifndef COMPILE_ON_MAC delete m_pTitleLabel; @@ -238,7 +238,7 @@ bool KviTrayIconWidget::event(QEvent * e) } } - srand(time(0)); + srand(time(nullptr)); // We use the bad way to generate random numbers :))))) diff --git a/src/modules/upnp/Manager.cpp b/src/modules/upnp/Manager.cpp index db3e8d503..12b828edd 100644 --- a/src/modules/upnp/Manager.cpp +++ b/src/modules/upnp/Manager.cpp @@ -43,11 +43,11 @@ namespace UPnP { // Set the static variable - Manager * Manager::m_pInstance(0); + Manager * Manager::m_pInstance(nullptr); // The constructor Manager::Manager() - : m_pActiveIgdControlPoint(0), m_bBroadcastFailed(false), m_bBroadcastFoundIt(false), m_pSsdpConnection(0), m_pSsdpTimer(0) + : m_pActiveIgdControlPoint(nullptr), m_bBroadcastFailed(false), m_bBroadcastFoundIt(false), m_pSsdpConnection(nullptr), m_pSsdpTimer(nullptr) { } @@ -56,7 +56,7 @@ namespace UPnP { delete m_pSsdpTimer; delete m_pSsdpConnection; - m_pInstance = 0; // Unregister the instance + m_pInstance = nullptr; // Unregister the instance } // Initialize the manager, detect all devices @@ -85,7 +85,7 @@ namespace UPnP Manager * Manager::instance() { // Create when it's required - if(m_pInstance == 0) + if(m_pInstance == nullptr) { m_pInstance = new Manager(); m_pInstance->initialize(); @@ -98,26 +98,26 @@ namespace UPnP QString Manager::getExternalIpAddress() const { // Do not expose activeIgd_; - return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString()); + return (m_pActiveIgdControlPoint != nullptr ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString()); } // Return true if a controlable gateway is available bool Manager::isGatewayAvailable() { - return (m_pActiveIgdControlPoint != 0 && m_pActiveIgdControlPoint->isGatewayAvailable()); + return (m_pActiveIgdControlPoint != nullptr && m_pActiveIgdControlPoint->isGatewayAvailable()); } // Add a port mapping void Manager::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort, const QString & internalClient, int internalPort, const QString & description, bool enabled, int leaseDuration) { - if(m_pActiveIgdControlPoint != 0) + if(m_pActiveIgdControlPoint != nullptr) m_pActiveIgdControlPoint->addPortMapping(protocol, remoteHost, externalPort, internalClient, internalPort, description, enabled, leaseDuration); } // Delete a port mapping void Manager::deletePortMapping(const QString & protocol, const QString & remoteHost, int externalPort) { - if(m_pActiveIgdControlPoint != 0) + if(m_pActiveIgdControlPoint != nullptr) m_pActiveIgdControlPoint->deletePortMapping(protocol, remoteHost, externalPort); } @@ -143,7 +143,7 @@ namespace UPnP IgdControlPoint * controlPoint = new IgdControlPoint(hostname, port, rootUrl); m_lIgdControlPoints.append(controlPoint); - if(m_pActiveIgdControlPoint == 0) + if(m_pActiveIgdControlPoint == nullptr) { m_pActiveIgdControlPoint = controlPoint; m_pActiveIgdControlPoint->initialize(); diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp index 2b0d87d4e..872393874 100644 --- a/src/modules/upnp/Service.cpp +++ b/src/modules/upnp/Service.cpp @@ -73,7 +73,7 @@ namespace UPnP // TODO: rename to callMethod / callSoapMethod int Service::callAction(const QString & actionName, const QString & prefix) { - return callActionInternal(actionName, 0, prefix); + return callActionInternal(actionName, nullptr, prefix); } // Makes a UPnP action request @@ -112,7 +112,7 @@ namespace UPnP + prefix + ":" + actionName + " xmlns:" + prefix + "=\"" + m_szServiceType + "\">\n"; // Do we have any arguments? - if(arguments != 0) + if(arguments != nullptr) { // Add the arguments QMap<QString, QString>::const_iterator it; diff --git a/src/modules/upnp/SsdpConnection.cpp b/src/modules/upnp/SsdpConnection.cpp index 11a316ce6..adfa21ace 100644 --- a/src/modules/upnp/SsdpConnection.cpp +++ b/src/modules/upnp/SsdpConnection.cpp @@ -52,7 +52,7 @@ namespace UPnP SsdpConnection::~SsdpConnection() { - if(m_pSocket != 0) + if(m_pSocket != nullptr) { m_pSocket->close(); delete m_pSocket; diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp index 686d576ca..0c2adce1e 100644 --- a/src/modules/upnp/igdcontrolpoint.cpp +++ b/src/modules/upnp/igdcontrolpoint.cpp @@ -46,7 +46,7 @@ namespace UPnP // The constructor IgdControlPoint::IgdControlPoint(const QString & hostname, int port, const QString & rootUrl) - : QObject(), m_bGatewayAvailable(false), m_iIgdPort(0), m_pRootService(0), m_pWanConnectionService(0) + : QObject(), m_bGatewayAvailable(false), m_iIgdPort(0), m_pRootService(nullptr), m_pWanConnectionService(nullptr) { qDebug() << "CREATED UPnP::IgdControlPoint: created control point" << " url='" << hostname << ":" << port << "/" << rootUrl << "'." << endl; @@ -75,7 +75,7 @@ namespace UPnP QString IgdControlPoint::getExternalIpAddress() const { // Do not expose wanConnectionService_; - if(m_pWanConnectionService != 0) + if(m_pWanConnectionService != nullptr) { return m_pWanConnectionService->getExternalIpAddress(); } @@ -145,7 +145,7 @@ namespace UPnP void IgdControlPoint::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort, const QString & internalClient, int internalPort, const QString & description, bool enabled, int leaseDuration) { // Do not expose wanConnectionService_; - if(m_pWanConnectionService != 0) + if(m_pWanConnectionService != nullptr) { m_pWanConnectionService->addPortMapping(protocol, remoteHost, externalPort, internalClient, internalPort, description, enabled, leaseDuration); } @@ -155,7 +155,7 @@ namespace UPnP void IgdControlPoint::deletePortMapping(const QString & protocol, const QString & remoteHost, int externalPort) { // Do not expose wanConnectionService_; - if(m_pWanConnectionService != 0) + if(m_pWanConnectionService != nullptr) { m_pWanConnectionService->deletePortMapping(protocol, remoteHost, externalPort); } diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp index 880b1b70c..58eae67d3 100644 --- a/src/modules/upnp/libkviupnp.cpp +++ b/src/modules/upnp/libkviupnp.cpp @@ -31,7 +31,7 @@ // Please use our common variable naming conventions and coding style :) // Let's be so:) -UPnP::Manager * g_pManager = 0; +UPnP::Manager * g_pManager = nullptr; /* @doc: upnp.getExternalIpAddress @@ -179,7 +179,7 @@ static bool upnp_kvs_cmd_refresh(KviKvsModuleCommandCall *) { if(g_pManager) delete g_pManager; - g_pManager = 0; + g_pManager = nullptr; g_pManager = UPnP::Manager::instance(); @@ -190,7 +190,7 @@ static bool upnp_module_init(KviModule * m) { if(g_pManager) delete g_pManager; - g_pManager = 0; + g_pManager = nullptr; g_pManager = UPnP::Manager::instance(); @@ -206,7 +206,7 @@ static bool upnp_module_init(KviModule * m) static bool upnp_module_cleanup(KviModule *) { delete g_pManager; - g_pManager = 0; + g_pManager = nullptr; return true; } diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 25eff493d..21f96dd3e 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -245,7 +245,7 @@ void UrlDialog::remove() { if(!m_pUrlList->currentItem()) { - QMessageBox::warning(0, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a URL entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + QMessageBox::warning(nullptr, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a URL entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); return; } @@ -299,11 +299,11 @@ void UrlDialog::dblclk_url(QTreeWidgetItem * item, int) void UrlDialog::popup(QTreeWidgetItem * item, const QPoint & point) { m_szUrl = item->text(0); - QMenu p("menu", 0); + QMenu p("menu", nullptr); p.addAction(__tr2qs("&Remove"), this, SLOT(remove())); // p.addAction(__tr2qs("&Find Text"),this,SLOT(findtext())); p.addSeparator(); - m_pListPopup = new QMenu("list", 0); + m_pListPopup = new QMenu("list", nullptr); for(KviWindow * w = g_pMainWindow->windowList()->first(); w; w = g_pMainWindow->windowList()->next()) { @@ -319,7 +319,7 @@ void UrlDialog::popup(QTreeWidgetItem * item, const QPoint & point) void UrlDialog::contextMenu(const QPoint & point) { - QMenu p("contextmenu", 0); + QMenu p("contextmenu", nullptr); p.addAction(__tr2qs("Configure"), this, SLOT(config())); p.exec(point); } @@ -339,7 +339,7 @@ void UrlDialog::sayToWin(QAction * act) } else { - QMessageBox::warning(0, __tr2qs("Window Not Found - KVIrc"), __tr2qs("Window not found."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + QMessageBox::warning(nullptr, __tr2qs("Window Not Found - KVIrc"), __tr2qs("Window not found."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); } } @@ -394,7 +394,7 @@ UrlDialog::~UrlDialog() if (m_pMenuBar) delete m_pMenuBar; m_pMenuBar = 0;*/ UrlDlgList * tmpitem = findFrame(); - tmpitem->dlg = 0; + tmpitem->dlg = nullptr; } // ----------------------------- CLASS URLDIALOG -------------------------end // @@ -471,7 +471,7 @@ ConfigDialog::~ConfigDialog() { for(int i = 0; i < cbnum; i++) delete cb[i]; - g_pConfigDialog = 0; + g_pConfigDialog = nullptr; } // --------------------------- CLASS CONFIGDIALOG ------------------------end // @@ -540,7 +540,7 @@ void BanFrame::removeBan() if(!m_pBanList->currentItem()->isSelected()) { - QMessageBox::warning(0, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a ban entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + QMessageBox::warning(nullptr, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a ban entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); return; } QString item(m_pBanList->currentItem()->text()); @@ -735,7 +735,7 @@ UrlDlgList * findFrame() if(!tmpitem) { UrlDlgList * udl = new UrlDlgList(); - udl->dlg = 0; + udl->dlg = nullptr; udl->menu_id = -1; g_pUrlDlgList->append(udl); tmpitem = g_pUrlDlgList->current(); @@ -887,7 +887,7 @@ static bool url_module_init(KviModule * m) loadBanList(); UrlDlgList * udl = new UrlDlgList(); - udl->dlg = 0; + udl->dlg = nullptr; g_pUrlDlgList->append(udl); return true; @@ -906,12 +906,12 @@ static bool url_module_cleanup(KviModule *) } delete g_pList; - g_pList = 0; + g_pList = nullptr; delete g_pBanList; - g_pBanList = 0; + g_pBanList = nullptr; delete g_pUrlDlgList; - g_pUrlDlgList = 0; + g_pUrlDlgList = nullptr; return true; } diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp index ccb607f44..742b846f4 100644 --- a/src/modules/window/UserWindow.cpp +++ b/src/modules/window/UserWindow.cpp @@ -43,9 +43,9 @@ UserWindow::UserWindow(const char * pcName, QString & szIcon, KviConsoleWindow * m_pIrcView = new KviIrcView(this, this); if(iCreationFlags & HasInput) - m_pInput = new KviInput(this, 0); + m_pInput = new KviInput(this, nullptr); else - m_pInput = 0; + m_pInput = nullptr; if(context()) context()->registerContextWindow(this); diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 092c7ba34..005d0dcaf 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -52,7 +52,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; // KviApplication.cpp extern KVIRC_API KviPointerHashTable<QString, KviWindow> * g_pGlobalWindowDict; -KviPointerList<UserWindow> * g_pUserWindowList = 0; +KviPointerList<UserWindow> * g_pUserWindowList = nullptr; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type // $window.input.text $window.input.cursorpos $window.input.textlen @@ -1039,7 +1039,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) if(szFlags.contains('i')) iFlags |= UserWindow::HasInput; - KviConsoleWindow * pConsole = 0; + KviConsoleWindow * pConsole = nullptr; if(c->parameterList()->count() >= 3) { pConsole = g_pApp->findConsole(uCtx); @@ -1325,7 +1325,7 @@ static bool window_kvs_cmd_savePropertiesAsDefault(KviKvsModuleCommandCall * c) #ifdef COMPILE_CRYPT_SUPPORT static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKey, KviCString & szDecryptKey, QString & szError) { - char * encKey = 0; + char * encKey = nullptr; int encKeyLen = 0; char * tmpKey; @@ -1342,7 +1342,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKe return false; } - char * decKey = 0; + char * decKey = nullptr; int decKeyLen = 0; decKeyLen = szDecryptKey.hexToBuffer(&tmpKey, false); @@ -1437,7 +1437,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) if(szEngine.isEmpty()) { - pWnd->setCryptSessionInfo(0); + pWnd->setCryptSessionInfo(nullptr); } else { |