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

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
Show Stats 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();

5
src/gui/DatabaseSettingsWidget.cpp
View File

@ -40,8 +40,8 @@ DatabaseSettingsWidget::~DatabaseSettingsWidget()
{
}
void DatabaseSettingsWidget::setForms(QString dbName, QString dbDescription,
QString defaultUsername, bool recylceBinEnabled,
void DatabaseSettingsWidget::setForms(const QString& dbName, const QString& dbDescription,
const QString& defaultUsername, bool recylceBinEnabled,
int transformRounds, int historyMaxItems,
int historyMaxSize)
{
@ -162,7 +162,6 @@ void DatabaseSettingsWidget::toggleHistoryMaxSizeSpinBox(int state)
else {
m_ui->historyMaxSizeSpinBox->setEnabled(false);
}
}
void DatabaseSettingsWidget::transformRoundsBenchmark()

4
src/gui/DatabaseSettingsWidget.h
View File

@ -36,8 +36,8 @@ public:
explicit DatabaseSettingsWidget(QWidget* parent = 0);
~DatabaseSettingsWidget();
void setForms(QString dbName, QString dbDescription,
QString defaultUsername, bool recylceBinEnabled,
void setForms(const QString& dbName, const QString& dbDescription,
const QString& defaultUsername, bool recylceBinEnabled,
int transformRounds, int historyMaxItems,
int historyMaxSize);
quint64 transformRounds();

4
src/gui/DatabaseWidget.h
View File

@ -79,6 +79,8 @@ private Q_SLOTS:
void emitCurrentModeChanged();
private:
void truncateHistories();
Database* const m_db;
QWidget* m_mainWidget;
EditEntryWidget* m_editEntryWidget;
@ -91,8 +93,6 @@ private:
Entry* m_newEntry;
Group* m_newParent;
QLineEdit* m_searchEdit;
void truncateHistories();
};
#endif // KEEPASSX_DATABASEWIDGET_H

2
src/gui/EntryModel.cpp
View File

@ -61,7 +61,7 @@ void EntryModel::setGroup(Group* group)
Q_EMIT switchedToView();
}
void EntryModel::setEntries(QList<Entry*> entries)
void EntryModel::setEntries(const QList<Entry*>& entries)
{
beginResetModel();

8
src/gui/EntryModel.h
View File

@ -41,7 +41,7 @@ public:
QStringList mimeTypes() const;
QMimeData* mimeData(const QModelIndexList& indexes) const;
void setEntries(QList<Entry*> entries);
void setEntries(const QList<Entry*>& entries);
Q_SIGNALS:
void switchedToSearch();
@ -58,12 +58,12 @@ private Q_SLOTS:
void entryDataChanged(Entry* entry);
private:
void severConnections();
void makeConnections(const Group* group);
Group* m_group;
QList<Entry*> m_entries;
QList<const Group*> m_allGroups;
void severConnections();
void makeConnections(const Group* group);
};
#endif // KEEPASSX_ENTRYMODEL_H

2
src/gui/EntryView.cpp
View File

@ -53,7 +53,7 @@ void EntryView::setGroup(Group* group)
Q_EMIT entrySelectionChanged();
}
void EntryView::search(QList<Entry*> entries)
void EntryView::search(const QList<Entry*>& entries)
{
m_model->setEntries(entries);
Q_EMIT entrySelectionChanged();

2
src/gui/EntryView.h
View File

@ -36,7 +36,7 @@ public:
bool isSingleEntrySelected();
void setCurrentEntry(Entry* entry);
Entry* entryFromIndex(const QModelIndex& index);
void search(QList<Entry *> entries);
void search(const QList<Entry*>& entries);
bool inSearch();
public Q_SLOTS:

2
src/gui/IconModels.cpp
View File

@ -54,7 +54,7 @@ CustomIconModel::CustomIconModel(QObject* parent) :
{
}
void CustomIconModel::setIcons(QHash<Uuid, QImage> icons, QList<Uuid> iconsOrder)
void CustomIconModel::setIcons(const QHash<Uuid, QImage>& icons, const QList<Uuid>& iconsOrder)
{
beginResetModel();

2
src/gui/IconModels.h
View File

@ -43,7 +43,7 @@ public:
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
void setIcons(QHash<Uuid, QImage> icons, QList<Uuid> iconsOrder);
void setIcons(const QHash<Uuid, QImage>& icons, const QList<Uuid>& iconsOrder);
Uuid uuidFromIndex(const QModelIndex& index) const;
QModelIndex indexFromUuid(const Uuid& uuid) const;