Prevent unnecessary memory allocations

This commit is contained in:
Josef Vitu 2017-09-24 11:45:58 +02:00 committed by Jonathan White
parent 852e89c0df
commit be312bbe4f
5 changed files with 13 additions and 13 deletions

View File

@ -418,7 +418,7 @@ Database* Database::unlockFromStdin(QString databaseFilename, QString keyFilenam
FileKey fileKey;
QString errorMessage;
if (!fileKey.load(keyFilename, &errorMessage)) {
errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilename).arg(errorMessage);
errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilename, errorMessage);
errorTextStream << endl;
return nullptr;
}

View File

@ -29,7 +29,7 @@ QList<QString> EntryAttachments::keys() const
bool EntryAttachments::hasKey(const QString& key) const
{
return m_attachments.keys().contains(key);
return m_attachments.contains(key);
}
QList<QByteArray> EntryAttachments::values() const

View File

@ -41,7 +41,7 @@ QList<QString> EntryAttributes::keys() const
bool EntryAttributes::hasKey(const QString& key) const
{
return m_attributes.keys().contains(key);
return m_attributes.contains(key);
}
QList<QString> EntryAttributes::customKeys()

View File

@ -521,9 +521,9 @@ void KeePass2XmlWriter::writeColor(const QString& qualifiedName, const QColor& c
QString colorStr;
if (color.isValid()) {
colorStr = QString("#%1%2%3").arg(colorPartToString(color.red()))
.arg(colorPartToString(color.green()))
.arg(colorPartToString(color.blue()));
colorStr = QString("#%1%2%3").arg(colorPartToString(color.red()),
colorPartToString(color.green()),
colorPartToString(color.blue()));
}
writeString(qualifiedName, colorStr);

View File

@ -59,16 +59,16 @@ AboutDialog::AboutDialog(QWidget* parent)
}
debugInfo.append(QString("%1\n- Qt %2\n- %3\n\n")
.arg(tr("Libraries:"))
.arg(QString::fromLocal8Bit(qVersion()))
.arg(Crypto::backendVersion()));
.arg(tr("Libraries:"),
QString::fromLocal8Bit(qVersion()),
Crypto::backendVersion()));
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4")
.arg(QSysInfo::prettyProductName())
.arg(QSysInfo::currentCpuArchitecture())
.arg(QSysInfo::kernelType())
.arg(QSysInfo::kernelVersion()));
.arg(QSysInfo::prettyProductName(),
QSysInfo::currentCpuArchitecture(),
QSysInfo::kernelType(),
QSysInfo::kernelVersion()));
debugInfo.append("\n\n");
#endif