8 files changed, 29 insertions, 48 deletions
diff --git a/include/events/messages/Audio.h b/include/events/messages/Audio.h
index 41bc2496..8abdf7f2 100644
--- a/include/events/messages/Audio.h
+++ b/include/events/messages/Audio.h
@@ -21,13 +21,11 @@
 
 #include "Deserializable.h"
 
-namespace matrix
+namespace matrix {
+namespace events {
+namespace messages {
+struct AudioInfo
 {
-namespace events
-{
-namespace messages
-{
-struct AudioInfo {
         uint64_t duration;
         int size;
 
diff --git a/include/events/messages/Emote.h b/include/events/messages/Emote.h
index 98d049e7..a11b7c8d 100644
--- a/include/events/messages/Emote.h
+++ b/include/events/messages/Emote.h
@@ -21,12 +21,9 @@
 
 #include "Deserializable.h"
 
-namespace matrix
-{
-namespace events
-{
-namespace messages
-{
+namespace matrix {
+namespace events {
+namespace messages {
 class Emote : public Deserializable
 {
 public:
diff --git a/include/events/messages/File.h b/include/events/messages/File.h
index a4e8b6a4..ff5eb0a6 100644
--- a/include/events/messages/File.h
+++ b/include/events/messages/File.h
@@ -22,13 +22,11 @@
 #include "Deserializable.h"
 #include "MessageEvent.h"
 
-namespace matrix
+namespace matrix {
+namespace events {
+namespace messages {
+struct FileInfo
 {
-namespace events
-{
-namespace messages
-{
-struct FileInfo {
         int size;
 
         QString mimetype;
diff --git a/include/events/messages/Image.h b/include/events/messages/Image.h
index 93a598e2..14889ff1 100644
--- a/include/events/messages/Image.h
+++ b/include/events/messages/Image.h
@@ -22,13 +22,11 @@
 #include "Deserializable.h"
 #include "MessageEvent.h"
 
-namespace matrix
+namespace matrix {
+namespace events {
+namespace messages {
+struct ImageInfo
 {
-namespace events
-{
-namespace messages
-{
-struct ImageInfo {
         int h;
         int w;
         int size;
diff --git a/include/events/messages/Location.h b/include/events/messages/Location.h
index 4b523878..e51c6799 100644
--- a/include/events/messages/Location.h
+++ b/include/events/messages/Location.h
@@ -22,13 +22,11 @@
 #include "Deserializable.h"
 #include "MessageEvent.h"
 
-namespace matrix
+namespace matrix {
+namespace events {
+namespace messages {
+struct LocationInfo
 {
-namespace events
-{
-namespace messages
-{
-struct LocationInfo {
         QString thumbnail_url;
         ThumbnailInfo thumbnail_info;
 };
diff --git a/include/events/messages/Notice.h b/include/events/messages/Notice.h
index b303dd79..66f4386d 100644
--- a/include/events/messages/Notice.h
+++ b/include/events/messages/Notice.h
@@ -21,12 +21,9 @@
 
 #include "Deserializable.h"
 
-namespace matrix
-{
-namespace events
-{
-namespace messages
-{
+namespace matrix {
+namespace events {
+namespace messages {
 class Notice : public Deserializable
 {
 public:
diff --git a/include/events/messages/Text.h b/include/events/messages/Text.h
index 2c787d04..c3182dc5 100644
--- a/include/events/messages/Text.h
+++ b/include/events/messages/Text.h
@@ -21,12 +21,9 @@
 
 #include "Deserializable.h"
 
-namespace matrix
-{
-namespace events
-{
-namespace messages
-{
+namespace matrix {
+namespace events {
+namespace messages {
 class Text : public Deserializable
 {
 public:
diff --git a/include/events/messages/Video.h b/include/events/messages/Video.h
index 37056c27..d167b8c1 100644
--- a/include/events/messages/Video.h
+++ b/include/events/messages/Video.h
@@ -22,13 +22,11 @@
 #include "Deserializable.h"
 #include "MessageEvent.h"
 
-namespace matrix
+namespace matrix {
+namespace events {
+namespace messages {
+struct VideoInfo
 {
-namespace events
-{
-namespace messages
-{
-struct VideoInfo {
         int h;
         int w;
         int size;