From 99524027d0d3b792997e2a1daac8e6ce07a27af6 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Fri, 14 Apr 2017 17:52:22 +0200
Subject: [PATCH] fixed the namespace comments

---
 channel.cpp                         |  6 +++---
 channel.h                           |  6 +++---
 channelmanager.cpp                  |  4 ++--
 channelmanager.h                    |  4 ++--
 colorscheme.cpp                     |  4 ++--
 colorscheme.h                       |  2 +-
 concurrentmap.h                     |  2 +-
 emojis.cpp                          |  2 +-
 emojis.h                            |  2 +-
 emotemanager.cpp                    |  4 ++--
 emotemanager.h                      |  4 ++--
 fontmanager.cpp                     |  2 +-
 fontmanager.h                       |  2 +-
 ircmanager.cpp                      |  4 ++--
 ircmanager.h                        |  2 +-
 ircuser2.cpp                        |  2 +-
 ircuser2.h                          |  2 +-
 logging/loggingchannel.cpp          |  8 ++++----
 logging/loggingchannel.h            |  8 ++++----
 logging/loggingmanager.cpp          |  8 ++++----
 logging/loggingmanager.h            |  8 ++++----
 main.cpp                            |  4 ++--
 messages/lazyloadedimage.cpp        |  4 ++--
 messages/lazyloadedimage.h          |  4 ++--
 messages/limitedqueue.h             |  8 ++++----
 messages/limitedqueuesnapshot.h     |  4 ++--
 messages/link.cpp                   |  4 ++--
 messages/link.h                     |  4 ++--
 messages/message.cpp                |  8 ++++----
 messages/message.h                  |  8 ++++----
 messages/messagebuilder.cpp         |  4 ++--
 messages/messagebuilder.h           |  4 ++--
 messages/messageparseargs.h         |  4 ++--
 messages/messageref.cpp             |  6 +++---
 messages/messageref.h               |  4 ++--
 messages/word.cpp                   |  8 ++++----
 messages/word.h                     |  8 ++++----
 messages/wordpart.cpp               |  4 ++--
 messages/wordpart.h                 |  4 ++--
 resources.cpp                       |  2 +-
 resources.h                         |  2 +-
 setting.h                           |  2 +-
 settingsmanager.cpp                 |  6 +++---
 settingsmanager.h                   |  2 +-
 settingssnapshot.h                  |  2 +-
 twitch/emotevalue.h                 |  4 ++--
 twitch/twitchmessagebuilder.cpp     |  6 +++---
 twitch/twitchmessagebuilder.h       |  4 ++--
 twitch/twitchparsemessage.cpp       |  6 +++---
 twitch/twitchparsemessage.h         |  4 ++--
 twitch/twitchuser.cpp               |  4 ++--
 twitch/twitchuser.h                 |  4 ++--
 usermanager.cpp                     |  4 ++--
 usermanager.h                       |  2 +-
 util/urlfetch.h                     |  4 ++--
 widgets/chatwidget.cpp              | 10 +++++-----
 widgets/chatwidget.h                |  8 ++++----
 widgets/chatwidgetheader.cpp        |  4 ++--
 widgets/chatwidgetheader.h          |  4 ++--
 widgets/chatwidgetheaderbutton.cpp  |  4 ++--
 widgets/chatwidgetheaderbutton.h    |  4 ++--
 widgets/chatwidgetinput.cpp         |  4 ++--
 widgets/chatwidgetinput.h           |  4 ++--
 widgets/chatwidgetview.cpp          |  4 ++--
 widgets/chatwidgetview.h            |  4 ++--
 widgets/fancybutton.cpp             |  4 ++--
 widgets/fancybutton.h               |  4 ++--
 widgets/mainwindow.cpp              |  8 ++++----
 widgets/mainwindow.h                |  8 ++++----
 widgets/notebook.cpp                |  8 ++++----
 widgets/notebook.h                  |  8 ++++----
 widgets/notebookbutton.cpp          |  4 ++--
 widgets/notebookpage.cpp            |  8 ++++----
 widgets/notebookpage.h              |  4 ++--
 widgets/notebookpagedroppreview.cpp |  4 ++--
 widgets/notebooktab.cpp             |  8 ++++----
 widgets/notebooktab.h               |  4 ++--
 widgets/scrollbar.cpp               |  4 ++--
 widgets/scrollbar.h                 |  4 ++--
 widgets/scrollbarhighlight.cpp      |  4 ++--
 widgets/scrollbarhighlight.h        |  4 ++--
 widgets/settingsdialog.cpp          |  8 ++++----
 widgets/settingsdialog.h            |  8 ++++----
 widgets/settingsdialogtab.cpp       |  4 ++--
 widgets/settingsdialogtab.h         |  4 ++--
 widgets/textinputdialog.cpp         |  4 ++--
 widgets/textinputdialog.h           |  4 ++--
 widgets/titlebar.cpp                |  4 ++--
 widgets/titlebar.h                  |  4 ++--
 widgets/userpopupwidget.cpp         |  8 ++++----
 widgets/userpopupwidget.h           | 10 +++++-----
 windowmanager.cpp                   |  2 +-
 windowmanager.h                     |  2 +-
 93 files changed, 219 insertions(+), 219 deletions(-)

diff --git a/channel.cpp b/channel.cpp
index b9d0e2e39..838ad4f69 100644
--- a/channel.cpp
+++ b/channel.cpp
@@ -15,9 +15,9 @@
 
 #include <memory>
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
+namespace chatterino {
 
 Channel::Channel(const QString &channel)
     : _messages()
@@ -188,4 +188,4 @@ void Channel::reloadFfzEmotes()
     });
 }
 
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/channel.h b/channel.h
index d69f935df..b24991649 100644
--- a/channel.h
+++ b/channel.h
@@ -13,8 +13,8 @@
 #include <boost/signals2.hpp>
 #include <memory>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 class Message;
 }
 
