mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Convert Q_FOREACH loops to C++11 for loops.

Browse source 
Q_FOREACH will de deprecated soon.
This commit is contained in:
Felix Geyer 2016-09-02 19:51:51 +02:00 • committed by Jonathan White
parent ad834f0f58
commit fff9e7ac46
31 changed files with 202 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/core/Group.cpp
View file

@ -18,6 +18,7 @@
#include "Group.h"
#include "core/Config.h"
#include "core/Global.h"
#include "core/DatabaseIcons.h"
#include "core/Metadata.h"
@ -37,13 +38,13 @@ Group::~Group()
{
// Destroy entries and children manually so DeletedObjects can be added
// to database.
QList<Entry*> entries = m_entries;
Q_FOREACH (Entry* entry, entries) {
const QList<Entry*> entries = m_entries;
for (Entry* entry : entries) {
delete entry;
}
QList<Group*> children = m_children;
Q_FOREACH (Group* group, children) {
const QList<Group*> children = m_children;
for (Group* group : children) {
delete group;
}
@ -427,12 +428,12 @@ QList<Entry*> Group::entriesRecursive(bool includeHistoryItems) const
entryList.append(m_entries);
if (includeHistoryItems) {
Q_FOREACH (Entry* entry, m_entries) {
for (Entry* entry : m_entries) {
entryList.append(entry->historyItems());
}
}
Q_FOREACH (Group* group, m_children) {
for (Group* group : m_children) {
entryList.append(group->entriesRecursive(includeHistoryItems));
}
@ -446,7 +447,7 @@ QList<const Group*> Group::groupsRecursive(bool includeSelf) const
groupList.append(this);
}
Q_FOREACH (const Group* group, m_children) {
for (const Group* group : m_children) {
groupList.append(group->groupsRecursive(true));
}
@ -460,7 +461,7 @@ QList<Group*> Group::groupsRecursive(bool includeSelf)
groupList.append(this);
}
Q_FOREACH (Group* group, m_children) {
for (Group* group : asConst(m_children)) {
groupList.append(group->groupsRecursive(true));
}
@ -475,13 +476,14 @@ QSet<Uuid> Group::customIconsRecursive() const
result.insert(iconUuid());
}
Q_FOREACH (Entry* entry, entriesRecursive(true)) {
const QList<Entry*> entryList = entriesRecursive(true);
for (Entry* entry : entryList) {
if (!entry->iconUuid().isNull()) {
result.insert(entry->iconUuid());
}
}
Q_FOREACH (Group* group, m_children) {
for (Group* group : m_children) {
result.unite(group->customIconsRecursive());
}
@ -497,12 +499,14 @@ Group* Group::clone(Entry::CloneFlags entryFlags) const
clonedGroup->setUuid(Uuid::random());
clonedGroup->m_data = m_data;
Q_FOREACH (Entry* entry, entries()) {
const QList<Entry*> entryList = entries();
for (Entry* entry : entryList) {
Entry* clonedEntry = entry->clone(entryFlags);
clonedEntry->setGroup(clonedGroup);
}
Q_FOREACH (Group* groupChild, children()) {
const QList<Group*> childrenGroups = children();
for (Group* groupChild : childrenGroups) {
Group* clonedGroupChild = groupChild->clone(entryFlags);
clonedGroupChild->setParent(clonedGroup);
}
@ -569,7 +573,7 @@ void Group::recSetDatabase(Database* db)
disconnect(SIGNAL(modified()), m_db);
}
Q_FOREACH (Entry* entry, m_entries) {
for (Entry* entry : asConst(m_entries)) {
if (m_db) {
entry->disconnect(m_db);
}
@ -591,7 +595,7 @@ void Group::recSetDatabase(Database* db)
m_db = db;
Q_FOREACH (Group* group, m_children) {
for (Group* group : asConst(m_children)) {
group->recSetDatabase(db);
}
}
@ -609,11 +613,11 @@ void Group::cleanupParent()
void Group::recCreateDelObjects()
{
if (m_db) {
Q_FOREACH (Entry* entry, m_entries) {
for (Entry* entry : asConst(m_entries)) {
m_db->addDeletedObject(entry->uuid());
}
Q_FOREACH (Group* group, m_children) {
for (Group* group : asConst(m_children)) {
group->recCreateDelObjects();
}
m_db->addDeletedObject(m_uuid);