rename #3

src/providers/bttv/BttvEmotes.cpp

@@ -1,8 +1,8 @@
-#include "providers/bttv/bttvemotes.hpp"
+#include "providers/bttv/BttvEmotes.hpp"
 
-#include "debug/log.hpp"
-#include "messages/image.hpp"
-#include "util/urlfetch.hpp"
+#include "debug/Log.hpp"
+#include "messages/Image.hpp"
+#include "util/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/bttv/BttvEmotes.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "signalvector.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/emotemap.hpp"
+#include "SignalVector.hpp"
+#include "util/ConcurrentMap.hpp"
+#include "util/Emotemap.hpp"
 
 #include <map>
 

src/providers/emoji/Emojis.cpp

@@ -1,8 +1,8 @@
-#include "providers/emoji/emojis.hpp"
+#include "providers/emoji/Emojis.hpp"
 
-#include "application.hpp"
-#include "debug/log.hpp"
-#include "singletons/settingsmanager.hpp"
+#include "Application.hpp"
+#include "debug/Log.hpp"
+#include "singletons/SettingsManager.hpp"
 
 #include <QFile>
 

src/providers/emoji/Emojis.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "signalvector.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/emotemap.hpp"
+#include "SignalVector.hpp"
+#include "util/ConcurrentMap.hpp"
+#include "util/Emotemap.hpp"
 
 #include <QMap>
 #include <QRegularExpression>

src/providers/ffz/FfzEmotes.cpp

@@ -1,8 +1,8 @@
-#include "providers/ffz/ffzemotes.hpp"
+#include "providers/ffz/FfzEmotes.hpp"
 
-#include "debug/log.hpp"
-#include "messages/image.hpp"
-#include "util/urlfetch.hpp"
+#include "debug/Log.hpp"
+#include "messages/Image.hpp"
+#include "util/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/ffz/FfzEmotes.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "signalvector.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/emotemap.hpp"
+#include "SignalVector.hpp"
+#include "util/ConcurrentMap.hpp"
+#include "util/Emotemap.hpp"
 
 #include <map>
 

src/providers/irc/AbstractIrcServer.cpp

@@ -1,8 +1,8 @@
-#include "abstractircserver.hpp"
+#include "AbstractIrcServer.hpp"
 
-#include "common.hpp"
-#include "messages/limitedqueuesnapshot.hpp"
-#include "messages/message.hpp"
+#include "Common.hpp"
+#include "messages/LimitedQueueSnapshot.hpp"
+#include "messages/Message.hpp"
 
 #include <QCoreApplication>
 

src/providers/irc/AbstractIrcServer.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "channel.hpp"
+#include "Channel.hpp"
+#include "providers/irc/IrcConnection2.hpp"
 
 #include <IrcMessage>
 #include <pajlada/signals/signal.hpp>
-#include <providers/irc/ircconnection2.hpp>
 
 #include <functional>
 #include <mutex>

src/providers/irc/IrcAccount.cpp

@@ -1,4 +1,4 @@
-#include "ircaccount.hpp"
+#include "IrcAccount.hpp"
 
 // namespace chatterino {
 // namespace providers {

src/providers/irc/IrcChannel2.cpp

@@ -1,4 +1,4 @@
-#include "ircchannel2.hpp"
+#include "IrcChannel2.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/irc/IrcConnection2.cpp

@@ -1,4 +1,4 @@
-#include "ircconnection2.hpp"
+#include "IrcConnection2.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/irc/IrcServer.cpp

@@ -1,4 +1,4 @@
-#include "ircserver.hpp"
+#include "IrcServer.hpp"
 
 #include <cassert>
 

src/providers/irc/IrcServer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "providers/irc/ircaccount.hpp"
-#include "providers/irc/abstractircserver.hpp"
+#include "providers/irc/IrcAccount.hpp"
+#include "providers/irc/AbstractIrcServer.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/IrcMessageHandler.cpp

@@ -1,17 +1,17 @@
-#include "ircmessagehandler.hpp"
+#include "IrcMessageHandler.hpp"
 
-#include "application.hpp"
-#include "controllers/highlights/highlightcontroller.hpp"
-#include "debug/log.hpp"
-#include "messages/limitedqueue.hpp"
-#include "messages/message.hpp"
-#include "providers/twitch/twitchchannel.hpp"
-#include "providers/twitch/twitchhelpers.hpp"
-#include "providers/twitch/twitchmessagebuilder.hpp"
-#include "providers/twitch/twitchserver.hpp"
-#include "singletons/resourcemanager.hpp"
-#include "singletons/windowmanager.hpp"
-#include "util/irchelpers.hpp"
+#include "Application.hpp"
+#include "controllers/highlights/HighlightController.hpp"
+#include "debug/Log.hpp"
+#include "messages/LimitedQueue.hpp"
+#include "messages/Message.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
+#include "providers/twitch/TwitchHelpers.hpp"
+#include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "providers/twitch/TwitchServer.hpp"
+#include "singletons/ResourceManager.hpp"
+#include "singletons/WindowManager.hpp"
+#include "util/IrcHelpers.hpp"
 
 #include <IrcMessage>
 

