From 739f4d97a6703c381771eb1532e9be63255a0692 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Wed, 2 May 2012 17:04:03 +0200 Subject: [PATCH] Coding style fixes. --- src/core/Group.cpp | 2 +- src/core/Group.h | 2 +- src/format/KeePass2XmlReader.cpp | 6 +++--- src/gui/DialogyWidget.cpp | 2 +- src/gui/DialogyWidget.h | 2 +- src/gui/EditEntryWidget_p.h | 2 +- src/gui/MainWindow.cpp | 2 +- src/gui/MainWindow.h | 2 +- src/keys/FileKey.cpp | 6 +++--- src/main.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/Group.cpp b/src/core/Group.cpp index e4a19b315..6996725eb 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -377,7 +377,7 @@ QList Group::entriesRecursive(bool includeHistoryItems) return entryList; } -void Group::addEntry(Entry *entry) +void Group::addEntry(Entry* entry) { Q_ASSERT(entry); Q_ASSERT(!m_entries.contains(entry)); diff --git a/src/core/Group.h b/src/core/Group.h index 48c85e34c..a725a672f 100644 --- a/src/core/Group.h +++ b/src/core/Group.h @@ -134,7 +134,7 @@ private: friend void Database::setRootGroup(Group* group); friend Entry::~Entry(); - friend void Entry::setGroup(Group *group); + friend void Entry::setGroup(Group* group); }; #endif // KEEPASSX_GROUP_H diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp index 97e4725a2..76bdf5f6e 100644 --- a/src/format/KeePass2XmlReader.cpp +++ b/src/format/KeePass2XmlReader.cpp @@ -605,7 +605,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history) return entry; } -void KeePass2XmlReader::parseEntryString(Entry *entry) +void KeePass2XmlReader::parseEntryString(Entry* entry) { Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "String"); @@ -638,7 +638,7 @@ void KeePass2XmlReader::parseEntryString(Entry *entry) } } -void KeePass2XmlReader::parseEntryBinary(Entry *entry) +void KeePass2XmlReader::parseEntryBinary(Entry* entry) { Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binary"); @@ -696,7 +696,7 @@ void KeePass2XmlReader::parseAutoType(Entry* entry) } } -void KeePass2XmlReader::parseAutoTypeAssoc(Entry *entry) +void KeePass2XmlReader::parseAutoTypeAssoc(Entry* entry) { Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Association"); diff --git a/src/gui/DialogyWidget.cpp b/src/gui/DialogyWidget.cpp index b2d9399ba..8fa6a8e3e 100644 --- a/src/gui/DialogyWidget.cpp +++ b/src/gui/DialogyWidget.cpp @@ -26,7 +26,7 @@ DialogyWidget::DialogyWidget(QWidget* parent) { } -void DialogyWidget::keyPressEvent(QKeyEvent *e) +void DialogyWidget::keyPressEvent(QKeyEvent* e) { #ifdef Q_WS_MAC if (e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_Period) { diff --git a/src/gui/DialogyWidget.h b/src/gui/DialogyWidget.h index cdfa1de76..87260ac2e 100644 --- a/src/gui/DialogyWidget.h +++ b/src/gui/DialogyWidget.h @@ -29,7 +29,7 @@ public: explicit DialogyWidget(QWidget* parent = 0); protected: - virtual void keyPressEvent(QKeyEvent *e); + virtual void keyPressEvent(QKeyEvent* e); private: bool clickButton(QDialogButtonBox::StandardButton standardButton); diff --git a/src/gui/EditEntryWidget_p.h b/src/gui/EditEntryWidget_p.h index c5e97bd3a..4619eeecd 100644 --- a/src/gui/EditEntryWidget_p.h +++ b/src/gui/EditEntryWidget_p.h @@ -26,7 +26,7 @@ class CategoryListViewDelegate : public QStyledItemDelegate { public: - explicit CategoryListViewDelegate(QObject *parent) : QStyledItemDelegate(parent) {} + explicit CategoryListViewDelegate(QObject* parent) : QStyledItemDelegate(parent) {} QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const { diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 990b7d916..d49a6aee5 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -170,7 +170,7 @@ void MainWindow::showAboutDialog() aboutDialog->show(); } -void MainWindow::closeEvent(QCloseEvent *event) { +void MainWindow::closeEvent(QCloseEvent* event) { if (!m_ui->tabWidget->closeAllDatabases()) { event->ignore(); } diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index 1d9e13b52..46227c50b 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -36,7 +36,7 @@ public: void openDatabase(const QString& fileName, const QString& pw, const QString& keyFile); protected: - void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent* event); private Q_SLOTS: void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None); diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp index 1bda60137..1faf70490 100644 --- a/src/keys/FileKey.cpp +++ b/src/keys/FileKey.cpp @@ -215,7 +215,7 @@ QByteArray FileKey::loadXmlKey(QXmlStreamReader& xmlReader) return data; } -bool FileKey::loadBinary(QIODevice *device) +bool FileKey::loadBinary(QIODevice* device) { if (device->size() != 32) { return false; @@ -225,7 +225,7 @@ bool FileKey::loadBinary(QIODevice *device) return true; } -bool FileKey::loadHex(QIODevice *device) +bool FileKey::loadHex(QIODevice* device) { if (device->size() != 64) { return false; @@ -247,7 +247,7 @@ bool FileKey::loadHex(QIODevice *device) return true; } -bool FileKey::loadHashed(QIODevice *device) +bool FileKey::loadHashed(QIODevice* device) { CryptoHash cryptoHash(CryptoHash::Sha256); diff --git a/src/main.cpp b/src/main.cpp index 606ce99be..49487cd39 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ #include "keys/CompositeKey.h" #include "keys/PasswordKey.h" -int main(int argc, char **argv) +int main(int argc, char** argv) { QApplication app(argc, argv); // don't set applicationName or organizationName as that changes