Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-27 23:07:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

FdoSecrets: fix typos

Browse Source
This commit is contained in:
Aetf 2020-11-02 23:01:04 -05:00
parent 000e1823ac
commit f5caf3968f
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fdosecrets/objects/Collection.cpp
View File

@ -25,7 +25,6 @@
#include "fdosecrets/objects/Session.h" #include "fdosecrets/objects/Session.h"
#include "core/Config.h" #include "core/Config.h"
#include "core/Database.h"
#include "core/Tools.h" #include "core/Tools.h"
#include "gui/DatabaseTabWidget.h" #include "gui/DatabaseTabWidget.h"
#include "gui/DatabaseWidget.h" #include "gui/DatabaseWidget.h"
@ -330,12 +329,12 @@ namespace FdoSecrets
itemPath = attributes.value(ItemAttributes::PathKey); itemPath = attributes.value(ItemAttributes::PathKey);
// check existing item using attributes // check existing item using attributes
auto existings = searchItems(attributes); auto existing = searchItems(attributes);
if (existings.isError()) { if (existing.isError()) {
return existings; return existing;
} }
if (!existings.value().isEmpty() && replace) { if (!existing.value().isEmpty() && replace) {
item = existings.value().front(); item = existing.value().front();
newlyCreated = false; newlyCreated = false;
} }
} }

8
src/fdosecrets/objects/Service.cpp
View File

@ -54,7 +54,7 @@ namespace FdoSecrets
: DBusObject(nullptr) : DBusObject(nullptr)
, m_plugin(plugin) , m_plugin(plugin)
, m_databases(std::move(dbTabs)) , m_databases(std::move(dbTabs))
, m_insdieEnsureDefaultAlias(false) , m_insideEnsureDefaultAlias(false)
, m_serviceWatcher(nullptr) , m_serviceWatcher(nullptr)
{ {
connect( connect(
@ -176,11 +176,11 @@ namespace FdoSecrets
void Service::ensureDefaultAlias() void Service::ensureDefaultAlias()
{ {
if (m_insdieEnsureDefaultAlias) { if (m_insideEnsureDefaultAlias) {
return; return;
} }
m_insdieEnsureDefaultAlias = true; m_insideEnsureDefaultAlias = true;
auto coll = findCollection(m_databases->currentDatabaseWidget()); auto coll = findCollection(m_databases->currentDatabaseWidget());
if (coll) { if (coll) {
@ -188,7 +188,7 @@ namespace FdoSecrets
coll->addAlias(DEFAULT_ALIAS).okOrDie(); coll->addAlias(DEFAULT_ALIAS).okOrDie();
} }
m_insdieEnsureDefaultAlias = false; m_insideEnsureDefaultAlias = false;
} }
void Service::dbusServiceUnregistered(const QString& service) void Service::dbusServiceUnregistered(const QString& service)

2
src/fdosecrets/objects/Service.h
View File

@ -159,7 +159,7 @@ namespace FdoSecrets
QList<Session*> m_sessions; QList<Session*> m_sessions;
QHash<QString, Session*> m_peerToSession; QHash<QString, Session*> m_peerToSession;
bool m_insdieEnsureDefaultAlias; bool m_insideEnsureDefaultAlias;
std::unique_ptr<QDBusServiceWatcher> m_serviceWatcher; std::unique_ptr<QDBusServiceWatcher> m_serviceWatcher;
}; };

4
src/fdosecrets/objects/Session.cpp
View File

@ -24,7 +24,7 @@
namespace FdoSecrets namespace FdoSecrets
{ {
QHash<QString, QVariant> Session::negoniationState; QHash<QString, QVariant> Session::negotiationState;
Session* Session::Create(std::unique_ptr<CipherPair>&& cipher, const QString& peer, Service* parent) Session* Session::Create(std::unique_ptr<CipherPair>&& cipher, const QString& peer, Service* parent)
{ {
@ -57,7 +57,7 @@ namespace FdoSecrets
void Session::CleanupNegotiation(const QString& peer) void Session::CleanupNegotiation(const QString& peer)
{ {
negoniationState.remove(peer); negotiationState.remove(peer);
} }
DBusReturn<void> Session::close() DBusReturn<void> Session::close()

4
src/fdosecrets/objects/Session.h
View File

@ -42,7 +42,7 @@ namespace FdoSecrets
public: public:
static std::unique_ptr<CipherPair> CreateCiphers(const QString& peer, static std::unique_ptr<CipherPair> CreateCiphers(const QString& peer,
const QString& algorithm, const QString& algorithm,
const QVariant& intpu, const QVariant& input,
QVariant& output, QVariant& output,
bool& incomplete); bool& incomplete);
static void CleanupNegotiation(const QString& peer); static void CleanupNegotiation(const QString& peer);
@ -99,7 +99,7 @@ namespace FdoSecrets
QString m_peer; QString m_peer;
QUuid m_id; QUuid m_id;
static QHash<QString, QVariant> negoniationState; static QHash<QString, QVariant> negotiationState;
}; };
} // namespace FdoSecrets } // namespace FdoSecrets

4
tests/gui/TestGuiFdoSecrets.cpp
View File

@ -267,7 +267,7 @@ void TestGuiFdoSecrets::init()
m_dbWidget = m_tabWidget->currentDatabaseWidget(); m_dbWidget = m_tabWidget->currentDatabaseWidget();
m_db = m_dbWidget->database(); m_db = m_dbWidget->database();
// by default expsoe the root group // by default expose the root group
FdoSecrets::settings()->setExposedGroup(m_db, m_db->rootGroup()->uuid()); FdoSecrets::settings()->setExposedGroup(m_db, m_db->rootGroup()->uuid());
QVERIFY(m_dbWidget->save()); QVERIFY(m_dbWidget->save());
} }
@ -1047,7 +1047,7 @@ void TestGuiFdoSecrets::testExposeSubgroup()
QCOMPARE(exposedEntries, subgroup->entries()); QCOMPARE(exposedEntries, subgroup->entries());
} }
void TestGuiFdoSecrets::testModifiyingExposedGroup() void TestGuiFdoSecrets::testModifyingExposedGroup()
{ {
// test when exposed group is removed the collection is not exposed anymore // test when exposed group is removed the collection is not exposed anymore
auto subgroup = m_db->rootGroup()->findGroupByPath("/Homebanking"); auto subgroup = m_db->rootGroup()->findGroupByPath("/Homebanking");

2
tests/gui/TestGuiFdoSecrets.h
View File

@ -82,7 +82,7 @@ private slots:
void testDefaultAliasAlwaysPresent(); void testDefaultAliasAlwaysPresent();
void testExposeSubgroup(); void testExposeSubgroup();
void testModifiyingExposedGroup(); void testModifyingExposedGroup();
protected slots: protected slots:
void createDatabaseCallback(); void createDatabaseCallback();