diff options
| author | 2016-04-30 18:23:42 +0100 | |
|---|---|---|
| committer | 2016-04-30 18:50:44 +0100 | |
| commit | 505d0768f8392e3c4775425dd97f41e1c829ef44 (patch) | |
| tree | 55dfa35f2e180b4186baf00ffbfd2ee38c0f1c18 /src/modules/reguser | |
| parent | Update my clang-format to 3.8.0 (diff) | |
| download | KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.gz KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.bz2 KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.zip | |
Apply clang-tidy: modernize-use-nullptr
Diffstat (limited to 'src/modules/reguser')
| -rw-r--r-- | src/modules/reguser/RegisteredUserEntryDialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/reguser/RegisteredUsersDialog.cpp | 10 | ||||
| -rw-r--r-- | src/modules/reguser/libkvireguser.cpp | 22 |
3 files changed, 17 insertions, 17 deletions
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( |
