diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 0685105b2..4c812f06c 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -40,10 +40,12 @@ QImage Entry::icon() const
 {
     Q_ASSERT(m_iconNumber != 0 || !m_customIcon.isNull());
 
-    if (m_iconNumber == 0)
+    if (m_iconNumber == 0) {
         return m_db->customIcon(m_customIcon);
-    else
+    }
+    else {
         return Database::icon(m_iconNumber);
+    }
 }
 
 int Entry::iconNumber() const
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index 6408dce21..1982cde13 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -50,10 +50,12 @@ QString Group::notes() const
 
 QImage Group::icon() const
 {
-    if (m_iconNumber == 0)
+    if (m_iconNumber == 0) {
         return m_db->customIcon(m_customIcon);
-    else
+    }
+    else {
         return Database::icon(m_iconNumber);
+    }
 }
 
 int Group::iconNumber() const
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index ec9a15c98..11ffbd585 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -19,7 +19,8 @@
 
 #include "Database.h"
 
-Metadata::Metadata(Database* parent) : QObject(parent)
+Metadata::Metadata(Database* parent)
+    : QObject(parent)
 {
     m_generator = "KeePassX";
     m_maintenanceHistoryDays = 365;
diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index 01d371c58..dc39d2d01 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -21,7 +21,8 @@
 
 const int Uuid::length = 16;
 
-Uuid::Uuid() : m_data(length, 0)
+Uuid::Uuid()
+    : m_data(length, 0)
 {
 }
 
diff --git a/src/gui/GroupModel.cpp b/src/gui/GroupModel.cpp
index 31f1f0d7b..7b135c29f 100644
--- a/src/gui/GroupModel.cpp
+++ b/src/gui/GroupModel.cpp
@@ -20,7 +20,8 @@
 #include "core/Database.h"
 #include "core/Group.h"
 
-GroupModel::GroupModel(Database* db, QObject* parent) : QAbstractItemModel(parent)
+GroupModel::GroupModel(Database* db, QObject* parent)
+    : QAbstractItemModel(parent)
 {
     m_root = db->rootGroup();
     connect(db, SIGNAL(groupDataChanged(Group*)), SLOT(groupDataChanged(Group*)));
diff --git a/src/gui/GroupView.cpp b/src/gui/GroupView.cpp
index d0f112836..617c3adc3 100644
--- a/src/gui/GroupView.cpp
+++ b/src/gui/GroupView.cpp
@@ -21,7 +21,8 @@
 #include "core/Group.h"
 #include "gui/GroupModel.h"
 
-GroupView::GroupView(Database* db, QWidget* parent) : QTreeView(parent)
+GroupView::GroupView(Database* db, QWidget* parent)
+    : QTreeView(parent)
 {
     m_model = new GroupModel(db, this);
     QTreeView::setModel(m_model);