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

Small optimizations.

Browse Source
This commit is contained in:
Felix Geyer 2012-10-28 11:27:10 +01:00
parent 4ff9681667
commit f1719cfc5f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/format/KeePass1Reader.cpp
View File

@ -85,13 +85,13 @@ Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& passwor
bool ok; bool ok;
quint32 signature1 = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok); quint32 signature1 = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok);
if (!ok || signature1 != 0x9AA2D903) { if (!ok || signature1 != KeePass1::SIGNATURE_1) {
raiseError(tr("Not a KeePass database.")); raiseError(tr("Not a KeePass database."));
return Q_NULLPTR; return Q_NULLPTR;
} }
quint32 signature2 = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok); quint32 signature2 = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok);
if (!ok || signature2 != 0xB54BFB65) { if (!ok || signature2 != KeePass1::SIGNATURE_2) {
raiseError(tr("Not a KeePass database.")); raiseError(tr("Not a KeePass database."));
return Q_NULLPTR; return Q_NULLPTR;
} }
@ -705,7 +705,7 @@ void KeePass1Reader::parseNotes(const QString& rawNotes, Entry* entry)
} }
} }
bool KeePass1Reader::constructGroupTree(const QList<Group*> groups) bool KeePass1Reader::constructGroupTree(const QList<Group*>& groups)
{ {
for (int i = 0; i < groups.size(); i++) { for (int i = 0; i < groups.size(); i++) {
quint32 level = m_groupLevels.value(groups[i]); quint32 level = m_groupLevels.value(groups[i]);
@ -726,7 +726,7 @@ bool KeePass1Reader::constructGroupTree(const QList<Group*> groups)
} }
} }
if (groups[i]->parent() == m_tmpParent) { if (groups[i]->parentGroup() == m_tmpParent) {
return false; return false;
} }
} }

2
src/format/KeePass1Reader.h
View File

@ -58,7 +58,7 @@ private:
Group* readGroup(QIODevice* cipherStream); Group* readGroup(QIODevice* cipherStream);
Entry* readEntry(QIODevice* cipherStream); Entry* readEntry(QIODevice* cipherStream);
void parseNotes(const QString& rawNotes, Entry* entry); void parseNotes(const QString& rawNotes, Entry* entry);
bool constructGroupTree(const QList<Group*> groups); bool constructGroupTree(const QList<Group*>& groups);
void parseMetaStream(const Entry* entry); void parseMetaStream(const Entry* entry);
bool parseGroupTreeState(const QByteArray& data); bool parseGroupTreeState(const QByteArray& data);
bool parseCustomIcons4(const QByteArray& data); bool parseCustomIcons4(const QByteArray& data);