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:
Gianluca Recchia 2018-11-01 04:27:38 +01:00 committed by Jonathan White
parent f9625189cb
commit fc930bae69
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
186 changed files with 2437 additions and 2122 deletions

View file

@ -112,7 +112,7 @@ namespace
return QByteArray::fromHex(QString(iqmp_hex).toLatin1());
}
}
} // namespace
bool ASN1Key::parseDSA(QByteArray& ba, OpenSSHKey& key)
{

View file

@ -26,6 +26,6 @@ namespace ASN1Key
{
bool parseDSA(QByteArray& ba, OpenSSHKey& key);
bool parseRSA(QByteArray& ba, OpenSSHKey& key);
}
} // namespace ASN1Key
#endif // ASN1KEY_H

View file

@ -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
{

View file

@ -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())

View file

@ -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)

View file

@ -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),