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

Reduce number of unneeded copies

Browse source 
This patch aims at reducing the number of copies for obejcts that could
be referenced rather than copied, because they're not modified during
the computation.
This commit is contained in:
Gianluca Recchia 2018-10-28 12:49:32 +01:00
parent a67a574b89
commit da9afd3f6f
No known key found for this signature in database
GPG key ID: 3C2B4128D9A1F218
40 changed files with 90 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/browser/BrowserAction.cpp
View file

@ -468,7 +468,7 @@ QJsonObject BrowserAction::decryptMessage(const QString& message, const QString&
return getErrorReply(action, ERROR_KEEPASS_CANNOT_DECRYPT_MESSAGE); return getErrorReply(action, ERROR_KEEPASS_CANNOT_DECRYPT_MESSAGE);
} }
QString BrowserAction::encrypt(const QString plaintext, const QString nonce) QString BrowserAction::encrypt(const QString& plaintext, const QString& nonce)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
const QByteArray ma = plaintext.toUtf8(); const QByteArray ma = plaintext.toUtf8();
@ -496,7 +496,7 @@ QString BrowserAction::encrypt(const QString plaintext, const QString nonce)
return QString(); return QString();
} }
QByteArray BrowserAction::decrypt(const QString encrypted, const QString nonce) QByteArray BrowserAction::decrypt(const QString& encrypted, const QString& nonce)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
const QByteArray ma = base64Decode(encrypted); const QByteArray ma = base64Decode(encrypted);
@ -546,14 +546,14 @@ QJsonObject BrowserAction::getJsonObject(const uchar* pArray, const uint len) co
return doc.object(); return doc.object();
} }
QJsonObject BrowserAction::getJsonObject(const QByteArray ba) const QJsonObject BrowserAction::getJsonObject(const QByteArray& ba) const
{ {
QJsonParseError err; QJsonParseError err;
QJsonDocument doc(QJsonDocument::fromJson(ba, &err)); QJsonDocument doc(QJsonDocument::fromJson(ba, &err));
return doc.object(); return doc.object();
} }
QByteArray BrowserAction::base64Decode(const QString str) QByteArray BrowserAction::base64Decode(const QString& str)
{ {
return QByteArray::fromBase64(str.toUtf8()); return QByteArray::fromBase64(str.toUtf8());
} }

8
src/browser/BrowserAction.h
View file

@ -73,14 +73,14 @@ private:
QString encryptMessage(const QJsonObject& message, const QString& nonce); QString encryptMessage(const QJsonObject& message, const QString& nonce);
QJsonObject decryptMessage(const QString& message, const QString& nonce, const QString& action = QString()); QJsonObject decryptMessage(const QString& message, const QString& nonce, const QString& action = QString());
QString encrypt(const QString plaintext, const QString nonce); QString encrypt(const QString& plaintext, const QString& nonce);
QByteArray decrypt(const QString encrypted, const QString nonce); QByteArray decrypt(const QString& encrypted, const QString& nonce);
QString getBase64FromKey(const uchar* array, const uint len); QString getBase64FromKey(const uchar* array, const uint len);
QByteArray getQByteArray(const uchar* array, const uint len) const; QByteArray getQByteArray(const uchar* array, const uint len) const;
QJsonObject getJsonObject(const uchar* pArray, const uint len) const; QJsonObject getJsonObject(const uchar* pArray, const uint len) const;
QJsonObject getJsonObject(const QByteArray ba) const; QJsonObject getJsonObject(const QByteArray& ba) const;
QByteArray base64Decode(const QString str); QByteArray base64Decode(const QString& str);
QString incrementNonce(const QString& nonce); QString incrementNonce(const QString& nonce);
private: private:

8
src/browser/BrowserSettings.cpp
View file

