jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coding style improvements.

Browse Source
This commit is contained in:
Felix Geyer
2012-05-14 16:27:59 +02:00
parent 89361b3bea
commit b88a0d8de3
12 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/core/Entry.cpp
View File

@@ -362,43 +362,45 @@ void Entry::addHistoryItem(Entry* entry)
void Entry::truncateHistory() {
const Database *db = database();
if(db) {
int histMaxItems = db->metadata()->historyMaxItems();
if (histMaxItems > -1) {
int historyCount = 0;
QMutableListIterator<Entry*> i(m_history);
i.toBack();
while (i.hasPrevious()) {
historyCount++;
Entry* entry = i.previous();
if (historyCount > histMaxItems) {
delete entry;
i.remove();
}
if (!db) {
return;
}
int histMaxItems = db->metadata()->historyMaxItems();
if (histMaxItems > -1) {
int historyCount = 0;
QMutableListIterator<Entry*> i(m_history);
i.toBack();
while (i.hasPrevious()) {
historyCount++;
Entry* entry = i.previous();
if (historyCount > histMaxItems) {
delete entry;
i.remove();
}
}
}
int histMaxSize = db->metadata()->historyMaxSize();
if (histMaxSize > -1) {
int size = 0;
QList<QByteArray>* foundAttachements = new QList<QByteArray>();
attachments()->attachmentsSize(foundAttachements);
int histMaxSize = db->metadata()->historyMaxSize();
if (histMaxSize > -1) {
int size = 0;
QList<QByteArray>* foundAttachements = new QList<QByteArray>();
attachments()->attachmentsSize(foundAttachements);
QMutableListIterator<Entry*> i(m_history);
i.toBack();
while (i.hasPrevious()) {
Entry* entry = i.previous();
if (size > histMaxSize) {
delete entry;
i.remove();
}
else {
size += entry->getSize(foundAttachements);
if (size > histMaxSize) {
delete entry;
i.remove();
}
}
QMutableListIterator<Entry*> i(m_history);
i.toBack();
while (i.hasPrevious()) {
Entry* entry = i.previous();
// don't calculate size if it's already above the maximum
if (size <= histMaxSize) {
size += entry->getSize(foundAttachements);
}
if (size > histMaxSize) {
delete entry;
i.remove();
}
}
}

2
src/core/EntryAttachments.h
View File

@@ -32,7 +32,7 @@ public:
void set(const QString& key, const QByteArray& value);
void remove(const QString& key);
void clear();
int attachmentsSize(QList<QByteArray> *foundAttachements);
int attachmentsSize(QList<QByteArray>* foundAttachements);
bool operator==(const EntryAttachments& other) const;
bool operator!=(const EntryAttachments& other) const;
EntryAttachments& operator=(EntryAttachments& other);

2
src/core/Tools.cpp
View File

@@ -92,7 +92,7 @@ bool readAllFromDevice(QIODevice* device, QByteArray& data)
}
}
QDateTime currentDateTimeUtc ()
QDateTime currentDateTimeUtc()
{
#if QT_VERSION >= 0x040700
return QDateTime::currentDateTimeUtc();