mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-12-27 08:19:47 -05:00
More coding style fixes.
This commit is contained in:
parent
3d1fc6cd6d
commit
246bc0115e
@ -75,14 +75,16 @@ Entry* Database::resolveEntry(const Uuid& uuid)
|
||||
Entry* Database::recFindEntry(const Uuid& uuid, Group* group)
|
||||
{
|
||||
Q_FOREACH (Entry* entry, group->entries()) {
|
||||
if (entry->uuid() == uuid)
|
||||
if (entry->uuid() == uuid) {
|
||||
return entry;
|
||||
}
|
||||
}
|
||||
|
||||
Q_FOREACH (Group* child, group->children()) {
|
||||
Entry* result = recFindEntry(uuid, child);
|
||||
if (result)
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -95,13 +97,15 @@ Group* Database::resolveGroup(const Uuid& uuid)
|
||||
|
||||
Group* Database::recFindGroup(const Uuid& uuid, Group* group)
|
||||
{
|
||||
if (group->uuid() == uuid)
|
||||
if (group->uuid() == uuid) {
|
||||
return group;
|
||||
}
|
||||
|
||||
Q_FOREACH (Group* child, group->children()) {
|
||||
Group* result = recFindGroup(uuid, child);
|
||||
if (result)
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -50,7 +50,7 @@ DatabaseOpenDialog::DatabaseOpenDialog(QFile* file, QString filename, QWidget* p
|
||||
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase()));
|
||||
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
|
||||
|
||||
QHash<QString,QVariant> lastKeyFiles = config()->get("LastKeyFiles").toHash();
|
||||
QHash<QString, QVariant> lastKeyFiles = config()->get("LastKeyFiles").toHash();
|
||||
if (lastKeyFiles.contains(m_filename)) {
|
||||
m_ui->checkKeyFile->setChecked(true);
|
||||
m_ui->comboKeyFile->addItem(lastKeyFiles[m_filename].toString());
|
||||
@ -75,7 +75,7 @@ void DatabaseOpenDialog::openDatabase()
|
||||
masterKey.addKey(PasswordKey(m_ui->editPassword->text()));
|
||||
}
|
||||
|
||||
QHash<QString,QVariant> lastKeyFiles = config()->get("LastKeyFiles").toHash();
|
||||
QHash<QString, QVariant> lastKeyFiles = config()->get("LastKeyFiles").toHash();
|
||||
|
||||
if (m_ui->checkKeyFile->isChecked()) {
|
||||
FileKey key;
|
||||
|
@ -56,8 +56,7 @@ MainWindow::~MainWindow()
|
||||
|
||||
void MainWindow::setMenuActionState(int index)
|
||||
{
|
||||
if (m_ui->tabWidget->currentIndex() != -1)
|
||||
{
|
||||
if (m_ui->tabWidget->currentIndex() != -1) {
|
||||
m_ui->actionDatabaseClose->setEnabled(true);
|
||||
DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget();
|
||||
Q_ASSERT(dbWidget);
|
||||
|
Loading…
Reference in New Issue
Block a user