src/providers/twitch/Pubsub.cpp

@@ -1,9 +1,9 @@
-#include "providers/twitch/pubsub.hpp"
+#include "providers/twitch/Pubsub.hpp"
 
-#include "debug/log.hpp"
-#include "providers/twitch/pubsubactions.hpp"
-#include "providers/twitch/pubsubhelpers.hpp"
-#include "util/rapidjson-helpers.hpp"
+#include "debug/Log.hpp"
+#include "providers/twitch/PubsubActions.hpp"
+#include "providers/twitch/PubsubHelpers.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 #include <rapidjson/error/en.h>
 

src/providers/twitch/Pubsub.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "providers/twitch/pubsubactions.hpp"
-#include "providers/twitch/twitchaccount.hpp"
-#include "providers/twitch/twitchserver.hpp"
+#include "providers/twitch/PubsubActions.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchServer.hpp"
 
 #include <rapidjson/document.h>
 #include <QString>

src/providers/twitch/PubsubActions.cpp

@@ -1,6 +1,6 @@
-#include "providers/twitch/pubsubactions.hpp"
+#include "providers/twitch/PubsubActions.hpp"
 
-#include "providers/twitch/pubsubhelpers.hpp"
+#include "providers/twitch/PubsubHelpers.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/PubsubHelpers.cpp

@@ -1,7 +1,7 @@
-#include "providers/twitch/pubsubhelpers.hpp"
+#include "providers/twitch/PubsubHelpers.hpp"
 
-#include "providers/twitch/pubsubactions.hpp"
-#include "util/rapidjson-helpers.hpp"
+#include "providers/twitch/PubsubActions.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/PubsubHelpers.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "debug/log.hpp"
-#include "providers/twitch/twitchaccount.hpp"
-#include "util/rapidjson-helpers.hpp"
+#include "debug/Log.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>

src/providers/twitch/TwitchAccount.cpp

@@ -1,10 +1,10 @@
-#include "providers/twitch/twitchaccount.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 
-#include "const.hpp"
-#include "debug/log.hpp"
-#include "util/networkrequest.hpp"
-#include "util/rapidjson-helpers.hpp"
-#include "util/urlfetch.hpp"
+#include "Const.hpp"
+#include "debug/Log.hpp"
+#include "util/NetworkRequest.hpp"
+#include "util/RapidjsonHelpers.hpp"
+#include "util/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/TwitchAccount.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "controllers/accounts/account.hpp"
-#include "providers/twitch/twitchuser.hpp"
+#include "controllers/accounts/Account.hpp"
+#include "providers/twitch/TwitchUser.hpp"
 
 #include <QColor>
 #include <QString>

src/providers/twitch/TwitchAccountManager.cpp

@@ -1,8 +1,8 @@
-#include "providers/twitch/twitchaccountmanager.hpp"
+#include "providers/twitch/TwitchAccountManager.hpp"
 
-#include "common.hpp"
-#include "const.hpp"
-#include "debug/log.hpp"
+#include "Common.hpp"
+#include "Const.hpp"
+#include "debug/Log.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/TwitchAccountManager.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "providers/twitch/twitchaccount.hpp"
-#include "util/sharedptrelementless.hpp"
-#include "util/signalvector2.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "util/SharedPtrElementLess.hpp"
+#include "util/SignalVector2.hpp"
 
 #include <pajlada/settings/setting.hpp>
 

src/providers/twitch/TwitchChannel.cpp

@@ -1,15 +1,15 @@
-#include "providers/twitch/twitchchannel.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 
-#include "common.hpp"
-#include "debug/log.hpp"
-#include "messages/message.hpp"
-#include "providers/twitch/pubsub.hpp"
-#include "providers/twitch/twitchmessagebuilder.hpp"
-#include "singletons/emotemanager.hpp"
-#include "singletons/ircmanager.hpp"
-#include "singletons/settingsmanager.hpp"
-#include "util/posttothread.hpp"
-#include "util/urlfetch.hpp"
+#include "Common.hpp"
+#include "debug/Log.hpp"
+#include "messages/Message.hpp"
+#include "providers/twitch/Pubsub.hpp"
+#include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "singletons/EmoteManager.hpp"
+#include "singletons/IrcManager.hpp"
+#include "singletons/SettingsManager.hpp"
+#include "util/PostToThread.hpp"
+#include "util/UrlFetch.hpp"
 
 #include <IrcConnection>
 #include <QThread>

src/providers/twitch/TwitchChannel.hpp

@@ -2,12 +2,12 @@
 
 #include <IrcConnection>
 
-#include "channel.hpp"
-#include "common.hpp"
-#include "singletons/emotemanager.hpp"
-#include "singletons/ircmanager.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/mutexvalue.hpp"
+#include "Channel.hpp"
+#include "Common.hpp"
+#include "singletons/EmoteManager.hpp"
+#include "singletons/IrcManager.hpp"
+#include "util/ConcurrentMap.hpp"
+#include "util/MutexValue.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
 

