Use C++11 keyword directly in new methods.

This commit is contained in:
Felix Geyer 2016-01-29 17:25:32 +01:00
parent 71d4cb781d
commit bfae81ec70
4 changed files with 6 additions and 6 deletions

View File

@ -25,13 +25,13 @@
#include "format/KeePass2XmlReader.h"
KeePass2Repair::KeePass2Repair()
: m_db(Q_NULLPTR)
: m_db(nullptr)
{
}
KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key)
{
m_db = Q_NULLPTR;
m_db = nullptr;
m_errorStr.clear();
KeePass2Reader reader;

View File

@ -25,14 +25,14 @@ class DatabaseRepairWidget : public DatabaseOpenWidget
Q_OBJECT
public:
explicit DatabaseRepairWidget(QWidget* parent = Q_NULLPTR);
explicit DatabaseRepairWidget(QWidget* parent = nullptr);
Q_SIGNALS:
void success();
void error();
protected:
void openDatabase() Q_DECL_OVERRIDE;
void openDatabase() override;
private Q_SLOTS:
void processEditFinished(bool result);

View File

@ -102,7 +102,7 @@ Q_SIGNALS:
void entryColumnSizesChanged();
protected:
bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE;
bool eventFilter(QObject* object, QEvent* event) override;
public Q_SLOTS:
void createEntry();

View File

@ -623,7 +623,7 @@ void MainWindow::repairDatabase()
if (dialog->exec() == QDialog::Accepted && dbRepairWidget->database()) {
QString saveFileName = fileDialog()->getSaveFileName(this, tr("Save repaired database"), QString(),
tr("KeePass 2 Database").append(" (*.kdbx)"),
Q_NULLPTR, 0, "kdbx");
nullptr, 0, "kdbx");
if (!saveFileName.isEmpty()) {
KeePass2Writer writer;