From dff3fc0572608558e87e9bb8c8e9e338feb8522a Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 15 Oct 2015 18:02:31 +0200 Subject: [PATCH] Coding style fixes. --- src/autotype/AutoTypeAction.h | 2 +- src/core/EntrySearcher.cpp | 9 ++++++--- src/core/EntrySearcher.h | 3 ++- src/gui/Application.cpp | 2 +- src/gui/DatabaseWidgetStateSync.h | 6 +++--- src/gui/DialogyWidget.h | 2 +- src/gui/IconModels.h | 4 ++-- src/gui/MainWindow.cpp | 2 +- src/gui/PasswordComboBox.cpp | 1 - src/gui/entry/EntryView.cpp | 2 +- src/keys/CompositeKey.cpp | 3 ++- tests/TestCsvExporter.cpp | 6 +++--- tests/TestCsvExporter.h | 1 - tests/TestExporter.cpp | 3 --- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/autotype/AutoTypeAction.h b/src/autotype/AutoTypeAction.h index 07e050b1a..490f0d89f 100644 --- a/src/autotype/AutoTypeAction.h +++ b/src/autotype/AutoTypeAction.h @@ -66,7 +66,7 @@ public: class KEEPASSX_EXPORT AutoTypeClearField : public AutoTypeAction { public: - explicit AutoTypeClearField(); + AutoTypeClearField(); AutoTypeAction* clone(); void accept(AutoTypeExecutor* executor); }; diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp index 82a553e3a..05c4c5892 100644 --- a/src/core/EntrySearcher.cpp +++ b/src/core/EntrySearcher.cpp @@ -19,7 +19,8 @@ #include "core/Group.h" -QList EntrySearcher::search(const QString &searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity) +QList EntrySearcher::search(const QString& searchTerm, const Group* group, + Qt::CaseSensitivity caseSensitivity) { if (!group->resolveSearchingEnabled()) { return QList(); @@ -28,7 +29,8 @@ QList EntrySearcher::search(const QString &searchTerm, const Group* grou return searchEntries(searchTerm, group, caseSensitivity); } -QList EntrySearcher::searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity) +QList EntrySearcher::searchEntries(const QString& searchTerm, const Group* group, + Qt::CaseSensitivity caseSensitivity) { QList searchResult; @@ -44,7 +46,8 @@ QList EntrySearcher::searchEntries(const QString& searchTerm, const Grou return searchResult; } -QList EntrySearcher::matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity) +QList EntrySearcher::matchEntry(const QString& searchTerm, Entry* entry, + Qt::CaseSensitivity caseSensitivity) { QStringList wordList = searchTerm.split(QRegExp("\\s"), QString::SkipEmptyParts); Q_FOREACH (const QString& word, wordList) { diff --git a/src/core/EntrySearcher.h b/src/core/EntrySearcher.h index 246538cbe..c7075dc9b 100644 --- a/src/core/EntrySearcher.h +++ b/src/core/EntrySearcher.h @@ -28,10 +28,11 @@ class EntrySearcher { public: QList search(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity); + private: QList searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity); QList matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity); - bool wordMatch(const QString &word, Entry *entry, Qt::CaseSensitivity caseSensitivity); + bool wordMatch(const QString& word, Entry* entry, Qt::CaseSensitivity caseSensitivity); }; #endif // KEEPASSX_ENTRYSEARCHER_H diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index b0aef8c99..70550c557 100644 --- a/src/gui/Application.cpp +++ b/src/gui/Application.cpp @@ -27,7 +27,7 @@ class XcbEventFilter : public QAbstractNativeEventFilter { public: - virtual bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override + bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override { Q_UNUSED(result) diff --git a/src/gui/DatabaseWidgetStateSync.h b/src/gui/DatabaseWidgetStateSync.h index 906d87cc0..a4861179e 100644 --- a/src/gui/DatabaseWidgetStateSync.h +++ b/src/gui/DatabaseWidgetStateSync.h @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef KEEPASSX_HEADERVIEWSYNC_H -#define KEEPASSX_HEADERVIEWSYNC_H +#ifndef KEEPASSX_DATABASEWIDGETSTATESYNC_H +#define KEEPASSX_DATABASEWIDGETSTATESYNC_H #include "gui/DatabaseWidget.h" @@ -51,4 +51,4 @@ private: QList m_columnSizesSearch; }; -#endif // KEEPASSX_HEADERVIEWSYNC_H +#endif // KEEPASSX_DATABASEWIDGETSTATESYNC_H diff --git a/src/gui/DialogyWidget.h b/src/gui/DialogyWidget.h index f6bbc3cdd..b0915a277 100644 --- a/src/gui/DialogyWidget.h +++ b/src/gui/DialogyWidget.h @@ -29,7 +29,7 @@ public: explicit DialogyWidget(QWidget* parent = nullptr); protected: - virtual void keyPressEvent(QKeyEvent* e) override; + void keyPressEvent(QKeyEvent* e) override; private: bool clickButton(QDialogButtonBox::StandardButton standardButton); diff --git a/src/gui/IconModels.h b/src/gui/IconModels.h index d27f636d2..beaeb9f17 100644 --- a/src/gui/IconModels.h +++ b/src/gui/IconModels.h @@ -41,8 +41,8 @@ class CustomIconModel : public QAbstractListModel public: explicit CustomIconModel(QObject* parent = nullptr); - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; void setIcons(const QHash& icons, const QList& iconsOrder); Uuid uuidFromIndex(const QModelIndex& index) const; QModelIndex indexFromUuid(const Uuid& uuid) const; diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 157a96265..13c3bfd22 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -444,7 +444,7 @@ void MainWindow::closeEvent(QCloseEvent* event) } } -void MainWindow::changeEvent(QEvent *event) +void MainWindow::changeEvent(QEvent* event) { if ((event->type() == QEvent::WindowStateChange) && isMinimized() && isTrayIconEnabled() && config()->get("GUI/MinimizeToTray").toBool()) diff --git a/src/gui/PasswordComboBox.cpp b/src/gui/PasswordComboBox.cpp index de52cd865..e1218505d 100644 --- a/src/gui/PasswordComboBox.cpp +++ b/src/gui/PasswordComboBox.cpp @@ -51,7 +51,6 @@ void PasswordComboBox::setEcho(bool echo) #else setStyleSheet("QComboBox { font-family: monospace,Courier; }"); #endif - } else { // clear items so the combobox indicates that no popup menu is available diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp index e4648d987..1c900a578 100644 --- a/src/gui/entry/EntryView.cpp +++ b/src/gui/entry/EntryView.cpp @@ -74,7 +74,7 @@ void EntryView::setEntryList(const QList& entries) void EntryView::setFirstEntryActive() { - if(m_model->rowCount() > 0) { + if (m_model->rowCount() > 0) { QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0)); setCurrentEntry(m_model->entryFromIndex(index)); } diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index 17ab1e391..d38f466fd 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -94,7 +94,8 @@ QByteArray CompositeKey::transform(const QByteArray& seed, quint64 rounds, QByteArray key = rawKey(); - QFuture future = QtConcurrent::run(transformKeyRaw, key.left(16), seed, rounds, &okLeft, &errorStringLeft); + QFuture future = QtConcurrent::run(transformKeyRaw, key.left(16), seed, rounds, + &okLeft, &errorStringLeft); QByteArray result2 = transformKeyRaw(key.right(16), seed, rounds, &okRight, &errorStringRight); QByteArray transformed; diff --git a/tests/TestCsvExporter.cpp b/tests/TestCsvExporter.cpp index 3304d6953..1fa663477 100644 --- a/tests/TestCsvExporter.cpp +++ b/tests/TestCsvExporter.cpp @@ -51,7 +51,7 @@ void TestCsvExporter::cleanUp() void TestCsvExporter::testExport() { Group* groupRoot = m_db->rootGroup(); - Group* group= new Group(); + Group* group = new Group(); group->setName("Test Group Name"); group->setParent(groupRoot); Entry* entry = new Entry(); @@ -83,10 +83,10 @@ void TestCsvExporter::testEmptyDatabase() void TestCsvExporter::testNestedGroups() { Group* groupRoot = m_db->rootGroup(); - Group* group= new Group(); + Group* group = new Group(); group->setName("Test Group Name"); group->setParent(groupRoot); - Group* childGroup= new Group(); + Group* childGroup = new Group(); childGroup->setName("Test Sub Group Name"); childGroup->setParent(group); Entry* entry = new Entry(); diff --git a/tests/TestCsvExporter.h b/tests/TestCsvExporter.h index a71c93655..c8cc4dc10 100644 --- a/tests/TestCsvExporter.h +++ b/tests/TestCsvExporter.h @@ -42,7 +42,6 @@ private Q_SLOTS: private: Database* m_db; CsvExporter* m_csvExporter; - }; #endif // KEEPASSX_TESTCSVEXPORTER_H diff --git a/tests/TestExporter.cpp b/tests/TestExporter.cpp index b205034b1..656b76c58 100644 --- a/tests/TestExporter.cpp +++ b/tests/TestExporter.cpp @@ -76,6 +76,3 @@ void TestExporter::testToDbExporter() delete dbOrg; delete dbExp; } - - -