From c98aad698a75a5f5040da561c4aac95000fbab0e Mon Sep 17 00:00:00 2001 From: Francois Ferrand Date: Tue, 16 Apr 2013 23:56:37 +0200 Subject: [PATCH] Cleanup reference/pointer declarations. --- src/http/Service.cpp | 20 ++++++++++---------- src/http/Service.h | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/http/Service.cpp b/src/http/Service.cpp index 8b2a7768e..3afedee9d 100644 --- a/src/http/Service.cpp +++ b/src/http/Service.cpp @@ -29,7 +29,7 @@ #include "core/PasswordGenerator.h" -Service::Service(DatabaseTabWidget *parent) : +Service::Service(DatabaseTabWidget* parent) : KeepassHttpProtocol::Server(parent), m_dbTabWidget(parent) { @@ -69,7 +69,7 @@ Entry* Service::getConfigEntry(bool create) bool Service::isDatabaseOpened() const { - if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) + if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget()) switch(dbWidget->currentMode()) { case DatabaseWidget::None: case DatabaseWidget::LockedMode: @@ -95,18 +95,18 @@ bool Service::openDatabase() QString Service::getDatabaseRootUuid() { - if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) - if (Database * db = dbWidget->database()) - if (Group * rootGroup = db->rootGroup()) + if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget()) + if (Database* db = dbWidget->database()) + if (Group* rootGroup = db->rootGroup()) return rootGroup->uuid().toHex(); return QString(); } QString Service::getDatabaseRecycleBinUuid() { - if (DatabaseWidget * dbWidget = m_dbTabWidget->currentDatabaseWidget()) - if (Database * db = dbWidget->database()) - if (Group * recycleBin = db->metadata()->recycleBin()) + if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget()) + if (Database* db = dbWidget->database()) + if (Group* recycleBin = db->metadata()->recycleBin()) return recycleBin->uuid().toHex(); return QString(); } @@ -137,7 +137,7 @@ QString Service::storeKey(const QString &key) } while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) && 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), - QMessageBox::Yes|QMessageBox::No) == QMessageBox::No); + QMessageBox::Yes | QMessageBox::No) == QMessageBox::No); config->attributes()->set(QLatin1String(ASSOCIATE_KEY_PREFIX) + id, key, true); } @@ -217,7 +217,7 @@ KeepassHttpProtocol::Entry Service::prepareEntry(const Entry* entry) return res; } -QList Service::findMatchingEntries(const QString &id, const QString &url, const QString &submitUrl, const QString &realm) +QList Service::findMatchingEntries(const QString& /*id*/, const QString& url, const QString& submitUrl, const QString& realm) { QList result; QList pwEntriesToConfirm; diff --git a/src/http/Service.h b/src/http/Service.h index 35a466bbf..9a792846c 100644 --- a/src/http/Service.h +++ b/src/http/Service.h @@ -23,19 +23,19 @@ class Service : public KeepassHttpProtocol::Server Q_OBJECT public: - explicit Service(DatabaseTabWidget *parent = 0); + explicit Service(DatabaseTabWidget* parent = 0); virtual bool isDatabaseOpened() const; virtual bool openDatabase(); virtual QString getDatabaseRootUuid(); virtual QString getDatabaseRecycleBinUuid(); - virtual QString getKey(const QString &id); - virtual QString storeKey(const QString &key); - virtual QList 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 QList 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 updateEntry(const QString &id, const QString &uuid, const QString &login, const QString &password, const QString &url); + virtual QString getKey(const QString& id); + virtual QString storeKey(const QString& key); + virtual QList 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 QList 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 updateEntry(const QString& id, const QString& uuid, const QString& login, const QString& password, const QString& url); virtual QString generatePassword(); public Q_SLOTS: @@ -45,12 +45,12 @@ public Q_SLOTS: private: enum Access { Denied, Unknown, Allowed}; Entry* getConfigEntry(bool create = false); - bool matchUrlScheme(const QString &url); - Access checkAccess(const Entry *entry, const QString & host, const QString & submitHost, const QString & realm); - bool removeFirstDomain(QString &hostname); + bool matchUrlScheme(const QString& url); + Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm); + bool removeFirstDomain(QString& hostname); Group *findCreateAddEntryGroup(); - KeepassHttpProtocol::Entry prepareEntry(const Entry *entry); - QList searchEntries(const QString &text); + KeepassHttpProtocol::Entry prepareEntry(const Entry* entry); + QList searchEntries(const QString& text); DatabaseTabWidget * const m_dbTabWidget; };