Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-01 17:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup reference/pointer declarations.

Browse Source
This commit is contained in:
Francois Ferrand 2013-04-16 23:56:37 +02:00
parent 75f0d132e5
commit c98aad698a
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/Service.cpp
View File

@ -29,7 +29,7 @@
#include "core/PasswordGenerator.h" #include "core/PasswordGenerator.h"
Service::Service(DatabaseTabWidget *parent) : Service::Service(DatabaseTabWidget* parent) :
KeepassHttpProtocol::Server(parent), KeepassHttpProtocol::Server(parent),
m_dbTabWidget(parent) m_dbTabWidget(parent)
{ {
@ -69,7 +69,7 @@ Entry* Service::getConfigEntry(bool create)
bool Service::isDatabaseOpened() const bool Service::isDatabaseOpened() const
{ {
if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget())
switch(dbWidget->currentMode()) { switch(dbWidget->currentMode()) {
case DatabaseWidget::None: case DatabaseWidget::None:
case DatabaseWidget::LockedMode: case DatabaseWidget::LockedMode:
@ -95,18 +95,18 @@ bool Service::openDatabase()
QString Service::getDatabaseRootUuid() QString Service::getDatabaseRootUuid()
{ {
if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget())
if (Database * db = dbWidget->database()) if (Database* db = dbWidget->database())
if (Group * rootGroup = db->rootGroup()) if (Group* rootGroup = db->rootGroup())
return rootGroup->uuid().toHex(); return rootGroup->uuid().toHex();
return QString(); return QString();
} }
QString Service::getDatabaseRecycleBinUuid() QString Service::getDatabaseRecycleBinUuid()
{ {
if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget())
if (Database * db = dbWidget->database()) if (Database* db = dbWidget->database())
if (Group * recycleBin = db->metadata()->recycleBin()) if (Group* recycleBin = db->metadata()->recycleBin())
return recycleBin->uuid().toHex(); return recycleBin->uuid().toHex();
return QString(); return QString();
} }
@ -137,7 +137,7 @@ QString Service::storeKey(const QString &key)
} while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) && } while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) &&
QMessageBox::warning(0, tr("KeyPassX/Http: Overwrite existing key?"), QMessageBox::warning(0, tr("KeyPassX/Http: Overwrite existing key?"),
tr("A shared encryption-key with the name \"%1\" already exists.\nDo you want to overwrite it?").arg(id), tr("A shared encryption-key with the name \"%1\" already exists.\nDo you want to overwrite it?").arg(id),
QMessageBox::Yes|QMessageBox::No) == QMessageBox::No); QMessageBox::Yes | QMessageBox::No) == QMessageBox::No);
config->attributes()->set(QLatin1String(ASSOCIATE_KEY_PREFIX) + id, key, true); config->attributes()->set(QLatin1String(ASSOCIATE_KEY_PREFIX) + id, key, true);
} }
@ -217,7 +217,7 @@ KeepassHttpProtocol::Entry Service::prepareEntry(const Entry* entry)
return res; return res;
} }
QList<KeepassHttpProtocol::Entry> Service::findMatchingEntries(const QString &id, const QString &url, const QString &submitUrl, const QString &realm) QList<KeepassHttpProtocol::Entry> Service::findMatchingEntries(const QString& /*id*/, const QString& url, const QString& submitUrl, const QString& realm)
{ {
QList<KeepassHttpProtocol::Entry> result; QList<KeepassHttpProtocol::Entry> result;
QList<Entry*> pwEntriesToConfirm; QList<Entry*> pwEntriesToConfirm;

26
src/http/Service.h
View File

@ -23,19 +23,19 @@ class Service : public KeepassHttpProtocol::Server
Q_OBJECT Q_OBJECT
public: public:
explicit Service(DatabaseTabWidget *parent = 0); explicit Service(DatabaseTabWidget* parent = 0);
virtual bool isDatabaseOpened() const; virtual bool isDatabaseOpened() const;
virtual bool openDatabase(); virtual bool openDatabase();
virtual QString getDatabaseRootUuid(); virtual QString getDatabaseRootUuid();
virtual QString getDatabaseRecycleBinUuid(); virtual QString getDatabaseRecycleBinUuid();
virtual QString getKey(const QString &id); virtual QString getKey(const QString& id);
virtual QString storeKey(const QString &key); virtual QString storeKey(const QString& key);
virtual QList<KeepassHttpProtocol::Entry> findMatchingEntries(const QString &id, const QString &url, const QString & submitUrl, const QString & realm); virtual QList<KeepassHttpProtocol::Entry> findMatchingEntries(const QString& id, const QString& url, const QString& submitUrl, const QString& realm);
virtual int countMatchingEntries(const QString &id, const QString &url, const QString & submitUrl, const QString & realm); virtual int countMatchingEntries(const QString& id, const QString& url, const QString& submitUrl, const QString& realm);
virtual QList<KeepassHttpProtocol::Entry> searchAllEntries(const QString &id); virtual QList<KeepassHttpProtocol::Entry> searchAllEntries(const QString& id);
virtual void addEntry(const QString &id, const QString &login, const QString &password, const QString &url, const QString &submitUrl, const QString &realm); virtual void addEntry(const QString& id, const QString& login, const QString& password, const QString& url, const QString& submitUrl, const QString& realm);
virtual void updateEntry(const QString &id, const QString &uuid, const QString &login, const QString &password, const QString &url); virtual void updateEntry(const QString& id, const QString& uuid, const QString& login, const QString& password, const QString& url);
virtual QString generatePassword(); virtual QString generatePassword();
public Q_SLOTS: public Q_SLOTS:
@ -45,12 +45,12 @@ public Q_SLOTS:
private: private:
enum Access { Denied, Unknown, Allowed}; enum Access { Denied, Unknown, Allowed};
Entry* getConfigEntry(bool create = false); Entry* getConfigEntry(bool create = false);
bool matchUrlScheme(const QString &url); bool matchUrlScheme(const QString& url);
Access checkAccess(const Entry *entry, const QString & host, const QString & submitHost, const QString & realm); Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm);
bool removeFirstDomain(QString &hostname); bool removeFirstDomain(QString& hostname);
Group *findCreateAddEntryGroup(); Group *findCreateAddEntryGroup();
KeepassHttpProtocol::Entry prepareEntry(const Entry *entry); KeepassHttpProtocol::Entry prepareEntry(const Entry* entry);
QList<Entry *> searchEntries(const QString &text); QList<Entry*> searchEntries(const QString& text);
DatabaseTabWidget * const m_dbTabWidget; DatabaseTabWidget * const m_dbTabWidget;
}; };