Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 16:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

More coding style fixes.

Browse Source
This commit is contained in:
Felix Geyer 2012-04-19 00:25:57 +02:00
parent 3d1fc6cd6d
commit 246bc0115e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/Database.cpp
View File

@ -75,14 +75,16 @@ Entry* Database::resolveEntry(const Uuid& uuid)
Entry* Database::recFindEntry(const Uuid& uuid, Group* group) Entry* Database::recFindEntry(const Uuid& uuid, Group* group)
{ {
Q_FOREACH (Entry* entry, group->entries()) { Q_FOREACH (Entry* entry, group->entries()) {
if (entry->uuid() == uuid) if (entry->uuid() == uuid) {
return entry; return entry;
}
} }
Q_FOREACH (Group* child, group->children()) { Q_FOREACH (Group* child, group->children()) {
Entry* result = recFindEntry(uuid, child); Entry* result = recFindEntry(uuid, child);
if (result) if (result) {
return result; return result;
}
} }
return 0; return 0;
@ -95,13 +97,15 @@ Group* Database::resolveGroup(const Uuid& uuid)
Group* Database::recFindGroup(const Uuid& uuid, Group* group) Group* Database::recFindGroup(const Uuid& uuid, Group* group)
{ {
if (group->uuid() == uuid) if (group->uuid() == uuid) {
return group; return group;
}
Q_FOREACH (Group* child, group->children()) { Q_FOREACH (Group* child, group->children()) {
Group* result = recFindGroup(uuid, child); Group* result = recFindGroup(uuid, child);
if (result) if (result) {
return result; return result;
}
} }
return 0; return 0;

4
src/gui/DatabaseOpenDialog.cpp
View File

@ -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(accepted()), SLOT(openDatabase()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject())); 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)) { if (lastKeyFiles.contains(m_filename)) {
m_ui->checkKeyFile->setChecked(true); m_ui->checkKeyFile->setChecked(true);
m_ui->comboKeyFile->addItem(lastKeyFiles[m_filename].toString()); m_ui->comboKeyFile->addItem(lastKeyFiles[m_filename].toString());
@ -75,7 +75,7 @@ void DatabaseOpenDialog::openDatabase()
masterKey.addKey(PasswordKey(m_ui->editPassword->text())); 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()) { if (m_ui->checkKeyFile->isChecked()) {
FileKey key; FileKey key;

3
src/gui/MainWindow.cpp
View File

@ -56,8 +56,7 @@ MainWindow::~MainWindow()
void MainWindow::setMenuActionState(int index) void MainWindow::setMenuActionState(int index)
{ {
if (m_ui->tabWidget->currentIndex() != -1) if (m_ui->tabWidget->currentIndex() != -1) {
{
m_ui->actionDatabaseClose->setEnabled(true); m_ui->actionDatabaseClose->setEnabled(true);
DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget();
Q_ASSERT(dbWidget); Q_ASSERT(dbWidget);