Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix code-style issues

Browse Source 
Fixed issues pointed out during review
This commit is contained in:
Christian Kieschnick 2018-01-16 08:34:56 +01:00 committed by Janek Bevendorff
parent 943dc6cdd6
commit 258438f01f
No known key found for this signature in database
GPG Key ID: 2FDEB0D40BCA5E11
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/AutoTypeAssociations.cpp
View File

@ -106,7 +106,7 @@ int AutoTypeAssociations::size() const
int AutoTypeAssociations::associationsSize() const
{
int size = 0;
foreach (const Association &association, m_associations) {
for (const Association &association : m_associations) {
size += association.sequence.toUtf8().size() + association.window.toUtf8().size();
}
return size;

4
src/core/Entry.cpp
View File

@ -586,6 +586,7 @@ void Entry::truncateHistory()
QMutableListIterator<Entry*> i(m_history);
i.toBack();
const QRegularExpression delimiter(",|:|;");
while (i.hasPrevious()) {
Entry* historyItem = i.previous();
@ -594,7 +595,8 @@ void Entry::truncateHistory()
size += historyItem->attributes()->attributesSize();
size += historyItem->autoTypeAssociations()->associationsSize();
size += historyItem->attachments()->attachmentsSize(foundAttachments);
foreach( const QString &tag, historyItem->tags().split(QRegExp(",|;|:"), QString::SkipEmptyParts)){
const QStringList tags = historyItem->tags().split(delimiter, QString::SkipEmptyParts);
for (const QString& tag : tags) {
size += tag.toUtf8().size();
}
foundAttachments += historyItem->attachments()->values();

13
src/core/EntryAttachments.cpp
View File

@ -153,16 +153,13 @@ bool EntryAttachments::operator!=(const EntryAttachments& other) const
return m_attachments != other.m_attachments;
}
int EntryAttachments::attachmentsSize(const QSet<QByteArray> &ignoredAttachments) const
int EntryAttachments::attachmentsSize(const QSet<QByteArray>& ignoredAttachments) const
{
int size = 0;
QMapIterator<QString, QByteArray> i(m_attachments);
while (i.hasNext()) {
i.next();
if( ! ignoredAttachments.contains( i.value() )){
size += i.key().toUtf8().size() + i.value().size();
}
for (auto it = m_attachments.constBegin(); it != m_attachments.constEnd(); ++it) {
if (!ignoredAttachments.contains(it.value())) {
size += it.key().toUtf8().size() + it.value().size();
}
}
return size;
}

2
src/core/EntryAttachments.h
View File

@ -41,7 +41,7 @@ public:
void copyDataFrom(const EntryAttachments* other);
bool operator==(const EntryAttachments& other) const;
bool operator!=(const EntryAttachments& other) const;
int attachmentsSize(const QSet<QByteArray> &ignoredAttachments) const;
int attachmentsSize(const QSet<QByteArray>& ignoredAttachments) const;
signals:
void modified();

7
src/core/EntryAttributes.cpp
View File

@ -286,11 +286,8 @@ void EntryAttributes::clear()
int EntryAttributes::attributesSize() const
{
int size = 0;
QMapIterator<QString, QString> i(m_attributes);
while (i.hasNext()) {
i.next();
size += i.key().toUtf8().size() + i.value().toUtf8().size();
for (auto it = m_attributes.constBegin(); it != m_attributes.constEnd(); ++it) {
size += it.key().toUtf8().size() + it.value().toUtf8().size();
}
return size;
}

20
tests/TestModified.cpp
View File

@ -400,8 +400,10 @@ void TestModified::testHistoryItem()
entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0);
const int historyMaxSize = 17000;
db->metadata()->setHistoryMaxItems(-1);
db->metadata()->setHistoryMaxSize(17000);
db->metadata()->setHistoryMaxSize(historyMaxSize);
entry2->beginUpdate();
entry2->attachments()->set("test", QByteArray(18000, 'X'));
@ -469,19 +471,21 @@ void TestModified::testHistoryItem()
entry4->setGroup(root);
QCOMPARE(entry4->historyItems().size(), 0);
const QString key("test");
int reservedSize = entry4->attributes()->attributesSize();
entry4->beginUpdate();
entry4->attachments()->set("test1", QByteArray(17000 - 5 - reservedSize + 1, 'a'));
entry4->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a'));
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1);
entry4->beginUpdate();
entry4->attachments()->remove("test1");
entry4->attachments()->remove(key);
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 0);
entry4->beginUpdate();
entry4->setTags(QByteArray(17000 - reservedSize + 1, 'a'));
entry4->setTags(QByteArray(historyMaxSize - reservedSize + 1, 'a'));
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1);
@ -491,19 +495,19 @@ void TestModified::testHistoryItem()
QCOMPARE(entry4->historyItems().size(), 0);
entry4->beginUpdate();
entry4->attributes()->set("test3", QByteArray(17000 - 5 - reservedSize + 1, 'a'));
entry4->attributes()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a'));
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1);
entry4->beginUpdate();
entry4->attributes()->remove("test3");
entry4->attributes()->remove(key);
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 0);
entry4->beginUpdate();
AutoTypeAssociations::Association association;
association.window = "test3";
association.sequence = QByteArray(17000 - 5 - reservedSize + 1, 'a');
association.window = key;
association.sequence = QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a');
entry4->autoTypeAssociations()->add(association);
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1);