walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

More Zero/Null as pointer constant corrections (#1947) 

Further to pull request #1938. Changes were missed in previous commit.

Resolve warnings `warning: zero as null pointer constant` in code by
using C++ 11 recommended `nullptr`.
This commit is contained in:
Scott Furry 2019-07-02 12:37:44 -06:00 committed by Daniel Marjamäki
parent 6ba3b2703a
commit da213d1534
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/librarydialog.cpp
View File

@ -313,15 +313,13 @@ void LibraryDialog::editArg()
return; return;
CppcheckLibraryData::Function::Arg &arg = function->args[mUi->arguments->row(mUi->arguments->selectedItems().first())]; CppcheckLibraryData::Function::Arg &arg = function->args[mUi->arguments->row(mUi->arguments->selectedItems().first())];
LibraryEditArgDialog *d = new LibraryEditArgDialog(0, arg); LibraryEditArgDialog d(nullptr, arg);
if (d->exec() == QDialog::Accepted) { if (d.exec() == QDialog::Accepted) {
unsigned number = arg.nr; unsigned number = arg.nr;
arg = d->getArg(); arg = d.getArg();
arg.nr = number; arg.nr = number;
mUi->arguments->selectedItems().first()->setText(getArgText(arg)); mUi->arguments->selectedItems().first()->setText(getArgText(arg));
} }
delete d;
mUi->buttonSave->setEnabled(true); mUi->buttonSave->setEnabled(true);
} }

10
test/testlibrary.cpp
View File

@ -704,7 +704,7 @@ private:
// s8 // s8
{ {
const struct Library::PodType * const type = library.podtype("s8"); const struct Library::PodType * const type = library.podtype("s8");
ASSERT_EQUALS(true, type != 0); ASSERT_EQUALS(true, type != nullptr);
if (type) { if (type) {
ASSERT_EQUALS(1U, type->size); ASSERT_EQUALS(1U, type->size);
ASSERT_EQUALS('s', type->sign); ASSERT_EQUALS('s', type->sign);
@ -713,7 +713,7 @@ private:
// u8 // u8
{ {
const struct Library::PodType * const type = library.podtype("u8"); const struct Library::PodType * const type = library.podtype("u8");
ASSERT_EQUALS(true, type != 0); ASSERT_EQUALS(true, type != nullptr);
if (type) { if (type) {
ASSERT_EQUALS(1U, type->size); ASSERT_EQUALS(1U, type->size);
ASSERT_EQUALS('u', type->sign); ASSERT_EQUALS('u', type->sign);
@ -722,7 +722,7 @@ private:
// u16 // u16
{ {
const struct Library::PodType * const type = library.podtype("u16"); const struct Library::PodType * const type = library.podtype("u16");
ASSERT_EQUALS(true, type != 0); ASSERT_EQUALS(true, type != nullptr);
if (type) { if (type) {
ASSERT_EQUALS(2U, type->size); ASSERT_EQUALS(2U, type->size);
ASSERT_EQUALS('u', type->sign); ASSERT_EQUALS('u', type->sign);
@ -731,7 +731,7 @@ private:
// s16 // s16
{ {
const struct Library::PodType * const type = library.podtype("s16"); const struct Library::PodType * const type = library.podtype("s16");
ASSERT_EQUALS(true, type != 0); ASSERT_EQUALS(true, type != nullptr);
if (type) { if (type) {
ASSERT_EQUALS(2U, type->size); ASSERT_EQUALS(2U, type->size);
ASSERT_EQUALS('s', type->sign); ASSERT_EQUALS('s', type->sign);
@ -740,7 +740,7 @@ private:
// robustness test: provide cfg without PodType // robustness test: provide cfg without PodType
{ {
const struct Library::PodType * const type = library.podtype("nonExistingPodType"); const struct Library::PodType * const type = library.podtype("nonExistingPodType");
ASSERT_EQUALS(true, type == 0); ASSERT_EQUALS(true, type == nullptr);
} }
} }
} }