From a9bf9cf722fe4af6f00083c6201661bf7b785e3c Mon Sep 17 00:00:00 2001 From: fourtf Date: Tue, 26 Jun 2018 14:09:39 +0200 Subject: [PATCH] rename #3 --- chatterino.pro | 598 +++++++++--------- files | 301 --------- files2 | 301 --------- src/Application.cpp | 36 +- src/Application.hpp | 4 +- src/Channel.cpp | 16 +- src/Channel.hpp | 10 +- src/ChannelData.cpp | 2 +- src/ChannelData.hpp | 4 +- src/Common.h.cpp | 2 +- src/Common.hpp | 2 +- src/controllers/accounts/Account.cpp | 2 +- src/controllers/accounts/Account.hpp | 2 +- .../accounts/AccountController.cpp | 4 +- .../accounts/AccountController.hpp | 8 +- src/controllers/accounts/AccountModel.cpp | 4 +- src/controllers/accounts/AccountModel.hpp | 6 +- src/controllers/commands/Command.cpp | 2 +- .../commands/CommandController.cpp | 22 +- .../commands/CommandController.hpp | 4 +- src/controllers/commands/CommandModel.cpp | 2 +- src/controllers/commands/CommandModel.hpp | 4 +- .../highlights/HighlightController.cpp | 8 +- .../highlights/HighlightController.hpp | 8 +- src/controllers/highlights/HighlightModel.cpp | 8 +- src/controllers/highlights/HighlightModel.hpp | 4 +- .../highlights/HighlightPhrase.hpp | 4 +- src/controllers/ignores/IgnoreController.cpp | 6 +- src/controllers/ignores/IgnoreController.hpp | 6 +- src/controllers/ignores/IgnoreModel.cpp | 8 +- src/controllers/ignores/IgnoreModel.hpp | 4 +- src/controllers/ignores/IgnorePhrase.hpp | 4 +- src/controllers/taggedusers/TaggedUser.cpp | 2 +- .../taggedusers/TaggedUsersController.cpp | 4 +- .../taggedusers/TaggedUsersController.hpp | 4 +- .../taggedusers/TaggedUsersModel.cpp | 6 +- .../taggedusers/TaggedUsersModel.hpp | 4 +- src/debug/Log.hpp | 2 +- src/main.cpp | 16 +- src/messages/HighlightPhrase.hpp | 2 +- src/messages/Image.cpp | 18 +- src/messages/LimitedQueue.hpp | 2 +- src/messages/Link.cpp | 2 +- src/messages/Message.cpp | 8 +- src/messages/Message.hpp | 10 +- src/messages/MessageBuilder.cpp | 8 +- src/messages/MessageBuilder.hpp | 2 +- src/messages/MessageColor.cpp | 2 +- src/messages/MessageColor.hpp | 2 +- src/messages/MessageElement.cpp | 14 +- src/messages/MessageElement.hpp | 10 +- src/messages/layouts/MessageLayout.cpp | 12 +- src/messages/layouts/MessageLayout.hpp | 10 +- .../layouts/MessageLayoutContainer.cpp | 10 +- .../layouts/MessageLayoutContainer.hpp | 4 +- src/messages/layouts/MessageLayoutElement.cpp | 8 +- src/messages/layouts/MessageLayoutElement.hpp | 6 +- src/providers/bttv/BttvEmotes.cpp | 8 +- src/providers/bttv/BttvEmotes.hpp | 6 +- src/providers/emoji/Emojis.cpp | 8 +- src/providers/emoji/Emojis.hpp | 6 +- src/providers/ffz/FfzEmotes.cpp | 8 +- src/providers/ffz/FfzEmotes.hpp | 6 +- src/providers/irc/AbstractIrcServer.cpp | 8 +- src/providers/irc/AbstractIrcServer.hpp | 4 +- src/providers/irc/IrcAccount.cpp | 2 +- src/providers/irc/IrcChannel2.cpp | 2 +- src/providers/irc/IrcConnection2.cpp | 2 +- src/providers/irc/IrcServer.cpp | 2 +- src/providers/irc/IrcServer.hpp | 4 +- src/providers/twitch/IrcMessageHandler.cpp | 26 +- src/providers/twitch/Pubsub.cpp | 10 +- src/providers/twitch/Pubsub.hpp | 6 +- src/providers/twitch/PubsubActions.cpp | 4 +- src/providers/twitch/PubsubHelpers.cpp | 6 +- src/providers/twitch/PubsubHelpers.hpp | 6 +- src/providers/twitch/TwitchAccount.cpp | 12 +- src/providers/twitch/TwitchAccount.hpp | 4 +- src/providers/twitch/TwitchAccountManager.cpp | 8 +- src/providers/twitch/TwitchAccountManager.hpp | 6 +- src/providers/twitch/TwitchChannel.cpp | 22 +- src/providers/twitch/TwitchChannel.hpp | 12 +- src/providers/twitch/TwitchEmotes.cpp | 12 +- src/providers/twitch/TwitchEmotes.hpp | 10 +- src/providers/twitch/TwitchHelpers.cpp | 4 +- src/providers/twitch/TwitchMessageBuilder.cpp | 28 +- src/providers/twitch/TwitchMessageBuilder.hpp | 6 +- src/providers/twitch/TwitchServer.cpp | 18 +- src/providers/twitch/TwitchServer.hpp | 8 +- src/providers/twitch/TwitchUser.cpp | 4 +- src/singletons/EmoteManager.cpp | 6 +- src/singletons/EmoteManager.hpp | 10 +- src/singletons/FontManager.cpp | 8 +- src/singletons/IrcManager.cpp | 24 +- src/singletons/LoggingManager.cpp | 10 +- src/singletons/LoggingManager.hpp | 4 +- src/singletons/NativeMessagingManager.cpp | 14 +- src/singletons/PathManager.cpp | 4 +- src/singletons/ResourceManager.cpp | 4 +- src/singletons/ResourceManager.hpp | 2 +- src/singletons/SettingsManager.cpp | 12 +- src/singletons/SettingsManager.hpp | 8 +- src/singletons/ThemeManager.cpp | 2 +- src/singletons/ThemeManager.hpp | 2 +- src/singletons/UpdateManager.cpp | 10 +- src/singletons/WindowManager.cpp | 22 +- src/singletons/WindowManager.hpp | 4 +- src/singletons/helper/ChatterinoSetting.cpp | 4 +- src/singletons/helper/GifTimer.cpp | 8 +- src/singletons/helper/LoggingChannel.cpp | 10 +- src/singletons/helper/LoggingChannel.hpp | 2 +- src/singletons/helper/ModerationAction.cpp | 4 +- src/util/CompletionModel.cpp | 12 +- src/util/CompletionModel.hpp | 2 +- src/util/DebugCount.cpp | 2 +- src/util/Emotemap.cpp | 6 +- src/util/Emotemap.hpp | 4 +- src/util/NetworkManager.cpp | 2 +- src/util/NetworkManager.hpp | 6 +- src/util/NetworkRequest.cpp | 4 +- src/util/NetworkRequest.hpp | 10 +- src/util/RapidjsonHelpers.cpp | 2 +- src/util/RapidjsonHelpers.hpp | 2 +- src/util/SignalVector2.hpp | 2 +- src/util/SignalVectorModel.hpp | 3 +- src/util/StreamLink.cpp | 10 +- src/util/UrlFetch.hpp | 10 +- src/util/WindowsHelper.cpp | 2 +- src/widgets/AccountSwitchPopupWidget.cpp | 6 +- src/widgets/AccountSwitchPopupWidget.hpp | 2 +- src/widgets/AccountSwitchWidget.cpp | 8 +- src/widgets/AttachedWindow.cpp | 10 +- src/widgets/AttachedWindow.hpp | 4 +- src/widgets/BaseWidget.cpp | 12 +- src/widgets/BaseWindow.cpp | 26 +- src/widgets/BaseWindow.hpp | 4 +- src/widgets/EmotePopup.cpp | 12 +- src/widgets/EmotePopup.hpp | 6 +- src/widgets/Label.cpp | 4 +- src/widgets/Label.hpp | 4 +- src/widgets/LastRunCrashDialog.cpp | 8 +- src/widgets/LoginDialog.cpp | 6 +- src/widgets/LoginDialog.hpp | 2 +- src/widgets/Notebook.cpp | 22 +- src/widgets/Notebook.hpp | 8 +- src/widgets/NotificationPopup.cpp | 4 +- src/widgets/NotificationPopup.hpp | 6 +- src/widgets/QualityPopup.cpp | 6 +- src/widgets/QualityPopup.hpp | 2 +- src/widgets/Scrollbar.cpp | 8 +- src/widgets/Scrollbar.hpp | 8 +- src/widgets/SelectChannelDialog.cpp | 10 +- src/widgets/SelectChannelDialog.hpp | 6 +- src/widgets/SettingsDialog.cpp | 36 +- src/widgets/SettingsDialog.hpp | 2 +- src/widgets/Split.cpp | 44 +- src/widgets/Split.hpp | 24 +- src/widgets/SplitContainer.cpp | 22 +- src/widgets/SplitContainer.hpp | 8 +- src/widgets/StreamView.cpp | 10 +- src/widgets/TextInputDialog.cpp | 2 +- src/widgets/TooltipWidget.cpp | 8 +- src/widgets/TooltipWidget.hpp | 2 +- src/widgets/UserInfoPopup.cpp | 20 +- src/widgets/UserInfoPopup.hpp | 4 +- src/widgets/WelcomeDialog.cpp | 2 +- src/widgets/WelcomeDialog.hpp | 2 +- src/widgets/Window.cpp | 30 +- src/widgets/Window.hpp | 6 +- src/widgets/helper/ChannelView.cpp | 30 +- src/widgets/helper/ChannelView.hpp | 18 +- src/widgets/helper/ComboBoxItemDelegate.cpp | 2 +- src/widgets/helper/DebugPopup.cpp | 4 +- src/widgets/helper/DropOverlay.cpp | 2 +- src/widgets/helper/DropOverlay.hpp | 2 +- src/widgets/helper/DropPreview.cpp | 6 +- src/widgets/helper/DropPreview.hpp | 2 +- src/widgets/helper/EditableModelView.cpp | 2 +- src/widgets/helper/Line.hpp | 2 +- src/widgets/helper/NotebookButton.cpp | 10 +- src/widgets/helper/NotebookButton.hpp | 2 +- src/widgets/helper/NotebookTab.cpp | 22 +- src/widgets/helper/NotebookTab.hpp | 6 +- src/widgets/helper/ResizingTextEdit.cpp | 6 +- src/widgets/helper/RippleEffectButton.cpp | 4 +- src/widgets/helper/RippleEffectButton.hpp | 2 +- src/widgets/helper/RippleEffectLabel.cpp | 6 +- src/widgets/helper/RippleEffectLabel.hpp | 8 +- src/widgets/helper/ScrollbarHighlight.cpp | 6 +- src/widgets/helper/SearchPopup.cpp | 6 +- src/widgets/helper/SearchPopup.hpp | 6 +- src/widgets/helper/SettingsDialogTab.cpp | 6 +- src/widgets/helper/SettingsDialogTab.hpp | 2 +- src/widgets/helper/SignalLabel.cpp | 2 +- src/widgets/helper/SplitColumn.cpp | 2 +- src/widgets/helper/SplitColumn.hpp | 2 +- src/widgets/helper/SplitHeader.cpp | 26 +- src/widgets/helper/SplitHeader.hpp | 6 +- src/widgets/helper/SplitInput.cpp | 26 +- src/widgets/helper/SplitInput.hpp | 8 +- src/widgets/helper/SplitNode.cpp | 2 +- src/widgets/helper/SplitOverlay.cpp | 10 +- src/widgets/helper/SplitOverlay.hpp | 2 +- src/widgets/helper/TitlebarButton.cpp | 4 +- src/widgets/helper/TitlebarButton.hpp | 2 +- src/widgets/settingspages/AboutPage.cpp | 8 +- src/widgets/settingspages/AboutPage.hpp | 2 +- src/widgets/settingspages/AccountsPage.cpp | 16 +- src/widgets/settingspages/AccountsPage.hpp | 4 +- src/widgets/settingspages/AppearancePage.cpp | 10 +- src/widgets/settingspages/AppearancePage.hpp | 2 +- src/widgets/settingspages/BehaviourPage.cpp | 6 +- src/widgets/settingspages/BehaviourPage.hpp | 2 +- .../settingspages/BrowserextensionPage.cpp | 4 +- .../settingspages/BrowserextensionPage.hpp | 2 +- src/widgets/settingspages/CommandPage.cpp | 16 +- src/widgets/settingspages/CommandPage.hpp | 2 +- src/widgets/settingspages/EmotesPage.cpp | 4 +- src/widgets/settingspages/EmotesPage.hpp | 2 +- .../settingspages/ExternaltoolsPage.cpp | 6 +- .../settingspages/ExternaltoolsPage.hpp | 2 +- .../settingspages/HighlightingPage.cpp | 18 +- .../settingspages/HighlightingPage.hpp | 2 +- src/widgets/settingspages/IgnoreusersPage.cpp | 16 +- src/widgets/settingspages/IgnoreusersPage.hpp | 2 +- .../settingspages/KeyboardsettingsPage.cpp | 4 +- .../settingspages/KeyboardsettingsPage.hpp | 2 +- src/widgets/settingspages/LogsPage.cpp | 8 +- src/widgets/settingspages/LogsPage.hpp | 2 +- src/widgets/settingspages/ModerationPage.cpp | 16 +- src/widgets/settingspages/ModerationPage.hpp | 2 +- src/widgets/settingspages/SettingsPage.cpp | 2 +- src/widgets/settingspages/SettingsPage.hpp | 2 +- .../settingspages/SpecialChannelsPage.cpp | 8 +- .../settingspages/SpecialChannelsPage.hpp | 2 +- 235 files changed, 1169 insertions(+), 1770 deletions(-) delete mode 100644 files delete mode 100644 files2 diff --git a/chatterino.pro b/chatterino.pro index 074cf1041..0f3328113 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -93,308 +93,308 @@ werr { # src SOURCES += \ - src/Application.cpp - src/Channel.cpp - src/ChannelData.cpp - src/Common.h.cpp - src/controllers/accounts/Account.cpp - src/controllers/accounts/AccountController.cpp - src/controllers/accounts/AccountModel.cpp - src/controllers/commands/Command.cpp - src/controllers/commands/CommandController.cpp - src/controllers/commands/CommandModel.cpp - src/controllers/highlights/HighlightController.cpp - src/controllers/highlights/HighlightModel.cpp - src/controllers/ignores/IgnoreController.cpp - src/controllers/ignores/IgnoreModel.cpp - src/controllers/taggedusers/TaggedUser.cpp - src/controllers/taggedusers/TaggedUsersController.cpp - src/controllers/taggedusers/TaggedUsersModel.cpp - src/main.cpp - src/messages/Image.cpp - src/messages/layouts/MessageLayout.cpp - src/messages/layouts/MessageLayoutContainer.cpp - src/messages/layouts/MessageLayoutElement.cpp - src/messages/Link.cpp - src/messages/Message.cpp - src/messages/MessageBuilder.cpp - src/messages/MessageColor.cpp - src/messages/MessageElement.cpp - src/providers/bttv/BttvEmotes.cpp - src/providers/emoji/Emojis.cpp - src/providers/ffz/FfzEmotes.cpp - src/providers/irc/AbstractIrcServer.cpp - src/providers/irc/IrcAccount.cpp - src/providers/irc/IrcChannel2.cpp - src/providers/irc/IrcConnection2.cpp - src/providers/irc/IrcServer.cpp - src/providers/twitch/IrcMessageHandler.cpp - src/providers/twitch/Pubsub.cpp - src/providers/twitch/PubsubActions.cpp - src/providers/twitch/PubsubHelpers.cpp - src/providers/twitch/TwitchAccount.cpp - src/providers/twitch/TwitchAccountManager.cpp - src/providers/twitch/TwitchChannel.cpp - src/providers/twitch/TwitchEmotes.cpp - src/providers/twitch/TwitchHelpers.cpp - src/providers/twitch/TwitchMessageBuilder.cpp - src/providers/twitch/TwitchServer.cpp - src/providers/twitch/TwitchUser.cpp - src/singletons/EmoteManager.cpp - src/singletons/FontManager.cpp - src/singletons/helper/ChatterinoSetting.cpp - src/singletons/helper/GifTimer.cpp - src/singletons/helper/LoggingChannel.cpp - src/singletons/helper/ModerationAction.cpp - src/singletons/IrcManager.cpp - src/singletons/LoggingManager.cpp - src/singletons/NativeMessagingManager.cpp - src/singletons/PathManager.cpp - src/singletons/ResourceManager.cpp - src/singletons/SettingsManager.cpp - src/singletons/ThemeManager.cpp - src/singletons/UpdateManager.cpp - src/singletons/WindowManager.cpp - src/util/CompletionModel.cpp - src/util/DebugCount.cpp - src/util/Emotemap.cpp - src/util/NetworkManager.cpp - src/util/NetworkRequest.cpp - src/util/RapidjsonHelpers.cpp - src/util/StreamLink.cpp - src/util/WindowsHelper.cpp - src/widgets/AccountSwitchPopupWidget.cpp - src/widgets/AccountSwitchWidget.cpp - src/widgets/AttachedWindow.cpp - src/widgets/BaseWidget.cpp - src/widgets/BaseWindow.cpp - src/widgets/EmotePopup.cpp - src/widgets/helper/ChannelView.cpp - src/widgets/helper/ComboBoxItemDelegate.cpp - src/widgets/helper/DebugPopup.cpp - src/widgets/helper/DropOverlay.cpp - src/widgets/helper/DropPreview.cpp - src/widgets/helper/EditableModelView.cpp - src/widgets/helper/NotebookButton.cpp - src/widgets/helper/NotebookTab.cpp - src/widgets/helper/ResizingTextEdit.cpp - src/widgets/helper/RippleEffectButton.cpp - src/widgets/helper/RippleEffectLabel.cpp - src/widgets/helper/ScrollbarHighlight.cpp - src/widgets/helper/SearchPopup.cpp - src/widgets/helper/SettingsDialogTab.cpp - src/widgets/helper/SignalLabel.cpp - src/widgets/helper/SplitColumn.cpp - src/widgets/helper/SplitHeader.cpp - src/widgets/helper/SplitInput.cpp - src/widgets/helper/SplitNode.cpp - src/widgets/helper/SplitOverlay.cpp - src/widgets/helper/TitlebarButton.cpp - src/widgets/Label.cpp - src/widgets/LastRunCrashDialog.cpp - src/widgets/LoginDialog.cpp - src/widgets/Notebook.cpp - src/widgets/NotificationPopup.cpp - src/widgets/QualityPopup.cpp - src/widgets/Scrollbar.cpp - src/widgets/SelectChannelDialog.cpp - src/widgets/SettingsDialog.cpp - src/widgets/settingspages/AboutPage.cpp - src/widgets/settingspages/AccountsPage.cpp - src/widgets/settingspages/AppearancePage.cpp - src/widgets/settingspages/BehaviourPage.cpp - src/widgets/settingspages/BrowserextensionPage.cpp - src/widgets/settingspages/CommandPage.cpp - src/widgets/settingspages/EmotesPage.cpp - src/widgets/settingspages/ExternaltoolsPage.cpp - src/widgets/settingspages/HighlightingPage.cpp - src/widgets/settingspages/IgnoreusersPage.cpp - src/widgets/settingspages/KeyboardsettingsPage.cpp - src/widgets/settingspages/LogsPage.cpp - src/widgets/settingspages/ModerationPage.cpp - src/widgets/settingspages/SettingsPage.cpp - src/widgets/settingspages/SpecialChannelsPage.cpp - src/widgets/Split.cpp - src/widgets/SplitContainer.cpp - src/widgets/StreamView.cpp - src/widgets/TextInputDialog.cpp - src/widgets/TooltipWidget.cpp - src/widgets/UserInfoPopup.cpp - src/widgets/WelcomeDialog.cpp + src/Application.cpp \ + src/Channel.cpp \ + src/ChannelData.cpp \ + src/Common.h.cpp \ + src/controllers/accounts/Account.cpp \ + src/controllers/accounts/AccountController.cpp \ + src/controllers/accounts/AccountModel.cpp \ + src/controllers/commands/Command.cpp \ + src/controllers/commands/CommandController.cpp \ + src/controllers/commands/CommandModel.cpp \ + src/controllers/highlights/HighlightController.cpp \ + src/controllers/highlights/HighlightModel.cpp \ + src/controllers/ignores/IgnoreController.cpp \ + src/controllers/ignores/IgnoreModel.cpp \ + src/controllers/taggedusers/TaggedUser.cpp \ + src/controllers/taggedusers/TaggedUsersController.cpp \ + src/controllers/taggedusers/TaggedUsersModel.cpp \ + src/main.cpp \ + src/messages/Image.cpp \ + src/messages/layouts/MessageLayout.cpp \ + src/messages/layouts/MessageLayoutContainer.cpp \ + src/messages/layouts/MessageLayoutElement.cpp \ + src/messages/Link.cpp \ + src/messages/Message.cpp \ + src/messages/MessageBuilder.cpp \ + src/messages/MessageColor.cpp \ + src/messages/MessageElement.cpp \ + src/providers/bttv/BttvEmotes.cpp \ + src/providers/emoji/Emojis.cpp \ + src/providers/ffz/FfzEmotes.cpp \ + src/providers/irc/AbstractIrcServer.cpp \ + src/providers/irc/IrcAccount.cpp \ + src/providers/irc/IrcChannel2.cpp \ + src/providers/irc/IrcConnection2.cpp \ + src/providers/irc/IrcServer.cpp \ + src/providers/twitch/IrcMessageHandler.cpp \ + src/providers/twitch/Pubsub.cpp \ + src/providers/twitch/PubsubActions.cpp \ + src/providers/twitch/PubsubHelpers.cpp \ + src/providers/twitch/TwitchAccount.cpp \ + src/providers/twitch/TwitchAccountManager.cpp \ + src/providers/twitch/TwitchChannel.cpp \ + src/providers/twitch/TwitchEmotes.cpp \ + src/providers/twitch/TwitchHelpers.cpp \ + src/providers/twitch/TwitchMessageBuilder.cpp \ + src/providers/twitch/TwitchServer.cpp \ + src/providers/twitch/TwitchUser.cpp \ + src/singletons/EmoteManager.cpp \ + src/singletons/FontManager.cpp \ + src/singletons/helper/ChatterinoSetting.cpp \ + src/singletons/helper/GifTimer.cpp \ + src/singletons/helper/LoggingChannel.cpp \ + src/singletons/helper/ModerationAction.cpp \ + src/singletons/IrcManager.cpp \ + src/singletons/LoggingManager.cpp \ + src/singletons/NativeMessagingManager.cpp \ + src/singletons/PathManager.cpp \ + src/singletons/ResourceManager.cpp \ + src/singletons/SettingsManager.cpp \ + src/singletons/ThemeManager.cpp \ + src/singletons/UpdateManager.cpp \ + src/singletons/WindowManager.cpp \ + src/util/CompletionModel.cpp \ + src/util/DebugCount.cpp \ + src/util/Emotemap.cpp \ + src/util/NetworkManager.cpp \ + src/util/NetworkRequest.cpp \ + src/util/RapidjsonHelpers.cpp \ + src/util/StreamLink.cpp \ + src/util/WindowsHelper.cpp \ + src/widgets/AccountSwitchPopupWidget.cpp \ + src/widgets/AccountSwitchWidget.cpp \ + src/widgets/AttachedWindow.cpp \ + src/widgets/BaseWidget.cpp \ + src/widgets/BaseWindow.cpp \ + src/widgets/EmotePopup.cpp \ + src/widgets/helper/ChannelView.cpp \ + src/widgets/helper/ComboBoxItemDelegate.cpp \ + src/widgets/helper/DebugPopup.cpp \ + src/widgets/helper/DropOverlay.cpp \ + src/widgets/helper/DropPreview.cpp \ + src/widgets/helper/EditableModelView.cpp \ + src/widgets/helper/NotebookButton.cpp \ + src/widgets/helper/NotebookTab.cpp \ + src/widgets/helper/ResizingTextEdit.cpp \ + src/widgets/helper/RippleEffectButton.cpp \ + src/widgets/helper/RippleEffectLabel.cpp \ + src/widgets/helper/ScrollbarHighlight.cpp \ + src/widgets/helper/SearchPopup.cpp \ + src/widgets/helper/SettingsDialogTab.cpp \ + src/widgets/helper/SignalLabel.cpp \ + src/widgets/helper/SplitColumn.cpp \ + src/widgets/helper/SplitHeader.cpp \ + src/widgets/helper/SplitInput.cpp \ + src/widgets/helper/SplitNode.cpp \ + src/widgets/helper/SplitOverlay.cpp \ + src/widgets/helper/TitlebarButton.cpp \ + src/widgets/Label.cpp \ + src/widgets/LastRunCrashDialog.cpp \ + src/widgets/LoginDialog.cpp \ + src/widgets/Notebook.cpp \ + src/widgets/NotificationPopup.cpp \ + src/widgets/QualityPopup.cpp \ + src/widgets/Scrollbar.cpp \ + src/widgets/SelectChannelDialog.cpp \ + src/widgets/SettingsDialog.cpp \ + src/widgets/settingspages/AboutPage.cpp \ + src/widgets/settingspages/AccountsPage.cpp \ + src/widgets/settingspages/AppearancePage.cpp \ + src/widgets/settingspages/BehaviourPage.cpp \ + src/widgets/settingspages/BrowserextensionPage.cpp \ + src/widgets/settingspages/CommandPage.cpp \ + src/widgets/settingspages/EmotesPage.cpp \ + src/widgets/settingspages/ExternaltoolsPage.cpp \ + src/widgets/settingspages/HighlightingPage.cpp \ + src/widgets/settingspages/IgnoreusersPage.cpp \ + src/widgets/settingspages/KeyboardsettingsPage.cpp \ + src/widgets/settingspages/LogsPage.cpp \ + src/widgets/settingspages/ModerationPage.cpp \ + src/widgets/settingspages/SettingsPage.cpp \ + src/widgets/settingspages/SpecialChannelsPage.cpp \ + src/widgets/Split.cpp \ + src/widgets/SplitContainer.cpp \ + src/widgets/StreamView.cpp \ + src/widgets/TextInputDialog.cpp \ + src/widgets/TooltipWidget.cpp \ + src/widgets/UserInfoPopup.cpp \ + src/widgets/WelcomeDialog.cpp \ src/widgets/Window.cpp HEADERS += \ - src/Application.hpp - src/Channel.hpp - src/ChannelData.hpp - src/Common.hpp - src/Const.hpp - src/controllers/accounts/Account.hpp - src/controllers/accounts/AccountController.hpp - src/controllers/accounts/AccountModel.hpp - src/controllers/commands/Command.hpp - src/controllers/commands/CommandController.hpp - src/controllers/commands/CommandModel.hpp - src/controllers/highlights/HighlightController.hpp - src/controllers/highlights/HighlightModel.hpp - src/controllers/highlights/HighlightPhrase.hpp - src/controllers/ignores/IgnoreController.hpp - src/controllers/ignores/IgnoreModel.hpp - src/controllers/ignores/IgnorePhrase.hpp - src/controllers/taggedusers/TaggedUser.hpp - src/controllers/taggedusers/TaggedUsersController.hpp - src/controllers/taggedusers/TaggedUsersModel.hpp - src/Credentials.hpp - src/debug/Log.hpp - src/LockedObject.hpp - src/messages/HighlightPhrase.hpp - src/messages/Image.hpp - src/messages/layouts/MessageLayout.hpp - src/messages/layouts/MessageLayoutContainer.hpp - src/messages/layouts/MessageLayoutElement.hpp - src/messages/LimitedQueue.hpp - src/messages/LimitedQueueSnapshot.hpp - src/messages/Link.hpp - src/messages/Message.hpp - src/messages/MessageBuilder.hpp - src/messages/MessageColor.hpp - src/messages/MessageElement.hpp - src/messages/MessageParseArgs.hpp - src/messages/Selection.hpp - src/NullablePtr.hpp - src/PrecompiledHeader.hpp - src/ProviderId.hpp - src/providers/bttv/BttvEmotes.hpp - src/providers/emoji/Emojis.hpp - src/providers/ffz/FfzEmotes.hpp - src/providers/irc/AbstractIrcServer.hpp - src/providers/irc/IrcAccount.hpp - src/providers/irc/IrcChannel2.hpp - src/providers/irc/IrcConnection2.hpp - src/providers/irc/IrcServer.hpp - src/providers/twitch/EmoteValue.hpp - src/providers/twitch/IrcMessageHandler.hpp - src/providers/twitch/Pubsub.hpp - src/providers/twitch/PubsubActions.hpp - src/providers/twitch/PubsubHelpers.hpp - src/providers/twitch/TwitchAccount.hpp - src/providers/twitch/TwitchAccountManager.hpp - src/providers/twitch/TwitchChannel.hpp - src/providers/twitch/TwitchEmotes.hpp - src/providers/twitch/TwitchHelpers.hpp - src/providers/twitch/TwitchMessageBuilder.hpp - src/providers/twitch/TwitchServer.hpp - src/providers/twitch/TwitchUser.hpp - src/SignalVector.hpp - src/singletons/EmoteManager.hpp - src/singletons/FontManager.hpp - src/singletons/helper/ChatterinoSetting.hpp - src/singletons/helper/GifTimer.hpp - src/singletons/helper/LoggingChannel.hpp - src/singletons/helper/ModerationAction.hpp - src/singletons/IrcManager.hpp - src/singletons/LoggingManager.hpp - src/singletons/NativeMessagingManager.hpp - src/singletons/PathManager.hpp - src/singletons/ResourceManager.hpp - src/singletons/SettingsManager.hpp - src/singletons/ThemeManager.hpp - src/singletons/UpdateManager.hpp - src/singletons/WindowManager.hpp - src/util/AssertInGuiThread.hpp - src/util/Benchmark.hpp - src/util/Clamp.hpp - src/util/CombinePath.hpp - src/util/CompletionModel.hpp - src/util/ConcurrentMap.hpp - src/util/DebugCount.hpp - src/util/DistanceBetweenPoints.hpp - src/util/Emotemap.hpp - src/util/FlagsEnum.hpp - src/util/Helpers.hpp - src/util/IrcHelpers.hpp - src/util/LayoutCreator.hpp - src/util/MutexValue.hpp - src/util/NativeEventHelper.hpp - src/util/NetworkManager.hpp - src/util/NetworkRequest.hpp - src/util/NetworkRequester.hpp - src/util/NetworkWorker.hpp - src/util/PostToThread.hpp - src/util/Property.hpp - src/util/QstringHash.hpp - src/util/RapidjsonHelpers.hpp - src/util/RemoveScrollAreaBackground.hpp - src/util/SerializeCustom.hpp - src/util/SharedPtrElementLess.hpp - src/util/SignalVector2.hpp - src/util/SignalVectorModel.hpp - src/util/StandardItemHelper.hpp - src/util/StreamLink.hpp - src/util/UrlFetch.hpp - src/util/WindowsHelper.hpp - src/Version.hpp - src/widgets/AccountSwitchPopupWidget.hpp - src/widgets/AccountSwitchWidget.hpp - src/widgets/AttachedWindow.hpp - src/widgets/BaseWidget.hpp - src/widgets/BaseWindow.hpp - src/widgets/EmotePopup.hpp - src/widgets/helper/ChannelView.hpp - src/widgets/helper/ComboBoxItemDelegate.hpp - src/widgets/helper/DebugPopup.hpp - src/widgets/helper/DropOverlay.hpp - src/widgets/helper/DropPreview.hpp - src/widgets/helper/EditableModelView.hpp - src/widgets/helper/Line.hpp - src/widgets/helper/NotebookButton.hpp - src/widgets/helper/NotebookTab.hpp - src/widgets/helper/ResizingTextEdit.hpp - src/widgets/helper/RippleEffectButton.hpp - src/widgets/helper/RippleEffectLabel.hpp - src/widgets/helper/ScrollbarHighlight.hpp - src/widgets/helper/SearchPopup.hpp - src/widgets/helper/SettingsDialogTab.hpp - src/widgets/helper/Shortcut.hpp - src/widgets/helper/SignalLabel.hpp - src/widgets/helper/SplitColumn.hpp - src/widgets/helper/SplitHeader.hpp - src/widgets/helper/SplitInput.hpp - src/widgets/helper/SplitNode.hpp - src/widgets/helper/SplitOverlay.hpp - src/widgets/helper/TitlebarButton.hpp - src/widgets/Label.hpp - src/widgets/LastRunCrashDialog.hpp - src/widgets/LoginDialog.hpp - src/widgets/Notebook.hpp - src/widgets/NotificationPopup.hpp - src/widgets/QualityPopup.hpp - src/widgets/Scrollbar.hpp - src/widgets/SelectChannelDialog.hpp - src/widgets/SettingsDialog.hpp - src/widgets/settingspages/AboutPage.hpp - src/widgets/settingspages/AccountsPage.hpp - src/widgets/settingspages/AppearancePage.hpp - src/widgets/settingspages/BehaviourPage.hpp - src/widgets/settingspages/BrowserextensionPage.hpp - src/widgets/settingspages/CommandPage.hpp - src/widgets/settingspages/EmotesPage.hpp - src/widgets/settingspages/ExternaltoolsPage.hpp - src/widgets/settingspages/HighlightingPage.hpp - src/widgets/settingspages/IgnoreusersPage.hpp - src/widgets/settingspages/KeyboardsettingsPage.hpp - src/widgets/settingspages/LogsPage.hpp - src/widgets/settingspages/ModerationPage.hpp - src/widgets/settingspages/SettingsPage.hpp - src/widgets/settingspages/SpecialChannelsPage.hpp - src/widgets/Split.hpp - src/widgets/SplitContainer.hpp - src/widgets/StreamView.hpp - src/widgets/TextInputDialog.hpp - src/widgets/Titlebar.hpp - src/widgets/TooltipWidget.hpp - src/widgets/UserInfoPopup.hpp - src/widgets/WelcomeDialog.hpp + src/Application.hpp \ + src/Channel.hpp \ + src/ChannelData.hpp \ + src/Common.hpp \ + src/Const.hpp \ + src/controllers/accounts/Account.hpp \ + src/controllers/accounts/AccountController.hpp \ + src/controllers/accounts/AccountModel.hpp \ + src/controllers/commands/Command.hpp \ + src/controllers/commands/CommandController.hpp \ + src/controllers/commands/CommandModel.hpp \ + src/controllers/highlights/HighlightController.hpp \ + src/controllers/highlights/HighlightModel.hpp \ + src/controllers/highlights/HighlightPhrase.hpp \ + src/controllers/ignores/IgnoreController.hpp \ + src/controllers/ignores/IgnoreModel.hpp \ + src/controllers/ignores/IgnorePhrase.hpp \ + src/controllers/taggedusers/TaggedUser.hpp \ + src/controllers/taggedusers/TaggedUsersController.hpp \ + src/controllers/taggedusers/TaggedUsersModel.hpp \ + src/Credentials.hpp \ + src/debug/Log.hpp \ + src/LockedObject.hpp \ + src/messages/HighlightPhrase.hpp \ + src/messages/Image.hpp \ + src/messages/layouts/MessageLayout.hpp \ + src/messages/layouts/MessageLayoutContainer.hpp \ + src/messages/layouts/MessageLayoutElement.hpp \ + src/messages/LimitedQueue.hpp \ + src/messages/LimitedQueueSnapshot.hpp \ + src/messages/Link.hpp \ + src/messages/Message.hpp \ + src/messages/MessageBuilder.hpp \ + src/messages/MessageColor.hpp \ + src/messages/MessageElement.hpp \ + src/messages/MessageParseArgs.hpp \ + src/messages/Selection.hpp \ + src/NullablePtr.hpp \ + src/PrecompiledHeader.hpp \ + src/ProviderId.hpp \ + src/providers/bttv/BttvEmotes.hpp \ + src/providers/emoji/Emojis.hpp \ + src/providers/ffz/FfzEmotes.hpp \ + src/providers/irc/AbstractIrcServer.hpp \ + src/providers/irc/IrcAccount.hpp \ + src/providers/irc/IrcChannel2.hpp \ + src/providers/irc/IrcConnection2.hpp \ + src/providers/irc/IrcServer.hpp \ + src/providers/twitch/EmoteValue.hpp \ + src/providers/twitch/IrcMessageHandler.hpp \ + src/providers/twitch/Pubsub.hpp \ + src/providers/twitch/PubsubActions.hpp \ + src/providers/twitch/PubsubHelpers.hpp \ + src/providers/twitch/TwitchAccount.hpp \ + src/providers/twitch/TwitchAccountManager.hpp \ + src/providers/twitch/TwitchChannel.hpp \ + src/providers/twitch/TwitchEmotes.hpp \ + src/providers/twitch/TwitchHelpers.hpp \ + src/providers/twitch/TwitchMessageBuilder.hpp \ + src/providers/twitch/TwitchServer.hpp \ + src/providers/twitch/TwitchUser.hpp \ + src/SignalVector.hpp \ + src/singletons/EmoteManager.hpp \ + src/singletons/FontManager.hpp \ + src/singletons/helper/ChatterinoSetting.hpp \ + src/singletons/helper/GifTimer.hpp \ + src/singletons/helper/LoggingChannel.hpp \ + src/singletons/helper/ModerationAction.hpp \ + src/singletons/IrcManager.hpp \ + src/singletons/LoggingManager.hpp \ + src/singletons/NativeMessagingManager.hpp \ + src/singletons/PathManager.hpp \ + src/singletons/ResourceManager.hpp \ + src/singletons/SettingsManager.hpp \ + src/singletons/ThemeManager.hpp \ + src/singletons/UpdateManager.hpp \ + src/singletons/WindowManager.hpp \ + src/util/AssertInGuiThread.hpp \ + src/util/Benchmark.hpp \ + src/util/Clamp.hpp \ + src/util/CombinePath.hpp \ + src/util/CompletionModel.hpp \ + src/util/ConcurrentMap.hpp \ + src/util/DebugCount.hpp \ + src/util/DistanceBetweenPoints.hpp \ + src/util/Emotemap.hpp \ + src/util/FlagsEnum.hpp \ + src/util/Helpers.hpp \ + src/util/IrcHelpers.hpp \ + src/util/LayoutCreator.hpp \ + src/util/MutexValue.hpp \ + src/util/NativeEventHelper.hpp \ + src/util/NetworkManager.hpp \ + src/util/NetworkRequest.hpp \ + src/util/NetworkRequester.hpp \ + src/util/NetworkWorker.hpp \ + src/util/PostToThread.hpp \ + src/util/Property.hpp \ + src/util/QstringHash.hpp \ + src/util/RapidjsonHelpers.hpp \ + src/util/RemoveScrollAreaBackground.hpp \ + src/util/SerializeCustom.hpp \ + src/util/SharedPtrElementLess.hpp \ + src/util/SignalVector2.hpp \ + src/util/SignalVectorModel.hpp \ + src/util/StandardItemHelper.hpp \ + src/util/StreamLink.hpp \ + src/util/UrlFetch.hpp \ + src/util/WindowsHelper.hpp \ + src/Version.hpp \ + src/widgets/AccountSwitchPopupWidget.hpp \ + src/widgets/AccountSwitchWidget.hpp \ + src/widgets/AttachedWindow.hpp \ + src/widgets/BaseWidget.hpp \ + src/widgets/BaseWindow.hpp \ + src/widgets/EmotePopup.hpp \ + src/widgets/helper/ChannelView.hpp \ + src/widgets/helper/ComboBoxItemDelegate.hpp \ + src/widgets/helper/DebugPopup.hpp \ + src/widgets/helper/DropOverlay.hpp \ + src/widgets/helper/DropPreview.hpp \ + src/widgets/helper/EditableModelView.hpp \ + src/widgets/helper/Line.hpp \ + src/widgets/helper/NotebookButton.hpp \ + src/widgets/helper/NotebookTab.hpp \ + src/widgets/helper/ResizingTextEdit.hpp \ + src/widgets/helper/RippleEffectButton.hpp \ + src/widgets/helper/RippleEffectLabel.hpp \ + src/widgets/helper/ScrollbarHighlight.hpp \ + src/widgets/helper/SearchPopup.hpp \ + src/widgets/helper/SettingsDialogTab.hpp \ + src/widgets/helper/Shortcut.hpp \ + src/widgets/helper/SignalLabel.hpp \ + src/widgets/helper/SplitColumn.hpp \ + src/widgets/helper/SplitHeader.hpp \ + src/widgets/helper/SplitInput.hpp \ + src/widgets/helper/SplitNode.hpp \ + src/widgets/helper/SplitOverlay.hpp \ + src/widgets/helper/TitlebarButton.hpp \ + src/widgets/Label.hpp \ + src/widgets/LastRunCrashDialog.hpp \ + src/widgets/LoginDialog.hpp \ + src/widgets/Notebook.hpp \ + src/widgets/NotificationPopup.hpp \ + src/widgets/QualityPopup.hpp \ + src/widgets/Scrollbar.hpp \ + src/widgets/SelectChannelDialog.hpp \ + src/widgets/SettingsDialog.hpp \ + src/widgets/settingspages/AboutPage.hpp \ + src/widgets/settingspages/AccountsPage.hpp \ + src/widgets/settingspages/AppearancePage.hpp \ + src/widgets/settingspages/BehaviourPage.hpp \ + src/widgets/settingspages/BrowserextensionPage.hpp \ + src/widgets/settingspages/CommandPage.hpp \ + src/widgets/settingspages/EmotesPage.hpp \ + src/widgets/settingspages/ExternaltoolsPage.hpp \ + src/widgets/settingspages/HighlightingPage.hpp \ + src/widgets/settingspages/IgnoreusersPage.hpp \ + src/widgets/settingspages/KeyboardsettingsPage.hpp \ + src/widgets/settingspages/LogsPage.hpp \ + src/widgets/settingspages/ModerationPage.hpp \ + src/widgets/settingspages/SettingsPage.hpp \ + src/widgets/settingspages/SpecialChannelsPage.hpp \ + src/widgets/Split.hpp \ + src/widgets/SplitContainer.hpp \ + src/widgets/StreamView.hpp \ + src/widgets/TextInputDialog.hpp \ + src/widgets/Titlebar.hpp \ + src/widgets/TooltipWidget.hpp \ + src/widgets/UserInfoPopup.hpp \ + src/widgets/WelcomeDialog.hpp \ src/widgets/Window.hpp RESOURCES += \ diff --git a/files b/files deleted file mode 100644 index cc5f266ee..000000000 --- a/files +++ /dev/null @@ -1,301 +0,0 @@ -mv src/application.cpp src/_Application.cpp -mv src/application.hpp src/_Application.hpp -mv src/channel.cpp src/_Channel.cpp -mv src/channel.hpp src/_Channel.hpp -mv src/channeldata.cpp src/_ChannelData.cpp -mv src/channeldata.hpp src/_ChannelData.hpp -mv src/common.h.cpp src/_Common.h.cpp -mv src/common.hpp src/_Common.hpp -mv src/const.hpp src/_Const.hpp -mv src/controllers/accounts/account.cpp src/controllers/accounts/_Account.cpp -mv src/controllers/accounts/account.hpp src/controllers/accounts/_Account.hpp -mv src/controllers/accounts/accountcontroller.cpp src/controllers/accounts/_AccountController.cpp -mv src/controllers/accounts/accountcontroller.hpp src/controllers/accounts/_AccountController.hpp -mv src/controllers/accounts/accountmodel.cpp src/controllers/accounts/_AccountModel.cpp -mv src/controllers/accounts/accountmodel.hpp src/controllers/accounts/_AccountModel.hpp -mv src/controllers/commands/command.cpp src/controllers/commands/_Command.cpp -mv src/controllers/commands/command.hpp src/controllers/commands/_Command.hpp -mv src/controllers/commands/commandcontroller.cpp src/controllers/commands/_CommandController.cpp -mv src/controllers/commands/commandcontroller.hpp src/controllers/commands/_CommandController.hpp -mv src/controllers/commands/commandmodel.cpp src/controllers/commands/_CommandModel.cpp -mv src/controllers/commands/commandmodel.hpp src/controllers/commands/_CommandModel.hpp -mv src/controllers/highlights/highlightcontroller.cpp src/controllers/highlights/_HighlightController.cpp -mv src/controllers/highlights/highlightcontroller.hpp src/controllers/highlights/_HighlightController.hpp -mv src/controllers/highlights/highlightmodel.cpp src/controllers/highlights/_HighlightModel.cpp -mv src/controllers/highlights/highlightmodel.hpp src/controllers/highlights/_HighlightModel.hpp -mv src/controllers/highlights/highlightphrase.hpp src/controllers/highlights/_HighlightPhrase.hpp -mv src/controllers/ignores/ignorecontroller.cpp src/controllers/ignores/_IgnoreController.cpp -mv src/controllers/ignores/ignorecontroller.hpp src/controllers/ignores/_IgnoreController.hpp -mv src/controllers/ignores/ignoremodel.cpp src/controllers/ignores/_IgnoreModel.cpp -mv src/controllers/ignores/ignoremodel.hpp src/controllers/ignores/_IgnoreModel.hpp -mv src/controllers/ignores/ignorephrase.hpp src/controllers/ignores/_IgnorePhrase.hpp -mv src/controllers/taggedusers/taggeduser.cpp src/controllers/taggedusers/_TaggedUser.cpp -mv src/controllers/taggedusers/taggeduser.hpp src/controllers/taggedusers/_TaggedUser.hpp -mv src/controllers/taggedusers/taggeduserscontroller.cpp src/controllers/taggedusers/_TaggedUsersController.cpp -mv src/controllers/taggedusers/taggeduserscontroller.hpp src/controllers/taggedusers/_TaggedUsersController.hpp -mv src/controllers/taggedusers/taggedusersmodel.cpp src/controllers/taggedusers/_TaggedUsersModel.cpp -mv src/controllers/taggedusers/taggedusersmodel.hpp src/controllers/taggedusers/_TaggedUsersModel.hpp -mv src/credentials.hpp src/_Credentials.hpp -mv src/debug/log.hpp src/debug/_Log.hpp -mv src/lockedobject.hpp src/_LockedObject.hpp -mv src/main.cpp src/_main.cpp -mv src/messages/highlightphrase.hpp src/messages/_HighlightPhrase.hpp -mv src/messages/image.cpp src/messages/_Image.cpp -mv src/messages/image.hpp src/messages/_Image.hpp -mv src/messages/layouts/messagelayout.cpp src/messages/layouts/_MessageLayout.cpp -mv src/messages/layouts/messagelayout.hpp src/messages/layouts/_MessageLayout.hpp -mv src/messages/layouts/messagelayoutcontainer.cpp src/messages/layouts/_MessageLayoutContainer.cpp -mv src/messages/layouts/messagelayoutcontainer.hpp src/messages/layouts/_MessageLayoutContainer.hpp -mv src/messages/layouts/messagelayoutelement.cpp src/messages/layouts/_MessageLayoutElement.cpp -mv src/messages/layouts/messagelayoutelement.hpp src/messages/layouts/_MessageLayoutElement.hpp -mv src/messages/limitedqueue.hpp src/messages/_LimitedQueue.hpp -mv src/messages/limitedqueuesnapshot.hpp src/messages/_LimitedQueueSnapshot.hpp -mv src/messages/link.cpp src/messages/_Link.cpp -mv src/messages/link.hpp src/messages/_Link.hpp -mv src/messages/message.cpp src/messages/_Message.cpp -mv src/messages/message.hpp src/messages/_Message.hpp -mv src/messages/messagebuilder.cpp src/messages/_MessageBuilder.cpp -mv src/messages/messagebuilder.hpp src/messages/_MessageBuilder.hpp -mv src/messages/messagecolor.cpp src/messages/_MessageColor.cpp -mv src/messages/messagecolor.hpp src/messages/_MessageColor.hpp -mv src/messages/messageelement.cpp src/messages/_MessageElement.cpp -mv src/messages/messageelement.hpp src/messages/_MessageElement.hpp -mv src/messages/messageparseargs.hpp src/messages/_MessageParseArgs.hpp -mv src/messages/selection.hpp src/messages/_Selection.hpp -mv src/nullableptr.hpp src/_NullablePtr.hpp -mv src/precompiled_header.hpp src/_PrecompiledHeader.hpp -mv src/providerid.hpp src/_ProviderId.hpp -mv src/providers/bttv/bttvemotes.cpp src/providers/bttv/_BttvEmotes.cpp -mv src/providers/bttv/bttvemotes.hpp src/providers/bttv/_BttvEmotes.hpp -mv src/providers/emoji/emojis.cpp src/providers/emoji/_Emojis.cpp -mv src/providers/emoji/emojis.hpp src/providers/emoji/_Emojis.hpp -mv src/providers/ffz/ffzemotes.cpp src/providers/ffz/_FfzEmotes.cpp -mv src/providers/ffz/ffzemotes.hpp src/providers/ffz/_FfzEmotes.hpp -mv src/providers/irc/abstractircserver.cpp src/providers/irc/_AbstractIrcServer.cpp -mv src/providers/irc/abstractircserver.hpp src/providers/irc/_AbstractIrcServer.hpp -mv src/providers/irc/ircaccount.cpp src/providers/irc/_IrcAccount.cpp -mv src/providers/irc/ircaccount.hpp src/providers/irc/_IrcAccount.hpp -mv src/providers/irc/ircchannel2.cpp src/providers/irc/_IrcChannel2.cpp -mv src/providers/irc/ircchannel2.hpp src/providers/irc/_IrcChannel2.hpp -mv src/providers/irc/ircconnection2.cpp src/providers/irc/_IrcConnection2.cpp -mv src/providers/irc/ircconnection2.hpp src/providers/irc/_IrcConnection2.hpp -mv src/providers/irc/ircserver.cpp src/providers/irc/_IrcServer.cpp -mv src/providers/irc/ircserver.hpp src/providers/irc/_IrcServer.hpp -mv src/providers/twitch/emotevalue.hpp src/providers/twitch/_EmoteValue.hpp -mv src/providers/twitch/ircmessagehandler.cpp src/providers/twitch/_IrcMessageHandler.cpp -mv src/providers/twitch/ircmessagehandler.hpp src/providers/twitch/_IrcMessageHandler.hpp -mv src/providers/twitch/pubsub.cpp src/providers/twitch/_Pubsub.cpp -mv src/providers/twitch/pubsub.hpp src/providers/twitch/_Pubsub.hpp -mv src/providers/twitch/pubsubactions.cpp src/providers/twitch/_PubsubActions.cpp -mv src/providers/twitch/pubsubactions.hpp src/providers/twitch/_PubsubActions.hpp -mv src/providers/twitch/pubsubhelpers.cpp src/providers/twitch/_PubsubHelpers.cpp -mv src/providers/twitch/pubsubhelpers.hpp src/providers/twitch/_PubsubHelpers.hpp -mv src/providers/twitch/twitchaccount.cpp src/providers/twitch/_TwitchAccount.cpp -mv src/providers/twitch/twitchaccount.hpp src/providers/twitch/_TwitchAccount.hpp -mv src/providers/twitch/twitchaccountmanager.cpp src/providers/twitch/_TwitchAccountManager.cpp -mv src/providers/twitch/twitchaccountmanager.hpp src/providers/twitch/_TwitchAccountManager.hpp -mv src/providers/twitch/twitchchannel.cpp src/providers/twitch/_TwitchChannel.cpp -mv src/providers/twitch/twitchchannel.hpp src/providers/twitch/_TwitchChannel.hpp -mv src/providers/twitch/twitchemotes.cpp src/providers/twitch/_TwitchEmotes.cpp -mv src/providers/twitch/twitchemotes.hpp src/providers/twitch/_TwitchEmotes.hpp -mv src/providers/twitch/twitchhelpers.cpp src/providers/twitch/_TwitchHelpers.cpp -mv src/providers/twitch/twitchhelpers.hpp src/providers/twitch/_TwitchHelpers.hpp -mv src/providers/twitch/twitchmessagebuilder.cpp src/providers/twitch/_TwitchMessageBuilder.cpp -mv src/providers/twitch/twitchmessagebuilder.hpp src/providers/twitch/_TwitchMessageBuilder.hpp -mv src/providers/twitch/twitchserver.cpp src/providers/twitch/_TwitchServer.cpp -mv src/providers/twitch/twitchserver.hpp src/providers/twitch/_TwitchServer.hpp -mv src/providers/twitch/twitchuser.cpp src/providers/twitch/_TwitchUser.cpp -mv src/providers/twitch/twitchuser.hpp src/providers/twitch/_TwitchUser.hpp -mv src/signalvector.hpp src/_SignalVector.hpp -mv src/singletons/emotemanager.cpp src/singletons/_EmoteManager.cpp -mv src/singletons/emotemanager.hpp src/singletons/_EmoteManager.hpp -mv src/singletons/fontmanager.cpp src/singletons/_FontManager.cpp -mv src/singletons/fontmanager.hpp src/singletons/_FontManager.hpp -mv src/singletons/helper/chatterinosetting.cpp src/singletons/helper/_ChatterinoSetting.cpp -mv src/singletons/helper/chatterinosetting.hpp src/singletons/helper/_ChatterinoSetting.hpp -mv src/singletons/helper/giftimer.cpp src/singletons/helper/_GifTimer.cpp -mv src/singletons/helper/giftimer.hpp src/singletons/helper/_GifTimer.hpp -mv src/singletons/helper/loggingchannel.cpp src/singletons/helper/_LoggingChannel.cpp -mv src/singletons/helper/loggingchannel.hpp src/singletons/helper/_LoggingChannel.hpp -mv src/singletons/helper/moderationaction.cpp src/singletons/helper/_ModerationAction.cpp -mv src/singletons/helper/moderationaction.hpp src/singletons/helper/_ModerationAction.hpp -mv src/singletons/ircmanager.cpp src/singletons/_IrcManager.cpp -mv src/singletons/ircmanager.hpp src/singletons/_IrcManager.hpp -mv src/singletons/loggingmanager.cpp src/singletons/_LoggingManager.cpp -mv src/singletons/loggingmanager.hpp src/singletons/_LoggingManager.hpp -mv src/singletons/nativemessagingmanager.cpp src/singletons/_NativeMessagingManager.cpp -mv src/singletons/nativemessagingmanager.hpp src/singletons/_NativeMessagingManager.hpp -mv src/singletons/pathmanager.cpp src/singletons/_PathManager.cpp -mv src/singletons/pathmanager.hpp src/singletons/_PathManager.hpp -mv src/singletons/resourcemanager.cpp src/singletons/_ResourceManager.cpp -mv src/singletons/resourcemanager.hpp src/singletons/_ResourceManager.hpp -mv src/singletons/settingsmanager.cpp src/singletons/_SettingsManager.cpp -mv src/singletons/settingsmanager.hpp src/singletons/_SettingsManager.hpp -mv src/singletons/thememanager.cpp src/singletons/_ThemeManager.cpp -mv src/singletons/thememanager.hpp src/singletons/_ThemeManager.hpp -mv src/singletons/updatemanager.cpp src/singletons/_UpdateManager.cpp -mv src/singletons/updatemanager.hpp src/singletons/_UpdateManager.hpp -mv src/singletons/windowmanager.cpp src/singletons/_WindowManager.cpp -mv src/singletons/windowmanager.hpp src/singletons/_WindowManager.hpp -mv src/util/assertinguithread.hpp src/util/_AssertInGuiThread.hpp -mv src/util/benchmark.hpp src/util/_Benchmark.hpp -mv src/util/clamp.hpp src/util/_Clamp.hpp -mv src/util/combine_path.hpp src/util/_CombinePath.hpp -mv src/util/completionmodel.cpp src/util/_CompletionModel.cpp -mv src/util/completionmodel.hpp src/util/_CompletionModel.hpp -mv src/util/concurrentmap.hpp src/util/_ConcurrentMap.hpp -mv src/util/debugcount.cpp src/util/_DebugCount.cpp -mv src/util/debugcount.hpp src/util/_DebugCount.hpp -mv src/util/distancebetweenpoints.hpp src/util/_DistanceBetweenPoints.hpp -mv src/util/emotemap.cpp src/util/_Emotemap.cpp -mv src/util/emotemap.hpp src/util/_Emotemap.hpp -mv src/util/flagsenum.hpp src/util/_FlagsEnum.hpp -mv src/util/helpers.hpp src/util/_Helpers.hpp -mv src/util/irchelpers.hpp src/util/_IrcHelpers.hpp -mv src/util/layoutcreator.hpp src/util/_LayoutCreator.hpp -mv src/util/mutexvalue.hpp src/util/_MutexValue.hpp -mv src/util/nativeeventhelper.hpp src/util/_NativeEventHelper.hpp -mv src/util/networkmanager.cpp src/util/_NetworkManager.cpp -mv src/util/networkmanager.hpp src/util/_NetworkManager.hpp -mv src/util/networkrequest.cpp src/util/_NetworkRequest.cpp -mv src/util/networkrequest.hpp src/util/_NetworkRequest.hpp -mv src/util/networkrequester.hpp src/util/_NetworkRequester.hpp -mv src/util/networkworker.hpp src/util/_NetworkWorker.hpp -mv src/util/posttothread.hpp src/util/_PostToThread.hpp -mv src/util/property.hpp src/util/_Property.hpp -mv src/util/qstringhash.hpp src/util/_QstringHash.hpp -mv src/util/rapidjson-helpers.cpp src/util/_RapidjsonHelpers.cpp -mv src/util/rapidjson-helpers.hpp src/util/_RapidjsonHelpers.hpp -mv src/util/removescrollareabackground.hpp src/util/_RemoveScrollAreaBackground.hpp -mv src/util/serialize-custom.hpp src/util/_SerializeCustom.hpp -mv src/util/sharedptrelementless.hpp src/util/_SharedPtrElementLess.hpp -mv src/util/signalvector2.hpp src/util/_SignalVector2.hpp -mv src/util/signalvectormodel.hpp src/util/_SignalVectorModel.hpp -mv src/util/standarditemhelper.hpp src/util/_StandardItemHelper.hpp -mv src/util/streamlink.cpp src/util/_StreamLink.cpp -mv src/util/streamlink.hpp src/util/_StreamLink.hpp -mv src/util/urlfetch.hpp src/util/_UrlFetch.hpp -mv src/util/windows_helper.cpp src/util/_WindowsHelper.cpp -mv src/util/windows_helper.hpp src/util/_WindowsHelper.hpp -mv src/version.hpp src/_Version.hpp -mv src/widgets/accountswitchpopupwidget.cpp src/widgets/_AccountSwitchPopupWidget.cpp -mv src/widgets/accountswitchpopupwidget.hpp src/widgets/_AccountSwitchPopupWidget.hpp -mv src/widgets/accountswitchwidget.cpp src/widgets/_AccountSwitchWidget.cpp -mv src/widgets/accountswitchwidget.hpp src/widgets/_AccountSwitchWidget.hpp -mv src/widgets/attachedwindow.cpp src/widgets/_AttachedWindow.cpp -mv src/widgets/attachedwindow.hpp src/widgets/_AttachedWindow.hpp -mv src/widgets/basewidget.cpp src/widgets/_BaseWidget.cpp -mv src/widgets/basewidget.hpp src/widgets/_BaseWidget.hpp -mv src/widgets/basewindow.cpp src/widgets/_BaseWindow.cpp -mv src/widgets/basewindow.hpp src/widgets/_BaseWindow.hpp -mv src/widgets/emotepopup.cpp src/widgets/_EmotePopup.cpp -mv src/widgets/emotepopup.hpp src/widgets/_EmotePopup.hpp -mv src/widgets/helper/channelview.cpp src/widgets/helper/_ChannelView.cpp -mv src/widgets/helper/channelview.hpp src/widgets/helper/_ChannelView.hpp -mv src/widgets/helper/comboboxitemdelegate.cpp src/widgets/helper/_ComboBoxItemDelegate.cpp -mv src/widgets/helper/comboboxitemdelegate.hpp src/widgets/helper/_ComboBoxItemDelegate.hpp -mv src/widgets/helper/debugpopup.cpp src/widgets/helper/_DebugPopup.cpp -mv src/widgets/helper/debugpopup.hpp src/widgets/helper/_DebugPopup.hpp -mv src/widgets/helper/dropoverlay.cpp src/widgets/helper/_DropOverlay.cpp -mv src/widgets/helper/dropoverlay.hpp src/widgets/helper/_DropOverlay.hpp -mv src/widgets/helper/droppreview.cpp src/widgets/helper/_DropPreview.cpp -mv src/widgets/helper/droppreview.hpp src/widgets/helper/_DropPreview.hpp -mv src/widgets/helper/editablemodelview.cpp src/widgets/helper/_EditableModelView.cpp -mv src/widgets/helper/editablemodelview.hpp src/widgets/helper/_EditableModelView.hpp -mv src/widgets/helper/line.hpp src/widgets/helper/_Line.hpp -mv src/widgets/helper/notebookbutton.cpp src/widgets/helper/_NotebookButton.cpp -mv src/widgets/helper/notebookbutton.hpp src/widgets/helper/_NotebookButton.hpp -mv src/widgets/helper/notebooktab.cpp src/widgets/helper/_NotebookTab.cpp -mv src/widgets/helper/notebooktab.hpp src/widgets/helper/_NotebookTab.hpp -mv src/widgets/helper/resizingtextedit.cpp src/widgets/helper/_ResizingTextEdit.cpp -mv src/widgets/helper/resizingtextedit.hpp src/widgets/helper/_ResizingTextEdit.hpp -mv src/widgets/helper/rippleeffectbutton.cpp src/widgets/helper/_RippleEffectButton.cpp -mv src/widgets/helper/rippleeffectbutton.hpp src/widgets/helper/_RippleEffectButton.hpp -mv src/widgets/helper/rippleeffectlabel.cpp src/widgets/helper/_RippleEffectLabel.cpp -mv src/widgets/helper/rippleeffectlabel.hpp src/widgets/helper/_RippleEffectLabel.hpp -mv src/widgets/helper/scrollbarhighlight.cpp src/widgets/helper/_ScrollbarHighlight.cpp -mv src/widgets/helper/scrollbarhighlight.hpp src/widgets/helper/_ScrollbarHighlight.hpp -mv src/widgets/helper/searchpopup.cpp src/widgets/helper/_SearchPopup.cpp -mv src/widgets/helper/searchpopup.hpp src/widgets/helper/_SearchPopup.hpp -mv src/widgets/helper/settingsdialogtab.cpp src/widgets/helper/_SettingsDialogTab.cpp -mv src/widgets/helper/settingsdialogtab.hpp src/widgets/helper/_SettingsDialogTab.hpp -mv src/widgets/helper/shortcut.hpp src/widgets/helper/_Shortcut.hpp -mv src/widgets/helper/signallabel.cpp src/widgets/helper/_SignalLabel.cpp -mv src/widgets/helper/signallabel.hpp src/widgets/helper/_SignalLabel.hpp -mv src/widgets/helper/splitcolumn.cpp src/widgets/helper/_SplitColumn.cpp -mv src/widgets/helper/splitcolumn.hpp src/widgets/helper/_SplitColumn.hpp -mv src/widgets/helper/splitheader.cpp src/widgets/helper/_SplitHeader.cpp -mv src/widgets/helper/splitheader.hpp src/widgets/helper/_SplitHeader.hpp -mv src/widgets/helper/splitinput.cpp src/widgets/helper/_SplitInput.cpp -mv src/widgets/helper/splitinput.hpp src/widgets/helper/_SplitInput.hpp -mv src/widgets/helper/splitnode.cpp src/widgets/helper/_SplitNode.cpp -mv src/widgets/helper/splitnode.hpp src/widgets/helper/_SplitNode.hpp -mv src/widgets/helper/splitoverlay.cpp src/widgets/helper/_SplitOverlay.cpp -mv src/widgets/helper/splitoverlay.hpp src/widgets/helper/_SplitOverlay.hpp -mv src/widgets/helper/titlebarbutton.cpp src/widgets/helper/_TitlebarButton.cpp -mv src/widgets/helper/titlebarbutton.hpp src/widgets/helper/_TitlebarButton.hpp -mv src/widgets/label.cpp src/widgets/_Label.cpp -mv src/widgets/label.hpp src/widgets/_Label.hpp -mv src/widgets/lastruncrashdialog.cpp src/widgets/_LastRunCrashDialog.cpp -mv src/widgets/lastruncrashdialog.hpp src/widgets/_LastRunCrashDialog.hpp -mv src/widgets/logindialog.cpp src/widgets/_LoginDialog.cpp -mv src/widgets/logindialog.hpp src/widgets/_LoginDialog.hpp -mv src/widgets/notebook.cpp src/widgets/_Notebook.cpp -mv src/widgets/notebook.hpp src/widgets/_Notebook.hpp -mv src/widgets/notificationpopup.cpp src/widgets/_NotificationPopup.cpp -mv src/widgets/notificationpopup.hpp src/widgets/_NotificationPopup.hpp -mv src/widgets/qualitypopup.cpp src/widgets/_QualityPopup.cpp -mv src/widgets/qualitypopup.hpp src/widgets/_QualityPopup.hpp -mv src/widgets/scrollbar.cpp src/widgets/_Scrollbar.cpp -mv src/widgets/scrollbar.hpp src/widgets/_Scrollbar.hpp -mv src/widgets/selectchanneldialog.cpp src/widgets/_SelectChannelDialog.cpp -mv src/widgets/selectchanneldialog.hpp src/widgets/_SelectChannelDialog.hpp -mv src/widgets/settingsdialog.cpp src/widgets/_SettingsDialog.cpp -mv src/widgets/settingsdialog.hpp src/widgets/_SettingsDialog.hpp -mv src/widgets/settingspages/aboutpage.cpp src/widgets/settingspages/_AboutPage.cpp -mv src/widgets/settingspages/aboutpage.hpp src/widgets/settingspages/_AboutPage.hpp -mv src/widgets/settingspages/accountspage.cpp src/widgets/settingspages/_AccountsPage.cpp -mv src/widgets/settingspages/accountspage.hpp src/widgets/settingspages/_AccountsPage.hpp -mv src/widgets/settingspages/appearancepage.cpp src/widgets/settingspages/_AppearancePage.cpp -mv src/widgets/settingspages/appearancepage.hpp src/widgets/settingspages/_AppearancePage.hpp -mv src/widgets/settingspages/behaviourpage.cpp src/widgets/settingspages/_BehaviourPage.cpp -mv src/widgets/settingspages/behaviourpage.hpp src/widgets/settingspages/_BehaviourPage.hpp -mv src/widgets/settingspages/browserextensionpage.cpp src/widgets/settingspages/_BrowserextensionPage.cpp -mv src/widgets/settingspages/browserextensionpage.hpp src/widgets/settingspages/_BrowserextensionPage.hpp -mv src/widgets/settingspages/commandpage.cpp src/widgets/settingspages/_CommandPage.cpp -mv src/widgets/settingspages/commandpage.hpp src/widgets/settingspages/_CommandPage.hpp -mv src/widgets/settingspages/emotespage.cpp src/widgets/settingspages/_EmotesPage.cpp -mv src/widgets/settingspages/emotespage.hpp src/widgets/settingspages/_EmotesPage.hpp -mv src/widgets/settingspages/externaltoolspage.cpp src/widgets/settingspages/_ExternaltoolsPage.cpp -mv src/widgets/settingspages/externaltoolspage.hpp src/widgets/settingspages/_ExternaltoolsPage.hpp -mv src/widgets/settingspages/highlightingpage.cpp src/widgets/settingspages/_HighlightingPage.cpp -mv src/widgets/settingspages/highlightingpage.hpp src/widgets/settingspages/_HighlightingPage.hpp -mv src/widgets/settingspages/ignoreuserspage.cpp src/widgets/settingspages/_IgnoreusersPage.cpp -mv src/widgets/settingspages/ignoreuserspage.hpp src/widgets/settingspages/_IgnoreusersPage.hpp -mv src/widgets/settingspages/keyboardsettingspage.cpp src/widgets/settingspages/_KeyboardsettingsPage.cpp -mv src/widgets/settingspages/keyboardsettingspage.hpp src/widgets/settingspages/_KeyboardsettingsPage.hpp -mv src/widgets/settingspages/logspage.cpp src/widgets/settingspages/_LogsPage.cpp -mv src/widgets/settingspages/logspage.hpp src/widgets/settingspages/_LogsPage.hpp -mv src/widgets/settingspages/moderationpage.cpp src/widgets/settingspages/_ModerationPage.cpp -mv src/widgets/settingspages/moderationpage.hpp src/widgets/settingspages/_ModerationPage.hpp -mv src/widgets/settingspages/settingspage.cpp src/widgets/settingspages/_SettingsPage.cpp -mv src/widgets/settingspages/settingspage.hpp src/widgets/settingspages/_SettingsPage.hpp -mv src/widgets/settingspages/specialchannelspage.cpp src/widgets/settingspages/_SpecialChannelsPage.cpp -mv src/widgets/settingspages/specialchannelspage.hpp src/widgets/settingspages/_SpecialChannelsPage.hpp -mv src/widgets/split.cpp src/widgets/_Split.cpp -mv src/widgets/split.hpp src/widgets/_Split.hpp -mv src/widgets/splitcontainer.cpp src/widgets/_SplitContainer.cpp -mv src/widgets/splitcontainer.hpp src/widgets/_SplitContainer.hpp -mv src/widgets/streamview.cpp src/widgets/_StreamView.cpp -mv src/widgets/streamview.hpp src/widgets/_StreamView.hpp -mv src/widgets/textinputdialog.cpp src/widgets/_TextInputDialog.cpp -mv src/widgets/textinputdialog.hpp src/widgets/_TextInputDialog.hpp -mv src/widgets/titlebar.hpp src/widgets/_Titlebar.hpp -mv src/widgets/tooltipwidget.cpp src/widgets/_TooltipWidget.cpp -mv src/widgets/tooltipwidget.hpp src/widgets/_TooltipWidget.hpp -mv src/widgets/userinfopopup.cpp src/widgets/_UserInfoPopup.cpp -mv src/widgets/userinfopopup.hpp src/widgets/_UserInfoPopup.hpp -mv src/widgets/welcomedialog.cpp src/widgets/_WelcomeDialog.cpp -mv src/widgets/welcomedialog.hpp src/widgets/_WelcomeDialog.hpp -mv src/widgets/window.cpp src/widgets/_Window.cpp -mv src/widgets/window.hpp src/widgets/_Window.hpp diff --git a/files2 b/files2 deleted file mode 100644 index 542215966..000000000 --- a/files2 +++ /dev/null @@ -1,301 +0,0 @@ -mv src/_Application.cpp src/Application.cpp -mv src/_Application.hpp src/Application.hpp -mv src/_Channel.cpp src/Channel.cpp -mv src/_Channel.hpp src/Channel.hpp -mv src/_ChannelData.cpp src/ChannelData.cpp -mv src/_ChannelData.hpp src/ChannelData.hpp -mv src/_Common.h.cpp src/Common.h.cpp -mv src/_Common.hpp src/Common.hpp -mv src/_Const.hpp src/Const.hpp -mv src/controllers/accounts/_Account.cpp src/controllers/accounts/Account.cpp -mv src/controllers/accounts/_Account.hpp src/controllers/accounts/Account.hpp -mv src/controllers/accounts/_AccountController.cpp src/controllers/accounts/AccountController.cpp -mv src/controllers/accounts/_AccountController.hpp src/controllers/accounts/AccountController.hpp -mv src/controllers/accounts/_AccountModel.cpp src/controllers/accounts/AccountModel.cpp -mv src/controllers/accounts/_AccountModel.hpp src/controllers/accounts/AccountModel.hpp -mv src/controllers/commands/_Command.cpp src/controllers/commands/Command.cpp -mv src/controllers/commands/_Command.hpp src/controllers/commands/Command.hpp -mv src/controllers/commands/_CommandController.cpp src/controllers/commands/CommandController.cpp -mv src/controllers/commands/_CommandController.hpp src/controllers/commands/CommandController.hpp -mv src/controllers/commands/_CommandModel.cpp src/controllers/commands/CommandModel.cpp -mv src/controllers/commands/_CommandModel.hpp src/controllers/commands/CommandModel.hpp -mv src/controllers/highlights/_HighlightController.cpp src/controllers/highlights/HighlightController.cpp -mv src/controllers/highlights/_HighlightController.hpp src/controllers/highlights/HighlightController.hpp -mv src/controllers/highlights/_HighlightModel.cpp src/controllers/highlights/HighlightModel.cpp -mv src/controllers/highlights/_HighlightModel.hpp src/controllers/highlights/HighlightModel.hpp -mv src/controllers/highlights/_HighlightPhrase.hpp src/controllers/highlights/HighlightPhrase.hpp -mv src/controllers/ignores/_IgnoreController.cpp src/controllers/ignores/IgnoreController.cpp -mv src/controllers/ignores/_IgnoreController.hpp src/controllers/ignores/IgnoreController.hpp -mv src/controllers/ignores/_IgnoreModel.cpp src/controllers/ignores/IgnoreModel.cpp -mv src/controllers/ignores/_IgnoreModel.hpp src/controllers/ignores/IgnoreModel.hpp -mv src/controllers/ignores/_IgnorePhrase.hpp src/controllers/ignores/IgnorePhrase.hpp -mv src/controllers/taggedusers/_TaggedUser.cpp src/controllers/taggedusers/TaggedUser.cpp -mv src/controllers/taggedusers/_TaggedUser.hpp src/controllers/taggedusers/TaggedUser.hpp -mv src/controllers/taggedusers/_TaggedUsersController.cpp src/controllers/taggedusers/TaggedUsersController.cpp -mv src/controllers/taggedusers/_TaggedUsersController.hpp src/controllers/taggedusers/TaggedUsersController.hpp -mv src/controllers/taggedusers/_TaggedUsersModel.cpp src/controllers/taggedusers/TaggedUsersModel.cpp -mv src/controllers/taggedusers/_TaggedUsersModel.hpp src/controllers/taggedusers/TaggedUsersModel.hpp -mv src/_Credentials.hpp src/Credentials.hpp -mv src/debug/_Log.hpp src/debug/Log.hpp -mv src/_LockedObject.hpp src/LockedObject.hpp -mv src/_main.cpp src/main.cpp -mv src/messages/_HighlightPhrase.hpp src/messages/HighlightPhrase.hpp -mv src/messages/_Image.cpp src/messages/Image.cpp -mv src/messages/_Image.hpp src/messages/Image.hpp -mv src/messages/layouts/_MessageLayout.cpp src/messages/layouts/MessageLayout.cpp -mv src/messages/layouts/_MessageLayout.hpp src/messages/layouts/MessageLayout.hpp -mv src/messages/layouts/_MessageLayoutContainer.cpp src/messages/layouts/MessageLayoutContainer.cpp -mv src/messages/layouts/_MessageLayoutContainer.hpp src/messages/layouts/MessageLayoutContainer.hpp -mv src/messages/layouts/_MessageLayoutElement.cpp src/messages/layouts/MessageLayoutElement.cpp -mv src/messages/layouts/_MessageLayoutElement.hpp src/messages/layouts/MessageLayoutElement.hpp -mv src/messages/_LimitedQueue.hpp src/messages/LimitedQueue.hpp -mv src/messages/_LimitedQueueSnapshot.hpp src/messages/LimitedQueueSnapshot.hpp -mv src/messages/_Link.cpp src/messages/Link.cpp -mv src/messages/_Link.hpp src/messages/Link.hpp -mv src/messages/_Message.cpp src/messages/Message.cpp -mv src/messages/_Message.hpp src/messages/Message.hpp -mv src/messages/_MessageBuilder.cpp src/messages/MessageBuilder.cpp -mv src/messages/_MessageBuilder.hpp src/messages/MessageBuilder.hpp -mv src/messages/_MessageColor.cpp src/messages/MessageColor.cpp -mv src/messages/_MessageColor.hpp src/messages/MessageColor.hpp -mv src/messages/_MessageElement.cpp src/messages/MessageElement.cpp -mv src/messages/_MessageElement.hpp src/messages/MessageElement.hpp -mv src/messages/_MessageParseArgs.hpp src/messages/MessageParseArgs.hpp -mv src/messages/_Selection.hpp src/messages/Selection.hpp -mv src/_NullablePtr.hpp src/NullablePtr.hpp -mv src/_PrecompiledHeader.hpp src/PrecompiledHeader.hpp -mv src/_ProviderId.hpp src/ProviderId.hpp -mv src/providers/bttv/_BttvEmotes.cpp src/providers/bttv/BttvEmotes.cpp -mv src/providers/bttv/_BttvEmotes.hpp src/providers/bttv/BttvEmotes.hpp -mv src/providers/emoji/_Emojis.cpp src/providers/emoji/Emojis.cpp -mv src/providers/emoji/_Emojis.hpp src/providers/emoji/Emojis.hpp -mv src/providers/ffz/_FfzEmotes.cpp src/providers/ffz/FfzEmotes.cpp -mv src/providers/ffz/_FfzEmotes.hpp src/providers/ffz/FfzEmotes.hpp -mv src/providers/irc/_AbstractIrcServer.cpp src/providers/irc/AbstractIrcServer.cpp -mv src/providers/irc/_AbstractIrcServer.hpp src/providers/irc/AbstractIrcServer.hpp -mv src/providers/irc/_IrcAccount.cpp src/providers/irc/IrcAccount.cpp -mv src/providers/irc/_IrcAccount.hpp src/providers/irc/IrcAccount.hpp -mv src/providers/irc/_IrcChannel2.cpp src/providers/irc/IrcChannel2.cpp -mv src/providers/irc/_IrcChannel2.hpp src/providers/irc/IrcChannel2.hpp -mv src/providers/irc/_IrcConnection2.cpp src/providers/irc/IrcConnection2.cpp -mv src/providers/irc/_IrcConnection2.hpp src/providers/irc/IrcConnection2.hpp -mv src/providers/irc/_IrcServer.cpp src/providers/irc/IrcServer.cpp -mv src/providers/irc/_IrcServer.hpp src/providers/irc/IrcServer.hpp -mv src/providers/twitch/_EmoteValue.hpp src/providers/twitch/EmoteValue.hpp -mv src/providers/twitch/_IrcMessageHandler.cpp src/providers/twitch/IrcMessageHandler.cpp -mv src/providers/twitch/_IrcMessageHandler.hpp src/providers/twitch/IrcMessageHandler.hpp -mv src/providers/twitch/_Pubsub.cpp src/providers/twitch/Pubsub.cpp -mv src/providers/twitch/_Pubsub.hpp src/providers/twitch/Pubsub.hpp -mv src/providers/twitch/_PubsubActions.cpp src/providers/twitch/PubsubActions.cpp -mv src/providers/twitch/_PubsubActions.hpp src/providers/twitch/PubsubActions.hpp -mv src/providers/twitch/_PubsubHelpers.cpp src/providers/twitch/PubsubHelpers.cpp -mv src/providers/twitch/_PubsubHelpers.hpp src/providers/twitch/PubsubHelpers.hpp -mv src/providers/twitch/_TwitchAccount.cpp src/providers/twitch/TwitchAccount.cpp -mv src/providers/twitch/_TwitchAccount.hpp src/providers/twitch/TwitchAccount.hpp -mv src/providers/twitch/_TwitchAccountManager.cpp src/providers/twitch/TwitchAccountManager.cpp -mv src/providers/twitch/_TwitchAccountManager.hpp src/providers/twitch/TwitchAccountManager.hpp -mv src/providers/twitch/_TwitchChannel.cpp src/providers/twitch/TwitchChannel.cpp -mv src/providers/twitch/_TwitchChannel.hpp src/providers/twitch/TwitchChannel.hpp -mv src/providers/twitch/_TwitchEmotes.cpp src/providers/twitch/TwitchEmotes.cpp -mv src/providers/twitch/_TwitchEmotes.hpp src/providers/twitch/TwitchEmotes.hpp -mv src/providers/twitch/_TwitchHelpers.cpp src/providers/twitch/TwitchHelpers.cpp -mv src/providers/twitch/_TwitchHelpers.hpp src/providers/twitch/TwitchHelpers.hpp -mv src/providers/twitch/_TwitchMessageBuilder.cpp src/providers/twitch/TwitchMessageBuilder.cpp -mv src/providers/twitch/_TwitchMessageBuilder.hpp src/providers/twitch/TwitchMessageBuilder.hpp -mv src/providers/twitch/_TwitchServer.cpp src/providers/twitch/TwitchServer.cpp -mv src/providers/twitch/_TwitchServer.hpp src/providers/twitch/TwitchServer.hpp -mv src/providers/twitch/_TwitchUser.cpp src/providers/twitch/TwitchUser.cpp -mv src/providers/twitch/_TwitchUser.hpp src/providers/twitch/TwitchUser.hpp -mv src/_SignalVector.hpp src/SignalVector.hpp -mv src/singletons/_EmoteManager.cpp src/singletons/EmoteManager.cpp -mv src/singletons/_EmoteManager.hpp src/singletons/EmoteManager.hpp -mv src/singletons/_FontManager.cpp src/singletons/FontManager.cpp -mv src/singletons/_FontManager.hpp src/singletons/FontManager.hpp -mv src/singletons/helper/_ChatterinoSetting.cpp src/singletons/helper/ChatterinoSetting.cpp -mv src/singletons/helper/_ChatterinoSetting.hpp src/singletons/helper/ChatterinoSetting.hpp -mv src/singletons/helper/_GifTimer.cpp src/singletons/helper/GifTimer.cpp -mv src/singletons/helper/_GifTimer.hpp src/singletons/helper/GifTimer.hpp -mv src/singletons/helper/_LoggingChannel.cpp src/singletons/helper/LoggingChannel.cpp -mv src/singletons/helper/_LoggingChannel.hpp src/singletons/helper/LoggingChannel.hpp -mv src/singletons/helper/_ModerationAction.cpp src/singletons/helper/ModerationAction.cpp -mv src/singletons/helper/_ModerationAction.hpp src/singletons/helper/ModerationAction.hpp -mv src/singletons/_IrcManager.cpp src/singletons/IrcManager.cpp -mv src/singletons/_IrcManager.hpp src/singletons/IrcManager.hpp -mv src/singletons/_LoggingManager.cpp src/singletons/LoggingManager.cpp -mv src/singletons/_LoggingManager.hpp src/singletons/LoggingManager.hpp -mv src/singletons/_NativeMessagingManager.cpp src/singletons/NativeMessagingManager.cpp -mv src/singletons/_NativeMessagingManager.hpp src/singletons/NativeMessagingManager.hpp -mv src/singletons/_PathManager.cpp src/singletons/PathManager.cpp -mv src/singletons/_PathManager.hpp src/singletons/PathManager.hpp -mv src/singletons/_ResourceManager.cpp src/singletons/ResourceManager.cpp -mv src/singletons/_ResourceManager.hpp src/singletons/ResourceManager.hpp -mv src/singletons/_SettingsManager.cpp src/singletons/SettingsManager.cpp -mv src/singletons/_SettingsManager.hpp src/singletons/SettingsManager.hpp -mv src/singletons/_ThemeManager.cpp src/singletons/ThemeManager.cpp -mv src/singletons/_ThemeManager.hpp src/singletons/ThemeManager.hpp -mv src/singletons/_UpdateManager.cpp src/singletons/UpdateManager.cpp -mv src/singletons/_UpdateManager.hpp src/singletons/UpdateManager.hpp -mv src/singletons/_WindowManager.cpp src/singletons/WindowManager.cpp -mv src/singletons/_WindowManager.hpp src/singletons/WindowManager.hpp -mv src/util/_AssertInGuiThread.hpp src/util/AssertInGuiThread.hpp -mv src/util/_Benchmark.hpp src/util/Benchmark.hpp -mv src/util/_Clamp.hpp src/util/Clamp.hpp -mv src/util/_CombinePath.hpp src/util/CombinePath.hpp -mv src/util/_CompletionModel.cpp src/util/CompletionModel.cpp -mv src/util/_CompletionModel.hpp src/util/CompletionModel.hpp -mv src/util/_ConcurrentMap.hpp src/util/ConcurrentMap.hpp -mv src/util/_DebugCount.cpp src/util/DebugCount.cpp -mv src/util/_DebugCount.hpp src/util/DebugCount.hpp -mv src/util/_DistanceBetweenPoints.hpp src/util/DistanceBetweenPoints.hpp -mv src/util/_Emotemap.cpp src/util/Emotemap.cpp -mv src/util/_Emotemap.hpp src/util/Emotemap.hpp -mv src/util/_FlagsEnum.hpp src/util/FlagsEnum.hpp -mv src/util/_Helpers.hpp src/util/Helpers.hpp -mv src/util/_IrcHelpers.hpp src/util/IrcHelpers.hpp -mv src/util/_LayoutCreator.hpp src/util/LayoutCreator.hpp -mv src/util/_MutexValue.hpp src/util/MutexValue.hpp -mv src/util/_NativeEventHelper.hpp src/util/NativeEventHelper.hpp -mv src/util/_NetworkManager.cpp src/util/NetworkManager.cpp -mv src/util/_NetworkManager.hpp src/util/NetworkManager.hpp -mv src/util/_NetworkRequest.cpp src/util/NetworkRequest.cpp -mv src/util/_NetworkRequest.hpp src/util/NetworkRequest.hpp -mv src/util/_NetworkRequester.hpp src/util/NetworkRequester.hpp -mv src/util/_NetworkWorker.hpp src/util/NetworkWorker.hpp -mv src/util/_PostToThread.hpp src/util/PostToThread.hpp -mv src/util/_Property.hpp src/util/Property.hpp -mv src/util/_QstringHash.hpp src/util/QstringHash.hpp -mv src/util/_RapidjsonHelpers.cpp src/util/RapidjsonHelpers.cpp -mv src/util/_RapidjsonHelpers.hpp src/util/RapidjsonHelpers.hpp -mv src/util/_RemoveScrollAreaBackground.hpp src/util/RemoveScrollAreaBackground.hpp -mv src/util/_SerializeCustom.hpp src/util/SerializeCustom.hpp -mv src/util/_SharedPtrElementLess.hpp src/util/SharedPtrElementLess.hpp -mv src/util/_SignalVector2.hpp src/util/SignalVector2.hpp -mv src/util/_SignalVectorModel.hpp src/util/SignalVectorModel.hpp -mv src/util/_StandardItemHelper.hpp src/util/StandardItemHelper.hpp -mv src/util/_StreamLink.cpp src/util/StreamLink.cpp -mv src/util/_StreamLink.hpp src/util/StreamLink.hpp -mv src/util/_UrlFetch.hpp src/util/UrlFetch.hpp -mv src/util/_WindowsHelper.cpp src/util/WindowsHelper.cpp -mv src/util/_WindowsHelper.hpp src/util/WindowsHelper.hpp -mv src/_Version.hpp src/Version.hpp -mv src/widgets/_AccountSwitchPopupWidget.cpp src/widgets/AccountSwitchPopupWidget.cpp -mv src/widgets/_AccountSwitchPopupWidget.hpp src/widgets/AccountSwitchPopupWidget.hpp -mv src/widgets/_AccountSwitchWidget.cpp src/widgets/AccountSwitchWidget.cpp -mv src/widgets/_AccountSwitchWidget.hpp src/widgets/AccountSwitchWidget.hpp -mv src/widgets/_AttachedWindow.cpp src/widgets/AttachedWindow.cpp -mv src/widgets/_AttachedWindow.hpp src/widgets/AttachedWindow.hpp -mv src/widgets/_BaseWidget.cpp src/widgets/BaseWidget.cpp -mv src/widgets/_BaseWidget.hpp src/widgets/BaseWidget.hpp -mv src/widgets/_BaseWindow.cpp src/widgets/BaseWindow.cpp -mv src/widgets/_BaseWindow.hpp src/widgets/BaseWindow.hpp -mv src/widgets/_EmotePopup.cpp src/widgets/EmotePopup.cpp -mv src/widgets/_EmotePopup.hpp src/widgets/EmotePopup.hpp -mv src/widgets/helper/_ChannelView.cpp src/widgets/helper/ChannelView.cpp -mv src/widgets/helper/_ChannelView.hpp src/widgets/helper/ChannelView.hpp -mv src/widgets/helper/_ComboBoxItemDelegate.cpp src/widgets/helper/ComboBoxItemDelegate.cpp -mv src/widgets/helper/_ComboBoxItemDelegate.hpp src/widgets/helper/ComboBoxItemDelegate.hpp -mv src/widgets/helper/_DebugPopup.cpp src/widgets/helper/DebugPopup.cpp -mv src/widgets/helper/_DebugPopup.hpp src/widgets/helper/DebugPopup.hpp -mv src/widgets/helper/_DropOverlay.cpp src/widgets/helper/DropOverlay.cpp -mv src/widgets/helper/_DropOverlay.hpp src/widgets/helper/DropOverlay.hpp -mv src/widgets/helper/_DropPreview.cpp src/widgets/helper/DropPreview.cpp -mv src/widgets/helper/_DropPreview.hpp src/widgets/helper/DropPreview.hpp -mv src/widgets/helper/_EditableModelView.cpp src/widgets/helper/EditableModelView.cpp -mv src/widgets/helper/_EditableModelView.hpp src/widgets/helper/EditableModelView.hpp -mv src/widgets/helper/_Line.hpp src/widgets/helper/Line.hpp -mv src/widgets/helper/_NotebookButton.cpp src/widgets/helper/NotebookButton.cpp -mv src/widgets/helper/_NotebookButton.hpp src/widgets/helper/NotebookButton.hpp -mv src/widgets/helper/_NotebookTab.cpp src/widgets/helper/NotebookTab.cpp -mv src/widgets/helper/_NotebookTab.hpp src/widgets/helper/NotebookTab.hpp -mv src/widgets/helper/_ResizingTextEdit.cpp src/widgets/helper/ResizingTextEdit.cpp -mv src/widgets/helper/_ResizingTextEdit.hpp src/widgets/helper/ResizingTextEdit.hpp -mv src/widgets/helper/_RippleEffectButton.cpp src/widgets/helper/RippleEffectButton.cpp -mv src/widgets/helper/_RippleEffectButton.hpp src/widgets/helper/RippleEffectButton.hpp -mv src/widgets/helper/_RippleEffectLabel.cpp src/widgets/helper/RippleEffectLabel.cpp -mv src/widgets/helper/_RippleEffectLabel.hpp src/widgets/helper/RippleEffectLabel.hpp -mv src/widgets/helper/_ScrollbarHighlight.cpp src/widgets/helper/ScrollbarHighlight.cpp -mv src/widgets/helper/_ScrollbarHighlight.hpp src/widgets/helper/ScrollbarHighlight.hpp -mv src/widgets/helper/_SearchPopup.cpp src/widgets/helper/SearchPopup.cpp -mv src/widgets/helper/_SearchPopup.hpp src/widgets/helper/SearchPopup.hpp -mv src/widgets/helper/_SettingsDialogTab.cpp src/widgets/helper/SettingsDialogTab.cpp -mv src/widgets/helper/_SettingsDialogTab.hpp src/widgets/helper/SettingsDialogTab.hpp -mv src/widgets/helper/_Shortcut.hpp src/widgets/helper/Shortcut.hpp -mv src/widgets/helper/_SignalLabel.cpp src/widgets/helper/SignalLabel.cpp -mv src/widgets/helper/_SignalLabel.hpp src/widgets/helper/SignalLabel.hpp -mv src/widgets/helper/_SplitColumn.cpp src/widgets/helper/SplitColumn.cpp -mv src/widgets/helper/_SplitColumn.hpp src/widgets/helper/SplitColumn.hpp -mv src/widgets/helper/_SplitHeader.cpp src/widgets/helper/SplitHeader.cpp -mv src/widgets/helper/_SplitHeader.hpp src/widgets/helper/SplitHeader.hpp -mv src/widgets/helper/_SplitInput.cpp src/widgets/helper/SplitInput.cpp -mv src/widgets/helper/_SplitInput.hpp src/widgets/helper/SplitInput.hpp -mv src/widgets/helper/_SplitNode.cpp src/widgets/helper/SplitNode.cpp -mv src/widgets/helper/_SplitNode.hpp src/widgets/helper/SplitNode.hpp -mv src/widgets/helper/_SplitOverlay.cpp src/widgets/helper/SplitOverlay.cpp -mv src/widgets/helper/_SplitOverlay.hpp src/widgets/helper/SplitOverlay.hpp -mv src/widgets/helper/_TitlebarButton.cpp src/widgets/helper/TitlebarButton.cpp -mv src/widgets/helper/_TitlebarButton.hpp src/widgets/helper/TitlebarButton.hpp -mv src/widgets/_Label.cpp src/widgets/Label.cpp -mv src/widgets/_Label.hpp src/widgets/Label.hpp -mv src/widgets/_LastRunCrashDialog.cpp src/widgets/LastRunCrashDialog.cpp -mv src/widgets/_LastRunCrashDialog.hpp src/widgets/LastRunCrashDialog.hpp -mv src/widgets/_LoginDialog.cpp src/widgets/LoginDialog.cpp -mv src/widgets/_LoginDialog.hpp src/widgets/LoginDialog.hpp -mv src/widgets/_Notebook.cpp src/widgets/Notebook.cpp -mv src/widgets/_Notebook.hpp src/widgets/Notebook.hpp -mv src/widgets/_NotificationPopup.cpp src/widgets/NotificationPopup.cpp -mv src/widgets/_NotificationPopup.hpp src/widgets/NotificationPopup.hpp -mv src/widgets/_QualityPopup.cpp src/widgets/QualityPopup.cpp -mv src/widgets/_QualityPopup.hpp src/widgets/QualityPopup.hpp -mv src/widgets/_Scrollbar.cpp src/widgets/Scrollbar.cpp -mv src/widgets/_Scrollbar.hpp src/widgets/Scrollbar.hpp -mv src/widgets/_SelectChannelDialog.cpp src/widgets/SelectChannelDialog.cpp -mv src/widgets/_SelectChannelDialog.hpp src/widgets/SelectChannelDialog.hpp -mv src/widgets/_SettingsDialog.cpp src/widgets/SettingsDialog.cpp -mv src/widgets/_SettingsDialog.hpp src/widgets/SettingsDialog.hpp -mv src/widgets/settingspages/_AboutPage.cpp src/widgets/settingspages/AboutPage.cpp -mv src/widgets/settingspages/_AboutPage.hpp src/widgets/settingspages/AboutPage.hpp -mv src/widgets/settingspages/_AccountsPage.cpp src/widgets/settingspages/AccountsPage.cpp -mv src/widgets/settingspages/_AccountsPage.hpp src/widgets/settingspages/AccountsPage.hpp -mv src/widgets/settingspages/_AppearancePage.cpp src/widgets/settingspages/AppearancePage.cpp -mv src/widgets/settingspages/_AppearancePage.hpp src/widgets/settingspages/AppearancePage.hpp -mv src/widgets/settingspages/_BehaviourPage.cpp src/widgets/settingspages/BehaviourPage.cpp -mv src/widgets/settingspages/_BehaviourPage.hpp src/widgets/settingspages/BehaviourPage.hpp -mv src/widgets/settingspages/_BrowserextensionPage.cpp src/widgets/settingspages/BrowserextensionPage.cpp -mv src/widgets/settingspages/_BrowserextensionPage.hpp src/widgets/settingspages/BrowserextensionPage.hpp -mv src/widgets/settingspages/_CommandPage.cpp src/widgets/settingspages/CommandPage.cpp -mv src/widgets/settingspages/_CommandPage.hpp src/widgets/settingspages/CommandPage.hpp -mv src/widgets/settingspages/_EmotesPage.cpp src/widgets/settingspages/EmotesPage.cpp -mv src/widgets/settingspages/_EmotesPage.hpp src/widgets/settingspages/EmotesPage.hpp -mv src/widgets/settingspages/_ExternaltoolsPage.cpp src/widgets/settingspages/ExternaltoolsPage.cpp -mv src/widgets/settingspages/_ExternaltoolsPage.hpp src/widgets/settingspages/ExternaltoolsPage.hpp -mv src/widgets/settingspages/_HighlightingPage.cpp src/widgets/settingspages/HighlightingPage.cpp -mv src/widgets/settingspages/_HighlightingPage.hpp src/widgets/settingspages/HighlightingPage.hpp -mv src/widgets/settingspages/_IgnoreusersPage.cpp src/widgets/settingspages/IgnoreusersPage.cpp -mv src/widgets/settingspages/_IgnoreusersPage.hpp src/widgets/settingspages/IgnoreusersPage.hpp -mv src/widgets/settingspages/_KeyboardsettingsPage.cpp src/widgets/settingspages/KeyboardsettingsPage.cpp -mv src/widgets/settingspages/_KeyboardsettingsPage.hpp src/widgets/settingspages/KeyboardsettingsPage.hpp -mv src/widgets/settingspages/_LogsPage.cpp src/widgets/settingspages/LogsPage.cpp -mv src/widgets/settingspages/_LogsPage.hpp src/widgets/settingspages/LogsPage.hpp -mv src/widgets/settingspages/_ModerationPage.cpp src/widgets/settingspages/ModerationPage.cpp -mv src/widgets/settingspages/_ModerationPage.hpp src/widgets/settingspages/ModerationPage.hpp -mv src/widgets/settingspages/_SettingsPage.cpp src/widgets/settingspages/SettingsPage.cpp -mv src/widgets/settingspages/_SettingsPage.hpp src/widgets/settingspages/SettingsPage.hpp -mv src/widgets/settingspages/_SpecialChannelsPage.cpp src/widgets/settingspages/SpecialChannelsPage.cpp -mv src/widgets/settingspages/_SpecialChannelsPage.hpp src/widgets/settingspages/SpecialChannelsPage.hpp -mv src/widgets/_Split.cpp src/widgets/Split.cpp -mv src/widgets/_Split.hpp src/widgets/Split.hpp -mv src/widgets/_SplitContainer.cpp src/widgets/SplitContainer.cpp -mv src/widgets/_SplitContainer.hpp src/widgets/SplitContainer.hpp -mv src/widgets/_StreamView.cpp src/widgets/StreamView.cpp -mv src/widgets/_StreamView.hpp src/widgets/StreamView.hpp -mv src/widgets/_TextInputDialog.cpp src/widgets/TextInputDialog.cpp -mv src/widgets/_TextInputDialog.hpp src/widgets/TextInputDialog.hpp -mv src/widgets/_Titlebar.hpp src/widgets/Titlebar.hpp -mv src/widgets/_TooltipWidget.cpp src/widgets/TooltipWidget.cpp -mv src/widgets/_TooltipWidget.hpp src/widgets/TooltipWidget.hpp -mv src/widgets/_UserInfoPopup.cpp src/widgets/UserInfoPopup.cpp -mv src/widgets/_UserInfoPopup.hpp src/widgets/UserInfoPopup.hpp -mv src/widgets/_WelcomeDialog.cpp src/widgets/WelcomeDialog.cpp -mv src/widgets/_WelcomeDialog.hpp src/widgets/WelcomeDialog.hpp -mv src/widgets/_Window.cpp src/widgets/Window.cpp -mv src/widgets/_Window.hpp src/widgets/Window.hpp diff --git a/src/Application.cpp b/src/Application.cpp index 5ea82f3a0..7b7ecc5a0 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -1,22 +1,22 @@ -#include "application.hpp" +#include "Application.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "controllers/commands/commandcontroller.hpp" -#include "controllers/highlights/highlightcontroller.hpp" -#include "controllers/ignores/ignorecontroller.hpp" -#include "controllers/taggedusers/taggeduserscontroller.hpp" -#include "providers/twitch/pubsub.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/emotemanager.hpp" -#include "singletons/fontmanager.hpp" -#include "singletons/loggingmanager.hpp" -#include "singletons/nativemessagingmanager.hpp" -#include "singletons/pathmanager.hpp" -#include "singletons/resourcemanager.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/posttothread.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "controllers/commands/CommandController.hpp" +#include "controllers/highlights/HighlightController.hpp" +#include "controllers/ignores/IgnoreController.hpp" +#include "controllers/taggedusers/TaggedUsersController.hpp" +#include "providers/twitch/Pubsub.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/EmoteManager.hpp" +#include "singletons/FontManager.hpp" +#include "singletons/LoggingManager.hpp" +#include "singletons/NativeMessagingManager.hpp" +#include "singletons/PathManager.hpp" +#include "singletons/ResourceManager.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/PostToThread.hpp" #include diff --git a/src/Application.hpp b/src/Application.hpp index ccb1ff2d2..cc961ad79 100644 --- a/src/Application.hpp +++ b/src/Application.hpp @@ -1,7 +1,7 @@ #pragma once -#include "singletons/ircmanager.hpp" -#include "singletons/resourcemanager.hpp" +#include "singletons/IrcManager.hpp" +#include "singletons/ResourceManager.hpp" #include diff --git a/src/Channel.cpp b/src/Channel.cpp index 4000662b9..e5fccf658 100644 --- a/src/Channel.cpp +++ b/src/Channel.cpp @@ -1,12 +1,12 @@ -#include "channel.hpp" +#include "Channel.hpp" -#include "application.hpp" -#include "debug/log.hpp" -#include "messages/message.hpp" -#include "singletons/emotemanager.hpp" -#include "singletons/ircmanager.hpp" -#include "singletons/loggingmanager.hpp" -#include "singletons/windowmanager.hpp" +#include "Application.hpp" +#include "debug/Log.hpp" +#include "messages/Message.hpp" +#include "singletons/EmoteManager.hpp" +#include "singletons/IrcManager.hpp" +#include "singletons/LoggingManager.hpp" +#include "singletons/WindowManager.hpp" #include #include diff --git a/src/Channel.hpp b/src/Channel.hpp index 2c8e57f61..d9374edbd 100644 --- a/src/Channel.hpp +++ b/src/Channel.hpp @@ -1,10 +1,10 @@ #pragma once -#include "messages/image.hpp" -#include "messages/limitedqueue.hpp" -#include "messages/message.hpp" -#include "util/completionmodel.hpp" -#include "util/concurrentmap.hpp" +#include "messages/Image.hpp" +#include "messages/LimitedQueue.hpp" +#include "messages/Message.hpp" +#include "util/CompletionModel.hpp" +#include "util/ConcurrentMap.hpp" #include #include diff --git a/src/ChannelData.cpp b/src/ChannelData.cpp index b95939d82..a19b04a02 100644 --- a/src/ChannelData.cpp +++ b/src/ChannelData.cpp @@ -1,4 +1,4 @@ -#include "channeldata.hpp" +#include "ChannelData.hpp" namespace chatterino { diff --git a/src/ChannelData.hpp b/src/ChannelData.hpp index 744f8455b..052583f01 100644 --- a/src/ChannelData.hpp +++ b/src/ChannelData.hpp @@ -1,7 +1,7 @@ #pragma once -#include "lockedobject.hpp" -#include "messages/image.hpp" +#include "LockedObject.hpp" +#include "messages/Image.hpp" namespace chatterino { diff --git a/src/Common.h.cpp b/src/Common.h.cpp index ad249c58d..0ac02013c 100644 --- a/src/Common.h.cpp +++ b/src/Common.h.cpp @@ -13,4 +13,4 @@ * * WARNING: All changes made in this file will be lost. --------------------------------------------------------------------*/ -#include "common.hpp" +#include "Common.hpp" diff --git a/src/Common.hpp b/src/Common.hpp index c1762d7da..78ce16578 100644 --- a/src/Common.hpp +++ b/src/Common.hpp @@ -1,6 +1,6 @@ #pragma once -#include "debug/log.hpp" +#include "debug/Log.hpp" #include #include diff --git a/src/controllers/accounts/Account.cpp b/src/controllers/accounts/Account.cpp index e9ef921ed..f7119ad56 100644 --- a/src/controllers/accounts/Account.cpp +++ b/src/controllers/accounts/Account.cpp @@ -1,4 +1,4 @@ -#include "account.hpp" +#include "Account.hpp" #include diff --git a/src/controllers/accounts/Account.hpp b/src/controllers/accounts/Account.hpp index bab75c5dd..07e7c0806 100644 --- a/src/controllers/accounts/Account.hpp +++ b/src/controllers/accounts/Account.hpp @@ -1,6 +1,6 @@ #pragma once -#include "providerid.hpp" +#include "ProviderId.hpp" #include diff --git a/src/controllers/accounts/AccountController.cpp b/src/controllers/accounts/AccountController.cpp index c70d4587d..df5c0c0e8 100644 --- a/src/controllers/accounts/AccountController.cpp +++ b/src/controllers/accounts/AccountController.cpp @@ -1,6 +1,6 @@ -#include "accountcontroller.hpp" +#include "AccountController.hpp" -#include "controllers/accounts/accountmodel.hpp" +#include "controllers/accounts/AccountModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp index 585c28896..72cf0d275 100644 --- a/src/controllers/accounts/AccountController.hpp +++ b/src/controllers/accounts/AccountController.hpp @@ -2,10 +2,10 @@ #include -#include "controllers/accounts/account.hpp" -#include "providers/twitch/twitchaccountmanager.hpp" -#include "util/sharedptrelementless.hpp" -#include "util/signalvector2.hpp" +#include "controllers/accounts/Account.hpp" +#include "providers/twitch/TwitchAccountManager.hpp" +#include "util/SharedPtrElementLess.hpp" +#include "util/SignalVector2.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/accounts/AccountModel.cpp b/src/controllers/accounts/AccountModel.cpp index f84a60e92..8e24be58e 100644 --- a/src/controllers/accounts/AccountModel.cpp +++ b/src/controllers/accounts/AccountModel.cpp @@ -1,6 +1,6 @@ -#include "accountmodel.hpp" +#include "AccountModel.hpp" -#include "util/standarditemhelper.hpp" +#include "util/StandardItemHelper.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp index 0d2e1c787..a3ba4f89f 100644 --- a/src/controllers/accounts/AccountModel.hpp +++ b/src/controllers/accounts/AccountModel.hpp @@ -1,8 +1,8 @@ #pragma once -#include "controllers/accounts/account.hpp" -#include "util/qstringhash.hpp" -#include "util/signalvectormodel.hpp" +#include "controllers/accounts/Account.hpp" +#include "util/QstringHash.hpp" +#include "util/SignalVectorModel.hpp" #include diff --git a/src/controllers/commands/Command.cpp b/src/controllers/commands/Command.cpp index 4ba5d3e80..80904f20b 100644 --- a/src/controllers/commands/Command.cpp +++ b/src/controllers/commands/Command.cpp @@ -1,4 +1,4 @@ -#include "command.hpp" +#include "Command.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp index 14d9c1063..70c3ae71f 100644 --- a/src/controllers/commands/CommandController.cpp +++ b/src/controllers/commands/CommandController.cpp @@ -1,15 +1,15 @@ -#include "commandcontroller.hpp" +#include "CommandController.hpp" -#include "application.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "controllers/commands/command.hpp" -#include "controllers/commands/commandmodel.hpp" -#include "messages/messagebuilder.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/pathmanager.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/signalvector2.hpp" +#include "Application.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "controllers/commands/Command.hpp" +#include "controllers/commands/CommandModel.hpp" +#include "messages/MessageBuilder.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/PathManager.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/SignalVector2.hpp" #include #include diff --git a/src/controllers/commands/CommandController.hpp b/src/controllers/commands/CommandController.hpp index 2fe8ba3b0..57277b554 100644 --- a/src/controllers/commands/CommandController.hpp +++ b/src/controllers/commands/CommandController.hpp @@ -4,8 +4,8 @@ #include #include -#include "controllers/commands/command.hpp" -#include "util/signalvector2.hpp" +#include "controllers/commands/Command.hpp" +#include "util/SignalVector2.hpp" namespace chatterino { class Channel; diff --git a/src/controllers/commands/CommandModel.cpp b/src/controllers/commands/CommandModel.cpp index 621e9d264..11b59d16e 100644 --- a/src/controllers/commands/CommandModel.cpp +++ b/src/controllers/commands/CommandModel.cpp @@ -1,4 +1,4 @@ -#include "commandmodel.hpp" +#include "CommandModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/commands/CommandModel.hpp b/src/controllers/commands/CommandModel.hpp index 7512c5761..85c2aead8 100644 --- a/src/controllers/commands/CommandModel.hpp +++ b/src/controllers/commands/CommandModel.hpp @@ -2,8 +2,8 @@ #include -#include "controllers/commands/command.hpp" -#include "util/signalvectormodel.hpp" +#include "controllers/commands/Command.hpp" +#include "util/SignalVectorModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/highlights/HighlightController.cpp b/src/controllers/highlights/HighlightController.cpp index df10341e5..198553271 100644 --- a/src/controllers/highlights/HighlightController.cpp +++ b/src/controllers/highlights/HighlightController.cpp @@ -1,8 +1,8 @@ -#include "highlightcontroller.hpp" +#include "HighlightController.hpp" -#include "application.hpp" -#include "controllers/highlights/highlightmodel.hpp" -#include "widgets/notificationpopup.hpp" +#include "Application.hpp" +#include "controllers/highlights/HighlightModel.hpp" +#include "widgets/NotificationPopup.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp index e6bed3343..31d3c5969 100644 --- a/src/controllers/highlights/HighlightController.hpp +++ b/src/controllers/highlights/HighlightController.hpp @@ -1,9 +1,9 @@ #pragma once -#include "controllers/highlights/highlightphrase.hpp" -#include "messages/message.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/signalvector2.hpp" +#include "controllers/highlights/HighlightPhrase.hpp" +#include "messages/Message.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/SignalVector2.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp index 5dfbaf608..e2d74a922 100644 --- a/src/controllers/highlights/HighlightModel.cpp +++ b/src/controllers/highlights/HighlightModel.cpp @@ -1,8 +1,8 @@ -#include "highlightmodel.hpp" +#include "HighlightModel.hpp" -#include "application.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/standarditemhelper.hpp" +#include "Application.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/StandardItemHelper.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/highlights/HighlightModel.hpp b/src/controllers/highlights/HighlightModel.hpp index 84dd3feee..a21497730 100644 --- a/src/controllers/highlights/HighlightModel.hpp +++ b/src/controllers/highlights/HighlightModel.hpp @@ -2,8 +2,8 @@ #include -#include "controllers/highlights/highlightphrase.hpp" -#include "util/signalvectormodel.hpp" +#include "controllers/highlights/HighlightPhrase.hpp" +#include "util/SignalVectorModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/highlights/HighlightPhrase.hpp b/src/controllers/highlights/HighlightPhrase.hpp index 052752c43..fa2f8edec 100644 --- a/src/controllers/highlights/HighlightPhrase.hpp +++ b/src/controllers/highlights/HighlightPhrase.hpp @@ -1,7 +1,7 @@ #pragma once -#include "util/rapidjson-helpers.hpp" -#include "util/serialize-custom.hpp" +#include "util/RapidjsonHelpers.hpp" +#include "util/SerializeCustom.hpp" #include #include diff --git a/src/controllers/ignores/IgnoreController.cpp b/src/controllers/ignores/IgnoreController.cpp index bd1910ca8..d7d7f649a 100644 --- a/src/controllers/ignores/IgnoreController.cpp +++ b/src/controllers/ignores/IgnoreController.cpp @@ -1,7 +1,7 @@ -#include "controllers/ignores/ignorecontroller.hpp" +#include "controllers/ignores/IgnoreController.hpp" -#include "application.hpp" -#include "controllers/ignores/ignoremodel.hpp" +#include "Application.hpp" +#include "controllers/ignores/IgnoreModel.hpp" #include diff --git a/src/controllers/ignores/IgnoreController.hpp b/src/controllers/ignores/IgnoreController.hpp index 84c3e27fe..966403b84 100644 --- a/src/controllers/ignores/IgnoreController.hpp +++ b/src/controllers/ignores/IgnoreController.hpp @@ -1,8 +1,8 @@ #pragma once -#include "controllers/ignores/ignorephrase.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/signalvector2.hpp" +#include "controllers/ignores/IgnorePhrase.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/SignalVector2.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/ignores/IgnoreModel.cpp b/src/controllers/ignores/IgnoreModel.cpp index af38db8db..5dc86cb0c 100644 --- a/src/controllers/ignores/IgnoreModel.cpp +++ b/src/controllers/ignores/IgnoreModel.cpp @@ -1,8 +1,8 @@ -#include "ignoremodel.hpp" +#include "IgnoreModel.hpp" -#include "application.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/standarditemhelper.hpp" +#include "Application.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/StandardItemHelper.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/ignores/IgnoreModel.hpp b/src/controllers/ignores/IgnoreModel.hpp index 3eacddfe7..f451ec4ff 100644 --- a/src/controllers/ignores/IgnoreModel.hpp +++ b/src/controllers/ignores/IgnoreModel.hpp @@ -2,8 +2,8 @@ #include -#include "controllers/ignores/ignorephrase.hpp" -#include "util/signalvectormodel.hpp" +#include "controllers/ignores/IgnorePhrase.hpp" +#include "util/SignalVectorModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp index 0be4ca105..960e60ed0 100644 --- a/src/controllers/ignores/IgnorePhrase.hpp +++ b/src/controllers/ignores/IgnorePhrase.hpp @@ -1,7 +1,7 @@ #pragma once -#include "util/rapidjson-helpers.hpp" -#include "util/serialize-custom.hpp" +#include "util/RapidjsonHelpers.hpp" +#include "util/SerializeCustom.hpp" #include #include diff --git a/src/controllers/taggedusers/TaggedUser.cpp b/src/controllers/taggedusers/TaggedUser.cpp index 6f50957b9..43ac76fe4 100644 --- a/src/controllers/taggedusers/TaggedUser.cpp +++ b/src/controllers/taggedusers/TaggedUser.cpp @@ -1,4 +1,4 @@ -#include "taggeduser.hpp" +#include "TaggedUser.hpp" #include diff --git a/src/controllers/taggedusers/TaggedUsersController.cpp b/src/controllers/taggedusers/TaggedUsersController.cpp index 98486c1fe..8ca80c5df 100644 --- a/src/controllers/taggedusers/TaggedUsersController.cpp +++ b/src/controllers/taggedusers/TaggedUsersController.cpp @@ -1,6 +1,6 @@ -#include "taggeduserscontroller.hpp" +#include "TaggedUsersController.hpp" -#include "controllers/taggedusers/taggedusersmodel.hpp" +#include "controllers/taggedusers/TaggedUsersModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/taggedusers/TaggedUsersController.hpp b/src/controllers/taggedusers/TaggedUsersController.hpp index 85e845c84..229addea5 100644 --- a/src/controllers/taggedusers/TaggedUsersController.hpp +++ b/src/controllers/taggedusers/TaggedUsersController.hpp @@ -1,7 +1,7 @@ #pragma once -#include "controllers/taggedusers/taggeduser.hpp" -#include "util/signalvector2.hpp" +#include "controllers/taggedusers/TaggedUser.hpp" +#include "util/SignalVector2.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/taggedusers/TaggedUsersModel.cpp b/src/controllers/taggedusers/TaggedUsersModel.cpp index 565bdf2ef..cf153f8ec 100644 --- a/src/controllers/taggedusers/TaggedUsersModel.cpp +++ b/src/controllers/taggedusers/TaggedUsersModel.cpp @@ -1,7 +1,7 @@ -#include "taggedusersmodel.hpp" +#include "TaggedUsersModel.hpp" -#include "application.hpp" -#include "util/standarditemhelper.hpp" +#include "Application.hpp" +#include "util/StandardItemHelper.hpp" namespace chatterino { namespace controllers { diff --git a/src/controllers/taggedusers/TaggedUsersModel.hpp b/src/controllers/taggedusers/TaggedUsersModel.hpp index 6db822c24..877e17c2f 100644 --- a/src/controllers/taggedusers/TaggedUsersModel.hpp +++ b/src/controllers/taggedusers/TaggedUsersModel.hpp @@ -1,7 +1,7 @@ #pragma once -#include "controllers/taggedusers/taggeduser.hpp" -#include "util/signalvectormodel.hpp" +#include "controllers/taggedusers/TaggedUser.hpp" +#include "util/SignalVectorModel.hpp" namespace chatterino { namespace controllers { diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp index 2eb6e126c..e55a4abf7 100644 --- a/src/debug/Log.hpp +++ b/src/debug/Log.hpp @@ -1,6 +1,6 @@ #pragma once -#include "util/helpers.hpp" +#include "util/Helpers.hpp" #include #include diff --git a/src/main.cpp b/src/main.cpp index 580f36902..c66242388 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,10 +1,10 @@ -#include "application.hpp" -#include "singletons/nativemessagingmanager.hpp" -#include "singletons/pathmanager.hpp" -#include "singletons/updatemanager.hpp" -#include "util/debugcount.hpp" -#include "util/networkmanager.hpp" -#include "widgets/lastruncrashdialog.hpp" +#include "Application.hpp" +#include "singletons/NativeMessagingManager.hpp" +#include "singletons/PathManager.hpp" +#include "singletons/UpdateManager.hpp" +#include "util/DebugCount.hpp" +#include "util/NetworkManager.hpp" +#include "widgets/LastRunCrashDialog.hpp" #include #include @@ -15,7 +15,7 @@ #include #ifdef USEWINSDK -#include "util/nativeeventhelper.hpp" +#include "util/NativeEventHelper.hpp" #endif #include diff --git a/src/messages/HighlightPhrase.hpp b/src/messages/HighlightPhrase.hpp index 6b39454bd..b2f7ff504 100644 --- a/src/messages/HighlightPhrase.hpp +++ b/src/messages/HighlightPhrase.hpp @@ -1,6 +1,6 @@ //#pragma once -//#include "util/serialize-custom.hpp" +//#include "util/SerializeCustom.hpp" //#include //#include diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp index 3ebc1a5ea..d1bee2097 100644 --- a/src/messages/Image.cpp +++ b/src/messages/Image.cpp @@ -1,13 +1,13 @@ -#include "messages/image.hpp" +#include "messages/Image.hpp" -#include "application.hpp" -#include "debug/log.hpp" -#include "singletons/emotemanager.hpp" -#include "singletons/ircmanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/networkmanager.hpp" -#include "util/posttothread.hpp" -#include "util/urlfetch.hpp" +#include "Application.hpp" +#include "debug/Log.hpp" +#include "singletons/EmoteManager.hpp" +#include "singletons/IrcManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/NetworkManager.hpp" +#include "util/PostToThread.hpp" +#include "util/UrlFetch.hpp" #include #include diff --git a/src/messages/LimitedQueue.hpp b/src/messages/LimitedQueue.hpp index 78d761809..8f24a78e5 100644 --- a/src/messages/LimitedQueue.hpp +++ b/src/messages/LimitedQueue.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/limitedqueuesnapshot.hpp" +#include "messages/LimitedQueueSnapshot.hpp" #include diff --git a/src/messages/Link.cpp b/src/messages/Link.cpp index 510d248ec..8432e1ff0 100644 --- a/src/messages/Link.cpp +++ b/src/messages/Link.cpp @@ -1,4 +1,4 @@ -#include "messages/link.hpp" +#include "messages/Link.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp index 50c9de41f..7bb73d89d 100644 --- a/src/messages/Message.cpp +++ b/src/messages/Message.cpp @@ -1,7 +1,7 @@ -#include "messages/message.hpp" -#include "messageelement.hpp" -#include "providers/twitch/pubsubactions.hpp" -#include "util/irchelpers.hpp" +#include "messages/Message.hpp" +#include "MessageElement.hpp" +#include "providers/twitch/PubsubActions.hpp" +#include "util/IrcHelpers.hpp" using SBHighlight = chatterino::widgets::ScrollbarHighlight; diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp index 7e95eb45e..0310f41ca 100644 --- a/src/messages/Message.hpp +++ b/src/messages/Message.hpp @@ -1,9 +1,9 @@ #pragma once -#include "messages/messageelement.hpp" -#include "providers/twitch/pubsubactions.hpp" -#include "util/flagsenum.hpp" -#include "widgets/helper/scrollbarhighlight.hpp" +#include "messages/MessageElement.hpp" +#include "providers/twitch/PubsubActions.hpp" +#include "util/FlagsEnum.hpp" +#include "widgets/helper/ScrollbarHighlight.hpp" #include @@ -11,7 +11,7 @@ #include #include -#include "util/debugcount.hpp" +#include "util/DebugCount.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index fa1a381e1..bcf650557 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -1,7 +1,7 @@ -#include "messagebuilder.hpp" -#include "singletons/emotemanager.hpp" -#include "singletons/resourcemanager.hpp" -#include "singletons/thememanager.hpp" +#include "MessageBuilder.hpp" +#include "singletons/EmoteManager.hpp" +#include "singletons/ResourceManager.hpp" +#include "singletons/ThemeManager.hpp" #include diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp index 933eb5ba6..56e185993 100644 --- a/src/messages/MessageBuilder.hpp +++ b/src/messages/MessageBuilder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/message.hpp" +#include "messages/Message.hpp" #include diff --git a/src/messages/MessageColor.cpp b/src/messages/MessageColor.cpp index 6e0f877e5..c56bc8d95 100644 --- a/src/messages/MessageColor.cpp +++ b/src/messages/MessageColor.cpp @@ -1,4 +1,4 @@ -#include "messagecolor.hpp" +#include "MessageColor.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/MessageColor.hpp b/src/messages/MessageColor.hpp index 04387bfb4..e29065bcd 100644 --- a/src/messages/MessageColor.hpp +++ b/src/messages/MessageColor.hpp @@ -1,6 +1,6 @@ #pragma once -#include "singletons/thememanager.hpp" +#include "singletons/ThemeManager.hpp" #include diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp index ff9562527..a214d48d3 100644 --- a/src/messages/MessageElement.cpp +++ b/src/messages/MessageElement.cpp @@ -1,11 +1,11 @@ -#include "messages/messageelement.hpp" +#include "messages/MessageElement.hpp" -#include "application.hpp" -#include "messages/layouts/messagelayoutcontainer.hpp" -#include "messages/layouts/messagelayoutelement.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/benchmark.hpp" -#include "util/emotemap.hpp" +#include "Application.hpp" +#include "messages/layouts/MessageLayoutContainer.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/Benchmark.hpp" +#include "util/Emotemap.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp index fc2be5928..71151884d 100644 --- a/src/messages/MessageElement.hpp +++ b/src/messages/MessageElement.hpp @@ -1,10 +1,10 @@ #pragma once -#include "messages/image.hpp" -#include "messages/link.hpp" -#include "messages/messagecolor.hpp" -#include "singletons/fontmanager.hpp" -#include "util/emotemap.hpp" +#include "messages/Image.hpp" +#include "messages/Link.hpp" +#include "messages/MessageColor.hpp" +#include "singletons/FontManager.hpp" +#include "util/Emotemap.hpp" #include #include diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index 0bbc9f6c2..cd5644087 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -1,10 +1,10 @@ -#include "messages/layouts/messagelayout.hpp" +#include "messages/layouts/MessageLayout.hpp" -#include "application.hpp" -#include "singletons/emotemanager.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/benchmark.hpp" +#include "Application.hpp" +#include "singletons/EmoteManager.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/Benchmark.hpp" #include #include diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp index 7b3c074ae..b1a1c6809 100644 --- a/src/messages/layouts/MessageLayout.hpp +++ b/src/messages/layouts/MessageLayout.hpp @@ -1,10 +1,10 @@ #pragma once -#include "messages/layouts/messagelayoutcontainer.hpp" -#include "messages/layouts/messagelayoutelement.hpp" -#include "messages/message.hpp" -#include "messages/selection.hpp" -#include "util/flagsenum.hpp" +#include "messages/layouts/MessageLayoutContainer.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" +#include "messages/Message.hpp" +#include "messages/Selection.hpp" +#include "util/FlagsEnum.hpp" #include diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp index 58aeeca81..29f132b15 100644 --- a/src/messages/layouts/MessageLayoutContainer.cpp +++ b/src/messages/layouts/MessageLayoutContainer.cpp @@ -1,9 +1,9 @@ -#include "messagelayoutcontainer.hpp" +#include "MessageLayoutContainer.hpp" -#include "application.hpp" -#include "messagelayoutelement.hpp" -#include "messages/selection.hpp" -#include "singletons/settingsmanager.hpp" +#include "Application.hpp" +#include "MessageLayoutElement.hpp" +#include "messages/Selection.hpp" +#include "singletons/SettingsManager.hpp" #include #include diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp index 91e4df1d1..a22ecb7b9 100644 --- a/src/messages/layouts/MessageLayoutContainer.hpp +++ b/src/messages/layouts/MessageLayoutContainer.hpp @@ -6,8 +6,8 @@ #include #include -#include "messages/message.hpp" -#include "messages/selection.hpp" +#include "messages/Message.hpp" +#include "messages/Selection.hpp" class QPainter; diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp index 2cf46f07f..ccd33141f 100644 --- a/src/messages/layouts/MessageLayoutElement.cpp +++ b/src/messages/layouts/MessageLayoutElement.cpp @@ -1,8 +1,8 @@ -#include "messages/layouts/messagelayoutelement.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" -#include "application.hpp" -#include "messages/messageelement.hpp" -#include "util/debugcount.hpp" +#include "Application.hpp" +#include "messages/MessageElement.hpp" +#include "util/DebugCount.hpp" #include #include diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp index 5735e6fcc..2b8707240 100644 --- a/src/messages/layouts/MessageLayoutElement.hpp +++ b/src/messages/layouts/MessageLayoutElement.hpp @@ -7,9 +7,9 @@ #include #include -#include "messages/link.hpp" -#include "messages/messagecolor.hpp" -#include "singletons/fontmanager.hpp" +#include "messages/Link.hpp" +#include "messages/MessageColor.hpp" +#include "singletons/FontManager.hpp" class QPainter; diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp index 4bf7adef1..972c5959b 100644 --- a/src/providers/bttv/BttvEmotes.cpp +++ b/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 { diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp index 2be042a67..550652d4e 100644 --- a/src/providers/bttv/BttvEmotes.hpp +++ b/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 diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp index 4e913a467..017179271 100644 --- a/src/providers/emoji/Emojis.cpp +++ b/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 diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp index 0fe8ed5f0..4fd668fbe 100644 --- a/src/providers/emoji/Emojis.hpp +++ b/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 #include diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp index 01a3ee2be..d7d3bb5da 100644 --- a/src/providers/ffz/FfzEmotes.cpp +++ b/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 { diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp index 7a8e45ad6..b9dfb99d7 100644 --- a/src/providers/ffz/FfzEmotes.hpp +++ b/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 diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp index f74040bef..dc4c0584e 100644 --- a/src/providers/irc/AbstractIrcServer.cpp +++ b/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 diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp index 27ed82a9e..b7f2e2e35 100644 --- a/src/providers/irc/AbstractIrcServer.hpp +++ b/src/providers/irc/AbstractIrcServer.hpp @@ -1,10 +1,10 @@ #pragma once -#include "channel.hpp" +#include "Channel.hpp" +#include "providers/irc/IrcConnection2.hpp" #include #include -#include #include #include diff --git a/src/providers/irc/IrcAccount.cpp b/src/providers/irc/IrcAccount.cpp index e09cde5c2..660f76f56 100644 --- a/src/providers/irc/IrcAccount.cpp +++ b/src/providers/irc/IrcAccount.cpp @@ -1,4 +1,4 @@ -#include "ircaccount.hpp" +#include "IrcAccount.hpp" // namespace chatterino { // namespace providers { diff --git a/src/providers/irc/IrcChannel2.cpp b/src/providers/irc/IrcChannel2.cpp index ffafc6ab7..31a895107 100644 --- a/src/providers/irc/IrcChannel2.cpp +++ b/src/providers/irc/IrcChannel2.cpp @@ -1,4 +1,4 @@ -#include "ircchannel2.hpp" +#include "IrcChannel2.hpp" namespace chatterino { namespace providers { diff --git a/src/providers/irc/IrcConnection2.cpp b/src/providers/irc/IrcConnection2.cpp index ac4257576..b9d7993e1 100644 --- a/src/providers/irc/IrcConnection2.cpp +++ b/src/providers/irc/IrcConnection2.cpp @@ -1,4 +1,4 @@ -#include "ircconnection2.hpp" +#include "IrcConnection2.hpp" namespace chatterino { namespace providers { diff --git a/src/providers/irc/IrcServer.cpp b/src/providers/irc/IrcServer.cpp index 5f0e5ca87..4c11e7e00 100644 --- a/src/providers/irc/IrcServer.cpp +++ b/src/providers/irc/IrcServer.cpp @@ -1,4 +1,4 @@ -#include "ircserver.hpp" +#include "IrcServer.hpp" #include diff --git a/src/providers/irc/IrcServer.hpp b/src/providers/irc/IrcServer.hpp index 97e684099..e627173f7 100644 --- a/src/providers/irc/IrcServer.hpp +++ b/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 { diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 54ba23a8d..5dbb26dfb 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/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 diff --git a/src/providers/twitch/Pubsub.cpp b/src/providers/twitch/Pubsub.cpp index a80f00fbd..c80a5ef8d 100644 --- a/src/providers/twitch/Pubsub.cpp +++ b/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 diff --git a/src/providers/twitch/Pubsub.hpp b/src/providers/twitch/Pubsub.hpp index 9eba6c29d..b885a8ef1 100644 --- a/src/providers/twitch/Pubsub.hpp +++ b/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 #include diff --git a/src/providers/twitch/PubsubActions.cpp b/src/providers/twitch/PubsubActions.cpp index d18b4fc5b..efb83b9d6 100644 --- a/src/providers/twitch/PubsubActions.cpp +++ b/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 { diff --git a/src/providers/twitch/PubsubHelpers.cpp b/src/providers/twitch/PubsubHelpers.cpp index 395ae44f9..710b59d9d 100644 --- a/src/providers/twitch/PubsubHelpers.cpp +++ b/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 { diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp index 60aa28e49..8bcb9192f 100644 --- a/src/providers/twitch/PubsubHelpers.hpp +++ b/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 #include diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp index 4e893fe21..ebec5d223 100644 --- a/src/providers/twitch/TwitchAccount.cpp +++ b/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 { diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp index 86f14153c..e47f7788e 100644 --- a/src/providers/twitch/TwitchAccount.hpp +++ b/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 #include diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp index 1fad27931..97329dfde 100644 --- a/src/providers/twitch/TwitchAccountManager.cpp +++ b/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 { diff --git a/src/providers/twitch/TwitchAccountManager.hpp b/src/providers/twitch/TwitchAccountManager.hpp index ea0a5c859..a9b97bcd1 100644 --- a/src/providers/twitch/TwitchAccountManager.hpp +++ b/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 diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index 3441b0902..3e4a117be 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/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 #include diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp index 7cd502f43..5826fe154 100644 --- a/src/providers/twitch/TwitchChannel.hpp +++ b/src/providers/twitch/TwitchChannel.hpp @@ -2,12 +2,12 @@ #include -#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 diff --git a/src/providers/twitch/TwitchEmotes.cpp b/src/providers/twitch/TwitchEmotes.cpp index 4dc8cca33..30a572d6d 100644 --- a/src/providers/twitch/TwitchEmotes.cpp +++ b/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}" diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp index 7060628e2..62f5e8ce9 100644 --- a/src/providers/twitch/TwitchEmotes.hpp +++ b/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 diff --git a/src/providers/twitch/TwitchHelpers.cpp b/src/providers/twitch/TwitchHelpers.cpp index 98140c6c2..8a97dadfc 100644 --- a/src/providers/twitch/TwitchHelpers.cpp +++ b/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 { diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index a8774922a..d126cd781 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/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 #include diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp index 048736790..a30ba7d15 100644 --- a/src/providers/twitch/TwitchMessageBuilder.hpp +++ b/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 diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp index 1fc3ee332..a17eb6b03 100644 --- a/src/providers/twitch/TwitchServer.cpp +++ b/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 diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp index 2ac9773cc..327af0648 100644 --- a/src/providers/twitch/TwitchServer.hpp +++ b/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 #include diff --git a/src/providers/twitch/TwitchUser.cpp b/src/providers/twitch/TwitchUser.cpp index 43d5f322e..f2a75384b 100644 --- a/src/providers/twitch/TwitchUser.cpp +++ b/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 { diff --git a/src/singletons/EmoteManager.cpp b/src/singletons/EmoteManager.cpp index cc11ae5e2..9ee1fe75a 100644 --- a/src/singletons/EmoteManager.cpp +++ b/src/singletons/EmoteManager.cpp @@ -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 { diff --git a/src/singletons/EmoteManager.hpp b/src/singletons/EmoteManager.hpp index 15146ed41..9de3036a9 100644 --- a/src/singletons/EmoteManager.hpp +++ b/src/singletons/EmoteManager.hpp @@ -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 { diff --git a/src/singletons/FontManager.cpp b/src/singletons/FontManager.cpp index f733979a7..ccbc7156d 100644 --- a/src/singletons/FontManager.cpp +++ b/src/singletons/FontManager.cpp @@ -1,11 +1,11 @@ -#include "singletons/fontmanager.hpp" +#include "singletons/FontManager.hpp" #include #include -#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" diff --git a/src/singletons/IrcManager.cpp b/src/singletons/IrcManager.cpp index f7187fc71..2c2070015 100644 --- a/src/singletons/IrcManager.cpp +++ b/src/singletons/IrcManager.cpp @@ -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 //#include diff --git a/src/singletons/LoggingManager.cpp b/src/singletons/LoggingManager.cpp index 0078ccba2..354615997 100644 --- a/src/singletons/LoggingManager.cpp +++ b/src/singletons/LoggingManager.cpp @@ -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 #include diff --git a/src/singletons/LoggingManager.hpp b/src/singletons/LoggingManager.hpp index c67acfad0..058bab4d9 100644 --- a/src/singletons/LoggingManager.hpp +++ b/src/singletons/LoggingManager.hpp @@ -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 diff --git a/src/singletons/NativeMessagingManager.cpp b/src/singletons/NativeMessagingManager.cpp index 79b6562f9..3f01efac2 100644 --- a/src/singletons/NativeMessagingManager.cpp +++ b/src/singletons/NativeMessagingManager.cpp @@ -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 #include @@ -20,8 +20,8 @@ namespace ipc = boost::interprocess; #include #include -#include "singletons/windowmanager.hpp" -#include "widgets/attachedwindow.hpp" +#include "singletons/WindowManager.hpp" +#include "widgets/AttachedWindow.hpp" #endif #include diff --git a/src/singletons/PathManager.cpp b/src/singletons/PathManager.cpp index cb150786b..d64b73b88 100644 --- a/src/singletons/PathManager.cpp +++ b/src/singletons/PathManager.cpp @@ -1,4 +1,4 @@ -#include "singletons/pathmanager.hpp" +#include "singletons/PathManager.hpp" #include #include @@ -6,7 +6,7 @@ #include #include -#include "util/combine_path.hpp" +#include "util/CombinePath.hpp" namespace chatterino { namespace singletons { diff --git a/src/singletons/ResourceManager.cpp b/src/singletons/ResourceManager.cpp index c37504ab2..032f6c064 100644 --- a/src/singletons/ResourceManager.cpp +++ b/src/singletons/ResourceManager.cpp @@ -1,5 +1,5 @@ -#include "resourcemanager.hpp" -#include "util/urlfetch.hpp" +#include "ResourceManager.hpp" +#include "util/UrlFetch.hpp" #include #include diff --git a/src/singletons/ResourceManager.hpp b/src/singletons/ResourceManager.hpp index 240aa4ae3..ceeee895b 100644 --- a/src/singletons/ResourceManager.hpp +++ b/src/singletons/ResourceManager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "util/emotemap.hpp" +#include "util/Emotemap.hpp" #include #include diff --git a/src/singletons/SettingsManager.cpp b/src/singletons/SettingsManager.cpp index 7970084cc..7a0efa900 100644 --- a/src/singletons/SettingsManager.cpp +++ b/src/singletons/SettingsManager.cpp @@ -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; diff --git a/src/singletons/SettingsManager.hpp b/src/singletons/SettingsManager.hpp index e6de9bfe3..968733b61 100644 --- a/src/singletons/SettingsManager.hpp +++ b/src/singletons/SettingsManager.hpp @@ -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 #include diff --git a/src/singletons/ThemeManager.cpp b/src/singletons/ThemeManager.cpp index c78c1ca90..fc7e4df29 100644 --- a/src/singletons/ThemeManager.cpp +++ b/src/singletons/ThemeManager.cpp @@ -1,6 +1,6 @@ #define LOOKUP_COLOR_COUNT 360 -#include "thememanager.hpp" +#include "ThemeManager.hpp" #include diff --git a/src/singletons/ThemeManager.hpp b/src/singletons/ThemeManager.hpp index 2de85944c..917c627cf 100644 --- a/src/singletons/ThemeManager.hpp +++ b/src/singletons/ThemeManager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "util/serialize-custom.hpp" +#include "util/SerializeCustom.hpp" #include #include diff --git a/src/singletons/UpdateManager.cpp b/src/singletons/UpdateManager.cpp index 02254a112..e271622b8 100644 --- a/src/singletons/UpdateManager.cpp +++ b/src/singletons/UpdateManager.cpp @@ -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 #include diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index f33a64c14..fe067e468 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -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 #include diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp index c28d9706f..8ce7f8e70 100644 --- a/src/singletons/WindowManager.hpp +++ b/src/singletons/WindowManager.hpp @@ -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 { diff --git a/src/singletons/helper/ChatterinoSetting.cpp b/src/singletons/helper/ChatterinoSetting.cpp index 12ea0f055..6a3b40797 100644 --- a/src/singletons/helper/ChatterinoSetting.cpp +++ b/src/singletons/helper/ChatterinoSetting.cpp @@ -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 { diff --git a/src/singletons/helper/GifTimer.cpp b/src/singletons/helper/GifTimer.cpp index 097b90dc6..6bc416fed 100644 --- a/src/singletons/helper/GifTimer.cpp +++ b/src/singletons/helper/GifTimer.cpp @@ -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 { diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp index e41876e8a..033963f7e 100644 --- a/src/singletons/helper/LoggingChannel.cpp +++ b/src/singletons/helper/LoggingChannel.cpp @@ -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 diff --git a/src/singletons/helper/LoggingChannel.hpp b/src/singletons/helper/LoggingChannel.hpp index 2a4dd4dd8..0204a2088 100644 --- a/src/singletons/helper/LoggingChannel.hpp +++ b/src/singletons/helper/LoggingChannel.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/message.hpp" +#include "messages/Message.hpp" #include #include diff --git a/src/singletons/helper/ModerationAction.cpp b/src/singletons/helper/ModerationAction.cpp index c8b322a1d..dbd542b24 100644 --- a/src/singletons/helper/ModerationAction.cpp +++ b/src/singletons/helper/ModerationAction.cpp @@ -1,6 +1,6 @@ -#include "moderationaction.hpp" +#include "ModerationAction.hpp" -#include "singletons/resourcemanager.hpp" +#include "singletons/ResourceManager.hpp" namespace chatterino { namespace singletons { diff --git a/src/util/CompletionModel.cpp b/src/util/CompletionModel.cpp index 372290c3e..6df1d6e20 100644 --- a/src/util/CompletionModel.cpp +++ b/src/util/CompletionModel.cpp @@ -1,10 +1,10 @@ -#include "util/completionmodel.hpp" +#include "util/CompletionModel.hpp" -#include "application.hpp" -#include "common.hpp" -#include "controllers/commands/commandcontroller.hpp" -#include "debug/log.hpp" -#include "singletons/emotemanager.hpp" +#include "Application.hpp" +#include "Common.hpp" +#include "controllers/commands/CommandController.hpp" +#include "debug/Log.hpp" +#include "singletons/EmoteManager.hpp" #include diff --git a/src/util/CompletionModel.hpp b/src/util/CompletionModel.hpp index bbcb26a6b..8bb86468c 100644 --- a/src/util/CompletionModel.hpp +++ b/src/util/CompletionModel.hpp @@ -1,6 +1,6 @@ #pragma once -#include "common.hpp" +#include "Common.hpp" #include diff --git a/src/util/DebugCount.cpp b/src/util/DebugCount.cpp index a8a454352..79261c1db 100644 --- a/src/util/DebugCount.cpp +++ b/src/util/DebugCount.cpp @@ -1,4 +1,4 @@ -#include "debugcount.hpp" +#include "DebugCount.hpp" namespace chatterino { namespace util { diff --git a/src/util/Emotemap.cpp b/src/util/Emotemap.cpp index ba0030451..1f0b53ac3 100644 --- a/src/util/Emotemap.cpp +++ b/src/util/Emotemap.cpp @@ -1,7 +1,7 @@ -#include "emotemap.hpp" +#include "Emotemap.hpp" -#include "application.hpp" -#include "singletons/settingsmanager.hpp" +#include "Application.hpp" +#include "singletons/SettingsManager.hpp" namespace chatterino { namespace util { diff --git a/src/util/Emotemap.hpp b/src/util/Emotemap.hpp index 253fb44ad..6b5366d4f 100644 --- a/src/util/Emotemap.hpp +++ b/src/util/Emotemap.hpp @@ -1,7 +1,7 @@ #pragma once -#include "messages/image.hpp" -#include "util/concurrentmap.hpp" +#include "messages/Image.hpp" +#include "util/ConcurrentMap.hpp" namespace chatterino { namespace util { diff --git a/src/util/NetworkManager.cpp b/src/util/NetworkManager.cpp index 7b320f9b5..f3c2650ba 100644 --- a/src/util/NetworkManager.cpp +++ b/src/util/NetworkManager.cpp @@ -1,4 +1,4 @@ -#include "util/networkmanager.hpp" +#include "util/NetworkManager.hpp" #include diff --git a/src/util/NetworkManager.hpp b/src/util/NetworkManager.hpp index 82203e9a7..64fe400e7 100644 --- a/src/util/NetworkManager.hpp +++ b/src/util/NetworkManager.hpp @@ -1,8 +1,8 @@ #pragma once -#include "debug/log.hpp" -#include "util/networkrequester.hpp" -#include "util/networkworker.hpp" +#include "debug/Log.hpp" +#include "util/NetworkRequester.hpp" +#include "util/NetworkWorker.hpp" #include #include diff --git a/src/util/NetworkRequest.cpp b/src/util/NetworkRequest.cpp index f23cfedc9..36648fd7f 100644 --- a/src/util/NetworkRequest.cpp +++ b/src/util/NetworkRequest.cpp @@ -1,6 +1,6 @@ -#include "util/networkrequest.hpp" +#include "util/NetworkRequest.hpp" -#include "application.hpp" +#include "Application.hpp" namespace chatterino { namespace util { diff --git a/src/util/NetworkRequest.hpp b/src/util/NetworkRequest.hpp index d4c0755cf..564f358df 100644 --- a/src/util/NetworkRequest.hpp +++ b/src/util/NetworkRequest.hpp @@ -1,10 +1,10 @@ #pragma once -#include "application.hpp" -#include "singletons/pathmanager.hpp" -#include "util/networkmanager.hpp" -#include "util/networkrequester.hpp" -#include "util/networkworker.hpp" +#include "Application.hpp" +#include "singletons/PathManager.hpp" +#include "util/NetworkManager.hpp" +#include "util/NetworkRequester.hpp" +#include "util/NetworkWorker.hpp" #include #include diff --git a/src/util/RapidjsonHelpers.cpp b/src/util/RapidjsonHelpers.cpp index 571b50f5f..78256b4a2 100644 --- a/src/util/RapidjsonHelpers.cpp +++ b/src/util/RapidjsonHelpers.cpp @@ -1,4 +1,4 @@ -#include "util/rapidjson-helpers.hpp" +#include "util/RapidjsonHelpers.hpp" #include diff --git a/src/util/RapidjsonHelpers.hpp b/src/util/RapidjsonHelpers.hpp index a447db0a2..632c1e60c 100644 --- a/src/util/RapidjsonHelpers.hpp +++ b/src/util/RapidjsonHelpers.hpp @@ -1,6 +1,6 @@ #pragma once -#include "util/serialize-custom.hpp" +#include "util/SerializeCustom.hpp" #include #include diff --git a/src/util/SignalVector2.hpp b/src/util/SignalVector2.hpp index d26878fa5..8492b8fce 100644 --- a/src/util/SignalVector2.hpp +++ b/src/util/SignalVector2.hpp @@ -6,7 +6,7 @@ #include #include -#include "util/assertinguithread.hpp" +#include "util/AssertInGuiThread.hpp" namespace chatterino { namespace util { diff --git a/src/util/SignalVectorModel.hpp b/src/util/SignalVectorModel.hpp index 78e4305a9..1ad24ed52 100644 --- a/src/util/SignalVectorModel.hpp +++ b/src/util/SignalVectorModel.hpp @@ -1,9 +1,10 @@ #pragma once +#include "util/SignalVector2.hpp" + #include #include #include -#include #include diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp index fe1e9ec26..a230b8d6a 100644 --- a/src/util/StreamLink.cpp +++ b/src/util/StreamLink.cpp @@ -1,9 +1,9 @@ -#include "util/streamlink.hpp" +#include "util/StreamLink.hpp" -#include "application.hpp" -#include "helpers.hpp" -#include "singletons/settingsmanager.hpp" -#include "widgets/qualitypopup.hpp" +#include "Application.hpp" +#include "Helpers.hpp" +#include "singletons/SettingsManager.hpp" +#include "widgets/QualityPopup.hpp" #include #include diff --git a/src/util/UrlFetch.hpp b/src/util/UrlFetch.hpp index 991e5a562..302c45e1f 100644 --- a/src/util/UrlFetch.hpp +++ b/src/util/UrlFetch.hpp @@ -1,10 +1,10 @@ #pragma once -#include "controllers/accounts/accountcontroller.hpp" -#include "credentials.hpp" -#include "debug/log.hpp" -#include "util/networkmanager.hpp" -#include "util/networkrequest.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "Credentials.hpp" +#include "debug/Log.hpp" +#include "util/NetworkManager.hpp" +#include "util/NetworkRequest.hpp" #include #include diff --git a/src/util/WindowsHelper.cpp b/src/util/WindowsHelper.cpp index a215ed960..97cd2a28c 100644 --- a/src/util/WindowsHelper.cpp +++ b/src/util/WindowsHelper.cpp @@ -1,4 +1,4 @@ -#include "windows_helper.hpp" +#include "WindowsHelper.hpp" #ifdef USEWINSDK diff --git a/src/widgets/AccountSwitchPopupWidget.cpp b/src/widgets/AccountSwitchPopupWidget.cpp index 03a494827..56f0b75ae 100644 --- a/src/widgets/AccountSwitchPopupWidget.cpp +++ b/src/widgets/AccountSwitchPopupWidget.cpp @@ -1,6 +1,6 @@ -#include "widgets/accountswitchpopupwidget.hpp" -#include "debug/log.hpp" -#include "widgets/settingsdialog.hpp" +#include "widgets/AccountSwitchPopupWidget.hpp" +#include "debug/Log.hpp" +#include "widgets/SettingsDialog.hpp" #include #include diff --git a/src/widgets/AccountSwitchPopupWidget.hpp b/src/widgets/AccountSwitchPopupWidget.hpp index 27c22ecc9..4cc8f09b8 100644 --- a/src/widgets/AccountSwitchPopupWidget.hpp +++ b/src/widgets/AccountSwitchPopupWidget.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/accountswitchwidget.hpp" +#include "widgets/AccountSwitchWidget.hpp" #include diff --git a/src/widgets/AccountSwitchWidget.cpp b/src/widgets/AccountSwitchWidget.cpp index ebec62ea9..2414a5c59 100644 --- a/src/widgets/AccountSwitchWidget.cpp +++ b/src/widgets/AccountSwitchWidget.cpp @@ -1,8 +1,8 @@ -#include "accountswitchwidget.hpp" +#include "AccountSwitchWidget.hpp" -#include "application.hpp" -#include "const.hpp" -#include "controllers/accounts/accountcontroller.hpp" +#include "Application.hpp" +#include "Const.hpp" +#include "controllers/accounts/AccountController.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp index 235a5cc7a..b4f60cbae 100644 --- a/src/widgets/AttachedWindow.cpp +++ b/src/widgets/AttachedWindow.cpp @@ -1,14 +1,14 @@ -#include "attachedwindow.hpp" +#include "AttachedWindow.hpp" -#include "application.hpp" -#include "util/debugcount.hpp" -#include "widgets/split.hpp" +#include "Application.hpp" +#include "util/DebugCount.hpp" +#include "widgets/Split.hpp" #include #include #ifdef USEWINSDK -#include "util/windows_helper.hpp" +#include "util/WindowsHelper.hpp" #include "Windows.h" // don't even think about reordering these diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp index 8d7c216cd..78b1b839f 100644 --- a/src/widgets/AttachedWindow.hpp +++ b/src/widgets/AttachedWindow.hpp @@ -2,8 +2,8 @@ #include -#include "channel.hpp" -#include "widgets/split.hpp" +#include "Channel.hpp" +#include "widgets/Split.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/BaseWidget.cpp b/src/widgets/BaseWidget.cpp index b94698551..c0cee0484 100644 --- a/src/widgets/BaseWidget.cpp +++ b/src/widgets/BaseWidget.cpp @@ -1,10 +1,10 @@ -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" -#include "application.hpp" -#include "debug/log.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "widgets/basewindow.hpp" +#include "Application.hpp" +#include "debug/Log.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "widgets/BaseWindow.hpp" #include #include diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index 81bdc31ae..b48ca7202 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -1,17 +1,17 @@ -#include "basewindow.hpp" +#include "BaseWindow.hpp" -#include "application.hpp" +#include "Application.hpp" #include "boost/algorithm/algorithm.hpp" -#include "debug/log.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/nativeeventhelper.hpp" -#include "util/posttothread.hpp" -#include "util/windows_helper.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" -#include "widgets/helper/shortcut.hpp" -#include "widgets/label.hpp" -#include "widgets/tooltipwidget.hpp" +#include "debug/Log.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/NativeEventHelper.hpp" +#include "util/PostToThread.hpp" +#include "util/WindowsHelper.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "widgets/helper/Shortcut.hpp" +#include "widgets/Label.hpp" +#include "widgets/TooltipWidget.hpp" #include #include @@ -36,7 +36,7 @@ #define WM_DPICHANGED 0x02E0 #endif -#include "widgets/helper/titlebarbutton.hpp" +#include "widgets/helper/TitlebarButton.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp index ebb771546..f41dbec06 100644 --- a/src/widgets/BaseWindow.hpp +++ b/src/widgets/BaseWindow.hpp @@ -1,7 +1,7 @@ #pragma once -#include "basewidget.hpp" -#include "widgets/helper/titlebarbutton.hpp" +#include "BaseWidget.hpp" +#include "widgets/helper/TitlebarButton.hpp" #include #include diff --git a/src/widgets/EmotePopup.cpp b/src/widgets/EmotePopup.cpp index fae47033d..91595b220 100644 --- a/src/widgets/EmotePopup.cpp +++ b/src/widgets/EmotePopup.cpp @@ -1,10 +1,10 @@ -#include "emotepopup.hpp" +#include "EmotePopup.hpp" -#include "application.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "messages/messagebuilder.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "widgets/notebook.hpp" +#include "Application.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "messages/MessageBuilder.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "widgets/Notebook.hpp" #include #include diff --git a/src/widgets/EmotePopup.hpp b/src/widgets/EmotePopup.hpp index 67a805cb4..7b374795a 100644 --- a/src/widgets/EmotePopup.hpp +++ b/src/widgets/EmotePopup.hpp @@ -1,8 +1,8 @@ #pragma once -#include "channel.hpp" -#include "widgets/basewindow.hpp" -#include "widgets/helper/channelview.hpp" +#include "Channel.hpp" +#include "widgets/BaseWindow.hpp" +#include "widgets/helper/ChannelView.hpp" #include diff --git a/src/widgets/Label.cpp b/src/widgets/Label.cpp index 0e6ef8b42..a990f8ac5 100644 --- a/src/widgets/Label.cpp +++ b/src/widgets/Label.cpp @@ -1,6 +1,6 @@ -#include "label.hpp" +#include "Label.hpp" -#include "application.hpp" +#include "Application.hpp" #include diff --git a/src/widgets/Label.hpp b/src/widgets/Label.hpp index 9e4ef4b97..2c6b47ca1 100644 --- a/src/widgets/Label.hpp +++ b/src/widgets/Label.hpp @@ -1,7 +1,7 @@ #pragma once -#include "singletons/fontmanager.hpp" -#include "widgets/basewidget.hpp" +#include "singletons/FontManager.hpp" +#include "widgets/BaseWidget.hpp" #include diff --git a/src/widgets/LastRunCrashDialog.cpp b/src/widgets/LastRunCrashDialog.cpp index a60153e97..427856eb5 100644 --- a/src/widgets/LastRunCrashDialog.cpp +++ b/src/widgets/LastRunCrashDialog.cpp @@ -1,13 +1,13 @@ -#include "lastruncrashdialog.hpp" +#include "LastRunCrashDialog.hpp" #include #include #include #include -#include "singletons/updatemanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/posttothread.hpp" +#include "singletons/UpdateManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/PostToThread.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/LoginDialog.cpp b/src/widgets/LoginDialog.cpp index cccac45e3..77dcce095 100644 --- a/src/widgets/LoginDialog.cpp +++ b/src/widgets/LoginDialog.cpp @@ -1,6 +1,6 @@ -#include "widgets/logindialog.hpp" -#include "common.hpp" -#include "util/urlfetch.hpp" +#include "widgets/LoginDialog.hpp" +#include "Common.hpp" +#include "util/UrlFetch.hpp" #ifdef USEWINSDK #include #endif diff --git a/src/widgets/LoginDialog.hpp b/src/widgets/LoginDialog.hpp index b6a17e627..23c1195a3 100644 --- a/src/widgets/LoginDialog.hpp +++ b/src/widgets/LoginDialog.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" #include #include diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp index 9e69bacd5..84ac18e07 100644 --- a/src/widgets/Notebook.cpp +++ b/src/widgets/Notebook.cpp @@ -1,15 +1,15 @@ -#include "widgets/notebook.hpp" +#include "widgets/Notebook.hpp" -#include "application.hpp" -#include "debug/log.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "widgets/helper/notebookbutton.hpp" -#include "widgets/helper/notebooktab.hpp" -#include "widgets/helper/shortcut.hpp" -#include "widgets/settingsdialog.hpp" -#include "widgets/splitcontainer.hpp" -#include "widgets/window.hpp" +#include "Application.hpp" +#include "debug/Log.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "widgets/helper/NotebookButton.hpp" +#include "widgets/helper/NotebookTab.hpp" +#include "widgets/helper/Shortcut.hpp" +#include "widgets/SettingsDialog.hpp" +#include "widgets/SplitContainer.hpp" +#include "widgets/Window.hpp" #include #include diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp index bd4233bce..70369b2d5 100644 --- a/src/widgets/Notebook.hpp +++ b/src/widgets/Notebook.hpp @@ -1,10 +1,10 @@ #pragma once #include "pajlada/signals/signal.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/helper/notebookbutton.hpp" -#include "widgets/helper/notebooktab.hpp" -#include "widgets/splitcontainer.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/NotebookButton.hpp" +#include "widgets/helper/NotebookTab.hpp" +#include "widgets/SplitContainer.hpp" #include #include diff --git a/src/widgets/NotificationPopup.cpp b/src/widgets/NotificationPopup.cpp index 31c1deb63..7de2a434c 100644 --- a/src/widgets/NotificationPopup.cpp +++ b/src/widgets/NotificationPopup.cpp @@ -1,6 +1,6 @@ -#include "notificationpopup.hpp" +#include "NotificationPopup.hpp" -#include "widgets/helper/channelview.hpp" +#include "widgets/helper/ChannelView.hpp" #include #include diff --git a/src/widgets/NotificationPopup.hpp b/src/widgets/NotificationPopup.hpp index ab7409faf..871fabb3b 100644 --- a/src/widgets/NotificationPopup.hpp +++ b/src/widgets/NotificationPopup.hpp @@ -1,8 +1,8 @@ #pragma once -#include "channel.hpp" -#include "messages/message.hpp" -#include "widgets/basewindow.hpp" +#include "Channel.hpp" +#include "messages/Message.hpp" +#include "widgets/BaseWindow.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/QualityPopup.cpp b/src/widgets/QualityPopup.cpp index 01717531b..27e3d898a 100644 --- a/src/widgets/QualityPopup.cpp +++ b/src/widgets/QualityPopup.cpp @@ -1,6 +1,6 @@ -#include "qualitypopup.hpp" -#include "debug/log.hpp" -#include "util/streamlink.hpp" +#include "QualityPopup.hpp" +#include "debug/Log.hpp" +#include "util/StreamLink.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/QualityPopup.hpp b/src/widgets/QualityPopup.hpp index aa4c48597..ca88ab962 100644 --- a/src/widgets/QualityPopup.hpp +++ b/src/widgets/QualityPopup.hpp @@ -1,6 +1,6 @@ #pragma once -#include "basewindow.hpp" +#include "BaseWindow.hpp" #include #include diff --git a/src/widgets/Scrollbar.cpp b/src/widgets/Scrollbar.cpp index d46c6a93b..d8fd70151 100644 --- a/src/widgets/Scrollbar.cpp +++ b/src/widgets/Scrollbar.cpp @@ -1,8 +1,8 @@ -#include "widgets/scrollbar.hpp" +#include "widgets/Scrollbar.hpp" -#include "application.hpp" -#include "singletons/thememanager.hpp" -#include "widgets/helper/channelview.hpp" +#include "Application.hpp" +#include "singletons/ThemeManager.hpp" +#include "widgets/helper/ChannelView.hpp" #include #include diff --git a/src/widgets/Scrollbar.hpp b/src/widgets/Scrollbar.hpp index bc8e69630..b6f11896c 100644 --- a/src/widgets/Scrollbar.hpp +++ b/src/widgets/Scrollbar.hpp @@ -1,9 +1,9 @@ #pragma once -#include "messages/limitedqueue.hpp" -#include "singletons/settingsmanager.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/helper/scrollbarhighlight.hpp" +#include "messages/LimitedQueue.hpp" +#include "singletons/SettingsManager.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/ScrollbarHighlight.hpp" #include #include diff --git a/src/widgets/SelectChannelDialog.cpp b/src/widgets/SelectChannelDialog.cpp index 8848e01f5..3e0e14571 100644 --- a/src/widgets/SelectChannelDialog.cpp +++ b/src/widgets/SelectChannelDialog.cpp @@ -1,15 +1,15 @@ -#include "selectchanneldialog.hpp" +#include "SelectChannelDialog.hpp" -#include "application.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "util/layoutcreator.hpp" +#include "Application.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/Notebook.hpp" #include #include #include #include #include -#include #define TAB_TWITCH 0 diff --git a/src/widgets/SelectChannelDialog.hpp b/src/widgets/SelectChannelDialog.hpp index f39b4b0c6..64f88250c 100644 --- a/src/widgets/SelectChannelDialog.hpp +++ b/src/widgets/SelectChannelDialog.hpp @@ -1,8 +1,8 @@ #pragma once -#include "channel.hpp" -#include "widgets/basewindow.hpp" -#include "widgets/notebook.hpp" +#include "Channel.hpp" +#include "widgets/BaseWindow.hpp" +#include "widgets/Notebook.hpp" #include diff --git a/src/widgets/SettingsDialog.cpp b/src/widgets/SettingsDialog.cpp index 35e6717eb..f77c69f60 100644 --- a/src/widgets/SettingsDialog.cpp +++ b/src/widgets/SettingsDialog.cpp @@ -1,22 +1,22 @@ -#include "widgets/settingsdialog.hpp" +#include "widgets/SettingsDialog.hpp" -#include "application.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/helper/settingsdialogtab.hpp" -#include "widgets/settingspages/aboutpage.hpp" -#include "widgets/settingspages/accountspage.hpp" -#include "widgets/settingspages/appearancepage.hpp" -#include "widgets/settingspages/behaviourpage.hpp" -#include "widgets/settingspages/browserextensionpage.hpp" -#include "widgets/settingspages/commandpage.hpp" -#include "widgets/settingspages/emotespage.hpp" -#include "widgets/settingspages/externaltoolspage.hpp" -#include "widgets/settingspages/highlightingpage.hpp" -#include "widgets/settingspages/ignoreuserspage.hpp" -#include "widgets/settingspages/keyboardsettingspage.hpp" -#include "widgets/settingspages/logspage.hpp" -#include "widgets/settingspages/moderationpage.hpp" -#include "widgets/settingspages/specialchannelspage.hpp" +#include "Application.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/helper/SettingsDialogTab.hpp" +#include "widgets/settingspages/AboutPage.hpp" +#include "widgets/settingspages/AccountsPage.hpp" +#include "widgets/settingspages/AppearancePage.hpp" +#include "widgets/settingspages/BehaviourPage.hpp" +#include "widgets/settingspages/BrowserextensionPage.hpp" +#include "widgets/settingspages/CommandPage.hpp" +#include "widgets/settingspages/EmotesPage.hpp" +#include "widgets/settingspages/ExternaltoolsPage.hpp" +#include "widgets/settingspages/HighlightingPage.hpp" +#include "widgets/settingspages/IgnoreusersPage.hpp" +#include "widgets/settingspages/KeyboardsettingsPage.hpp" +#include "widgets/settingspages/LogsPage.hpp" +#include "widgets/settingspages/ModerationPage.hpp" +#include "widgets/settingspages/SpecialChannelsPage.hpp" #include diff --git a/src/widgets/SettingsDialog.hpp b/src/widgets/SettingsDialog.hpp index 4cf43589d..6b095984d 100644 --- a/src/widgets/SettingsDialog.hpp +++ b/src/widgets/SettingsDialog.hpp @@ -1,6 +1,6 @@ #pragma once -#include "basewindow.hpp" +#include "BaseWindow.hpp" #include #include diff --git a/src/widgets/Split.cpp b/src/widgets/Split.cpp index c8c1ab6c8..9ee84ca45 100644 --- a/src/widgets/Split.cpp +++ b/src/widgets/Split.cpp @@ -1,26 +1,26 @@ -#include "widgets/split.hpp" +#include "widgets/Split.hpp" -#include "application.hpp" -#include "common.hpp" -#include "providers/twitch/emotevalue.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "providers/twitch/twitchmessagebuilder.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/streamlink.hpp" -#include "util/urlfetch.hpp" -#include "widgets/helper/debugpopup.hpp" -#include "widgets/helper/searchpopup.hpp" -#include "widgets/helper/shortcut.hpp" -#include "widgets/helper/splitoverlay.hpp" -#include "widgets/qualitypopup.hpp" -#include "widgets/selectchanneldialog.hpp" -#include "widgets/splitcontainer.hpp" -#include "widgets/textinputdialog.hpp" -#include "widgets/userinfopopup.hpp" -#include "widgets/window.hpp" +#include "Application.hpp" +#include "Common.hpp" +#include "providers/twitch/EmoteValue.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "providers/twitch/TwitchMessageBuilder.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/StreamLink.hpp" +#include "util/UrlFetch.hpp" +#include "widgets/helper/DebugPopup.hpp" +#include "widgets/helper/SearchPopup.hpp" +#include "widgets/helper/Shortcut.hpp" +#include "widgets/helper/SplitOverlay.hpp" +#include "widgets/QualityPopup.hpp" +#include "widgets/SelectChannelDialog.hpp" +#include "widgets/SplitContainer.hpp" +#include "widgets/TextInputDialog.hpp" +#include "widgets/UserInfoPopup.hpp" +#include "widgets/Window.hpp" #include #include diff --git a/src/widgets/Split.hpp b/src/widgets/Split.hpp index ebbced2dd..f51086936 100644 --- a/src/widgets/Split.hpp +++ b/src/widgets/Split.hpp @@ -1,17 +1,17 @@ #pragma once -#include "channel.hpp" -#include "messages/layouts/messagelayout.hpp" -#include "messages/layouts/messagelayoutelement.hpp" -#include "messages/limitedqueuesnapshot.hpp" -#include "messages/messageelement.hpp" -#include "nullableptr.hpp" -#include "util/serialize-custom.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/helper/channelview.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" -#include "widgets/helper/splitheader.hpp" -#include "widgets/helper/splitinput.hpp" +#include "Channel.hpp" +#include "messages/layouts/MessageLayout.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" +#include "messages/LimitedQueueSnapshot.hpp" +#include "messages/MessageElement.hpp" +#include "NullablePtr.hpp" +#include "util/SerializeCustom.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/ChannelView.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "widgets/helper/SplitHeader.hpp" +#include "widgets/helper/SplitInput.hpp" #include #include diff --git a/src/widgets/SplitContainer.cpp b/src/widgets/SplitContainer.cpp index c3d854837..913a3ea6e 100644 --- a/src/widgets/SplitContainer.cpp +++ b/src/widgets/SplitContainer.cpp @@ -1,14 +1,14 @@ -#include "widgets/splitcontainer.hpp" -#include "application.hpp" -#include "common.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/assertinguithread.hpp" -#include "util/helpers.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/helper/notebooktab.hpp" -#include "widgets/notebook.hpp" -#include "widgets/split.hpp" +#include "widgets/SplitContainer.hpp" +#include "Application.hpp" +#include "Common.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/AssertInGuiThread.hpp" +#include "util/Helpers.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Split.hpp" #include #include diff --git a/src/widgets/SplitContainer.hpp b/src/widgets/SplitContainer.hpp index 367610847..f2a8cb78d 100644 --- a/src/widgets/SplitContainer.hpp +++ b/src/widgets/SplitContainer.hpp @@ -1,9 +1,9 @@ #pragma once -#include "widgets/basewidget.hpp" -#include "widgets/helper/droppreview.hpp" -#include "widgets/helper/notebooktab.hpp" -#include "widgets/split.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/DropPreview.hpp" +#include "widgets/helper/NotebookTab.hpp" +#include "widgets/Split.hpp" #include #include diff --git a/src/widgets/StreamView.cpp b/src/widgets/StreamView.cpp index 3961fdbba..10496a673 100644 --- a/src/widgets/StreamView.cpp +++ b/src/widgets/StreamView.cpp @@ -1,9 +1,9 @@ -#include "streamview.hpp" +#include "StreamView.hpp" -#include "channel.hpp" -#include "util/helpers.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/split.hpp" +#include "Channel.hpp" +#include "util/Helpers.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/Split.hpp" #ifdef USEWEBENGINE #include diff --git a/src/widgets/TextInputDialog.cpp b/src/widgets/TextInputDialog.cpp index 2cf372095..a6507570e 100644 --- a/src/widgets/TextInputDialog.cpp +++ b/src/widgets/TextInputDialog.cpp @@ -1,4 +1,4 @@ -#include "widgets/textinputdialog.hpp" +#include "widgets/TextInputDialog.hpp" #include namespace chatterino { diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp index 566b9c8bb..f30734f92 100644 --- a/src/widgets/TooltipWidget.cpp +++ b/src/widgets/TooltipWidget.cpp @@ -1,8 +1,8 @@ -#include "tooltipwidget.hpp" +#include "TooltipWidget.hpp" -#include "application.hpp" -#include "singletons/fontmanager.hpp" -#include "singletons/thememanager.hpp" +#include "Application.hpp" +#include "singletons/FontManager.hpp" +#include "singletons/ThemeManager.hpp" #include #include diff --git a/src/widgets/TooltipWidget.hpp b/src/widgets/TooltipWidget.hpp index 20a62c368..ac89e0d81 100644 --- a/src/widgets/TooltipWidget.hpp +++ b/src/widgets/TooltipWidget.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewindow.hpp" +#include "widgets/BaseWindow.hpp" #include #include diff --git a/src/widgets/UserInfoPopup.cpp b/src/widgets/UserInfoPopup.cpp index 0690a4849..e52db607d 100644 --- a/src/widgets/UserInfoPopup.cpp +++ b/src/widgets/UserInfoPopup.cpp @@ -1,14 +1,14 @@ -#include "userinfopopup.hpp" +#include "UserInfoPopup.hpp" -#include "application.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "singletons/resourcemanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/posttothread.hpp" -#include "util/urlfetch.hpp" -#include "widgets/helper/line.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" -#include "widgets/label.hpp" +#include "Application.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "singletons/ResourceManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/PostToThread.hpp" +#include "util/UrlFetch.hpp" +#include "widgets/helper/Line.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "widgets/Label.hpp" #include #include diff --git a/src/widgets/UserInfoPopup.hpp b/src/widgets/UserInfoPopup.hpp index 056c37b12..26f542ffe 100644 --- a/src/widgets/UserInfoPopup.hpp +++ b/src/widgets/UserInfoPopup.hpp @@ -1,7 +1,7 @@ #pragma once -#include "channel.hpp" -#include "widgets/basewindow.hpp" +#include "Channel.hpp" +#include "widgets/BaseWindow.hpp" #include diff --git a/src/widgets/WelcomeDialog.cpp b/src/widgets/WelcomeDialog.cpp index 56fa3cb99..b20adca1a 100644 --- a/src/widgets/WelcomeDialog.cpp +++ b/src/widgets/WelcomeDialog.cpp @@ -1,4 +1,4 @@ -#include "welcomedialog.hpp" +#include "WelcomeDialog.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/WelcomeDialog.hpp b/src/widgets/WelcomeDialog.hpp index 1fad3dbb2..775257681 100644 --- a/src/widgets/WelcomeDialog.hpp +++ b/src/widgets/WelcomeDialog.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewindow.hpp" +#include "widgets/BaseWindow.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 5c221699d..0783f40d1 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -1,19 +1,19 @@ -#include "widgets/window.hpp" +#include "widgets/Window.hpp" -#include "application.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/ircmanager.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "version.hpp" -#include "widgets/accountswitchpopupwidget.hpp" -#include "widgets/helper/shortcut.hpp" -#include "widgets/notebook.hpp" -#include "widgets/settingsdialog.hpp" -#include "widgets/split.hpp" -#include "widgets/welcomedialog.hpp" +#include "Application.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/IrcManager.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "Version.hpp" +#include "widgets/AccountSwitchPopupWidget.hpp" +#include "widgets/helper/Shortcut.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/SettingsDialog.hpp" +#include "widgets/Split.hpp" +#include "widgets/WelcomeDialog.hpp" #include #include diff --git a/src/widgets/Window.hpp b/src/widgets/Window.hpp index a70894528..fe431500c 100644 --- a/src/widgets/Window.hpp +++ b/src/widgets/Window.hpp @@ -1,8 +1,8 @@ #pragma once -#include "util/helpers.hpp" -#include "widgets/basewindow.hpp" -#include "widgets/notebook.hpp" +#include "util/Helpers.hpp" +#include "widgets/BaseWindow.hpp" +#include "widgets/Notebook.hpp" //#ifdef USEWINSDK //#include diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index b65660497..24528afd4 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -1,19 +1,19 @@ -#include "channelview.hpp" +#include "ChannelView.hpp" -#include "application.hpp" -#include "debug/log.hpp" -#include "messages/layouts/messagelayout.hpp" -#include "messages/limitedqueuesnapshot.hpp" -#include "messages/message.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "singletons/windowmanager.hpp" -#include "util/benchmark.hpp" -#include "util/distancebetweenpoints.hpp" -#include "widgets/split.hpp" -#include "widgets/tooltipwidget.hpp" -#include "widgets/userinfopopup.hpp" +#include "Application.hpp" +#include "debug/Log.hpp" +#include "messages/layouts/MessageLayout.hpp" +#include "messages/LimitedQueueSnapshot.hpp" +#include "messages/Message.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "singletons/WindowManager.hpp" +#include "util/Benchmark.hpp" +#include "util/DistanceBetweenPoints.hpp" +#include "widgets/Split.hpp" +#include "widgets/TooltipWidget.hpp" +#include "widgets/UserInfoPopup.hpp" #include #include diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp index 440b6159f..e72776b6d 100644 --- a/src/widgets/helper/ChannelView.hpp +++ b/src/widgets/helper/ChannelView.hpp @@ -1,14 +1,14 @@ #pragma once -#include "channel.hpp" -#include "messages/image.hpp" -#include "messages/layouts/messagelayout.hpp" -#include "messages/limitedqueuesnapshot.hpp" -#include "messages/messageelement.hpp" -#include "messages/selection.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" -#include "widgets/scrollbar.hpp" +#include "Channel.hpp" +#include "messages/Image.hpp" +#include "messages/layouts/MessageLayout.hpp" +#include "messages/LimitedQueueSnapshot.hpp" +#include "messages/MessageElement.hpp" +#include "messages/Selection.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "widgets/Scrollbar.hpp" #include #include diff --git a/src/widgets/helper/ComboBoxItemDelegate.cpp b/src/widgets/helper/ComboBoxItemDelegate.cpp index 0911066b1..f67b0c547 100644 --- a/src/widgets/helper/ComboBoxItemDelegate.cpp +++ b/src/widgets/helper/ComboBoxItemDelegate.cpp @@ -1,4 +1,4 @@ -#include "comboboxitemdelegate.hpp" +#include "ComboBoxItemDelegate.hpp" #include diff --git a/src/widgets/helper/DebugPopup.cpp b/src/widgets/helper/DebugPopup.cpp index d4ecc346a..a9bae87dc 100644 --- a/src/widgets/helper/DebugPopup.cpp +++ b/src/widgets/helper/DebugPopup.cpp @@ -1,6 +1,6 @@ -#include "debugpopup.hpp" +#include "DebugPopup.hpp" -#include "util/debugcount.hpp" +#include "util/DebugCount.hpp" #include #include diff --git a/src/widgets/helper/DropOverlay.cpp b/src/widgets/helper/DropOverlay.cpp index f98160a5d..0d49e2141 100644 --- a/src/widgets/helper/DropOverlay.cpp +++ b/src/widgets/helper/DropOverlay.cpp @@ -1,4 +1,4 @@ -//#include "dropoverlay.hpp" +//#include "DropOverlay.hpp" // namespace chatterino { // namespace widgets { diff --git a/src/widgets/helper/DropOverlay.hpp b/src/widgets/helper/DropOverlay.hpp index 7ae89104f..e9175ff75 100644 --- a/src/widgets/helper/DropOverlay.hpp +++ b/src/widgets/helper/DropOverlay.hpp @@ -1,6 +1,6 @@ //#pragma once -//#include "widgets/helper/splitnode.hpp" +//#include "widgets/helper/SplitNode.hpp" // namespace chatterino { // namespace widgets { diff --git a/src/widgets/helper/DropPreview.cpp b/src/widgets/helper/DropPreview.cpp index 3bc8fefe3..d9258f0cf 100644 --- a/src/widgets/helper/DropPreview.cpp +++ b/src/widgets/helper/DropPreview.cpp @@ -1,6 +1,6 @@ -#include "widgets/helper/droppreview.hpp" -#include "application.hpp" -#include "singletons/thememanager.hpp" +#include "widgets/helper/DropPreview.hpp" +#include "Application.hpp" +#include "singletons/ThemeManager.hpp" #include #include diff --git a/src/widgets/helper/DropPreview.hpp b/src/widgets/helper/DropPreview.hpp index 763555172..39069de68 100644 --- a/src/widgets/helper/DropPreview.hpp +++ b/src/widgets/helper/DropPreview.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" #include #include diff --git a/src/widgets/helper/EditableModelView.cpp b/src/widgets/helper/EditableModelView.cpp index d2813079d..c157c88d3 100644 --- a/src/widgets/helper/EditableModelView.cpp +++ b/src/widgets/helper/EditableModelView.cpp @@ -1,4 +1,4 @@ -#include "editablemodelview.hpp" +#include "EditableModelView.hpp" #include #include diff --git a/src/widgets/helper/Line.hpp b/src/widgets/helper/Line.hpp index 81487959f..5939ba6fe 100644 --- a/src/widgets/helper/Line.hpp +++ b/src/widgets/helper/Line.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" #include diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp index 30184b974..ff19a00f0 100644 --- a/src/widgets/helper/NotebookButton.cpp +++ b/src/widgets/helper/NotebookButton.cpp @@ -1,8 +1,8 @@ -#include "widgets/helper/notebookbutton.hpp" -#include "singletons/thememanager.hpp" -#include "widgets/helper/rippleeffectbutton.hpp" -#include "widgets/notebook.hpp" -#include "widgets/splitcontainer.hpp" +#include "widgets/helper/NotebookButton.hpp" +#include "singletons/ThemeManager.hpp" +#include "widgets/helper/RippleEffectButton.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/SplitContainer.hpp" #include #include diff --git a/src/widgets/helper/NotebookButton.hpp b/src/widgets/helper/NotebookButton.hpp index ddd86c4f5..2aed8c315 100644 --- a/src/widgets/helper/NotebookButton.hpp +++ b/src/widgets/helper/NotebookButton.hpp @@ -1,6 +1,6 @@ #pragma once -#include "rippleeffectbutton.hpp" +#include "RippleEffectButton.hpp" #include diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp index c615c9e8e..40fc89a3a 100644 --- a/src/widgets/helper/NotebookTab.cpp +++ b/src/widgets/helper/NotebookTab.cpp @@ -1,15 +1,15 @@ -#include "widgets/helper/notebooktab.hpp" +#include "widgets/helper/NotebookTab.hpp" -#include "application.hpp" -#include "common.hpp" -#include "debug/log.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "util/clamp.hpp" -#include "util/helpers.hpp" -#include "widgets/notebook.hpp" -#include "widgets/settingsdialog.hpp" -#include "widgets/textinputdialog.hpp" +#include "Application.hpp" +#include "Common.hpp" +#include "debug/Log.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "util/Clamp.hpp" +#include "util/Helpers.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/SettingsDialog.hpp" +#include "widgets/TextInputDialog.hpp" #include #include diff --git a/src/widgets/helper/NotebookTab.hpp b/src/widgets/helper/NotebookTab.hpp index 1069f61af..19c3a2e81 100644 --- a/src/widgets/helper/NotebookTab.hpp +++ b/src/widgets/helper/NotebookTab.hpp @@ -1,8 +1,8 @@ #pragma once -#include "common.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/helper/rippleeffectbutton.hpp" +#include "Common.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/RippleEffectButton.hpp" #include #include diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp index 3ca219a06..d9476cc7b 100644 --- a/src/widgets/helper/ResizingTextEdit.cpp +++ b/src/widgets/helper/ResizingTextEdit.cpp @@ -1,6 +1,6 @@ -#include "widgets/helper/resizingtextedit.hpp" -#include "common.hpp" -#include "util/completionmodel.hpp" +#include "widgets/helper/ResizingTextEdit.hpp" +#include "Common.hpp" +#include "util/CompletionModel.hpp" ResizingTextEdit::ResizingTextEdit() { diff --git a/src/widgets/helper/RippleEffectButton.cpp b/src/widgets/helper/RippleEffectButton.cpp index 0dffe7ea6..4942aa55d 100644 --- a/src/widgets/helper/RippleEffectButton.cpp +++ b/src/widgets/helper/RippleEffectButton.cpp @@ -1,9 +1,9 @@ -#include "rippleeffectbutton.hpp" +#include "RippleEffectButton.hpp" #include #include -#include "singletons/thememanager.hpp" +#include "singletons/ThemeManager.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/RippleEffectButton.hpp b/src/widgets/helper/RippleEffectButton.hpp index 67ac71093..3087ff66a 100644 --- a/src/widgets/helper/RippleEffectButton.hpp +++ b/src/widgets/helper/RippleEffectButton.hpp @@ -2,7 +2,7 @@ #include -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" #include #include diff --git a/src/widgets/helper/RippleEffectLabel.cpp b/src/widgets/helper/RippleEffectLabel.cpp index 90cf2eee2..8f83bb89b 100644 --- a/src/widgets/helper/RippleEffectLabel.cpp +++ b/src/widgets/helper/RippleEffectLabel.cpp @@ -1,6 +1,6 @@ -#include "widgets/helper/rippleeffectlabel.hpp" -#include "singletons/thememanager.hpp" -#include "widgets/helper/splitheader.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "singletons/ThemeManager.hpp" +#include "widgets/helper/SplitHeader.hpp" #include #include diff --git a/src/widgets/helper/RippleEffectLabel.hpp b/src/widgets/helper/RippleEffectLabel.hpp index 95a2500b4..a0282755d 100644 --- a/src/widgets/helper/RippleEffectLabel.hpp +++ b/src/widgets/helper/RippleEffectLabel.hpp @@ -1,9 +1,9 @@ #pragma once -#include "widgets/basewidget.hpp" -#include "widgets/helper/rippleeffectbutton.hpp" -#include "widgets/helper/signallabel.hpp" -#include "widgets/label.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/RippleEffectButton.hpp" +#include "widgets/helper/SignalLabel.hpp" +#include "widgets/Label.hpp" #include #include diff --git a/src/widgets/helper/ScrollbarHighlight.cpp b/src/widgets/helper/ScrollbarHighlight.cpp index 239273ec8..958ebf7c2 100644 --- a/src/widgets/helper/ScrollbarHighlight.cpp +++ b/src/widgets/helper/ScrollbarHighlight.cpp @@ -1,6 +1,6 @@ -#include "widgets/helper/scrollbarhighlight.hpp" -#include "singletons/thememanager.hpp" -#include "widgets/scrollbar.hpp" +#include "widgets/helper/ScrollbarHighlight.hpp" +#include "singletons/ThemeManager.hpp" +#include "widgets/Scrollbar.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp index 136647aea..3d523d248 100644 --- a/src/widgets/helper/SearchPopup.cpp +++ b/src/widgets/helper/SearchPopup.cpp @@ -1,11 +1,11 @@ -#include "searchpopup.hpp" +#include "SearchPopup.hpp" #include #include #include -#include "channel.hpp" -#include "widgets/helper/channelview.hpp" +#include "Channel.hpp" +#include "widgets/helper/ChannelView.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/SearchPopup.hpp b/src/widgets/helper/SearchPopup.hpp index 909626ff5..471780b41 100644 --- a/src/widgets/helper/SearchPopup.hpp +++ b/src/widgets/helper/SearchPopup.hpp @@ -1,8 +1,8 @@ #pragma once -#include "messages/limitedqueuesnapshot.hpp" -#include "messages/message.hpp" -#include "widgets/basewindow.hpp" +#include "messages/LimitedQueueSnapshot.hpp" +#include "messages/Message.hpp" +#include "widgets/BaseWindow.hpp" #include diff --git a/src/widgets/helper/SettingsDialogTab.cpp b/src/widgets/helper/SettingsDialogTab.cpp index 812e82de0..aece18907 100644 --- a/src/widgets/helper/SettingsDialogTab.cpp +++ b/src/widgets/helper/SettingsDialogTab.cpp @@ -1,6 +1,6 @@ -#include "widgets/helper/settingsdialogtab.hpp" -#include "widgets/settingsdialog.hpp" -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/helper/SettingsDialogTab.hpp" +#include "widgets/SettingsDialog.hpp" +#include "widgets/settingspages/SettingsPage.hpp" #include #include diff --git a/src/widgets/helper/SettingsDialogTab.hpp b/src/widgets/helper/SettingsDialogTab.hpp index 45aa27bec..37d2d85e8 100644 --- a/src/widgets/helper/SettingsDialogTab.hpp +++ b/src/widgets/helper/SettingsDialogTab.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" #include #include diff --git a/src/widgets/helper/SignalLabel.cpp b/src/widgets/helper/SignalLabel.cpp index bc1eb6aaf..fe62bd2c2 100644 --- a/src/widgets/helper/SignalLabel.cpp +++ b/src/widgets/helper/SignalLabel.cpp @@ -1,4 +1,4 @@ -#include "widgets/helper/signallabel.hpp" +#include "widgets/helper/SignalLabel.hpp" SignalLabel::SignalLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f) diff --git a/src/widgets/helper/SplitColumn.cpp b/src/widgets/helper/SplitColumn.cpp index b3e7e3c7f..45cf879e4 100644 --- a/src/widgets/helper/SplitColumn.cpp +++ b/src/widgets/helper/SplitColumn.cpp @@ -1,4 +1,4 @@ -#include "splitcolumn.hpp" +#include "SplitColumn.hpp" namespace chatterino { namespace helper { diff --git a/src/widgets/helper/SplitColumn.hpp b/src/widgets/helper/SplitColumn.hpp index de63fffef..20bb6321d 100644 --- a/src/widgets/helper/SplitColumn.hpp +++ b/src/widgets/helper/SplitColumn.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/split.hpp" +#include "widgets/Split.hpp" #include diff --git a/src/widgets/helper/SplitHeader.cpp b/src/widgets/helper/SplitHeader.cpp index 05e799350..7ce99c035 100644 --- a/src/widgets/helper/SplitHeader.cpp +++ b/src/widgets/helper/SplitHeader.cpp @@ -1,16 +1,16 @@ -#include "widgets/helper/splitheader.hpp" +#include "widgets/helper/SplitHeader.hpp" -#include "application.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/resourcemanager.hpp" -#include "singletons/thememanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/urlfetch.hpp" -#include "widgets/label.hpp" -#include "widgets/split.hpp" -#include "widgets/splitcontainer.hpp" -#include "widgets/tooltipwidget.hpp" +#include "Application.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/ResourceManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/UrlFetch.hpp" +#include "widgets/Label.hpp" +#include "widgets/Split.hpp" +#include "widgets/SplitContainer.hpp" +#include "widgets/TooltipWidget.hpp" #include #include @@ -19,7 +19,7 @@ #include #ifdef USEWEBENGINE -#include "widgets/streamview.hpp" +#include "widgets/StreamView.hpp" #endif using namespace chatterino::providers::twitch; diff --git a/src/widgets/helper/SplitHeader.hpp b/src/widgets/helper/SplitHeader.hpp index 278157aae..38c202e19 100644 --- a/src/widgets/helper/SplitHeader.hpp +++ b/src/widgets/helper/SplitHeader.hpp @@ -1,8 +1,8 @@ #pragma once -#include "widgets/basewidget.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" -#include "widgets/helper/signallabel.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" +#include "widgets/helper/SignalLabel.hpp" #include #include diff --git a/src/widgets/helper/SplitInput.cpp b/src/widgets/helper/SplitInput.cpp index ec12ebb0e..0a05e30c5 100644 --- a/src/widgets/helper/SplitInput.cpp +++ b/src/widgets/helper/SplitInput.cpp @@ -1,17 +1,17 @@ -#include "widgets/helper/splitinput.hpp" +#include "widgets/helper/SplitInput.hpp" -#include "application.hpp" -#include "controllers/commands/commandcontroller.hpp" -#include "providers/twitch/twitchchannel.hpp" -#include "providers/twitch/twitchserver.hpp" -#include "singletons/ircmanager.hpp" -#include "singletons/settingsmanager.hpp" -#include "singletons/thememanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/urlfetch.hpp" -#include "widgets/notebook.hpp" -#include "widgets/split.hpp" -#include "widgets/splitcontainer.hpp" +#include "Application.hpp" +#include "controllers/commands/CommandController.hpp" +#include "providers/twitch/TwitchChannel.hpp" +#include "providers/twitch/TwitchServer.hpp" +#include "singletons/IrcManager.hpp" +#include "singletons/SettingsManager.hpp" +#include "singletons/ThemeManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/UrlFetch.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Split.hpp" +#include "widgets/SplitContainer.hpp" #include #include diff --git a/src/widgets/helper/SplitInput.hpp b/src/widgets/helper/SplitInput.hpp index 4dbd793f2..883ffbec8 100644 --- a/src/widgets/helper/SplitInput.hpp +++ b/src/widgets/helper/SplitInput.hpp @@ -1,9 +1,9 @@ #pragma once -#include "resizingtextedit.hpp" -#include "widgets/basewidget.hpp" -#include "widgets/emotepopup.hpp" -#include "widgets/helper/rippleeffectlabel.hpp" +#include "ResizingTextEdit.hpp" +#include "widgets/BaseWidget.hpp" +#include "widgets/EmotePopup.hpp" +#include "widgets/helper/RippleEffectLabel.hpp" #include #include diff --git a/src/widgets/helper/SplitNode.cpp b/src/widgets/helper/SplitNode.cpp index fac9a6739..697facca2 100644 --- a/src/widgets/helper/SplitNode.cpp +++ b/src/widgets/helper/SplitNode.cpp @@ -1,4 +1,4 @@ -#include "splitnode.hpp" +#include "SplitNode.hpp" SplitNode::SplitNode() { diff --git a/src/widgets/helper/SplitOverlay.cpp b/src/widgets/helper/SplitOverlay.cpp index 48aac6be1..bcbc7f96f 100644 --- a/src/widgets/helper/SplitOverlay.cpp +++ b/src/widgets/helper/SplitOverlay.cpp @@ -1,4 +1,4 @@ -#include "splitoverlay.hpp" +#include "SplitOverlay.hpp" #include #include @@ -8,10 +8,10 @@ #include #include -#include "application.hpp" -#include "singletons/resourcemanager.hpp" -#include "widgets/split.hpp" -#include "widgets/splitcontainer.hpp" +#include "Application.hpp" +#include "singletons/ResourceManager.hpp" +#include "widgets/Split.hpp" +#include "widgets/SplitContainer.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/SplitOverlay.hpp b/src/widgets/helper/SplitOverlay.hpp index bed720b0d..a12edb9bc 100644 --- a/src/widgets/helper/SplitOverlay.hpp +++ b/src/widgets/helper/SplitOverlay.hpp @@ -4,7 +4,7 @@ #include #include "pajlada/signals/signalholder.hpp" -#include "widgets/basewidget.hpp" +#include "widgets/BaseWidget.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp index 3caa4ec19..6972afb2a 100644 --- a/src/widgets/helper/TitlebarButton.cpp +++ b/src/widgets/helper/TitlebarButton.cpp @@ -1,6 +1,6 @@ -#include "titlebarbutton.hpp" +#include "TitlebarButton.hpp" -#include "singletons/thememanager.hpp" +#include "singletons/ThemeManager.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/TitlebarButton.hpp b/src/widgets/helper/TitlebarButton.hpp index 418e9143b..c718dd1a6 100644 --- a/src/widgets/helper/TitlebarButton.hpp +++ b/src/widgets/helper/TitlebarButton.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/helper/rippleeffectbutton.hpp" +#include "widgets/helper/RippleEffectButton.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp index e06c4480d..c0932f389 100644 --- a/src/widgets/settingspages/AboutPage.cpp +++ b/src/widgets/settingspages/AboutPage.cpp @@ -1,8 +1,8 @@ -#include "aboutpage.hpp" +#include "AboutPage.hpp" -#include "util/layoutcreator.hpp" -#include "util/removescrollareabackground.hpp" -#include "widgets/helper/signallabel.hpp" +#include "util/LayoutCreator.hpp" +#include "util/RemoveScrollAreaBackground.hpp" +#include "widgets/helper/SignalLabel.hpp" #include #include diff --git a/src/widgets/settingspages/AboutPage.hpp b/src/widgets/settingspages/AboutPage.hpp index 20d3e082c..f04702f9e 100644 --- a/src/widgets/settingspages/AboutPage.hpp +++ b/src/widgets/settingspages/AboutPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" class QLabel; class QFormLayout; diff --git a/src/widgets/settingspages/AccountsPage.cpp b/src/widgets/settingspages/AccountsPage.cpp index ab9b5620e..3eac1c911 100644 --- a/src/widgets/settingspages/AccountsPage.cpp +++ b/src/widgets/settingspages/AccountsPage.cpp @@ -1,12 +1,12 @@ -#include "accountspage.hpp" +#include "AccountsPage.hpp" -#include "application.hpp" -#include "const.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "controllers/accounts/accountmodel.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/helper/editablemodelview.hpp" -#include "widgets/logindialog.hpp" +#include "Application.hpp" +#include "Const.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "controllers/accounts/AccountModel.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/helper/EditableModelView.hpp" +#include "widgets/LoginDialog.hpp" #include #include diff --git a/src/widgets/settingspages/AccountsPage.hpp b/src/widgets/settingspages/AccountsPage.hpp index 0e5c1c5ba..90b4e810b 100644 --- a/src/widgets/settingspages/AccountsPage.hpp +++ b/src/widgets/settingspages/AccountsPage.hpp @@ -1,7 +1,7 @@ #pragma once -#include "widgets/accountswitchwidget.hpp" -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/AccountSwitchWidget.hpp" +#include "widgets/settingspages/SettingsPage.hpp" #include diff --git a/src/widgets/settingspages/AppearancePage.cpp b/src/widgets/settingspages/AppearancePage.cpp index 31fffdfe0..60889c2c1 100644 --- a/src/widgets/settingspages/AppearancePage.cpp +++ b/src/widgets/settingspages/AppearancePage.cpp @@ -1,9 +1,9 @@ -#include "appearancepage.hpp" +#include "AppearancePage.hpp" -#include "application.hpp" -#include "singletons/windowmanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/removescrollareabackground.hpp" +#include "Application.hpp" +#include "singletons/WindowManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/RemoveScrollAreaBackground.hpp" #include #include diff --git a/src/widgets/settingspages/AppearancePage.hpp b/src/widgets/settingspages/AppearancePage.hpp index d5bf43a0b..062772087 100644 --- a/src/widgets/settingspages/AppearancePage.hpp +++ b/src/widgets/settingspages/AppearancePage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" #include #include diff --git a/src/widgets/settingspages/BehaviourPage.cpp b/src/widgets/settingspages/BehaviourPage.cpp index 30d754d0f..51a11932c 100644 --- a/src/widgets/settingspages/BehaviourPage.cpp +++ b/src/widgets/settingspages/BehaviourPage.cpp @@ -1,7 +1,7 @@ -#include "behaviourpage.hpp" +#include "BehaviourPage.hpp" -#include "application.hpp" -#include "util/layoutcreator.hpp" +#include "Application.hpp" +#include "util/LayoutCreator.hpp" #include #include diff --git a/src/widgets/settingspages/BehaviourPage.hpp b/src/widgets/settingspages/BehaviourPage.hpp index 724827d33..4f3c2b96b 100644 --- a/src/widgets/settingspages/BehaviourPage.hpp +++ b/src/widgets/settingspages/BehaviourPage.hpp @@ -2,7 +2,7 @@ #include -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/BrowserextensionPage.cpp b/src/widgets/settingspages/BrowserextensionPage.cpp index 58a5230a0..d453e643d 100644 --- a/src/widgets/settingspages/BrowserextensionPage.cpp +++ b/src/widgets/settingspages/BrowserextensionPage.cpp @@ -1,6 +1,6 @@ -#include "browserextensionpage.hpp" +#include "BrowserextensionPage.hpp" -#include "util/layoutcreator.hpp" +#include "util/LayoutCreator.hpp" #include diff --git a/src/widgets/settingspages/BrowserextensionPage.hpp b/src/widgets/settingspages/BrowserextensionPage.hpp index 3bcc6eadd..cdd2613b7 100644 --- a/src/widgets/settingspages/BrowserextensionPage.hpp +++ b/src/widgets/settingspages/BrowserextensionPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/CommandPage.cpp b/src/widgets/settingspages/CommandPage.cpp index 143ba44c8..964dc127d 100644 --- a/src/widgets/settingspages/CommandPage.cpp +++ b/src/widgets/settingspages/CommandPage.cpp @@ -1,4 +1,4 @@ -#include "commandpage.hpp" +#include "CommandPage.hpp" #include #include @@ -7,13 +7,13 @@ #include #include -#include "application.hpp" -#include "controllers/commands/commandcontroller.hpp" -#include "controllers/commands/commandmodel.hpp" -#include "util/layoutcreator.hpp" -#include "util/standarditemhelper.hpp" -#include "widgets/helper/editablemodelview.hpp" -//#include "widgets/helper/comboboxitemdelegate.hpp" +#include "Application.hpp" +#include "controllers/commands/CommandController.hpp" +#include "controllers/commands/CommandModel.hpp" +#include "util/LayoutCreator.hpp" +#include "util/StandardItemHelper.hpp" +#include "widgets/helper/EditableModelView.hpp" +//#include "widgets/helper/ComboBoxItemDelegate.hpp" #include #include diff --git a/src/widgets/settingspages/CommandPage.hpp b/src/widgets/settingspages/CommandPage.hpp index 40e6d9886..c15d02cf0 100644 --- a/src/widgets/settingspages/CommandPage.hpp +++ b/src/widgets/settingspages/CommandPage.hpp @@ -3,7 +3,7 @@ #include #include -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/EmotesPage.cpp b/src/widgets/settingspages/EmotesPage.cpp index 6578c1287..2e54a962b 100644 --- a/src/widgets/settingspages/EmotesPage.cpp +++ b/src/widgets/settingspages/EmotesPage.cpp @@ -1,6 +1,6 @@ -#include "emotespage.hpp" +#include "EmotesPage.hpp" -#include "util/layoutcreator.hpp" +#include "util/LayoutCreator.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/EmotesPage.hpp b/src/widgets/settingspages/EmotesPage.hpp index 75cfec6af..adbe94d2e 100644 --- a/src/widgets/settingspages/EmotesPage.hpp +++ b/src/widgets/settingspages/EmotesPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/ExternaltoolsPage.cpp b/src/widgets/settingspages/ExternaltoolsPage.cpp index 3ed7ff859..17d6bb8ae 100644 --- a/src/widgets/settingspages/ExternaltoolsPage.cpp +++ b/src/widgets/settingspages/ExternaltoolsPage.cpp @@ -1,7 +1,7 @@ -#include "externaltoolspage.hpp" +#include "ExternaltoolsPage.hpp" -#include "application.hpp" -#include "util/layoutcreator.hpp" +#include "Application.hpp" +#include "util/LayoutCreator.hpp" #include diff --git a/src/widgets/settingspages/ExternaltoolsPage.hpp b/src/widgets/settingspages/ExternaltoolsPage.hpp index ccf960626..d5c631836 100644 --- a/src/widgets/settingspages/ExternaltoolsPage.hpp +++ b/src/widgets/settingspages/ExternaltoolsPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp index f67af3746..c2608efca 100644 --- a/src/widgets/settingspages/HighlightingPage.cpp +++ b/src/widgets/settingspages/HighlightingPage.cpp @@ -1,13 +1,13 @@ -#include "highlightingpage.hpp" +#include "HighlightingPage.hpp" -#include "application.hpp" -#include "controllers/highlights/highlightcontroller.hpp" -#include "controllers/highlights/highlightmodel.hpp" -#include "debug/log.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/layoutcreator.hpp" -#include "util/standarditemhelper.hpp" -#include "widgets/helper/editablemodelview.hpp" +#include "Application.hpp" +#include "controllers/highlights/HighlightController.hpp" +#include "controllers/highlights/HighlightModel.hpp" +#include "debug/Log.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/LayoutCreator.hpp" +#include "util/StandardItemHelper.hpp" +#include "widgets/helper/EditableModelView.hpp" #include #include diff --git a/src/widgets/settingspages/HighlightingPage.hpp b/src/widgets/settingspages/HighlightingPage.hpp index 5a1c3c756..9bb19753e 100644 --- a/src/widgets/settingspages/HighlightingPage.hpp +++ b/src/widgets/settingspages/HighlightingPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" #include #include diff --git a/src/widgets/settingspages/IgnoreusersPage.cpp b/src/widgets/settingspages/IgnoreusersPage.cpp index 091a6c781..98e035990 100644 --- a/src/widgets/settingspages/IgnoreusersPage.cpp +++ b/src/widgets/settingspages/IgnoreusersPage.cpp @@ -1,12 +1,12 @@ -#include "ignoreuserspage.hpp" +#include "IgnoreusersPage.hpp" -#include "application.hpp" -#include "controllers/accounts/accountcontroller.hpp" -#include "controllers/ignores/ignorecontroller.hpp" -#include "controllers/ignores/ignoremodel.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/helper/editablemodelview.hpp" +#include "Application.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "controllers/ignores/IgnoreController.hpp" +#include "controllers/ignores/IgnoreModel.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/helper/EditableModelView.hpp" #include #include diff --git a/src/widgets/settingspages/IgnoreusersPage.hpp b/src/widgets/settingspages/IgnoreusersPage.hpp index b9ffdd6c0..32f6ab9be 100644 --- a/src/widgets/settingspages/IgnoreusersPage.hpp +++ b/src/widgets/settingspages/IgnoreusersPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" #include diff --git a/src/widgets/settingspages/KeyboardsettingsPage.cpp b/src/widgets/settingspages/KeyboardsettingsPage.cpp index 39df2c2e3..ccc5fc5a2 100644 --- a/src/widgets/settingspages/KeyboardsettingsPage.cpp +++ b/src/widgets/settingspages/KeyboardsettingsPage.cpp @@ -1,6 +1,6 @@ -#include "keyboardsettingspage.hpp" +#include "KeyboardsettingsPage.hpp" -#include "util/layoutcreator.hpp" +#include "util/LayoutCreator.hpp" #include #include diff --git a/src/widgets/settingspages/KeyboardsettingsPage.hpp b/src/widgets/settingspages/KeyboardsettingsPage.hpp index 7064e6e39..fcbafb10f 100644 --- a/src/widgets/settingspages/KeyboardsettingsPage.hpp +++ b/src/widgets/settingspages/KeyboardsettingsPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/LogsPage.cpp b/src/widgets/settingspages/LogsPage.cpp index b7455fe69..1706b2041 100644 --- a/src/widgets/settingspages/LogsPage.cpp +++ b/src/widgets/settingspages/LogsPage.cpp @@ -1,12 +1,12 @@ -//#include "logspage.hpp" +//#include "LogsPage.hpp" -//#include "application.hpp" -//#include "singletons/pathmanager.hpp" +//#include "Application.hpp" +//#include "singletons/PathManager.hpp" //#include //#include -//#include "util/layoutcreator.hpp" +//#include "util/LayoutCreator.hpp" // namespace chatterino { // namespace widgets { diff --git a/src/widgets/settingspages/LogsPage.hpp b/src/widgets/settingspages/LogsPage.hpp index 5103571b2..6a3aff771 100644 --- a/src/widgets/settingspages/LogsPage.hpp +++ b/src/widgets/settingspages/LogsPage.hpp @@ -1,6 +1,6 @@ //#pragma once -//#include "widgets/settingspages/settingspage.hpp" +//#include "widgets/settingspages/SettingsPage.hpp" // namespace chatterino { // namespace widgets { diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp index e854fd17c..e23541d3d 100644 --- a/src/widgets/settingspages/ModerationPage.cpp +++ b/src/widgets/settingspages/ModerationPage.cpp @@ -1,12 +1,12 @@ -#include "moderationpage.hpp" +#include "ModerationPage.hpp" -#include "application.hpp" -#include "controllers/taggedusers/taggeduserscontroller.hpp" -#include "controllers/taggedusers/taggedusersmodel.hpp" -#include "singletons/loggingmanager.hpp" -#include "singletons/pathmanager.hpp" -#include "util/layoutcreator.hpp" -#include "widgets/helper/editablemodelview.hpp" +#include "Application.hpp" +#include "controllers/taggedusers/TaggedUsersController.hpp" +#include "controllers/taggedusers/TaggedUsersModel.hpp" +#include "singletons/LoggingManager.hpp" +#include "singletons/PathManager.hpp" +#include "util/LayoutCreator.hpp" +#include "widgets/helper/EditableModelView.hpp" #include #include diff --git a/src/widgets/settingspages/ModerationPage.hpp b/src/widgets/settingspages/ModerationPage.hpp index 4e30c717c..2ed59c86d 100644 --- a/src/widgets/settingspages/ModerationPage.hpp +++ b/src/widgets/settingspages/ModerationPage.hpp @@ -2,7 +2,7 @@ #include -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" class QPushButton; diff --git a/src/widgets/settingspages/SettingsPage.cpp b/src/widgets/settingspages/SettingsPage.cpp index 1d6bb9d2f..3921c5bd0 100644 --- a/src/widgets/settingspages/SettingsPage.cpp +++ b/src/widgets/settingspages/SettingsPage.cpp @@ -1,4 +1,4 @@ -#include "settingspage.hpp" +#include "SettingsPage.hpp" #include diff --git a/src/widgets/settingspages/SettingsPage.hpp b/src/widgets/settingspages/SettingsPage.hpp index 0adb335b2..97c7d26e5 100644 --- a/src/widgets/settingspages/SettingsPage.hpp +++ b/src/widgets/settingspages/SettingsPage.hpp @@ -6,7 +6,7 @@ #include #include -#include "singletons/settingsmanager.hpp" +#include "singletons/SettingsManager.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/settingspages/SpecialChannelsPage.cpp b/src/widgets/settingspages/SpecialChannelsPage.cpp index 39e29770e..002bd5275 100644 --- a/src/widgets/settingspages/SpecialChannelsPage.cpp +++ b/src/widgets/settingspages/SpecialChannelsPage.cpp @@ -1,8 +1,8 @@ -#include "specialchannelspage.hpp" +#include "SpecialChannelsPage.hpp" -#include "application.hpp" -#include "singletons/settingsmanager.hpp" -#include "util/layoutcreator.hpp" +#include "Application.hpp" +#include "singletons/SettingsManager.hpp" +#include "util/LayoutCreator.hpp" #include #include diff --git a/src/widgets/settingspages/SpecialChannelsPage.hpp b/src/widgets/settingspages/SpecialChannelsPage.hpp index fbf18f312..ac0ff1e6d 100644 --- a/src/widgets/settingspages/SpecialChannelsPage.hpp +++ b/src/widgets/settingspages/SpecialChannelsPage.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/settingspages/settingspage.hpp" +#include "widgets/settingspages/SettingsPage.hpp" namespace chatterino { namespace widgets {