Skip to content

Commit

Permalink
clang-tidy: use nullptr
Browse files Browse the repository at this point in the history
Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb authored and droidmonkey committed May 3, 2022
1 parent 7e1d980 commit a4d4adb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/cli/Generate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ QSharedPointer<PasswordGenerator> Generate::createGenerator(QSharedPointer<QComm
passwordGenerator->setLength(passwordLength.toInt());
}

PasswordGenerator::CharClasses classes = 0x0;
PasswordGenerator::CharClasses classes;

if (parser->isSet(Generate::LowerCaseOption)) {
classes |= PasswordGenerator::LowerLetters;
Expand All @@ -116,7 +116,7 @@ QSharedPointer<PasswordGenerator> Generate::createGenerator(QSharedPointer<QComm
classes |= PasswordGenerator::EASCII;
}

PasswordGenerator::GeneratorFlags flags = 0x0;
PasswordGenerator::GeneratorFlags flags;

if (parser->isSet(Generate::ExcludeSimilarCharsOption)) {
flags |= PasswordGenerator::ExcludeLookAlike;
Expand Down
8 changes: 4 additions & 4 deletions src/gui/KMessageWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ class KMessageWidget : public QFrame
/**
* Constructs a KMessageWidget with the specified @p parent.
*/
explicit KMessageWidget(QWidget *parent = 0);
explicit KMessageWidget(QWidget* parent = nullptr);

/**
* Constructs a KMessageWidget with the specified @p parent and
* contents @p text.
*/
explicit KMessageWidget(const QString &text, QWidget *parent = 0);
explicit KMessageWidget(const QString& text, QWidget* parent = nullptr);

/**
* Destructor.
*/
Expand Down
4 changes: 2 additions & 2 deletions tests/TestEntryModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void TestEntryModel::testAttachmentsModel()

QSignalSpy spyReset(model, SIGNAL(modelReset()));
entryAttachments->clear();
model->setEntryAttachments(0);
model->setEntryAttachments(nullptr);
QCOMPARE(spyReset.count(), 2);
QCOMPARE(model->rowCount(), 0);

Expand Down Expand Up @@ -217,7 +217,7 @@ void TestEntryModel::testAttributesModel()

QSignalSpy spyReset(model, SIGNAL(modelReset()));
entryAttributes->clear();
model->setEntryAttributes(0);
model->setEntryAttributes(nullptr);
QCOMPARE(spyReset.count(), 2);
QCOMPARE(model->rowCount(), 0);

Expand Down
6 changes: 3 additions & 3 deletions tests/TestKeePass1Reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void TestKeePass1Reader::initTestCase()
QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/basic.kdb");

KeePass1Reader reader;
m_db = reader.readDatabase(filename, "masterpw", 0);
m_db = reader.readDatabase(filename, "masterpw", nullptr);
QVERIFY(m_db);
QVERIFY(!reader.hasError());
}
Expand Down Expand Up @@ -213,7 +213,7 @@ void TestKeePass1Reader::testTwofish()

QString dbFilename = QString("%1/%2.kdb").arg(QString(KEEPASSX_TEST_DATA_DIR), name);

auto db = reader.readDatabase(dbFilename, "masterpw", 0);
auto db = reader.readDatabase(dbFilename, "masterpw", nullptr);
QVERIFY(db);
QVERIFY(!reader.hasError());
QCOMPARE(db->rootGroup()->children().size(), 1);
Expand All @@ -229,7 +229,7 @@ void TestKeePass1Reader::testCP1252Password()
QString dbFilename = QString("%1/%2.kdb").arg(QString(KEEPASSX_TEST_DATA_DIR), name);
QString password = QString::fromUtf8("\xe2\x80\x9e\x70\x61\x73\x73\x77\x6f\x72\x64\xe2\x80\x9d");

auto db = reader.readDatabase(dbFilename, password, 0);
auto db = reader.readDatabase(dbFilename, password, nullptr);
QVERIFY(db);
QVERIFY(!reader.hasError());
QCOMPARE(db->rootGroup()->children().size(), 1);
Expand Down

0 comments on commit a4d4adb

Please sign in to comment.