@ -169,7 +169,7 @@ QString BrowserSettings::customProxyLocation()
return config()->get("Browser/CustomProxyLocation", "").toString(); return config()->get("Browser/CustomProxyLocation", "").toString();
} }
void BrowserSettings::setCustomProxyLocation(QString location) void BrowserSettings::setCustomProxyLocation(const QString& location)
{ {
config()->set("Browser/CustomProxyLocation", location); config()->set("Browser/CustomProxyLocation", location);
} }
@ -364,7 +364,7 @@ QString BrowserSettings::passwordExcludedChars()
return config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString(); return config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString();
} }
void BrowserSettings::setPasswordExcludedChars(QString chars) void BrowserSettings::setPasswordExcludedChars(const QString& chars)
{ {
config()->set("generator/ExcludedChars", chars); config()->set("generator/ExcludedChars", chars);
} }
@ -384,7 +384,7 @@ QString BrowserSettings::passPhraseWordSeparator()
return config()->get("generator/WordSeparator", PassphraseGenerator::DefaultSeparator).toString(); return config()->get("generator/WordSeparator", PassphraseGenerator::DefaultSeparator).toString();
} }
void BrowserSettings::setPassPhraseWordSeparator(QString separator) void BrowserSettings::setPassPhraseWordSeparator(const QString& separator)
{ {
config()->set("generator/WordSeparator", separator); config()->set("generator/WordSeparator", separator);
} }
@ -496,7 +496,7 @@ QString BrowserSettings::generatePassword()
} }
} }
void BrowserSettings::updateBinaryPaths(QString customProxyLocation) void BrowserSettings::updateBinaryPaths(const QString& customProxyLocation)
{ {
bool isProxy = supportBrowserProxy(); bool isProxy = supportBrowserProxy();
m_hostInstaller.updateBinaryPaths(isProxy, customProxyLocation); m_hostInstaller.updateBinaryPaths(isProxy, customProxyLocation);

8
src/browser/BrowserSettings.h
View file

@ -59,7 +59,7 @@ public:
bool useCustomProxy(); bool useCustomProxy();
void setUseCustomProxy(bool enabled); void setUseCustomProxy(bool enabled);
QString customProxyLocation(); QString customProxyLocation();
void setCustomProxyLocation(QString location); void setCustomProxyLocation(const QString& location);
bool updateBinaryPath(); bool updateBinaryPath();
void setUpdateBinaryPath(bool enabled); void setUpdateBinaryPath(bool enabled);
bool chromeSupport(); bool chromeSupport();
@ -98,11 +98,11 @@ public:
bool advancedMode(); bool advancedMode();
void setAdvancedMode(bool advancedMode); void setAdvancedMode(bool advancedMode);
QString passwordExcludedChars(); QString passwordExcludedChars();
void setPasswordExcludedChars(QString chars); void setPasswordExcludedChars(const QString& chars);
int passPhraseWordCount(); int passPhraseWordCount();
void setPassPhraseWordCount(int wordCount); void setPassPhraseWordCount(int wordCount);
QString passPhraseWordSeparator(); QString passPhraseWordSeparator();
void setPassPhraseWordSeparator(QString separator); void setPassPhraseWordSeparator(const QString& separator);
int generatorType(); int generatorType();
void setGeneratorType(int type); void setGeneratorType(int type);
bool passwordEveryGroup(); bool passwordEveryGroup();
@ -114,7 +114,7 @@ public:
PasswordGenerator::CharClasses passwordCharClasses(); PasswordGenerator::CharClasses passwordCharClasses();
PasswordGenerator::GeneratorFlags passwordGeneratorFlags(); PasswordGenerator::GeneratorFlags passwordGeneratorFlags();
QString generatePassword(); QString generatePassword();
void updateBinaryPaths(QString customProxyLocation = QString()); void updateBinaryPaths(const QString& customProxyLocation = QString());
bool checkIfProxyExists(QString& path); bool checkIfProxyExists(QString& path);
private: private:

2
src/cli/Clip.cpp
View file

@ -71,7 +71,7 @@ int Clip::execute(const QStringList& arguments)
return clipEntry(db, args.at(1), args.value(2)); return clipEntry(db, args.at(1), args.value(2));
} }
int Clip::clipEntry(Database* database, QString entryPath, QString timeout) int Clip::clipEntry(Database* database, const QString& entryPath, const QString& timeout)
{ {
TextStream err(Utils::STDERR); TextStream err(Utils::STDERR);

2
src/cli/Clip.h
View file

@ -26,7 +26,7 @@ public:
Clip(); Clip();
~Clip(); ~Clip();
int execute(const QStringList& arguments); int execute(const QStringList& arguments);
int clipEntry(Database* database, QString entryPath, QString timeout); int clipEntry(Database* database, const QString& entryPath, const QString& timeout);
}; };
#endif // KEEPASSXC_CLIP_H #endif // KEEPASSXC_CLIP_H

2
src/cli/Command.cpp
View file

