From 0c0ac68bc2e23fe1590614bb961a21a4bb09d0dc Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sun, 1 Oct 2017 12:11:33 +0300
Subject: Remove extra clang-format options

---
 include/Deserializable.h            | 20 +++++---------------
 include/RoomState.h                 |  7 ++++---
 include/TimelineView.h              |  3 ++-
 include/events/CreateEventContent.h |  3 ++-
 include/events/TopicEventContent.h  |  3 ++-
 include/ui/Menu.h                   |  6 +++---
 6 files changed, 18 insertions(+), 24 deletions(-)

(limited to 'include')

diff --git a/include/Deserializable.h b/include/Deserializable.h
index 938238b9..0d0b2882 100644
--- a/include/Deserializable.h
+++ b/include/Deserializable.h
@@ -37,25 +37,15 @@ private:
 class Deserializable
 {
 public:
-        virtual void deserialize(const QJsonValue &)
-        {
-        }
-        virtual void deserialize(const QJsonObject &)
-        {
-        }
-        virtual void deserialize(const QJsonDocument &)
-        {
-        }
-        virtual ~Deserializable()
-        {
-        }
+        virtual void deserialize(const QJsonValue &) {}
+        virtual void deserialize(const QJsonObject &) {}
+        virtual void deserialize(const QJsonDocument &) {}
+        virtual ~Deserializable() {}
 };
 
 class Serializable
 {
 public:
         virtual QJsonObject serialize() const = 0;
-        virtual ~Serializable()
-        {
-        }
+        virtual ~Serializable() {}
 };
diff --git a/include/RoomState.h b/include/RoomState.h
index 11d298d3..a07fcbed 100644
--- a/include/RoomState.h
+++ b/include/RoomState.h
@@ -41,7 +41,8 @@ namespace events = matrix::events;
 class RoomState
 {
 public:
-        // Calculate room data that are not immediatly accessible. Like room name and avatar.
+        // Calculate room data that are not immediatly accessible. Like room name and
+        // avatar.
         //
         // e.g If the room is 1-on-1 name and avatar should be extracted from a user.
         void resolveName();
@@ -76,8 +77,8 @@ private:
         QUrl avatar_;
         QString name_;
 
-        // It defines the user whose avatar is used for the room. If the room has an avatar
-        // event this should be empty.
+        // It defines the user whose avatar is used for the room. If the room has an
+        // avatar event this should be empty.
         QString userAvatar_;
 };
 
diff --git a/include/TimelineView.h b/include/TimelineView.h
index c5c84bdb..4b5a2f77 100644
--- a/include/TimelineView.h
+++ b/include/TimelineView.h
@@ -106,7 +106,8 @@ private:
         void updateLastSender(const QString &user_id, TimelineDirection direction);
         void notifyForLastEvent();
 
-        // Used to determine whether or not we should prefix a message with the sender's name.
+        // Used to determine whether or not we should prefix a message with the
+        // sender's name.
         bool isSenderRendered(const QString &user_id, TimelineDirection direction);
 
         bool isPendingMessage(const QString &eventid,
diff --git a/include/events/CreateEventContent.h b/include/events/CreateEventContent.h
index dcea5fd5..7db2d367 100644
--- a/include/events/CreateEventContent.h
+++ b/include/events/CreateEventContent.h
@@ -26,7 +26,8 @@ namespace matrix
 namespace events
 {
 /*
- * This is the first event in a room and cannot be changed. It acts as the root of all other events.
+ * This is the first event in a room and cannot be changed. It acts as the root
+ * of all other events.
  */
 
 class CreateEventContent
diff --git a/include/events/TopicEventContent.h b/include/events/TopicEventContent.h
index c393b3ef..b6c376e7 100644
--- a/include/events/TopicEventContent.h
+++ b/include/events/TopicEventContent.h
@@ -26,7 +26,8 @@ namespace matrix
 namespace events
 {
 /*
- * A topic is a short message detailing what is currently being discussed in the room.
+ * A topic is a short message detailing what is currently being discussed in the
+ * room.
  */
 
 class TopicEventContent
diff --git a/include/ui/Menu.h b/include/ui/Menu.h
index 2029b1fd..4c2a3c68 100644
--- a/include/ui/Menu.h
+++ b/include/ui/Menu.h
@@ -16,9 +16,9 @@ public:
                 setFont(font);
                 setStyleSheet(
                   "QMenu { color: black; background-color: white; margin: 0px;}"
-                  "QMenu::item { color: black; padding: 7px 20px; border: 1px solid transparent; "
-                  "margin: "
-                  "2px 0px; }"
+                  "QMenu::item {"
+                  "color: black; padding: 7px 20px; border: 1px solid transparent;"
+                  "margin: 2px 0px; }"
                   "QMenu::item:selected { color: black; background: rgba(180, 180, 180, 100); }");
         };
 
-- 
cgit 1.5.1