@@ -75,6 +75,6 @@ private:
     void reloadFfzEmotes();
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // CHANNEL_H
diff --git a/channelmanager.cpp b/channelmanager.cpp
index 3d59b3778..7985e357a 100644
--- a/channelmanager.cpp
+++ b/channelmanager.cpp
@@ -1,7 +1,7 @@
 #include "channelmanager.h"
 #include "ircmanager.h"
 
-namespace  chatterino {
+namespace chatterino {
 
 ChannelManager ChannelManager::instance;
 
@@ -119,4 +119,4 @@ void ChannelManager::removeChannel(const QString &channel)
     }
 }
 
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/channelmanager.h b/channelmanager.h
index c2c1f7bce..7df13f38f 100644
--- a/channelmanager.h
+++ b/channelmanager.h
@@ -3,7 +3,7 @@
 
 #include "channel.h"
 
-namespace  chatterino {
+namespace chatterino {
 
 class ChannelManager
 {
@@ -36,6 +36,6 @@ private:
     SharedChannel _empty;
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // CHANNELS_H
diff --git a/colorscheme.cpp b/colorscheme.cpp
index 35e4df412..4800b98b1 100644
--- a/colorscheme.cpp
+++ b/colorscheme.cpp
@@ -6,7 +6,7 @@
 
 #include <QColor>
 
-namespace  chatterino {
+namespace chatterino {
 
 void ColorScheme::init()
 {
@@ -172,4 +172,4 @@ void ColorScheme::normalizeColor(QColor &color)
 
     //    color.setHslF(color.hueF(), s, newL);
 }
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/colorscheme.h b/colorscheme.h
index c06463c53..dfbcf82fa 100644
--- a/colorscheme.h
+++ b/colorscheme.h
@@ -5,7 +5,7 @@
 #include <QColor>
 #include <boost/signals2.hpp>
 
-namespace  chatterino {
+namespace chatterino {
 
 class ColorScheme
 {
diff --git a/concurrentmap.h b/concurrentmap.h
index ae10ab1bc..1e5fba6f8 100644
--- a/concurrentmap.h
+++ b/concurrentmap.h
@@ -65,6 +65,6 @@ private:
     QMap<TKey, TValue> _map;
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // CONCURRENTMAP_H
diff --git a/emojis.cpp b/emojis.cpp
index 7e56d6291..9ad302c8d 100644
--- a/emojis.cpp
+++ b/emojis.cpp
@@ -5,7 +5,7 @@
 #include <QStringBuilder>
 #include <QTextStream>
 
-namespace  chatterino {
+namespace chatterino {
 
 QRegularExpression Emojis::findShortCodesRegex(":([-+\\w]+):");
 
diff --git a/emojis.h b/emojis.h
index 05af091f3..6a172a486 100644
--- a/emojis.h
+++ b/emojis.h
@@ -9,7 +9,7 @@
 #include <QString>
 #include <unordered_map>
 
-namespace  chatterino {
+namespace chatterino {
 
 class Emojis
 {
diff --git a/emotemanager.cpp b/emotemanager.cpp
index 1d182f373..4f2e26adc 100644
--- a/emotemanager.cpp
+++ b/emotemanager.cpp
@@ -13,9 +13,9 @@
 
 #define TWITCH_EMOTE_TEMPLATE "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0"
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
+namespace chatterino {
 
 EmoteManager EmoteManager::instance;
 
diff --git a/emotemanager.h b/emotemanager.h
index 81fc4e5bd..3097d3953 100644
--- a/emotemanager.h
+++ b/emotemanager.h
@@ -13,7 +13,7 @@
 #include <QTimer>
 #include <boost/signals2.hpp>
 
-namespace  chatterino {
+namespace chatterino {
 class EmoteManager
 {
 public:
@@ -93,6 +93,6 @@ private:
     void loadFfzEmotes();
     void loadBttvEmotes();
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // EMOTES_H
diff --git a/fontmanager.cpp b/fontmanager.cpp
index c04f76361..ab0ddbdf6 100644
--- a/fontmanager.cpp
+++ b/fontmanager.cpp
@@ -2,7 +2,7 @@
 
 #define DEFAULT_FONT "Arial"
 
-namespace  chatterino {
+namespace chatterino {
 
 FontManager FontManager::instance;
 
diff --git a/fontmanager.h b/fontmanager.h
index 8e3eb796d..2edf2f16a 100644
--- a/fontmanager.h
+++ b/fontmanager.h
@@ -4,7 +4,7 @@
 #include <QFont>
 #include <QFontMetrics>
 
-namespace  chatterino {
+namespace chatterino {
 
 class FontManager
 {
diff --git a/ircmanager.cpp b/ircmanager.cpp
index 9fea7d8cd..9c37279f2 100644
--- a/ircmanager.cpp
+++ b/ircmanager.cpp
@@ -19,9 +19,9 @@
 
 #include <future>
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
+namespace chatterino {
 
 IrcManager IrcManager::instance;
 
diff --git a/ircmanager.h b/ircmanager.h
index 563ef9835..e3706d9f2 100644
--- a/ircmanager.h
+++ b/ircmanager.h
@@ -70,6 +70,6 @@ private:
     void messageReceived(Communi::IrcMessage *message);
     void privateMessageReceived(Communi::IrcPrivateMessage *message);
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // IRCMANAGER_H
diff --git a/ircuser2.cpp b/ircuser2.cpp
index 0c71469c5..4c221719e 100644
--- a/ircuser2.cpp
+++ b/ircuser2.cpp
@@ -1,6 +1,6 @@
 #include "ircuser2.h"
 
-namespace  chatterino {
+namespace chatterino {
 
 IrcUser2::IrcUser2(const QString &userName, const QString &nickName, const QString &realName,
                    const QString &password)
diff --git a/ircuser2.h b/ircuser2.h
index 44cf1ab21..9053a87fa 100644
--- a/ircuser2.h
+++ b/ircuser2.h
@@ -22,6 +22,6 @@ private:
     QString _realName;
     QString _password;
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // IRCUSER_H
diff --git a/logging/loggingchannel.cpp b/logging/loggingchannel.cpp
index d640646fe..8c0f3748a 100644
--- a/logging/loggingchannel.cpp
+++ b/logging/loggingchannel.cpp
@@ -5,8 +5,8 @@
 
 #include <ctime>
 
-namespace  chatterino {
-namespace  logging {
+namespace chatterino {
+namespace logging {
 
 Channel::Channel(const QString &_channelName, const QString &_baseDirectory)
     : channelName(_channelName)
@@ -72,5 +72,5 @@ void Channel::appendLine(const QString &line)
     this->fileHandle.flush();
 }
 
-}  // namespace  logging
-}  // namespace  chatterino
+}  // namespace logging
+}  // namespace chatterino
diff --git a/logging/loggingchannel.h b/logging/loggingchannel.h
index d28c7e5c0..1ca7f4ce5 100644
--- a/logging/loggingchannel.h
+++ b/logging/loggingchannel.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-namespace  chatterino {
-namespace  logging {
+namespace chatterino {
+namespace logging {
 
 class Channel
 {
@@ -33,7 +33,7 @@ private:
     QFile fileHandle;
 };
 
-}  // namespace  logging
-}  // namespace  chatterino
+}  // namespace logging
+}  // namespace chatterino
 
 #endif  // LOGGINGCHANNEL_H
diff --git a/logging/loggingmanager.cpp b/logging/loggingmanager.cpp
index c9093f3e6..750b10384 100644
--- a/logging/loggingmanager.cpp
+++ b/logging/loggingmanager.cpp
@@ -5,8 +5,8 @@
 
 #include <unordered_map>
 
-namespace  chatterino {
-namespace  logging {
+namespace chatterino {
+namespace logging {
 
 static QString logBasePath;
 static QString channelBasePath;
@@ -96,5 +96,5 @@ std::shared_ptr<Channel> get(const QString &channelName)
     return ret;
 }
 
-}  // namespace  logging
-}  // namespace  chatterino
+}  // namespace logging
+}  // namespace chatterino
diff --git a/logging/loggingmanager.h b/logging/loggingmanager.h
index 7721181e7..e7d7d0399 100644
--- a/logging/loggingmanager.h
+++ b/logging/loggingmanager.h
@@ -5,13 +5,13 @@
 
 #include <memory>
 
-namespace  chatterino {
-namespace  logging {
+namespace chatterino {
+namespace logging {
 
 void init();
 std::shared_ptr<Channel> get(const QString &channelName);
 
-}  // namespace  logging
-}  // namespace  chatterino
+}  // namespace logging
+}  // namespace chatterino
 
 #endif  // LOGGINGMANAGER_H
diff --git a/main.cpp b/main.cpp
index 27ffa5a46..c7847221d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,8 +16,8 @@
 #include <QStandardPaths>
 #include <boost/signals2.hpp>
 
-using namespace  chatterino;
-using namespace  chatterino::widgets;
+using namespace chatterino;
+using namespace chatterino::widgets;
 
 int main(int argc, char *argv[])
 {
diff --git a/messages/lazyloadedimage.cpp b/messages/lazyloadedimage.cpp
index 49b5e489a..1d9734672 100644
--- a/messages/lazyloadedimage.cpp
+++ b/messages/lazyloadedimage.cpp
@@ -103,5 +103,5 @@ void LazyLoadedImage::gifUpdateTimout()
 
     _currentPixmap = _allFrames[_currentFrame].image;
 }
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
diff --git a/messages/lazyloadedimage.h b/messages/lazyloadedimage.h
index 19e8f20f3..54b5bea56 100644
--- a/messages/lazyloadedimage.h
+++ b/messages/lazyloadedimage.h
@@ -103,7 +103,7 @@ private:
 
     void gifUpdateTimout();
 };
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
 
 #endif  // LAZYLOADEDIMAGE_H
diff --git a/messages/limitedqueue.h b/messages/limitedqueue.h
index 90d9fcda7..3ea0f17fa 100644
--- a/messages/limitedqueue.h
+++ b/messages/limitedqueue.h
@@ -7,8 +7,8 @@
 #include <mutex>
 #include <vector>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 template <typename T>
 class LimitedQueue
@@ -96,7 +96,7 @@ private:
     unsigned int buffer;
 };
 
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
 
 #endif  // LIMITEDQUEUE_H
diff --git a/messages/limitedqueuesnapshot.h b/messages/limitedqueuesnapshot.h
index 97262aae8..b137b66a2 100644
--- a/messages/limitedqueuesnapshot.h
+++ b/messages/limitedqueuesnapshot.h
@@ -34,7 +34,7 @@ private:
     int _offset;
     int _length;
 };
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
 
 #endif  // LIMITEDQUEUESNAPSHOT_H
diff --git a/messages/link.cpp b/messages/link.cpp
index 90e123739..c41178cbc 100644
--- a/messages/link.cpp
+++ b/messages/link.cpp
@@ -1,7 +1,7 @@
 #include "messages/link.h"
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 Link::Link()
     : type(None)
diff --git a/messages/link.h b/messages/link.h
index 89428b217..99dfd7ecd 100644
--- a/messages/link.h
+++ b/messages/link.h
@@ -3,8 +3,8 @@
 
 #include <QString>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 class Link
 {
diff --git a/messages/message.cpp b/messages/message.cpp
index a51e9f584..493509a22 100644
--- a/messages/message.cpp
+++ b/messages/message.cpp
@@ -16,8 +16,8 @@
 #include <list>
 #include <tuple>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 Message::Message(const QString &text)
     : _words()
@@ -81,5 +81,5 @@ const QString &Message::getId() const
     return _id;
 }
 
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
diff --git a/messages/message.h b/messages/message.h
index dbc3f220b..89c3c3dc7 100644
--- a/messages/message.h
+++ b/messages/message.h
@@ -12,11 +12,11 @@
 #include <chrono>
 #include <memory>
 
-namespace  chatterino {
+namespace chatterino {
 
 class Channel;
 
-namespace  messages {
+namespace messages {
 class Message;
 
 typedef std::shared_ptr<Message> SharedMessage;
@@ -63,7 +63,7 @@ private:
     std::vector<Word> _words;
 };
 
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
 
 #endif  // MESSAGE_H
diff --git a/messages/messagebuilder.cpp b/messages/messagebuilder.cpp
index 27db5541d..e44282efc 100644
--- a/messages/messagebuilder.cpp
+++ b/messages/messagebuilder.cpp
@@ -3,8 +3,8 @@
 #include "emotemanager.h"
 #include "resources.h"
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 MessageBuilder::MessageBuilder()
     : _words()
diff --git a/messages/messagebuilder.h b/messages/messagebuilder.h
index b98d93e89..f6c38b06a 100644
--- a/messages/messagebuilder.h
+++ b/messages/messagebuilder.h
@@ -4,8 +4,8 @@
 #include "messages/message.h"
 #include <ctime>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 class MessageBuilder
 {
diff --git a/messages/messageparseargs.h b/messages/messageparseargs.h
index eeccd3585..8acfab565 100644
--- a/messages/messageparseargs.h
+++ b/messages/messageparseargs.h
@@ -1,8 +1,8 @@
 #ifndef MESSAGEPARSEARGS_H
 #define MESSAGEPARSEARGS_H
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 struct MessageParseArgs {
 public:
diff --git a/messages/messageref.cpp b/messages/messageref.cpp
index d32f2f415..145bc6d47 100644
--- a/messages/messageref.cpp
+++ b/messages/messageref.cpp
@@ -9,10 +9,10 @@
 #define MARGIN_TOP 8
 #define MARGIN_BOTTOM 8
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 MessageRef::MessageRef(SharedMessage message)
     : _message(message)
diff --git a/messages/messageref.h b/messages/messageref.h
index f1eb99f4a..487100477 100644
--- a/messages/messageref.h
+++ b/messages/messageref.h
@@ -6,8 +6,8 @@
 #include <QPixmap>
 #include <memory>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 class MessageRef;
 
diff --git a/messages/word.cpp b/messages/word.cpp
index 614611783..58ef5a75d 100644
--- a/messages/word.cpp
+++ b/messages/word.cpp
@@ -1,7 +1,7 @@
 #include "messages/word.h"
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 // Image word
 Word::Word(LazyLoadedImage *image, Type type, const QString &copytext, const QString &tooltip,
@@ -130,5 +130,5 @@ std::vector<short> &Word::getCharacterWidthCache() const
 {
     return _characterWidthCache;
 }
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
diff --git a/messages/word.h b/messages/word.h
index 95976b4d5..d4b72f2aa 100644
--- a/messages/word.h
+++ b/messages/word.h
@@ -9,8 +9,8 @@
 #include <QRect>
 #include <QString>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 class Word
 {
@@ -114,7 +114,7 @@ private:
     mutable std::vector<short> _characterWidthCache;
 };
 
-}  // namespace  messages
-}  // namespace  chatterino
+}  // namespace messages
+}  // namespace chatterino
 
 #endif  // WORD_H
diff --git a/messages/wordpart.cpp b/messages/wordpart.cpp
index 7c4bec5f4..57deade4c 100644
--- a/messages/wordpart.cpp
+++ b/messages/wordpart.cpp
@@ -1,8 +1,8 @@
 #include "messages/wordpart.h"
 #include "messages/word.h"
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 WordPart::WordPart(Word &word, int x, int y, int lineNumber, const QString &copyText,
                    bool allowTrailingSpace)
diff --git a/messages/wordpart.h b/messages/wordpart.h
index 2be859bde..15904c94c 100644
--- a/messages/wordpart.h
+++ b/messages/wordpart.h
@@ -4,8 +4,8 @@
 #include <QRect>
 #include <QString>
 
-namespace  chatterino {
-namespace  messages {
+namespace chatterino {
+namespace messages {
 
 class Word;
 
diff --git a/resources.cpp b/resources.cpp
index 109fdb8b5..762ed7336 100644
--- a/resources.cpp
+++ b/resources.cpp
@@ -2,7 +2,7 @@
 
 #include <QPixmap>
 
-namespace  chatterino {
+namespace chatterino {
 
 messages::LazyLoadedImage *Resources::badgeStaff(NULL);
 messages::LazyLoadedImage *Resources::badgeAdmin(NULL);
diff --git a/resources.h b/resources.h
index 5926d9ada..0a0c7ee28 100644
--- a/resources.h
+++ b/resources.h
@@ -108,6 +108,6 @@ private:
     static messages::LazyLoadedImage *buttonBan;
     static messages::LazyLoadedImage *buttonTimeout;
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // RESOURCES_H
diff --git a/setting.h b/setting.h
index cdcdb1b3d..76eceedb7 100644
--- a/setting.h
+++ b/setting.h
@@ -72,6 +72,6 @@ private:
     T _value;
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // SETTING_H
diff --git a/settingsmanager.cpp b/settingsmanager.cpp
index 6a6f13a6a..6fdf8d038 100644
--- a/settingsmanager.cpp
+++ b/settingsmanager.cpp
@@ -5,9 +5,9 @@
 #include <QDir>
 #include <QStandardPaths>
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
+namespace chatterino {
 
 SettingsManager SettingsManager::instance;
 
@@ -131,4 +131,4 @@ SettingsSnapshot SettingsManager::createSnapshot()
     return snapshot;
 }
 
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/settingsmanager.h b/settingsmanager.h
index fb45e6f92..1b8e09c36 100644
--- a/settingsmanager.h
+++ b/settingsmanager.h
@@ -79,6 +79,6 @@ private:
     static SettingsManager instance;
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // APPSETTINGS_H
diff --git a/settingssnapshot.h b/settingssnapshot.h
index e0c29621d..bf0fcd37d 100644
--- a/settingssnapshot.h
+++ b/settingssnapshot.h
@@ -28,6 +28,6 @@ public:
 private:
     std::vector<std::pair<std::reference_wrapper<BaseSetting>, QVariant>> _items;
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // SETTINGSSNAPSHOT_H
diff --git a/twitch/emotevalue.h b/twitch/emotevalue.h
index 7e05147df..9170b713c 100644
--- a/twitch/emotevalue.h
+++ b/twitch/emotevalue.h
@@ -3,8 +3,8 @@
 
 #include "QString"
 
-namespace  chatterino {
-namespace  twitch {
+namespace chatterino {
+namespace twitch {
 
 struct EmoteValue {
 public:
diff --git a/twitch/twitchmessagebuilder.cpp b/twitch/twitchmessagebuilder.cpp
index cd08d90cb..0835577df 100644
--- a/twitch/twitchmessagebuilder.cpp
+++ b/twitch/twitchmessagebuilder.cpp
@@ -5,10 +5,10 @@
 #include "ircmanager.h"
 #include "resources.h"
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
-namespace  twitch {
+namespace chatterino {
+namespace twitch {
 TwitchMessageBuilder::TwitchMessageBuilder()
     : MessageBuilder()
     , messageId()
diff --git a/twitch/twitchmessagebuilder.h b/twitch/twitchmessagebuilder.h
index a676131e8..d8bbfff2d 100644
--- a/twitch/twitchmessagebuilder.h
+++ b/twitch/twitchmessagebuilder.h
@@ -6,8 +6,8 @@
 
 #include <QString>
 
-namespace  chatterino {
-namespace  twitch {
+namespace chatterino {
+namespace twitch {
 
 class TwitchMessageBuilder : public messages::MessageBuilder
 {
diff --git a/twitch/twitchparsemessage.cpp b/twitch/twitchparsemessage.cpp
index ad68c2674..2c677bc30 100644
--- a/twitch/twitchparsemessage.cpp
+++ b/twitch/twitchparsemessage.cpp
@@ -8,10 +8,10 @@
 //
 //#include <QRegularExpression>
 //
-// using namespace  chatterino::messages;
+// using namespace chatterino::messages;
 //
-// namespace  chatterino {
-// namespace  twitch {
+// namespace chatterino {
+// namespace twitch {
 // SharedMessage
 // twitchParseMessage(const Communi::IrcPrivateMessage *ircMessage,
 //                   Channel *channel, const MessageParseArgs &args)
diff --git a/twitch/twitchparsemessage.h b/twitch/twitchparsemessage.h
index b7c87d1a3..23aec2f80 100644
--- a/twitch/twitchparsemessage.h
+++ b/twitch/twitchparsemessage.h
@@ -5,8 +5,8 @@
 //#include "messages/messagebuilder.h"
 //#include "messages/messageparseargs.h"
 //
-// namespace  chatterino {
-// namespace  twitch {
+// namespace chatterino {
+// namespace twitch {
 //}
 //}
 //
diff --git a/twitch/twitchuser.cpp b/twitch/twitchuser.cpp
index 0de10f578..4bf9c1873 100644
--- a/twitch/twitchuser.cpp
+++ b/twitch/twitchuser.cpp
@@ -1,7 +1,7 @@
 #include "twitchuser.h"
 
-namespace  chatterino {
-namespace  twitch {
+namespace chatterino {
+namespace twitch {
 TwitchUser::TwitchUser(const QString &username, const QString &oauthToken,
                        const QString &oauthClient)
     : IrcUser2(username, username, username, "oauth:" + oauthToken)
diff --git a/twitch/twitchuser.h b/twitch/twitchuser.h
index 2e909d8d8..ca1f6ab4b 100644
--- a/twitch/twitchuser.h
+++ b/twitch/twitchuser.h
@@ -5,8 +5,8 @@
 
 #include <QString>
 
-namespace  chatterino {
-namespace  twitch {
+namespace chatterino {
+namespace twitch {
 
 class TwitchUser : public IrcUser2
 {
diff --git a/usermanager.cpp b/usermanager.cpp
index e2ffd1c3f..964f15d6d 100644
--- a/usermanager.cpp
+++ b/usermanager.cpp
@@ -1,6 +1,6 @@
 #include "usermanager.h"
 
-namespace  chatterino {
+namespace chatterino {
 
 AccountManager AccountManager::instance;
 
@@ -41,4 +41,4 @@ void AccountManager::addTwitchUser(const twitch::TwitchUser &user)
 
     _twitchUsers.push_back(user);
 }
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/usermanager.h b/usermanager.h
index 9f97f957d..cb3dab6d5 100644
--- a/usermanager.h
+++ b/usermanager.h
@@ -31,6 +31,6 @@ private:
     std::vector<twitch::TwitchUser> _twitchUsers;
     std::mutex _twitchUsersMutex;
 };
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // ACCOUNTMANAGER_H
diff --git a/util/urlfetch.h b/util/urlfetch.h
index df8030dc8..34786c6ba 100644
--- a/util/urlfetch.h
+++ b/util/urlfetch.h
@@ -12,8 +12,8 @@
 
 #include <functional>
 
-namespace  chatterino {
-namespace  util {
+namespace chatterino {
+namespace util {
 
 static void urlFetch(const QString &url, std::function<void(QNetworkReply &)> successCallback)
 {
diff --git a/widgets/chatwidget.cpp b/widgets/chatwidget.cpp
index a9e098aa9..8c21c4a59 100644
--- a/widgets/chatwidget.cpp
+++ b/widgets/chatwidget.cpp
@@ -11,10 +11,10 @@
 #include <QVBoxLayout>
 #include <boost/signals2.hpp>
 
-using namespace  chatterino::messages;
+using namespace chatterino::messages;
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ChatWidget::ChatWidget(QWidget *parent)
     : QWidget(parent)
@@ -198,5 +198,5 @@ ChatWidget::save()
     return tree;
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/chatwidget.h b/widgets/chatwidget.h
index c063b8651..0ae900400 100644
--- a/widgets/chatwidget.h
+++ b/widgets/chatwidget.h
@@ -16,8 +16,8 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/signals2/connection.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class ChatWidget : public QWidget
 {
@@ -62,7 +62,7 @@ public:
     boost::property_tree::ptree save();
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // CHATWIDGET_H
diff --git a/widgets/chatwidgetheader.cpp b/widgets/chatwidgetheader.cpp
index a2db7a478..213ee1e4a 100644
--- a/widgets/chatwidgetheader.cpp
+++ b/widgets/chatwidgetheader.cpp
@@ -8,8 +8,8 @@
 #include <QMimeData>
 #include <QPainter>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ChatWidgetHeader::ChatWidgetHeader(ChatWidget *parent)
     : QWidget()
diff --git a/widgets/chatwidgetheader.h b/widgets/chatwidgetheader.h
index ebf2d9025..eca9cbaca 100644
--- a/widgets/chatwidgetheader.h
+++ b/widgets/chatwidgetheader.h
@@ -13,8 +13,8 @@
 #include <QPoint>
 #include <QWidget>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 class ChatWidget;
 
 class ChatWidgetHeader : public QWidget
diff --git a/widgets/chatwidgetheaderbutton.cpp b/widgets/chatwidgetheaderbutton.cpp
index 625f15069..c48017fad 100644
--- a/widgets/chatwidgetheaderbutton.cpp
+++ b/widgets/chatwidgetheaderbutton.cpp
@@ -4,8 +4,8 @@
 #include <QBrush>
 #include <QPainter>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ChatWidgetHeaderButton::ChatWidgetHeaderButton(int spacing)
     : QWidget()
diff --git a/widgets/chatwidgetheaderbutton.h b/widgets/chatwidgetheaderbutton.h
index 6333ee708..7f0838c63 100644
--- a/widgets/chatwidgetheaderbutton.h
+++ b/widgets/chatwidgetheaderbutton.h
@@ -8,8 +8,8 @@
 #include <QPaintEvent>
 #include <QWidget>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class ChatWidgetHeaderButton : public QWidget
 {
diff --git a/widgets/chatwidgetinput.cpp b/widgets/chatwidgetinput.cpp
index 44226f084..a66ad3e19 100644
--- a/widgets/chatwidgetinput.cpp
+++ b/widgets/chatwidgetinput.cpp
@@ -8,8 +8,8 @@
 #include <QPainter>
 #include <boost/signals2.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ChatWidgetInput::ChatWidgetInput(ChatWidget *widget)
     : _chatWidget(widget)
diff --git a/widgets/chatwidgetinput.h b/widgets/chatwidgetinput.h
index a53a5535e..dd1a21109 100644
--- a/widgets/chatwidgetinput.h
+++ b/widgets/chatwidgetinput.h
@@ -49,7 +49,7 @@ private slots:
     void editTextChanged();
     //    void editKeyPressed(QKeyEvent *event);
 };
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // CHATWIDGETINPUT_H
diff --git a/widgets/chatwidgetview.cpp b/widgets/chatwidgetview.cpp
index a2dfd4f43..1ac5f0d67 100644
--- a/widgets/chatwidgetview.cpp
+++ b/widgets/chatwidgetview.cpp
@@ -405,5 +405,5 @@ bool ChatWidgetView::tryGetMessageAt(QPoint p, std::shared_ptr<messages::Message
 
     return false;
 }
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/chatwidgetview.h b/widgets/chatwidgetview.h
index c53a350c4..9d67d5ab9 100644
--- a/widgets/chatwidgetview.h
+++ b/widgets/chatwidgetview.h
@@ -67,7 +67,7 @@ private slots:
         update();
     }
 };
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // CHATVIEW_H
diff --git a/widgets/fancybutton.cpp b/widgets/fancybutton.cpp
index 52e54ab6b..dc70feae0 100644
--- a/widgets/fancybutton.cpp
+++ b/widgets/fancybutton.cpp
@@ -3,8 +3,8 @@
 #include <QDebug>
 #include <QPainter>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 FancyButton::FancyButton(QWidget *parent)
     : QWidget(parent)
diff --git a/widgets/fancybutton.h b/widgets/fancybutton.h
index 6b52c8e5a..736e784d4 100644
--- a/widgets/fancybutton.h
+++ b/widgets/fancybutton.h
@@ -7,8 +7,8 @@
 #include <QTimer>
 #include <QWidget>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 class FancyButton : public QWidget
 {
     struct ClickEffect {
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 9950d744d..1a5061162 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -13,8 +13,8 @@
 #include "Windows.h"
 #endif
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 MainWindow::MainWindow(QWidget *parent)
     : QWidget(parent)
@@ -139,5 +139,5 @@ Notebook &MainWindow::getNotebook()
 {
     return _notebook;
 }
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index 183414298..61d00c548 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -8,8 +8,8 @@
 #include <QMainWindow>
 #include <boost/property_tree/ptree.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class MainWindow : public QWidget
 {
@@ -37,7 +37,7 @@ private:
     TitleBar _titleBar;
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // MAINWINDOW_H
diff --git a/widgets/notebook.cpp b/widgets/notebook.cpp
index 5caab511a..ceb348c46 100644
--- a/widgets/notebook.cpp
+++ b/widgets/notebook.cpp
@@ -14,8 +14,8 @@
 #include <QWidget>
 #include <boost/foreach.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 Notebook::Notebook(QWidget *parent)
     : QWidget(parent)
@@ -242,5 +242,5 @@ void Notebook::loadDefaults()
     addPage();
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/notebook.h b/widgets/notebook.h
index dfbe58425..ae334cd07 100644
--- a/widgets/notebook.h
+++ b/widgets/notebook.h
@@ -9,8 +9,8 @@
 #include <QWidget>
 #include <boost/property_tree/ptree.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class Notebook : public QWidget
 {
@@ -61,7 +61,7 @@ public:
     void loadDefaults();
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // NOTEBOOK_H
diff --git a/widgets/notebookbutton.cpp b/widgets/notebookbutton.cpp
index 012fc8589..91b32b699 100644
--- a/widgets/notebookbutton.cpp
+++ b/widgets/notebookbutton.cpp
@@ -7,8 +7,8 @@
 #include <QPainterPath>
 #include <QRadialGradient>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 NotebookButton::NotebookButton(QWidget *parent)
     : FancyButton(parent)
diff --git a/widgets/notebookpage.cpp b/widgets/notebookpage.cpp
index 5264f33cf..0e7d9472a 100644
--- a/widgets/notebookpage.cpp
+++ b/widgets/notebookpage.cpp
@@ -12,8 +12,8 @@
 #include <QWidget>
 #include <boost/foreach.hpp>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 bool NotebookPage::isDraggingSplit = false;
 ChatWidget *NotebookPage::draggingSplit = NULL;
@@ -334,5 +334,5 @@ boost::property_tree::ptree NotebookPage::save()
     return tree;
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/notebookpage.h b/widgets/notebookpage.h
index f30080674..713c6a05f 100644
--- a/widgets/notebookpage.h
+++ b/widgets/notebookpage.h
@@ -78,7 +78,7 @@ public:
     boost::property_tree::ptree save();
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // NOTEBOOKPAGE_H
diff --git a/widgets/notebookpagedroppreview.cpp b/widgets/notebookpagedroppreview.cpp
index 3a2ff20f8..f135bfbd0 100644
--- a/widgets/notebookpagedroppreview.cpp
+++ b/widgets/notebookpagedroppreview.cpp
@@ -4,8 +4,8 @@
 #include <QDebug>
 #include <QPainter>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 NotebookPageDropPreview::NotebookPageDropPreview(QWidget *parent)
     : QWidget(parent)
diff --git a/widgets/notebooktab.cpp b/widgets/notebooktab.cpp
index 557d97015..acbfac6aa 100644
--- a/widgets/notebooktab.cpp
+++ b/widgets/notebooktab.cpp
@@ -5,8 +5,8 @@
 
 #include <QPainter>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 NotebookTab::NotebookTab(Notebook *notebook)
     : QWidget(notebook)
@@ -246,5 +246,5 @@ boost::property_tree::ptree NotebookTab::save()
     return tree;
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/notebooktab.h b/widgets/notebooktab.h
index 404b22c15..acc7bf87e 100644
--- a/widgets/notebooktab.h
+++ b/widgets/notebooktab.h
@@ -81,7 +81,7 @@ public:
     boost::property_tree::ptree save();
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // NOTEBOOKTAB_H
diff --git a/widgets/scrollbar.cpp b/widgets/scrollbar.cpp
index 1f88c1239..70e676614 100644
--- a/widgets/scrollbar.cpp
+++ b/widgets/scrollbar.cpp
@@ -6,8 +6,8 @@
 
 #define MIN_THUMB_HEIGHT 10
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ScrollBar::ScrollBar(QWidget *widget)
     : QWidget(widget)
diff --git a/widgets/scrollbar.h b/widgets/scrollbar.h
index fa0d14678..cebdc3583 100644
--- a/widgets/scrollbar.h
+++ b/widgets/scrollbar.h
@@ -9,8 +9,8 @@
 #include <boost/signals2.hpp>
 #include <functional>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class ScrollBar : public QWidget
 {
diff --git a/widgets/scrollbarhighlight.cpp b/widgets/scrollbarhighlight.cpp
index 8deffe268..96e0b395a 100644
--- a/widgets/scrollbarhighlight.cpp
+++ b/widgets/scrollbarhighlight.cpp
@@ -1,8 +1,8 @@
 #include "widgets/scrollbarhighlight.h"
 #include "colorscheme.h"
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 ScrollBarHighlight::ScrollBarHighlight(float position, int colorIndex, Style style, QString tag)
     : _position(position)
diff --git a/widgets/scrollbarhighlight.h b/widgets/scrollbarhighlight.h
index d9101811a..0fd08a3c9 100644
--- a/widgets/scrollbarhighlight.h
+++ b/widgets/scrollbarhighlight.h
@@ -3,8 +3,8 @@
 
 #include "QString"
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class ScrollBarHighlight
 {
diff --git a/widgets/settingsdialog.cpp b/widgets/settingsdialog.cpp
index 26e71907b..7ccb75ef6 100644
--- a/widgets/settingsdialog.cpp
+++ b/widgets/settingsdialog.cpp
@@ -13,8 +13,8 @@
 #include <QPalette>
 #include <QResource>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 SettingsDialog::SettingsDialog()
     : _snapshot(SettingsManager::getInstance().createSnapshot())
@@ -325,5 +325,5 @@ void SettingsDialog::cancelButtonClicked()
     this->close();
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/settingsdialog.h b/widgets/settingsdialog.h
index 88b7bf2cc..edd74b6e0 100644
--- a/widgets/settingsdialog.h
+++ b/widgets/settingsdialog.h
@@ -16,8 +16,8 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class SettingsDialog : public QWidget
 {
@@ -50,7 +50,7 @@ private:
     void cancelButtonClicked();
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // SETTINGSDIALOG_H
diff --git a/widgets/settingsdialogtab.cpp b/widgets/settingsdialogtab.cpp
index 0157e4a04..a21622cf0 100644
--- a/widgets/settingsdialogtab.cpp
+++ b/widgets/settingsdialogtab.cpp
@@ -71,5 +71,5 @@ void SettingsDialogTab::mousePressEvent(QMouseEvent *event)
 
     _dialog->select(this);
 }
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/settingsdialogtab.h b/widgets/settingsdialogtab.h
index 863577f7e..a1bd13c04 100644
--- a/widgets/settingsdialogtab.h
+++ b/widgets/settingsdialogtab.h
@@ -37,7 +37,7 @@ private:
 
     bool _selected;
 };
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // SETTINGSNOTEBOOKTAB_H
diff --git a/widgets/textinputdialog.cpp b/widgets/textinputdialog.cpp
index cb5ebe3b7..9c2319130 100644
--- a/widgets/textinputdialog.cpp
+++ b/widgets/textinputdialog.cpp
@@ -1,8 +1,8 @@
 #include "widgets/textinputdialog.h"
 #include <QSizePolicy>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 TextInputDialog::TextInputDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/widgets/textinputdialog.h b/widgets/textinputdialog.h
index 357e6e555..9354b9a6f 100644
--- a/widgets/textinputdialog.h
+++ b/widgets/textinputdialog.h
@@ -8,8 +8,8 @@
 #include <QString>
 #include <QVBoxLayout>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 class TextInputDialog : public QDialog
 {
diff --git a/widgets/titlebar.cpp b/widgets/titlebar.cpp
index a5e865181..c898ec3b5 100644
--- a/widgets/titlebar.cpp
+++ b/widgets/titlebar.cpp
@@ -1,7 +1,7 @@
 #include "titlebar.h"
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 TitleBar::TitleBar(QWidget *parent)
     : QWidget(parent)
 {
diff --git a/widgets/titlebar.h b/widgets/titlebar.h
index 8ce06b261..ab72d8803 100644
--- a/widgets/titlebar.h
+++ b/widgets/titlebar.h
@@ -3,8 +3,8 @@
 
 #include <QWidget>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 class TitleBar : public QWidget
 {
 public:
diff --git a/widgets/userpopupwidget.cpp b/widgets/userpopupwidget.cpp
index 3ff94b5b8..4cea7877f 100644
--- a/widgets/userpopupwidget.cpp
+++ b/widgets/userpopupwidget.cpp
@@ -4,8 +4,8 @@
 
 #include <QDebug>
 
-namespace  chatterino {
-namespace  widgets {
+namespace chatterino {
+namespace widgets {
 
 UserPopupWidget::UserPopupWidget(std::shared_ptr<Channel> &&channel)
     : QWidget(nullptr)
@@ -37,5 +37,5 @@ void UserPopupWidget::setName(const QString &name)
     _ui->lblUsername->setText(name);
 }
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
diff --git a/widgets/userpopupwidget.h b/widgets/userpopupwidget.h
index f427765d9..7979ea997 100644
--- a/widgets/userpopupwidget.h
+++ b/widgets/userpopupwidget.h
@@ -5,15 +5,15 @@
 
 #include <memory>
 
-namespace  Ui {
+namespace Ui {
 class UserPopup;
 }
 
-namespace  chatterino {
+namespace chatterino {
 
 class Channel;
 
-namespace  widgets {
+namespace widgets {
 
 class UserPopupWidget : public QWidget
 {
@@ -29,7 +29,7 @@ private:
     std::shared_ptr<Channel> _channel;
 };
 
-}  // namespace  widgets
-}  // namespace  chatterino
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // USERPOPUPWIDGET_H
diff --git a/windowmanager.cpp b/windowmanager.cpp
index ed8f3f9ff..8aa2a7b62 100644
--- a/windowmanager.cpp
+++ b/windowmanager.cpp
@@ -121,4 +121,4 @@ void WindowManager::save()
     boost::property_tree::write_json(settingsPath, tree);
 }
 
-}  // namespace  chatterino
+}  // namespace chatterino
diff --git a/windowmanager.h b/windowmanager.h
index 7b5549581..9b4b15da3 100644
--- a/windowmanager.h
+++ b/windowmanager.h
@@ -34,6 +34,6 @@ private:
     widgets::MainWindow *_mainWindow;
 };
 
-}  // namespace  chatterino
+}  // namespace chatterino
 
 #endif  // WINDOWS_H