Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-27 08:01:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Jonathan White 2021-01-31 16:47:35 -05:00
parent 4e90cb5818
commit 61b85183f9
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
13 changed files with 158 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/sshagent/SSHAgent.h
View file

@ -24,7 +24,6 @@
#include <QtCore>
#include "crypto/ssh/OpenSSHKey.h"
#include "gui/DatabaseWidget.h"
#include "sshagent/KeeAgentSettings.h"
class SSHAgent : public QObject
@ -32,7 +31,7 @@ class SSHAgent : public QObject
Q_OBJECT
public:
~SSHAgent() override;
~SSHAgent() override = default;
static SSHAgent* instance();
bool isEnabled() const;
@ -59,8 +58,8 @@ signals:
void enabledChanged(bool enabled);
public slots:
void databaseLocked();
void databaseUnlocked();
void databaseLocked(QSharedPointer<Database> db);
void databaseUnlocked(QSharedPointer<Database> db);
private:
const quint8 SSH_AGENT_FAILURE = 5;