@ -71,7 +71,7 @@ void populateCommands()
} }
} }
Command* Command::getCommand(QString commandName) Command* Command::getCommand(const QString& commandName)
{ {
populateCommands(); populateCommands();
if (commands.contains(commandName)) { if (commands.contains(commandName)) {

2
src/cli/Command.h
View file

@ -35,7 +35,7 @@ public:
QString getDescriptionLine(); QString getDescriptionLine();
static QList<Command*> getCommands(); static QList<Command*> getCommands();
static Command* getCommand(QString commandName); static Command* getCommand(const QString& commandName);
}; };
#endif // KEEPASSXC_COMMAND_H #endif // KEEPASSXC_COMMAND_H

6
src/core/CsvParser.cpp
View file

@ -1,4 +1,4 @@
/* /*
* Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it> * Copyright (C) 2016 Enrico Mariotti <enricomariotti@yahoo.it>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org> * Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* *
@ -327,7 +327,7 @@ bool CsvParser::isText(QChar c) const
return !((isCRLF(c)) || (isSeparator(c))); return !((isCRLF(c)) || (isSeparator(c)));
} }
bool CsvParser::isEmptyRow(CsvRow row) const bool CsvParser::isEmptyRow(const CsvRow& row) const
{ {
CsvRow::const_iterator it = row.constBegin(); CsvRow::const_iterator it = row.constBegin();
for (; it != row.constEnd(); ++it) for (; it != row.constEnd(); ++it)
@ -414,7 +414,7 @@ int CsvParser::getCsvRows() const
return m_table.size(); return m_table.size();
} }
void CsvParser::appendStatusMsg(QString s, bool isCritical) void CsvParser::appendStatusMsg(const QString& s, bool isCritical)
{ {
m_statusMsg += QObject::tr("%1: (row, col) %2,%3").arg(s, m_currRow, m_currCol).append("\n"); m_statusMsg += QObject::tr("%1: (row, col) %2,%3").arg(s, m_currRow, m_currCol).append("\n");
m_isGood = !isCritical; m_isGood = !isCritical;

4
src/core/CsvParser.h
View file

@ -83,7 +83,7 @@ private:
bool isCRLF(const QChar& c) const; bool isCRLF(const QChar& c) const;
bool isSpace(const QChar& c) const; bool isSpace(const QChar& c) const;
bool isTab(const QChar& c) const; bool isTab(const QChar& c) const;
bool isEmptyRow(CsvRow row) const; bool isEmptyRow(const CsvRow& row) const;
bool parseFile(); bool parseFile();
void parseRecord(); void parseRecord();
void parseField(CsvRow& row); void parseField(CsvRow& row);
@ -96,7 +96,7 @@ private:
void clear(); void clear();
bool skipEndline(); bool skipEndline();
void skipLine(); void skipLine();
void appendStatusMsg(QString s, bool isCritical = false); void appendStatusMsg(const QString& s, bool isCritical = false);
}; };
#endif // CSVPARSER_H #endif // CSVPARSER_H

12
src/core/Database.cpp
View file

@ -315,7 +315,7 @@ void Database::setCompressionAlgo(Database::CompressionAlgorithm algo)
* @param updateTransformSalt true to update the transform salt * @param updateTransformSalt true to update the transform salt
* @return true on success * @return true on success
*/ */
bool Database::setKey(QSharedPointer<const CompositeKey> key, bool updateChangedTime, bool updateTransformSalt) bool Database::setKey(const QSharedPointer<const CompositeKey>& key, bool updateChangedTime, bool updateTransformSalt)
{ {
if (!key) { if (!key) {
m_data.key.reset(); m_data.key.reset();
@ -354,7 +354,7 @@ bool Database::hasKey() const
return m_data.hasKey; return m_data.hasKey;
} }
bool Database::verifyKey(QSharedPointer<CompositeKey> key) const bool Database::verifyKey(const QSharedPointer<CompositeKey>& key) const
{ {
Q_ASSERT(hasKey()); Q_ASSERT(hasKey());
@ -501,7 +501,7 @@ Database* Database::openDatabaseFile(const QString& fileName, QSharedPointer<con
return db; return db;
} }
Database* Database::unlockFromStdin(QString databaseFilename, QString keyFilename, FILE* outputDescriptor, FILE* errorDescriptor) Database* Database::unlockFromStdin(const QString& databaseFilename, const QString& keyFilename, FILE* outputDescriptor, FILE* errorDescriptor)
{ {
auto compositeKey = QSharedPointer<CompositeKey>::create(); auto compositeKey = QSharedPointer<CompositeKey>::create();
QTextStream out(outputDescriptor); QTextStream out(outputDescriptor);
@ -553,7 +553,7 @@ Database* Database::unlockFromStdin(QString databaseFilename, QString keyFilenam
* @param backup Backup the existing database file, if exists * @param backup Backup the existing database file, if exists
* @return error string, if any * @return error string, if any
*/ */
QString Database::saveToFile(QString filePath, bool atomic, bool backup) QString Database::saveToFile(const QString& filePath, bool atomic, bool backup)
{ {
QString error; QString error;
if (atomic) { if (atomic) {
@ -633,7 +633,7 @@ QString Database::writeDatabase(QIODevice* device)
* @param filePath Path to the file to backup * @param filePath Path to the file to backup
* @return * @return
*/ */
bool Database::backupDatabase(QString filePath) bool Database::backupDatabase(const QString& filePath)
{ {
QString backupFilePath = filePath; QString backupFilePath = filePath;
auto re = QRegularExpression("\\.kdbx$|(?<!\\.kdbx)$", QRegularExpression::CaseInsensitiveOption); auto re = QRegularExpression("\\.kdbx$|(?<!\\.kdbx)$", QRegularExpression::CaseInsensitiveOption);
@ -652,7 +652,7 @@ void Database::setKdf(QSharedPointer<Kdf> kdf)
m_data.kdf = std::move(kdf); m_data.kdf = std::move(kdf);
} }
bool Database::changeKdf(QSharedPointer<Kdf> kdf) bool Database::changeKdf(const QSharedPointer<Kdf>& kdf)
{ {
kdf->randomizeSeed(); kdf->randomizeSeed();
QByteArray transformedMasterKey; QByteArray transformedMasterKey;

12
src/core/Database.h
View file

@ -110,9 +110,9 @@ public:
void setCipher(const QUuid& cipher); void setCipher(const QUuid& cipher);
void setCompressionAlgo(Database::CompressionAlgorithm algo); void setCompressionAlgo(Database::CompressionAlgorithm algo);
void setKdf(QSharedPointer<Kdf> kdf); void setKdf(QSharedPointer<Kdf> kdf);
bool setKey(QSharedPointer<const CompositeKey> key, bool updateChangedTime = true, bool updateTransformSalt = false); bool setKey(const QSharedPointer<const CompositeKey>& key, bool updateChangedTime = true, bool updateTransformSalt = false);
bool hasKey() const; bool hasKey() const;
bool verifyKey(QSharedPointer<CompositeKey> key) const; bool verifyKey(const QSharedPointer<CompositeKey>& key) const;
QVariantMap& publicCustomData(); QVariantMap& publicCustomData();
const QVariantMap& publicCustomData() const; const QVariantMap& publicCustomData() const;
void setPublicCustomData(const QVariantMap& customData); void setPublicCustomData(const QVariantMap& customData);
@ -121,17 +121,17 @@ public:
void emptyRecycleBin(); void emptyRecycleBin();
void setEmitModified(bool value); void setEmitModified(bool value);
void markAsModified(); void markAsModified();
QString saveToFile(QString filePath, bool atomic = true, bool backup = false); QString saveToFile(const QString& filePath, bool atomic = true, bool backup = false);
/** /**
* Returns a unique id that is only valid as long as the Database exists. * Returns a unique id that is only valid as long as the Database exists.
*/ */
const QUuid& uuid(); const QUuid& uuid();
bool changeKdf(QSharedPointer<Kdf> kdf); bool changeKdf(const QSharedPointer<Kdf>& kdf);
static Database* databaseByUuid(const QUuid& uuid); static Database* databaseByUuid(const QUuid& uuid);
static Database* openDatabaseFile(const QString& fileName, QSharedPointer<const CompositeKey> key); static Database* openDatabaseFile(const QString& fileName, QSharedPointer<const CompositeKey> key);
static Database* unlockFromStdin(QString databaseFilename, QString keyFilename = {}, static Database* unlockFromStdin(const QString& databaseFilename, const QString& keyFilename = {},
FILE* outputDescriptor = stdout, FILE* errorDescriptor = stderr); FILE* outputDescriptor = stdout, FILE* errorDescriptor = stderr);
signals: signals:
@ -156,7 +156,7 @@ private:
void createRecycleBin(); void createRecycleBin();
QString writeDatabase(QIODevice* device); QString writeDatabase(QIODevice* device);
bool backupDatabase(QString filePath); bool backupDatabase(const QString& filePath);
Metadata* const m_metadata; Metadata* const m_metadata;
Group* m_rootGroup; Group* m_rootGroup;

4
src/core/EntrySearcher.cpp
View file

@ -34,12 +34,12 @@ EntrySearcher::searchEntries(const QString& searchTerm, const Group* group, Qt::
{ {
QList<Entry*> searchResult; QList<Entry*> searchResult;
const QList<Entry*> entryList = group->entries(); const QList<Entry*>& entryList = group->entries();
for (Entry* entry : entryList) { for (Entry* entry : entryList) {
searchResult.append(matchEntry(searchTerm, entry, caseSensitivity)); searchResult.append(matchEntry(searchTerm, entry, caseSensitivity));
} }
const QList<Group*> children = group->children(); const QList<Group*>& children = group->children();
for (Group* childGroup : children) { for (Group* childGroup : children) {
if (childGroup->searchingEnabled() != Group::Disable) { if (childGroup->searchingEnabled() != Group::Disable) {
if (matchGroup(searchTerm, childGroup, caseSensitivity)) { if (matchGroup(searchTerm, childGroup, caseSensitivity)) {

12
src/core/Group.cpp
View file

@ -563,7 +563,7 @@ Entry* Group::findEntryByUuid(const QUuid& uuid) const
return nullptr; return nullptr;
} }
Entry* Group::findEntryByPath(QString entryPath) Entry* Group::findEntryByPath(const QString& entryPath)
{ {
if (entryPath.isEmpty()) { if (entryPath.isEmpty()) {
return nullptr; return nullptr;
@ -578,7 +578,7 @@ Entry* Group::findEntryByPath(QString entryPath)
return findEntryByPathRecursive(normalizedEntryPath, "/"); return findEntryByPathRecursive(normalizedEntryPath, "/");
} }
Entry* Group::findEntryByPathRecursive(QString entryPath, QString basePath) Entry* Group::findEntryByPathRecursive(const QString& entryPath, const QString& basePath)
{ {
// Return the first entry that matches the full path OR if there is no leading // Return the first entry that matches the full path OR if there is no leading
// slash, return the first entry title that matches // slash, return the first entry title that matches
@ -599,7 +599,7 @@ Entry* Group::findEntryByPathRecursive(QString entryPath, QString basePath)
return nullptr; return nullptr;
} }
Group* Group::findGroupByPath(QString groupPath) Group* Group::findGroupByPath(const QString& groupPath)
{ {
// normalize the groupPath by adding missing front and rear slashes. once. // normalize the groupPath by adding missing front and rear slashes. once.
QString normalizedGroupPath; QString normalizedGroupPath;
@ -614,7 +614,7 @@ Group* Group::findGroupByPath(QString groupPath)
return findGroupByPathRecursive(normalizedGroupPath, "/"); return findGroupByPathRecursive(normalizedGroupPath, "/");
} }
Group* Group::findGroupByPathRecursive(QString groupPath, QString basePath) Group* Group::findGroupByPathRecursive(const QString& groupPath, const QString& basePath)
{ {
// paths must be normalized // paths must be normalized
Q_ASSERT(groupPath.startsWith("/") && groupPath.endsWith("/")); Q_ASSERT(groupPath.startsWith("/") && groupPath.endsWith("/"));
@ -926,7 +926,7 @@ bool Group::resolveAutoTypeEnabled() const
} }
} }
QStringList Group::locate(QString locateTerm, QString currentPath) const QStringList Group::locate(const QString& locateTerm, const QString& currentPath) const
{ {
// TODO: Replace with EntrySearcher // TODO: Replace with EntrySearcher
QStringList response; QStringList response;
@ -950,7 +950,7 @@ QStringList Group::locate(QString locateTerm, QString currentPath) const
return response; return response;
} }
Entry* Group::addEntryWithPath(QString entryPath) Entry* Group::addEntryWithPath(const QString& entryPath)
{ {
if (entryPath.isEmpty() || findEntryByPath(entryPath)) { if (entryPath.isEmpty() || findEntryByPath(entryPath)) {
return nullptr; return nullptr;

12
src/core/Group.h
View file

@ -115,11 +115,11 @@ public:
Group* findChildByName(const QString& name); Group* findChildByName(const QString& name);
Entry* findEntryByUuid(const QUuid& uuid) const; Entry* findEntryByUuid(const QUuid& uuid) const;
Entry* findEntryByPath(QString entryPath); Entry* findEntryByPath(const QString& entryPath);
Group* findGroupByUuid(const QUuid& uuid); Group* findGroupByUuid(const QUuid& uuid);
Group* findGroupByPath(QString groupPath); Group* findGroupByPath(const QString& groupPath);
QStringList locate(QString locateTerm, QString currentPath = {"/"}) const; QStringList locate(const QString& locateTerm, const QString& currentPath = {"/"}) const;
Entry* addEntryWithPath(QString entryPath); Entry* addEntryWithPath(const QString& entryPath);
void setUuid(const QUuid& uuid); void setUuid(const QUuid& uuid);
void setName(const QString& name); void setName(const QString& name);
void setNotes(const QString& notes); void setNotes(const QString& notes);
@ -190,8 +190,8 @@ private:
void cleanupParent(); void cleanupParent();
void recCreateDelObjects(); void recCreateDelObjects();
Entry* findEntryByPathRecursive(QString entryPath, QString basePath); Entry* findEntryByPathRecursive(const QString& entryPath, const QString& basePath);
Group* findGroupByPathRecursive(QString groupPath, QString basePath); Group* findGroupByPathRecursive(const QString& groupPath, const QString& basePath);
QPointer<Database> m_db; QPointer<Database> m_db;
QUuid m_uuid; QUuid m_uuid;

2
src/core/PasswordGenerator.cpp
View file

@ -31,7 +31,7 @@ PasswordGenerator::PasswordGenerator()
{ {
} }
double PasswordGenerator::calculateEntropy(QString password) double PasswordGenerator::calculateEntropy(const QString& password)
{ {
return ZxcvbnMatch(password.toLatin1(), 0, 0); return ZxcvbnMatch(password.toLatin1(), 0, 0);
} }

2
src/core/PasswordGenerator.h
View file

@ -57,7 +57,7 @@ public:
public: public:
PasswordGenerator(); PasswordGenerator();
double calculateEntropy(QString password); double calculateEntropy(const QString& password);
void setLength(int length); void setLength(int length);
void setCharClasses(const CharClasses& classes); void setCharClasses(const CharClasses& classes);
void setFlags(const GeneratorFlags& flags); void setFlags(const GeneratorFlags& flags);

4
src/format/CsvExporter.cpp
View file

@ -64,7 +64,7 @@ bool CsvExporter::writeGroup(QIODevice* device, const Group* group, QString grou
} }
groupPath.append(group->name()); groupPath.append(group->name());
const QList<Entry*> entryList = group->entries(); const QList<Entry*>& entryList = group->entries();
for (const Entry* entry : entryList) { for (const Entry* entry : entryList) {
QString line; QString line;
@ -83,7 +83,7 @@ bool CsvExporter::writeGroup(QIODevice* device, const Group* group, QString grou
} }
} }
const QList<Group*> children = group->children(); const QList<Group*>& children = group->children();
for (const Group* child : children) { for (const Group* child : children) {
if (!writeGroup(device, child, groupPath)) { if (!writeGroup(device, child, groupPath)) {
return false; return false;

4
src/format/KeePass2.cpp
View file

@ -59,7 +59,7 @@ const QList<QPair<QUuid, QString>> KeePass2::KDFS{
qMakePair(KeePass2::KDF_AES_KDBX3, QObject::tr("AES-KDF (KDBX 3.1)")) qMakePair(KeePass2::KDF_AES_KDBX3, QObject::tr("AES-KDF (KDBX 3.1)"))
}; };
QByteArray KeePass2::hmacKey(QByteArray masterSeed, QByteArray transformedMasterKey) QByteArray KeePass2::hmacKey(const QByteArray& masterSeed, const QByteArray& transformedMasterKey)
{ {
CryptoHash hmacKeyHash(CryptoHash::Sha512); CryptoHash hmacKeyHash(CryptoHash::Sha512);
hmacKeyHash.addData(masterSeed); hmacKeyHash.addData(masterSeed);
@ -98,7 +98,7 @@ QSharedPointer<Kdf> KeePass2::kdfFromParameters(const QVariantMap& p)
return kdf; return kdf;
} }
QVariantMap KeePass2::kdfToParameters(QSharedPointer<Kdf> kdf) QVariantMap KeePass2::kdfToParameters(const QSharedPointer<Kdf>& kdf)
{ {
return kdf->writeParameters(); return kdf->writeParameters();
} }

4
src/format/KeePass2.h
View file

@ -126,9 +126,9 @@ extern const QList<QPair<QUuid, QString>> KDFS;
ByteArray = 0x42 ByteArray = 0x42
}; };
QByteArray hmacKey(QByteArray masterSeed, QByteArray transformedMasterKey); QByteArray hmacKey(const QByteArray& masterSeed, const QByteArray& transformedMasterKey);
QSharedPointer<Kdf> kdfFromParameters(const QVariantMap& p); QSharedPointer<Kdf> kdfFromParameters(const QVariantMap& p);
QVariantMap kdfToParameters(QSharedPointer<Kdf> kdf); QVariantMap kdfToParameters(const QSharedPointer<Kdf>& kdf);
QSharedPointer<Kdf> uuidToKdf(const QUuid& uuid); QSharedPointer<Kdf> uuidToKdf(const QUuid& uuid);
ProtectedStreamAlgo idToProtectedStreamAlgo(quint32 id); ProtectedStreamAlgo idToProtectedStreamAlgo(quint32 id);

4
src/gui/EditWidgetIcons.cpp
View file

@ -176,7 +176,7 @@ namespace {
// Try to get the 2nd level domain of the host part of a QUrl. For example, // Try to get the 2nd level domain of the host part of a QUrl. For example,
// "foo.bar.example.com" would become "example.com", and "foo.bar.example.co.uk" // "foo.bar.example.com" would become "example.com", and "foo.bar.example.co.uk"
// would become "example.co.uk". // would become "example.co.uk".
QString getSecondLevelDomain(QUrl url) QString getSecondLevelDomain(const QUrl& url)
{ {
QString fqdn = url.host(); QString fqdn = url.host();
fqdn.truncate(fqdn.length() - url.topLevelDomain().length()); fqdn.truncate(fqdn.length() - url.topLevelDomain().length());
@ -185,7 +185,7 @@ namespace {
return newdom; return newdom;
} }
QUrl convertVariantToUrl(QVariant var) QUrl convertVariantToUrl(const QVariant& var)
{ {
QUrl url; QUrl url;
if (var.canConvert<QUrl>()) if (var.canConvert<QUrl>())

2
src/gui/FileDialog.cpp
View file

@ -178,7 +178,7 @@ FileDialog::FileDialog()
{ {
} }
void FileDialog::saveLastDir(QString dir) void FileDialog::saveLastDir(const QString& dir)
{ {
if (!dir.isEmpty() && !m_forgetLastDir) { if (!dir.isEmpty() && !m_forgetLastDir) {
config()->set("LastDir", QFileInfo(dir).absolutePath()); config()->set("LastDir", QFileInfo(dir).absolutePath());

2
src/gui/FileDialog.h
View file

@ -65,7 +65,7 @@ private:
QString m_nextDirName; QString m_nextDirName;
bool m_forgetLastDir = false; bool m_forgetLastDir = false;
void saveLastDir(QString); void saveLastDir(const QString&);
static FileDialog* m_instance; static FileDialog* m_instance;

2
src/gui/MainWindow.cpp
View file

@ -673,7 +673,7 @@ void MainWindow::switchToOpenDatabase()
switchToDatabases(); switchToDatabases();
} }
void MainWindow::switchToDatabaseFile(QString file) void MainWindow::switchToDatabaseFile(const QString& file)
{ {
m_ui->tabWidget->openDatabase(file); m_ui->tabWidget->openDatabase(file);
switchToDatabases(); switchToDatabases();

2
src/gui/MainWindow.h
View file

@ -90,7 +90,7 @@ private slots:
void switchToPasswordGen(bool enabled); void switchToPasswordGen(bool enabled);
void switchToNewDatabase(); void switchToNewDatabase();
void switchToOpenDatabase(); void switchToOpenDatabase();
void switchToDatabaseFile(QString file); void switchToDatabaseFile(const QString& file);
void switchToKeePass1Database(); void switchToKeePass1Database();
void switchToCsvImport(); void switchToCsvImport();
void closePasswordGen(); void closePasswordGen();

2
src/gui/PasswordEdit.cpp
View file

@ -98,7 +98,7 @@ void PasswordEdit::updateStylesheet()
setStyleSheet(stylesheet); setStyleSheet(stylesheet);
} }
void PasswordEdit::autocompletePassword(QString password) void PasswordEdit::autocompletePassword(const QString& password)
{ {
if (config()->get("security/passwordsrepeat").toBool() && echoMode() == QLineEdit::Normal) { if (config()->get("security/passwordsrepeat").toBool() && echoMode() == QLineEdit::Normal) {
setText(password); setText(password);

2
src/gui/PasswordEdit.h
View file

@ -41,7 +41,7 @@ signals:
private slots: private slots:
void updateStylesheet(); void updateStylesheet();
void autocompletePassword(QString password); void autocompletePassword(const QString& password);
private: private:
bool passwordsEqual() const; bool passwordsEqual() const;

4
src/gui/csvImport/CsvImportWidget.cpp
View file

@ -315,7 +315,7 @@ void CsvImportWidget::setRootGroup()
m_db->rootGroup()->setName("Root"); m_db->rootGroup()->setName("Root");
} }
Group* CsvImportWidget::splitGroups(QString label) Group* CsvImportWidget::splitGroups(const QString& label)
{ {
// extract group names from nested path provided in "label" // extract group names from nested path provided in "label"
Group* current = m_db->rootGroup(); Group* current = m_db->rootGroup();
@ -345,7 +345,7 @@ Group* CsvImportWidget::splitGroups(QString label)
return current; return current;
} }
Group* CsvImportWidget::hasChildren(Group* current, QString groupName) Group* CsvImportWidget::hasChildren(Group* current, const QString& groupName)
{ {
// returns the group whose name is "groupName" and is child of "current" group // returns the group whose name is "groupName" and is child of "current" group
for (Group* group : current->children()) { for (Group* group : current->children()) {

4
src/gui/csvImport/CsvImportWidget.h
View file

@ -68,8 +68,8 @@ private:
QStringList m_fieldSeparatorList; QStringList m_fieldSeparatorList;
void configParser(); void configParser();
void updateTableview(); void updateTableview();
Group* splitGroups(QString label); Group* splitGroups(const QString& label);
Group* hasChildren(Group* current, QString groupName); Group* hasChildren(Group* current, const QString& groupName);
QString formatStatusText() const; QString formatStatusText() const;
}; };

2
src/gui/entry/AutoTypeMatchModel.cpp
View file

@ -37,7 +37,7 @@ AutoTypeMatch AutoTypeMatchModel::matchFromIndex(const QModelIndex& index) const
return m_matches.at(index.row()); return m_matches.at(index.row());
} }
QModelIndex AutoTypeMatchModel::indexFromMatch(AutoTypeMatch match) const QModelIndex AutoTypeMatchModel::indexFromMatch(const AutoTypeMatch& match) const
{ {
int row = m_matches.indexOf(match); int row = m_matches.indexOf(match);
Q_ASSERT(row != -1); Q_ASSERT(row != -1);

2
src/gui/entry/AutoTypeMatchModel.h
View file

@ -41,7 +41,7 @@ public:
explicit AutoTypeMatchModel(QObject* parent = nullptr); explicit AutoTypeMatchModel(QObject* parent = nullptr);
AutoTypeMatch matchFromIndex(const QModelIndex& index) const; AutoTypeMatch matchFromIndex(const QModelIndex& index) const;
QModelIndex indexFromMatch(AutoTypeMatch match) const; QModelIndex indexFromMatch(const AutoTypeMatch& match) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;

2
src/gui/entry/AutoTypeMatchView.cpp
View file

@ -98,7 +98,7 @@ AutoTypeMatch AutoTypeMatchView::currentMatch()
return AutoTypeMatch(); return AutoTypeMatch();
} }
void AutoTypeMatchView::setCurrentMatch(AutoTypeMatch match) void AutoTypeMatchView::setCurrentMatch(const AutoTypeMatch& match)
{ {
selectionModel()->setCurrentIndex(m_sortModel->mapFromSource(m_model->indexFromMatch(match)), selectionModel()->setCurrentIndex(m_sortModel->mapFromSource(m_model->indexFromMatch(match)),
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);

2
src/gui/entry/AutoTypeMatchView.h
View file

@ -34,7 +34,7 @@ class AutoTypeMatchView : public QTreeView
public: public:
explicit AutoTypeMatchView(QWidget* parent = nullptr); explicit AutoTypeMatchView(QWidget* parent = nullptr);
AutoTypeMatch currentMatch(); AutoTypeMatch currentMatch();
void setCurrentMatch(AutoTypeMatch match); void setCurrentMatch(const AutoTypeMatch& match);
AutoTypeMatch matchFromIndex(const QModelIndex& index); AutoTypeMatch matchFromIndex(const QModelIndex& index);
void setMatchList(const QList<AutoTypeMatch>& matches); void setMatchList(const QList<AutoTypeMatch>& matches);
void setFirstMatchActive(); void setFirstMatchActive();

2
src/gui/entry/EntryHistoryModel.cpp
View file

@ -54,7 +54,7 @@ QVariant EntryHistoryModel::data(const QModelIndex& index, int role) const
if (role == Qt::DisplayRole || role == Qt::UserRole) { if (role == Qt::DisplayRole || role == Qt::UserRole) {
Entry* entry = entryFromIndex(index); Entry* entry = entryFromIndex(index);
TimeInfo timeInfo = entry->timeInfo(); const TimeInfo& timeInfo = entry->timeInfo();
QDateTime lastModificationLocalTime = timeInfo.lastModificationTime().toLocalTime(); QDateTime lastModificationLocalTime = timeInfo.lastModificationTime().toLocalTime();
switch (index.column()) { switch (index.column()) {
case 0: case 0:

4
src/keys/CompositeKey.cpp
View file

@ -153,7 +153,7 @@ bool CompositeKey::challenge(const QByteArray& seed, QByteArray& result) const
* *
* @param key the key * @param key the key
*/ */
void CompositeKey::addKey(QSharedPointer<Key> key) void CompositeKey::addKey(const QSharedPointer<Key>& key)
{ {
m_keys.append(key); m_keys.append(key);
} }
@ -173,7 +173,7 @@ const QList<QSharedPointer<Key>>& CompositeKey::keys() const
* *
* @param key the key * @param key the key
*/ */
void CompositeKey::addChallengeResponseKey(QSharedPointer<ChallengeResponseKey> key) void CompositeKey::addChallengeResponseKey(const QSharedPointer<ChallengeResponseKey>& key)
{ {
m_challengeResponseKeys.append(key); m_challengeResponseKeys.append(key);
} }

4
src/keys/CompositeKey.h
View file

@ -42,10 +42,10 @@ public:
Q_REQUIRED_RESULT bool transform(const Kdf& kdf, QByteArray& result) const; Q_REQUIRED_RESULT bool transform(const Kdf& kdf, QByteArray& result) const;
bool challenge(const QByteArray& seed, QByteArray& result) const; bool challenge(const QByteArray& seed, QByteArray& result) const;
void addKey(QSharedPointer<Key> key); void addKey(const QSharedPointer<Key>& key);
const QList<QSharedPointer<Key>>& keys() const; const QList<QSharedPointer<Key>>& keys() const;
void addChallengeResponseKey(QSharedPointer<ChallengeResponseKey> key);\ void addChallengeResponseKey(const QSharedPointer<ChallengeResponseKey>& key);\
const QList<QSharedPointer<ChallengeResponseKey>>& challengeResponseKeys() const; const QList<QSharedPointer<ChallengeResponseKey>>& challengeResponseKeys() const;
private: private:

2
src/streams/HmacBlockStream.cpp
View file

@ -245,7 +245,7 @@ QByteArray HmacBlockStream::getCurrentHmacKey() const
return getHmacKey(m_blockIndex, m_key); return getHmacKey(m_blockIndex, m_key);
} }
QByteArray HmacBlockStream::getHmacKey(quint64 blockIndex, QByteArray key) QByteArray HmacBlockStream::getHmacKey(quint64 blockIndex, const QByteArray& key)
{ {
Q_ASSERT(key.size() == 64); Q_ASSERT(key.size() == 64);
QByteArray indexBytes = Endian::sizedIntToBytes<quint64>(blockIndex, ByteOrder); QByteArray indexBytes = Endian::sizedIntToBytes<quint64>(blockIndex, ByteOrder);

2
src/streams/HmacBlockStream.h
View file

@ -34,7 +34,7 @@ public:
bool reset() override; bool reset() override;
void close() override; void close() override;
static QByteArray getHmacKey(quint64 blockIndex, QByteArray key); static QByteArray getHmacKey(quint64 blockIndex, const QByteArray& key);
bool atEnd() const override; bool atEnd() const override;

8
src/totp/totp.cpp
View file

@ -97,7 +97,7 @@ QSharedPointer<Totp::Settings> Totp::createSettings(const QString& key, const ui
}); });
} }
QString Totp::writeSettings(const QSharedPointer<Totp::Settings> settings, const QString& title, const QString& username, bool forceOtp) QString Totp::writeSettings(const QSharedPointer<Totp::Settings>& settings, const QString& title, const QString& username, bool forceOtp)
{ {
if (settings.isNull()) { if (settings.isNull()) {
return {}; return {};
@ -127,7 +127,7 @@ QString Totp::writeSettings(const QSharedPointer<Totp::Settings> settings, const
return QString("%1;%2").arg(settings->step).arg(settings->digits); return QString("%1;%2").arg(settings->step).arg(settings->digits);
} }
QString Totp::generateTotp(const QSharedPointer<Totp::Settings> settings, const quint64 time) QString Totp::generateTotp(const QSharedPointer<Totp::Settings>& settings, const quint64 time)
{ {
Q_ASSERT(!settings.isNull()); Q_ASSERT(!settings.isNull());
if (settings.isNull()) { if (settings.isNull()) {
@ -194,7 +194,7 @@ Totp::Encoder& Totp::steamEncoder()
return getEncoderByShortName("S"); return getEncoderByShortName("S");
} }
Totp::Encoder& Totp::getEncoderByShortName(QString shortName) Totp::Encoder& Totp::getEncoderByShortName(const QString& shortName)
{ {
for (auto& encoder : encoders) { for (auto& encoder : encoders) {
if (encoder.shortName == shortName) { if (encoder.shortName == shortName) {
@ -204,7 +204,7 @@ Totp::Encoder& Totp::getEncoderByShortName(QString shortName)
return defaultEncoder(); return defaultEncoder();
} }
Totp::Encoder& Totp::getEncoderByName(QString name) Totp::Encoder& Totp::getEncoderByName(const QString& name)
{ {
for (auto& encoder : encoders) { for (auto& encoder : encoders) {
if (encoder.name == name) { if (encoder.name == name) {

8
src/totp/totp.h
View file

@ -60,15 +60,15 @@ static const QString ATTRIBUTE_SETTINGS = "TOTP Settings";
QSharedPointer<Totp::Settings> parseSettings(const QString& rawSettings, const QString& key = {}); QSharedPointer<Totp::Settings> parseSettings(const QString& rawSettings, const QString& key = {});
QSharedPointer<Totp::Settings> createSettings(const QString& key, const uint digits, const uint step, QSharedPointer<Totp::Settings> createSettings(const QString& key, const uint digits, const uint step,
const QString& encoderShortName = {}); const QString& encoderShortName = {});
QString writeSettings(const QSharedPointer<Totp::Settings> settings, const QString& title = {}, QString writeSettings(const QSharedPointer<Totp::Settings>& settings, const QString& title = {},
const QString& username = {}, bool forceOtp = false); const QString& username = {}, bool forceOtp = false);
QString generateTotp(const QSharedPointer<Totp::Settings> settings, const quint64 time = 0ull); QString generateTotp(const QSharedPointer<Totp::Settings>& settings, const quint64 time = 0ull);
Encoder& defaultEncoder(); Encoder& defaultEncoder();
Encoder& steamEncoder(); Encoder& steamEncoder();
Encoder& getEncoderByShortName(QString shortName); Encoder& getEncoderByShortName(const QString& shortName);
Encoder& getEncoderByName(QString name); Encoder& getEncoderByName(const QString& name);
} }
#endif // QTOTP_H #endif // QTOTP_H