This commit is contained in:
fourtf
2018-06-26 14:09:39 +02:00
parent 14f07274d9
commit a9bf9cf722
235 changed files with 1169 additions and 1770 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
#include "singletons/emotemanager.hpp"
#include "singletons/EmoteManager.hpp"
#include "application.hpp"
#include "controllers/accounts/accountcontroller.hpp"
#include "Application.hpp"
#include "controllers/accounts/AccountController.hpp"
namespace chatterino {
namespace singletons {
+5 -5
View File
@@ -2,11 +2,11 @@
#define GIF_FRAME_LENGTH 33
#include "providers/bttv/bttvemotes.hpp"
#include "providers/emoji/emojis.hpp"
#include "providers/ffz/ffzemotes.hpp"
#include "providers/twitch/twitchemotes.hpp"
#include "singletons/helper/giftimer.hpp"
#include "providers/bttv/BttvEmotes.hpp"
#include "providers/emoji/Emojis.hpp"
#include "providers/ffz/FfzEmotes.hpp"
#include "providers/twitch/TwitchEmotes.hpp"
#include "singletons/helper/GifTimer.hpp"
namespace chatterino {
namespace singletons {
+4 -4
View File
@@ -1,11 +1,11 @@
#include "singletons/fontmanager.hpp"
#include "singletons/FontManager.hpp"
#include <QDebug>
#include <QtGlobal>
#include "application.hpp"
#include "util/assertinguithread.hpp"
#include "windowmanager.hpp"
#include "Application.hpp"
#include "util/AssertInGuiThread.hpp"
#include "WindowManager.hpp"
#ifdef Q_OS_WIN32
#define DEFAULT_FONT_FAMILY "Segoe UI"
+12 -12
View File
@@ -1,17 +1,17 @@
//#include "singletons/ircmanager.hpp"
//#include "channel.hpp"
//#include "debug/log.hpp"
//#include "messages/messageparseargs.hpp"
//#include "providers/twitch/twitchaccount.hpp"
//#include "providers/twitch/twitchmessagebuilder.hpp"
//#include "singletons/IrcManager.hpp"
//#include "Channel.hpp"
//#include "debug/Log.hpp"
//#include "messages/MessageParseArgs.hpp"
//#include "providers/twitch/TwitchAccount.hpp"
//#include "providers/twitch/TwitchMessageBuilder.hpp"
//#include "singletons/accountmanager.hpp"
//#include "singletons/channelmanager.hpp"
//#include "singletons/emotemanager.hpp"
//#include "singletons/resourcemanager.hpp"
//#include "singletons/settingsmanager.hpp"
//#include "singletons/windowmanager.hpp"
//#include "util/posttothread.hpp"
//#include "util/urlfetch.hpp"
//#include "singletons/EmoteManager.hpp"
//#include "singletons/ResourceManager.hpp"
//#include "singletons/SettingsManager.hpp"
//#include "singletons/WindowManager.hpp"
//#include "util/PostToThread.hpp"
//#include "util/UrlFetch.hpp"
//#include <irccommand.h>
//#include <QJsonArray>
+5 -5
View File
@@ -1,9 +1,9 @@
#include "singletons/loggingmanager.hpp"
#include "singletons/LoggingManager.hpp"
#include "application.hpp"
#include "debug/log.hpp"
#include "singletons/pathmanager.hpp"
#include "singletons/settingsmanager.hpp"
#include "Application.hpp"
#include "debug/Log.hpp"
#include "singletons/PathManager.hpp"
#include "singletons/SettingsManager.hpp"
#include <QDir>
#include <QStandardPaths>
+2 -2
View File
@@ -1,7 +1,7 @@
#pragma once
#include "messages/message.hpp"
#include "singletons/helper/loggingchannel.hpp"
#include "messages/Message.hpp"
#include "singletons/helper/LoggingChannel.hpp"
#include <memory>
+7 -7
View File
@@ -1,9 +1,9 @@
#include "nativemessagingmanager.hpp"
#include "NativeMessagingManager.hpp"
#include "application.hpp"
#include "providers/twitch/twitchserver.hpp"
#include "singletons/pathmanager.hpp"
#include "util/posttothread.hpp"
#include "Application.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/PathManager.hpp"
#include "util/PostToThread.hpp"
#include <QCoreApplication>
#include <QFile>
@@ -20,8 +20,8 @@ namespace ipc = boost::interprocess;
#include <QProcess>
#include <Windows.h>
#include "singletons/windowmanager.hpp"
#include "widgets/attachedwindow.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/AttachedWindow.hpp"
#endif
#include <iostream>
+2 -2
View File
@@ -1,4 +1,4 @@
#include "singletons/pathmanager.hpp"
#include "singletons/PathManager.hpp"
#include <QCoreApplication>
#include <QCryptographicHash>
@@ -6,7 +6,7 @@
#include <QStandardPaths>
#include <cassert>
#include "util/combine_path.hpp"
#include "util/CombinePath.hpp"
namespace chatterino {
namespace singletons {
+2 -2
View File
@@ -1,5 +1,5 @@
#include "resourcemanager.hpp"
#include "util/urlfetch.hpp"
#include "ResourceManager.hpp"
#include "util/UrlFetch.hpp"
#include <QIcon>
#include <QPixmap>
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "util/emotemap.hpp"
#include "util/Emotemap.hpp"
#include <QIcon>
#include <QRegularExpression>
+6 -6
View File
@@ -1,10 +1,10 @@
#include "singletons/settingsmanager.hpp"
#include "singletons/SettingsManager.hpp"
#include "application.hpp"
#include "debug/log.hpp"
#include "singletons/pathmanager.hpp"
#include "singletons/resourcemanager.hpp"
#include "singletons/windowmanager.hpp"
#include "Application.hpp"
#include "debug/Log.hpp"
#include "singletons/PathManager.hpp"
#include "singletons/ResourceManager.hpp"
#include "singletons/WindowManager.hpp"
using namespace chatterino::messages;
+4 -4
View File
@@ -1,9 +1,9 @@
#pragma once
#include "controllers/highlights/highlightphrase.hpp"
#include "messages/messageelement.hpp"
#include "singletons/helper/chatterinosetting.hpp"
#include "singletons/helper/moderationaction.hpp"
#include "controllers/highlights/HighlightPhrase.hpp"
#include "messages/MessageElement.hpp"
#include "singletons/helper/ChatterinoSetting.hpp"
#include "singletons/helper/ModerationAction.hpp"
#include <pajlada/settings/setting.hpp>
#include <pajlada/settings/settinglistener.hpp>
+1 -1
View File
@@ -1,6 +1,6 @@
#define LOOKUP_COLOR_COUNT 360
#include "thememanager.hpp"
#include "ThemeManager.hpp"
#include <QColor>
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "util/serialize-custom.hpp"
#include "util/SerializeCustom.hpp"
#include <QBrush>
#include <QColor>
+5 -5
View File
@@ -1,9 +1,9 @@
#include "updatemanager.hpp"
#include "UpdateManager.hpp"
#include "util/combine_path.hpp"
#include "util/networkrequest.hpp"
#include "util/posttothread.hpp"
#include "version.hpp"
#include "util/CombinePath.hpp"
#include "util/NetworkRequest.hpp"
#include "util/PostToThread.hpp"
#include "Version.hpp"
#include <QMessageBox>
#include <QProcess>
+11 -11
View File
@@ -1,15 +1,15 @@
#include "windowmanager.hpp"
#include "WindowManager.hpp"
#include "application.hpp"
#include "debug/log.hpp"
#include "providers/twitch/twitchserver.hpp"
#include "singletons/fontmanager.hpp"
#include "singletons/pathmanager.hpp"
#include "singletons/thememanager.hpp"
#include "util/assertinguithread.hpp"
#include "util/clamp.hpp"
#include "widgets/accountswitchpopupwidget.hpp"
#include "widgets/settingsdialog.hpp"
#include "Application.hpp"
#include "debug/Log.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/FontManager.hpp"
#include "singletons/PathManager.hpp"
#include "singletons/ThemeManager.hpp"
#include "util/AssertInGuiThread.hpp"
#include "util/Clamp.hpp"
#include "widgets/AccountSwitchPopupWidget.hpp"
#include "widgets/SettingsDialog.hpp"
#include <QJsonArray>
#include <QJsonDocument>
+2 -2
View File
@@ -1,7 +1,7 @@
#pragma once
#include "widgets/splitcontainer.hpp"
#include "widgets/window.hpp"
#include "widgets/SplitContainer.hpp"
#include "widgets/Window.hpp"
namespace chatterino {
// namespace widgets {
+2 -2
View File
@@ -1,6 +1,6 @@
#include "singletons/helper/chatterinosetting.hpp"
#include "singletons/helper/ChatterinoSetting.hpp"
#include "singletons/settingsmanager.hpp"
#include "singletons/SettingsManager.hpp"
namespace chatterino {
namespace singletons {
+4 -4
View File
@@ -1,8 +1,8 @@
#include "singletons/helper/giftimer.hpp"
#include "singletons/helper/GifTimer.hpp"
#include "application.hpp"
#include "singletons/settingsmanager.hpp"
#include "singletons/windowmanager.hpp"
#include "Application.hpp"
#include "singletons/SettingsManager.hpp"
#include "singletons/WindowManager.hpp"
namespace chatterino {
namespace singletons {
+5 -5
View File
@@ -1,9 +1,9 @@
#include "loggingchannel.hpp"
#include "LoggingChannel.hpp"
#include "application.hpp"
#include "debug/log.hpp"
#include "singletons/pathmanager.hpp"
#include "singletons/settingsmanager.hpp"
#include "Application.hpp"
#include "debug/Log.hpp"
#include "singletons/PathManager.hpp"
#include "singletons/SettingsManager.hpp"
#include <QDir>
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "messages/message.hpp"
#include "messages/Message.hpp"
#include <QDateTime>
#include <QFile>
+2 -2
View File
@@ -1,6 +1,6 @@
#include "moderationaction.hpp"
#include "ModerationAction.hpp"
#include "singletons/resourcemanager.hpp"
#include "singletons/ResourceManager.hpp"
namespace chatterino {
namespace singletons {