src/providers/twitch/TwitchEmotes.cpp

@@ -1,10 +1,10 @@
-#include "providers/twitch/twitchemotes.hpp"
+#include "providers/twitch/TwitchEmotes.hpp"
 
-#include "debug/log.hpp"
-#include "messages/image.hpp"
-#include "util/benchmark.hpp"
-#include "util/rapidjson-helpers.hpp"
-#include "util/urlfetch.hpp"
+#include "debug/Log.hpp"
+#include "messages/Image.hpp"
+#include "util/Benchmark.hpp"
+#include "util/RapidjsonHelpers.hpp"
+#include "util/UrlFetch.hpp"
 
 #define TWITCH_EMOTE_TEMPLATE "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 

src/providers/twitch/TwitchEmotes.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "providers/twitch/emotevalue.hpp"
-#include "providers/twitch/twitchaccount.hpp"
-#include "providers/twitch/twitchemotes.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/emotemap.hpp"
+#include "providers/twitch/EmoteValue.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchEmotes.hpp"
+#include "util/ConcurrentMap.hpp"
+#include "util/Emotemap.hpp"
 
 #include <map>
 

src/providers/twitch/TwitchHelpers.cpp

@@ -1,5 +1,5 @@
-#include "providers/twitch/twitchhelpers.hpp"
-#include "debug/log.hpp"
+#include "providers/twitch/TwitchHelpers.hpp"
+#include "debug/Log.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -1,18 +1,18 @@
-#include "providers/twitch/twitchmessagebuilder.hpp"
+#include "providers/twitch/TwitchMessageBuilder.hpp"
 
-#include "application.hpp"
-#include "controllers/accounts/accountcontroller.hpp"
-#include "controllers/highlights/highlightcontroller.hpp"
-#include "controllers/ignores/ignorecontroller.hpp"
-#include "debug/log.hpp"
-#include "providers/twitch/twitchchannel.hpp"
-#include "singletons/emotemanager.hpp"
-#include "singletons/ircmanager.hpp"
-#include "singletons/resourcemanager.hpp"
-#include "singletons/settingsmanager.hpp"
-#include "singletons/thememanager.hpp"
-#include "singletons/windowmanager.hpp"
-#include "util/irchelpers.hpp"
+#include "Application.hpp"
+#include "controllers/accounts/AccountController.hpp"
+#include "controllers/highlights/HighlightController.hpp"
+#include "controllers/ignores/IgnoreController.hpp"
+#include "debug/Log.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
+#include "singletons/EmoteManager.hpp"
+#include "singletons/IrcManager.hpp"
+#include "singletons/ResourceManager.hpp"
+#include "singletons/SettingsManager.hpp"
+#include "singletons/ThemeManager.hpp"
+#include "singletons/WindowManager.hpp"
+#include "util/IrcHelpers.hpp"
 
 #include <QApplication>
 #include <QDebug>

src/providers/twitch/TwitchMessageBuilder.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "messages/messagebuilder.hpp"
-#include "messages/messageparseargs.hpp"
-#include "singletons/emotemanager.hpp"
+#include "messages/MessageBuilder.hpp"
+#include "messages/MessageParseArgs.hpp"
+#include "singletons/EmoteManager.hpp"
 
 #include <IrcMessage>
 

src/providers/twitch/TwitchServer.cpp

@@ -1,13 +1,13 @@
-#include "twitchserver.hpp"
+#include "TwitchServer.hpp"
 
-#include "application.hpp"
-#include "controllers/accounts/accountcontroller.hpp"
-#include "controllers/highlights/highlightcontroller.hpp"
-#include "providers/twitch/ircmessagehandler.hpp"
-#include "providers/twitch/twitchaccount.hpp"
-#include "providers/twitch/twitchhelpers.hpp"
-#include "providers/twitch/twitchmessagebuilder.hpp"
-#include "util/posttothread.hpp"
+#include "Application.hpp"
+#include "controllers/accounts/AccountController.hpp"
+#include "controllers/highlights/HighlightController.hpp"
+#include "providers/twitch/IrcMessageHandler.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchHelpers.hpp"
+#include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "util/PostToThread.hpp"
 
 #include <IrcCommand>
 

src/providers/twitch/TwitchServer.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "providers/irc/abstractircserver.hpp"
-#include "providers/twitch/twitchaccount.hpp"
-#include "providers/twitch/twitchchannel.hpp"
-#include "util/mutexvalue.hpp"
+#include "providers/irc/AbstractIrcServer.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
+#include "util/MutexValue.hpp"
 
 #include <chrono>
 #include <memory>

src/providers/twitch/TwitchUser.cpp

@@ -1,6 +1,6 @@
-#include "providers/twitch/twitchuser.hpp"
+#include "providers/twitch/TwitchUser.hpp"
 
-#include "util/rapidjson-helpers.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 namespace providers {