mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-05-23 16:51:22 -04:00
Restore correct formatting
Many lines were not conformant with the project's formatting rules. This patch should fix all formatting and whitespace issues in the code base. A clang-format directive was put around the connect() calls containing SIGNALs and SLOTs whose signatures would be denormalized because of the formatting rules.
This commit is contained in:
parent
f9625189cb
commit
fc930bae69
186 changed files with 2437 additions and 2122 deletions
|
@ -112,7 +112,7 @@ namespace
|
|||
|
||||
return QByteArray::fromHex(QString(iqmp_hex).toLatin1());
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
bool ASN1Key::parseDSA(QByteArray& ba, OpenSSHKey& key)
|
||||
{
|
||||
|
|
|
@ -26,6 +26,6 @@ namespace ASN1Key
|
|||
{
|
||||
bool parseDSA(QByteArray& ba, OpenSSHKey& key);
|
||||
bool parseRSA(QByteArray& ba, OpenSSHKey& key);
|
||||
}
|
||||
} // namespace ASN1Key
|
||||
|
||||
#endif // ASN1KEY_H
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#ifndef AGENTSETTINGSPAGE_H
|
||||
#define AGENTSETTINGSPAGE_H
|
||||
|
||||
#include "gui/DatabaseTabWidget.h"
|
||||
#include "gui/ApplicationSettingsWidget.h"
|
||||
#include "gui/DatabaseTabWidget.h"
|
||||
|
||||
class AgentSettingsPage : public ISettingsPage
|
||||
{
|
||||
|
|
|
@ -17,9 +17,10 @@
|
|||
*/
|
||||
|
||||
#include "AgentSettingsWidget.h"
|
||||
#include "core/Config.h"
|
||||
#include "ui_AgentSettingsWidget.h"
|
||||
|
||||
#include "core/Config.h"
|
||||
|
||||
AgentSettingsWidget::AgentSettingsWidget(QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::AgentSettingsWidget())
|
||||
|
|
|
@ -34,6 +34,7 @@ KeeAgentSettings::KeeAgentSettings()
|
|||
|
||||
bool KeeAgentSettings::operator==(KeeAgentSettings& other)
|
||||
{
|
||||
// clang-format off
|
||||
return (m_allowUseOfSshKey == other.m_allowUseOfSshKey && m_addAtDatabaseOpen == other.m_addAtDatabaseOpen
|
||||
&& m_removeAtDatabaseClose == other.m_removeAtDatabaseClose
|
||||
&& m_useConfirmConstraintWhenAdding == other.m_useConfirmConstraintWhenAdding
|
||||
|
@ -43,6 +44,7 @@ bool KeeAgentSettings::operator==(KeeAgentSettings& other)
|
|||
&& m_attachmentName == other.m_attachmentName
|
||||
&& m_saveAttachmentToTempFile == other.m_saveAttachmentToTempFile
|
||||
&& m_fileName == other.m_fileName);
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
bool KeeAgentSettings::operator!=(KeeAgentSettings& other)
|
||||
|
|
|
@ -390,7 +390,7 @@ bool OpenSSHKey::openPrivateKey(const QString& passphrase)
|
|||
hash.addData(m_cipherIV.data(), 8);
|
||||
mdBuf = hash.result();
|
||||
keyData.append(mdBuf);
|
||||
} while(keyData.size() < cipher->keySize());
|
||||
} while (keyData.size() < cipher->keySize());
|
||||
|
||||
if (keyData.size() > cipher->keySize()) {
|
||||
// If our key size isn't a multiple of 16 (e.g. AES-192 or something),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue