Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-17 21:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use QSharedPointer

Browse Source
This commit is contained in:
Janek Bevendorff 2017-10-21 14:00:25 +02:00
parent a1aad5d165
commit aba2acb062
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/DatabaseOpenWidget.cpp
View File

@ -162,7 +162,7 @@ void DatabaseOpenWidget::enterKey(const QString& pw, const QString& keyFile)
void DatabaseOpenWidget::openDatabase() void DatabaseOpenWidget::openDatabase()
{ {
KeePass2Reader reader; KeePass2Reader reader;
QScopedPointer<CompositeKey> masterKey(databaseKey()); QSharedPointer<CompositeKey> masterKey = databaseKey();
if (masterKey.isNull()) { if (masterKey.isNull()) {
return; return;
} }
@ -192,9 +192,9 @@ void DatabaseOpenWidget::openDatabase()
} }
} }
CompositeKey* DatabaseOpenWidget::databaseKey() QSharedPointer<CompositeKey> DatabaseOpenWidget::databaseKey()
{ {
CompositeKey* masterKey = new CompositeKey(); auto masterKey = QSharedPointer<CompositeKey>::create();
if (m_ui->checkPassword->isChecked()) { if (m_ui->checkPassword->isChecked()) {
masterKey->addKey(PasswordKey(m_ui->editPassword->text())); masterKey->addKey(PasswordKey(m_ui->editPassword->text()));
@ -210,8 +210,7 @@ CompositeKey* DatabaseOpenWidget::databaseKey()
if (!key.load(keyFilename, &errorMsg)) { if (!key.load(keyFilename, &errorMsg)) {
m_ui->messageWidget->showMessage(tr("Can't open key file").append(":\n").append(errorMsg), m_ui->messageWidget->showMessage(tr("Can't open key file").append(":\n").append(errorMsg),
MessageWidget::Error); MessageWidget::Error);
delete masterKey; return QSharedPointer<CompositeKey>();
return nullptr;
} }
masterKey->addKey(key); masterKey->addKey(key);
lastKeyFiles[m_filename] = keyFilename; lastKeyFiles[m_filename] = keyFilename;

2
src/gui/DatabaseOpenWidget.h
View File

@ -52,7 +52,7 @@ signals:
protected: protected:
void showEvent(QShowEvent* event) override; void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override; void hideEvent(QHideEvent* event) override;
CompositeKey* databaseKey(); QSharedPointer<CompositeKey> databaseKey();
protected slots: protected slots:
virtual void openDatabase(); virtual void openDatabase();