From b90807c4d33cebc299a26d9de5dcc3f1855d4c70 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Tue, 15 May 2012 17:48:48 +0200
Subject: [PATCH] Coding style fixes.

---
 src/core/Entry.h                | 2 +-
 src/gui/EditWidget.cpp          | 3 +--
 src/gui/EditWidget.h            | 5 ++---
 src/gui/EntryModel.cpp          | 2 +-
 src/keys/FileKey.cpp            | 2 +-
 tests/TestKeePass2XmlReader.cpp | 6 +++---
 tests/tests.h                   | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/core/Entry.h b/src/core/Entry.h
index 212f7f73..0b712337 100644
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -126,7 +126,7 @@ public:
     void setGroup(Group* group);
 
     void setUpdateTimeinfo(bool value);
-    bool match(const QString &searchTerm, Qt::CaseSensitivity caseSensitivity);
+    bool match(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity);
 
 Q_SIGNALS:
     /**
diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index a5b28f1b..90b6b8a0 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -18,7 +18,7 @@
 #include "EditWidget.h"
 #include "ui_EditWidget.h"
 
-EditWidget::EditWidget(QWidget *parent)
+EditWidget::EditWidget(QWidget* parent)
     : DialogyWidget(parent)
     ,  m_ui(new Ui::EditWidget())
 {
@@ -50,4 +50,3 @@ QLabel* EditWidget::headlineLabel()
 {
     return m_ui->headerLabel;
 }
-
diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h
index 9fdd35c7..d1a6d134 100644
--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@@ -21,8 +21,7 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/QLabel>
 
-#include <gui/DialogyWidget.h>
-
+#include "gui/DialogyWidget.h"
 
 namespace Ui {
     class EditWidget;
@@ -33,7 +32,7 @@ class EditWidget : public DialogyWidget
     Q_OBJECT
 
 public:
-    explicit EditWidget(QWidget *parent = 0);
+    explicit EditWidget(QWidget* parent = 0);
     ~EditWidget();
 
     void add(const QString& labelText, QWidget* widget);
diff --git a/src/gui/EntryModel.cpp b/src/gui/EntryModel.cpp
index 53435890..15f3f505 100644
--- a/src/gui/EntryModel.cpp
+++ b/src/gui/EntryModel.cpp
@@ -251,7 +251,7 @@ void EntryModel::severConnections()
     }
 }
 
-void EntryModel::makeConnections(const Group *group)
+void EntryModel::makeConnections(const Group* group)
 {
     connect(group, SIGNAL(entryAboutToAdd(Entry*)), SLOT(entryAboutToAdd(Entry*)));
     connect(group, SIGNAL(entryAdded()), SLOT(entryAdded()));
diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp
index 46f63f16..b0313b66 100644
--- a/src/keys/FileKey.cpp
+++ b/src/keys/FileKey.cpp
@@ -152,7 +152,7 @@ bool FileKey::create(const QString& fileName, QString* errorMsg)
     }
 }
 
-bool FileKey::loadXml(QIODevice *device)
+bool FileKey::loadXml(QIODevice* device)
 {
     QXmlStreamReader xmlReader(device);
 
diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp
index e4083c3a..c0ca80d0 100644
--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -29,16 +29,16 @@
 
 namespace QTest {
     template<>
-    char *toString(const Uuid &uuid)
+    char* toString(const Uuid& uuid)
     {
         QByteArray ba = "Uuid(";
         ba += uuid.toBase64().toAscii().constData();
         ba += ")";
-        return qstrdup(ba.data());
+        return qstrdup(ba.constData());
     }
 
     template<>
-    char *toString(const Group::TriState &triState)
+    char* toString(const Group::TriState& triState)
     {
         QString value;
 
diff --git a/tests/tests.h b/tests/tests.h
index cfb679f9..f1596add 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -21,7 +21,7 @@
 #include <QtTest/QTest>
 
 #define KEEPASSX_QTEST_CORE_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
+int main(int argc, char* argv[]) \
 { \
     QCoreApplication app(argc, argv); \
     TestObject tc; \