chatterino2
Code Issues

Remove Unnecessary Includes in Headers (#4275)

Browse Source 
* refactor: remove unnecessary includes in headers

* fix: formatting

* chore: changelog

* fix: scrollbar

* fix: suggestions and old appbase remains

* fix: suggestion

* fix: missing Qt forward declarations

* fix: another qt include

* fix: includes for precompiled-headers=off

* Add missing `<memory>` includes

* Add missing `#pragma once`

* Fix tests

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
nerix
2022-12-31 15:41:01 +01:00
committed by GitHub
parent f04c4c7388
commit 1043f9f803
239 changed files with 871 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/AccountSwitchPopup.cpp
+1 -2
View File
@@ -1,12 +1,11 @@
#include "widgets/AccountSwitchPopup.hpp"
#include "widgets/AccountSwitchWidget.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
#include <QHBoxLayout>
#include <QLayout>
#include <QPainter>
#include <QPushButton>
#include <QVBoxLayout>
namespace chatterino {
src/widgets/AccountSwitchPopup.hpp
+2 -1
View File
@@ -1,12 +1,13 @@
#pragma once
#include "widgets/AccountSwitchWidget.hpp"
#include "widgets/BaseWindow.hpp"
#include <QWidget>
namespace chatterino {
class AccountSwitchWidget;
class AccountSwitchPopup : public BaseWindow
{
Q_OBJECT
src/widgets/BaseWindow.cpp
+3 -6
View File
@@ -1,7 +1,9 @@
#include "widgets/BaseWindow.hpp"
#include "BaseSettings.hpp"
#include "Application.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/DebugCount.hpp"
#include "util/PostToThread.hpp"
#include "util/WindowsHelper.hpp"
@@ -16,11 +18,6 @@
#include <functional>
#ifdef CHATTERINO
# include "Application.hpp"
# include "singletons/WindowManager.hpp"
#endif
#ifdef USEWINSDK
# include <dwmapi.h>
# include <VersionHelpers.h>
src/widgets/BaseWindow.hpp
+1
View File
@@ -4,6 +4,7 @@
#include "widgets/BaseWidget.hpp"
#include <pajlada/signals/signalholder.hpp>
#include <QTimer>
#include <functional>
src/widgets/Notebook.hpp
+1 -1
View File
@@ -1,8 +1,8 @@
#pragma once
#include "pajlada/signals/signal.hpp"
#include "widgets/BaseWidget.hpp"
#include <pajlada/signals/signal.hpp>
#include <pajlada/signals/signalholder.hpp>
#include <QList>
#include <QMenu>
src/widgets/Scrollbar.cpp
-2
View File
@@ -1,13 +1,11 @@
#include "widgets/Scrollbar.hpp"
#include "Application.hpp"
#include "common/QLogging.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp"
#include <QDebug>
#include <QMouseEvent>
#include <QPainter>
#include <QTimer>
src/widgets/TooltipWidget.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
#include "TooltipWidget.hpp"
#include "widgets/TooltipWidget.hpp"
#include "Application.hpp"
#include "messages/Image.hpp"
#include "singletons/Fonts.hpp"
#include "singletons/WindowManager.hpp"
src/widgets/TooltipWidget.hpp
+3 -1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "messages/Image.hpp"
#include "widgets/BaseWindow.hpp"
#include <pajlada/signals/signalholder.hpp>
@@ -9,6 +8,9 @@
namespace chatterino {
class Image;
using ImagePtr = std::shared_ptr<Image>;
class TooltipWidget : public BaseWindow
{
Q_OBJECT
src/widgets/dialogs/ColorPickerDialog.cpp
+4
View File
@@ -2,9 +2,13 @@
#include "providers/colors/ColorProvider.hpp"
#include "singletons/Theme.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/ColorButton.hpp"
#include "widgets/helper/QColorPicker.hpp"
#include <QDialogButtonBox>
#include <QLineEdit>
#include <QSet>
namespace chatterino {
src/widgets/dialogs/ColorPickerDialog.hpp
+10 -3
View File
@@ -1,17 +1,24 @@
#pragma once
#include "util/LayoutCreator.hpp"
#include "widgets/BasePopup.hpp"
#include "widgets/helper/ColorButton.hpp"
#include "widgets/helper/QColorPicker.hpp"
#include <pajlada/signals/signal.hpp>
#include <QLabel>
#include <QLineEdit>
#include <QRegularExpressionValidator>
#include <array>
namespace chatterino {
class ColorButton;
class QColorLuminancePicker;
class QColorPicker;
class QColSpinBox;
template <class T>
class LayoutCreator;
/**
* @brief A custom color picker dialog.
*
src/widgets/dialogs/EditHotkeyDialog.cpp
+1
View File
@@ -3,6 +3,7 @@
#include "Application.hpp"
#include "common/QLogging.hpp"
#include "controllers/hotkeys/ActionNames.hpp"
#include "controllers/hotkeys/Hotkey.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "controllers/hotkeys/HotkeyHelpers.hpp"
#include "ui_EditHotkeyDialog.h"
src/widgets/dialogs/EditHotkeyDialog.hpp
+2 -2
View File
@@ -1,7 +1,5 @@
#pragma once
#include "controllers/hotkeys/Hotkey.hpp"
#include <QDialog>
#include <memory>
@@ -14,6 +12,8 @@ class EditHotkeyDialog;
namespace chatterino {
class Hotkey;
class EditHotkeyDialog : public QDialog
{
Q_OBJECT
src/widgets/dialogs/EmotePopup.cpp
+2
View File
@@ -9,10 +9,12 @@
#include "messages/Emote.hpp"
#include "messages/Message.hpp"
#include "messages/MessageBuilder.hpp"
#include "messages/MessageElement.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp"
#include "widgets/helper/TrimRegExpValidator.hpp"
src/widgets/dialogs/EmotePopup.hpp
+2 -2
View File
@@ -1,8 +1,6 @@
#pragma once
#include "providers/twitch/TwitchChannel.hpp"
#include "widgets/BasePopup.hpp"
#include "widgets/Notebook.hpp"
#include <pajlada/signals/signal.hpp>
#include <QLineEdit>
@@ -13,6 +11,8 @@ struct Link;
class ChannelView;
class Channel;
using ChannelPtr = std::shared_ptr<Channel>;
class Notebook;
class TwitchChannel;
class EmotePopup : public BasePopup
{
src/widgets/dialogs/ReplyThreadPopup.cpp
+4
View File
@@ -3,9 +3,13 @@
#include "Application.hpp"
#include "common/Channel.hpp"
#include "common/QLogging.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "messages/Message.hpp"
#include "messages/MessageThread.hpp"
#include "providers/twitch/ChannelPointReward.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/ChannelView.hpp"
#include "widgets/helper/ResizingTextEdit.hpp"
src/widgets/dialogs/SelectChannelDialog.cpp
+3
View File
@@ -4,7 +4,10 @@
#include "common/QLogging.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "providers/irc/Irc2.hpp"
#include "providers/irc/IrcChannel2.hpp"
#include "providers/irc/IrcServer.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/dialogs/IrcConnectionEditor.hpp"
src/widgets/dialogs/SelectChannelDialog.hpp
+3 -2
View File
@@ -1,7 +1,5 @@
#pragma once
#include "Application.hpp"
#include "common/Channel.hpp"
#include "widgets/BaseWindow.hpp"
#include <pajlada/signals/signal.hpp>
@@ -13,6 +11,9 @@ namespace chatterino {
class Notebook;
class EditableModelView;
class IndirectChannel;
class Channel;
using ChannelPtr = std::shared_ptr<Channel>;
class SelectChannelDialog final : public BaseWindow
{
src/widgets/dialogs/SelectChannelFiltersDialog.cpp
+1
View File
@@ -1,5 +1,6 @@
#include "SelectChannelFiltersDialog.hpp"
#include "controllers/filters/FilterRecord.hpp"
#include "singletons/Settings.hpp"
#include <QCheckBox>
src/widgets/dialogs/SettingsDialog.cpp
+2 -1
View File
@@ -4,9 +4,10 @@
#include "common/Args.hpp"
#include "controllers/commands/CommandController.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "singletons/Resources.hpp"
#include "singletons/Settings.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/Button.hpp"
#include "widgets/helper/SettingsDialogTab.hpp"
#include "widgets/settingspages/AboutPage.hpp"
#include "widgets/settingspages/AccountsPage.hpp"
#include "widgets/settingspages/CommandPage.hpp"
src/widgets/dialogs/SettingsDialog.hpp
+1 -1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "widgets/BaseWindow.hpp"
#include "widgets/helper/SettingsDialogTab.hpp"
#include <pajlada/settings/setting.hpp>
#include <QFrame>
@@ -19,6 +18,7 @@ namespace chatterino {
class SettingsPage;
class SettingsDialogTab;
class ModerationPage;
enum class SettingsTabId;
class PageHeader : public QFrame
{
src/widgets/dialogs/UpdateDialog.hpp
+4 -2
View File
@@ -1,14 +1,16 @@
#pragma once
#include "pajlada/signals/signalholder.hpp"
#include "singletons/Updates.hpp"
#include "widgets/BaseWindow.hpp"
#include "widgets/Label.hpp"
#include <pajlada/signals/signalholder.hpp>
class QPushButton;
namespace chatterino {
class Label;
class UpdateDialog : public BaseWindow
{
public:
src/widgets/dialogs/UserInfoPopup.cpp
+1 -1
View File
@@ -11,6 +11,7 @@
#include "messages/MessageBuilder.hpp"
#include "providers/IvrApi.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/ChannelPointReward.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
@@ -21,7 +22,6 @@
#include "util/Clipboard.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "util/PostToThread.hpp"
#include "util/StreamerMode.hpp"
#include "widgets/helper/ChannelView.hpp"
#include "widgets/helper/EffectLabel.hpp"
src/widgets/dialogs/UserInfoPopup.hpp
+2 -1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "widgets/DraggablePopup.hpp"
#include "widgets/helper/ChannelView.hpp"
#include <pajlada/signals/scoped-connection.hpp>
#include <pajlada/signals/signal.hpp>
@@ -15,6 +14,8 @@ namespace chatterino {
class Channel;
using ChannelPtr = std::shared_ptr<Channel>;
class Label;
class ChannelView;
class Split;
class UserInfoPopup final : public DraggablePopup
{
src/widgets/dialogs/switcher/SwitchSplitItem.cpp
+2
View File
@@ -3,7 +3,9 @@
#include "Application.hpp"
#include "singletons/Fonts.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/helper/NotebookTab.hpp"
#include "widgets/splits/Split.hpp"
namespace chatterino {
src/widgets/dialogs/switcher/SwitchSplitItem.hpp
+7 -5
View File
@@ -1,14 +1,16 @@
#pragma once
#include "singletons/WindowManager.hpp"
#include "widgets/dialogs/switcher/AbstractSwitcherItem.hpp"
#include "widgets/helper/NotebookTab.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/splits/Split.hpp"
#include "widgets/Window.hpp"
#include <QPainter>
#include <QRect>
#include <QSize>
namespace chatterino {
class SplitContainer;
class Split;
class SwitchSplitItem : public AbstractSwitcherItem
{
public:
src/widgets/helper/ChannelView.cpp
+5
View File
@@ -4,15 +4,19 @@
#include "common/Common.hpp"
#include "common/QLogging.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/commands/Command.hpp"
#include "controllers/commands/CommandController.hpp"
#include "controllers/filters/FilterSet.hpp"
#include "debug/Benchmark.hpp"
#include "messages/Emote.hpp"
#include "messages/Image.hpp"
#include "messages/layouts/MessageLayout.hpp"
#include "messages/layouts/MessageLayoutElement.hpp"
#include "messages/LimitedQueueSnapshot.hpp"
#include "messages/Message.hpp"
#include "messages/MessageBuilder.hpp"
#include "messages/MessageElement.hpp"
#include "messages/MessageThread.hpp"
#include "providers/LinkResolver.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
@@ -31,6 +35,7 @@
#include "widgets/dialogs/SettingsDialog.hpp"
#include "widgets/dialogs/UserInfoPopup.hpp"
#include "widgets/helper/EffectLabel.hpp"
#include "widgets/helper/ScrollbarHighlight.hpp"
#include "widgets/helper/SearchPopup.hpp"
#include "widgets/Scrollbar.hpp"
#include "widgets/splits/Split.hpp"
src/widgets/helper/ChannelView.hpp
+3 -2
View File
@@ -1,8 +1,6 @@
#pragma once
#include "common/FlagsEnum.hpp"
#include "controllers/filters/FilterSet.hpp"
#include "messages/Image.hpp"
#include "messages/LimitedQueue.hpp"
#include "messages/LimitedQueueSnapshot.hpp"
#include "messages/Selection.hpp"
@@ -10,6 +8,7 @@
#include "widgets/BaseWidget.hpp"
#include <pajlada/signals/signal.hpp>
#include <QMenu>
#include <QPaintEvent>
#include <QScroller>
#include <QTimer>
@@ -43,6 +42,8 @@ class EffectLabel;
struct Link;
class MessageLayoutElement;
class Split;
class FilterSet;
using FilterSetPtr = std::shared_ptr<FilterSet>;
enum class PauseReason {
Mouse,
src/widgets/helper/EffectLabel.hpp
-1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "widgets/BaseWidget.hpp"
#include "widgets/helper/Button.hpp"
#include "widgets/helper/SignalLabel.hpp"
#include "widgets/Label.hpp"
src/widgets/helper/NotebookTab.hpp
-3
View File
@@ -1,7 +1,6 @@
#pragma once
#include "common/Common.hpp"
#include "widgets/BaseWidget.hpp"
#include "widgets/helper/Button.hpp"
#include "widgets/Notebook.hpp"
@@ -14,8 +13,6 @@ namespace chatterino {
#define NOTEBOOK_TAB_HEIGHT 28
// class Notebook;
class Notebook;
class SplitContainer;
class NotebookTab : public Button
src/widgets/helper/SearchPopup.cpp
+4
View File
@@ -1,7 +1,10 @@
#include "SearchPopup.hpp"
#include "Application.hpp"
#include "common/Channel.hpp"
#include "controllers/filters/FilterSet.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "messages/MessageElement.hpp"
#include "messages/search/AuthorPredicate.hpp"
#include "messages/search/BadgePredicate.hpp"
#include "messages/search/ChannelPredicate.hpp"
@@ -12,6 +15,7 @@
#include "messages/search/SubtierPredicate.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp"
#include "widgets/splits/Split.hpp"
#include <QHBoxLayout>
#include <QLineEdit>
src/widgets/helper/SearchPopup.hpp
+3 -3
View File
@@ -1,11 +1,8 @@
#pragma once
#include "controllers/filters/FilterSet.hpp"
#include "ForwardDecl.hpp"
#include "messages/LimitedQueueSnapshot.hpp"
#include "messages/search/MessagePredicate.hpp"
#include "widgets/BasePopup.hpp"
#include "widgets/splits/Split.hpp"
#include <memory>
@@ -13,6 +10,9 @@ class QLineEdit;
namespace chatterino {
class Split;
class MessagePredicate;
class SearchPopup : public BasePopup
{
public:
src/widgets/helper/SettingsDialogTab.hpp
+1 -1
View File
@@ -13,7 +13,7 @@ namespace chatterino {
class SettingsPage;
class SettingsDialog;
enum SettingsTabId {
enum class SettingsTabId {
None,
Accounts,
Moderation,
src/widgets/listview/GenericListModel.hpp
+2
View File
@@ -1,3 +1,5 @@
#pragma once
#include "widgets/listview/GenericListItem.hpp"
#include <QAbstractListModel>
src/widgets/listview/GenericListView.hpp
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "widgets/listview/GenericItemDelegate.hpp"
#include "widgets/listview/GenericListItem.hpp"
#include <QListView>
src/widgets/settingspages/AccountsPage.hpp
+2 -1
View File
@@ -1,12 +1,13 @@
#pragma once
#include "widgets/AccountSwitchWidget.hpp"
#include "widgets/settingspages/SettingsPage.hpp"
#include <QPushButton>
namespace chatterino {
class AccountSwitchWidget;
class AccountsPage : public SettingsPage
{
public:
src/widgets/settingspages/CommandPage.cpp
+4 -6
View File
@@ -1,9 +1,13 @@
#include "CommandPage.hpp"
#include "Application.hpp"
#include "controllers/commands/Command.hpp"
#include "controllers/commands/CommandController.hpp"
#include "controllers/commands/CommandModel.hpp"
#include "singletons/Settings.hpp"
#include "util/CombinePath.hpp"
#include "util/LayoutCreator.hpp"
#include "util/Qt.hpp"
#include "util/StandardItemHelper.hpp"
#include "widgets/helper/EditableModelView.hpp"
@@ -13,12 +17,6 @@
#include <QStandardItemModel>
#include <QTableView>
#include <QTextEdit>
//#include "widgets/helper/ComboBoxItemDelegate.hpp"
#include "util/CombinePath.hpp"
#include "util/Qt.hpp"
#include <QLabel>
#include <QTextEdit>
// clang-format off
#define TEXT "{1} => first word &nbsp;&nbsp;&nbsp; {1+} => first word and after &nbsp;&nbsp;&nbsp; {{ => { &nbsp;&nbsp;&nbsp; <a href='https://chatterino.com/help/commands'>more info</a>"
src/widgets/settingspages/ExternalToolsPage.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "ExternalToolsPage.hpp"
#include "Application.hpp"
#include "singletons/Settings.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "util/RemoveScrollAreaBackground.hpp"
src/widgets/settingspages/FiltersPage.cpp
+2
View File
@@ -1,6 +1,8 @@
#include "FiltersPage.hpp"
#include "Application.hpp"
#include "controllers/filters/FilterModel.hpp"
#include "controllers/filters/FilterRecord.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "util/LayoutCreator.hpp"
src/widgets/settingspages/FiltersPage.hpp
+2 -1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "widgets/helper/EditableModelView.hpp"
#include "widgets/settingspages/SettingsPage.hpp"
#include <QStringListModel>
@@ -9,6 +8,8 @@ class QVBoxLayout;
namespace chatterino {
class EditableModelView;
class FiltersPage : public SettingsPage
{
public:
src/widgets/settingspages/GeneralPage.cpp
+1 -2
View File
@@ -10,14 +10,13 @@
#include "singletons/Fonts.hpp"
#include "singletons/NativeMessaging.hpp"
#include "singletons/Paths.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/FuzzyConvert.hpp"
#include "util/Helpers.hpp"
#include "util/IncognitoBrowser.hpp"
#include "util/StreamerMode.hpp"
#include "widgets/BaseWindow.hpp"
#include "widgets/helper/Line.hpp"
#include "widgets/settingspages/GeneralPageView.hpp"
#include "widgets/splits/SplitInput.hpp"
src/widgets/settingspages/GeneralPageView.cpp
+1 -1
View File
@@ -1,7 +1,6 @@
#include "widgets/settingspages/GeneralPageView.hpp"
#include "Application.hpp"
#include "singletons/WindowManager.hpp"
#include "util/LayoutHelper.hpp"
#include "util/RapidJsonSerializeQString.hpp"
#include "widgets/dialogs/ColorPickerDialog.hpp"
@@ -9,6 +8,7 @@
#include "widgets/helper/Line.hpp"
#include <QRegularExpression>
#include <QScrollArea>
#include <QScrollBar>
namespace {
src/widgets/settingspages/HighlightingPage.cpp
+5 -1
View File
@@ -2,16 +2,20 @@
#include "Application.hpp"
#include "controllers/highlights/BadgeHighlightModel.hpp"
#include "controllers/highlights/HighlightBadge.hpp"
#include "controllers/highlights/HighlightBlacklistModel.hpp"
#include "controllers/highlights/HighlightBlacklistUser.hpp"
#include "controllers/highlights/HighlightModel.hpp"
#include "controllers/highlights/HighlightPhrase.hpp"
#include "controllers/highlights/UserHighlightModel.hpp"
#include "providers/colors/ColorProvider.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "util/StandardItemHelper.hpp"
#include "widgets/dialogs/BadgePickerDialog.hpp"
#include "widgets/dialogs/ColorPickerDialog.hpp"
#include "widgets/helper/EditableModelView.hpp"
#include <QFileDialog>
#include <QHeaderView>
src/widgets/settingspages/HighlightingPage.hpp
+2 -1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "widgets/helper/EditableModelView.hpp"
#include "widgets/settingspages/SettingsPage.hpp"
#include <QAbstractTableModel>
@@ -11,6 +10,8 @@ class QListWidget;
namespace chatterino {
class EditableModelView;
class HighlightingPage : public SettingsPage
{
public:
src/widgets/settingspages/IgnoresPage.cpp
+2
View File
@@ -4,7 +4,9 @@
#include "controllers/accounts/AccountController.hpp"
#include "controllers/ignores/IgnoreController.hpp"
#include "controllers/ignores/IgnoreModel.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchUser.hpp"
#include "singletons/Settings.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/EditableModelView.hpp"
src/widgets/settingspages/KeyboardSettingsPage.cpp
+3
View File
@@ -2,14 +2,17 @@
#include "Application.hpp"
#include "common/QLogging.hpp"
#include "controllers/hotkeys/Hotkey.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "controllers/hotkeys/HotkeyModel.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/dialogs/EditHotkeyDialog.hpp"
#include "widgets/helper/EditableModelView.hpp"
#include <QFormLayout>
#include <QHeaderView>
#include <QLabel>
#include <QMessageBox>
#include <QTableView>
namespace chatterino {
src/widgets/settingspages/KeyboardSettingsPage.hpp
+1 -1
View File
@@ -1,11 +1,11 @@
#pragma once
#include "widgets/helper/EditableModelView.hpp"
#include "widgets/settingspages/SettingsPage.hpp"
namespace chatterino {
class HotkeyModel;
class EditableModelView;
class KeyboardSettingsPage : public SettingsPage
{
src/widgets/settingspages/ModerationPage.cpp
+2 -5
View File
@@ -1,25 +1,22 @@
#include "ModerationPage.hpp"
#include "Application.hpp"
#include "controllers/moderationactions/ModerationAction.hpp"
#include "controllers/moderationactions/ModerationActionModel.hpp"
#include "singletons/Logging.hpp"
#include "singletons/Paths.hpp"
#include "singletons/Settings.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/EditableModelView.hpp"
#include <QFileDialog>
#include <QFormLayout>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QListView>
#include <QPushButton>
#include <QTableView>
#include <QtConcurrent/QtConcurrent>
#include <QTextEdit>
#include <QVBoxLayout>
namespace chatterino {
src/widgets/settingspages/NicknamesPage.cpp
+1 -1
View File
@@ -1,11 +1,11 @@
#include "NicknamesPage.hpp"
#include "controllers/nicknames/Nickname.hpp"
#include "controllers/nicknames/NicknamesModel.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/EditableModelView.hpp"
#include "widgets/Window.hpp"
#include <QHeaderView>
#include <QTableView>
src/widgets/settingspages/NicknamesPage.hpp
-5
View File
@@ -1,12 +1,7 @@
#pragma once
#include "widgets/helper/EditableModelView.hpp"
#include "widgets/settingspages/SettingsPage.hpp"
#include <QStringListModel>
class QVBoxLayout;
namespace chatterino {
class NicknamesPage : public SettingsPage
src/widgets/settingspages/NotificationPage.hpp
+1 -4
View File
@@ -2,10 +2,7 @@
#include "widgets/settingspages/SettingsPage.hpp"
class QPushButton;
class QListWidget;
class QVBoxLayout;
class QComboBox;
namespace chatterino {
src/widgets/settingspages/SettingsPage.cpp
+2 -2
View File
@@ -2,10 +2,10 @@
#include "Application.hpp"
#include "singletons/WindowManager.hpp"
#include "util/FunctionEventFilter.hpp"
#include "util/RapidJsonSerializeQString.hpp"
#include <QDebug>
#include <QPainter>
#include <util/FunctionEventFilter.hpp>
namespace chatterino {
src/widgets/settingspages/SettingsPage.hpp
+1 -2
View File
@@ -1,7 +1,6 @@
#pragma once
#include "singletons/Settings.hpp"
#include <pajlada/settings.hpp>
#include <pajlada/signals/signal.hpp>
#include <QCheckBox>
#include <QComboBox>
src/widgets/splits/ClosedSplits.hpp
+3 -3
View File
@@ -1,8 +1,6 @@
#pragma once
#include "common/Channel.hpp"
#include "widgets/helper/NotebookTab.hpp"
#include <QList>
#include <QUuid>
#include <deque>
@@ -11,6 +9,8 @@
namespace chatterino {
class NotebookTab;
class ClosedSplits
{
public:
src/widgets/splits/InputCompletionItem.cpp
+4 -1
View File
@@ -1,4 +1,7 @@
#include "InputCompletionItem.hpp"
#include "widgets/splits/InputCompletionItem.hpp"
#include "messages/Emote.hpp"
#include "messages/Image.hpp"
namespace chatterino {
src/widgets/splits/InputCompletionItem.hpp
+3 -1
View File
@@ -1,12 +1,14 @@
#pragma once
#include "messages/Emote.hpp"
#include "widgets/listview/GenericListItem.hpp"
#include <functional>
namespace chatterino {
struct Emote;
using EmotePtr = std::shared_ptr<const Emote>;
class InputCompletionItem : public GenericListItem
{
using ActionCallback = std::function<void(const QString &)>;
src/widgets/splits/InputCompletionPopup.hpp
+3 -1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "common/Channel.hpp"
#include "widgets/BasePopup.hpp"
#include "widgets/listview/GenericListModel.hpp"
@@ -8,6 +7,9 @@
namespace chatterino {
class Channel;
using ChannelPtr = std::shared_ptr<Channel>;
class GenericListView;
class InputCompletionPopup : public BasePopup
src/widgets/splits/Split.cpp
+1 -2
View File
@@ -2,15 +2,14 @@
#include "Application.hpp"
#include "common/Common.hpp"
#include "common/Env.hpp"
#include "common/NetworkRequest.hpp"
#include "common/NetworkResult.hpp"
#include "common/QLogging.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/commands/CommandController.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "controllers/notifications/NotificationController.hpp"
#include "messages/MessageThread.hpp"
#include "providers/twitch/EmoteValue.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
src/widgets/splits/Split.hpp
+1 -1
View File
@@ -3,10 +3,10 @@
#include "common/Aliases.hpp"
#include "common/Channel.hpp"
#include "common/NullablePtr.hpp"
#include "pajlada/signals/signalholder.hpp"
#include "widgets/BaseWidget.hpp"
#include <boost/signals2.hpp>
#include <pajlada/signals/signalholder.hpp>
#include <QFont>
#include <QShortcut>
#include <QVBoxLayout>
src/widgets/splits/SplitContainer.cpp
+1 -1
View File
@@ -3,6 +3,7 @@
#include "Application.hpp"
#include "common/Common.hpp"
#include "common/QLogging.hpp"
#include "common/WindowDescriptors.hpp"
#include "debug/AssertInGuiThread.hpp"
#include "singletons/Fonts.hpp"
#include "singletons/Theme.hpp"
@@ -15,7 +16,6 @@
#include "widgets/splits/Split.hpp"
#include "widgets/Window.hpp"
#include <boost/foreach.hpp>
#include <QApplication>
#include <QJsonArray>
#include <QJsonObject>
src/widgets/splits/SplitContainer.hpp
+1
View File
@@ -12,6 +12,7 @@
#include <algorithm>
#include <optional>
#include <unordered_map>
#include <variant>
#include <vector>
class QJsonObject;
src/widgets/splits/SplitHeader.cpp
+3 -1
View File
@@ -1,6 +1,9 @@
#include "widgets/splits/SplitHeader.hpp"
#include "Application.hpp"
#include "common/NetworkCommon.hpp"
#include "common/NetworkRequest.hpp"
#include "common/NetworkResult.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/commands/CommandController.hpp"
#include "controllers/hotkeys/Hotkey.hpp"
@@ -15,7 +18,6 @@
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "util/LayoutHelper.hpp"
#include "util/StreamerMode.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
src/widgets/splits/SplitInput.cpp
+2 -1
View File
@@ -5,6 +5,8 @@
#include "controllers/commands/CommandController.hpp"
#include "controllers/hotkeys/HotkeyController.hpp"
#include "messages/Link.hpp"
#include "messages/Message.hpp"
#include "messages/MessageThread.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchCommon.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
@@ -22,7 +24,6 @@
#include "widgets/splits/InputCompletionPopup.hpp"
#include "widgets/splits/Split.hpp"
#include "widgets/splits/SplitContainer.hpp"
#include "widgets/splits/SplitInput.hpp"
#include <QCompleter>
#include <QPainter>
src/widgets/splits/SplitInput.hpp
-1
View File
@@ -2,7 +2,6 @@
#include "util/QObjectRef.hpp"
#include "widgets/BaseWidget.hpp"
#include "widgets/dialogs/EmotePopup.hpp"
#include <QHBoxLayout>
#include <QLabel>
src/widgets/splits/SplitOverlay.hpp
+1 -1
View File
@@ -1,8 +1,8 @@
#pragma once
#include "pajlada/signals/signalholder.hpp"
#include "widgets/BaseWidget.hpp"
#include <pajlada/signals/signalholder.hpp>
#include <QGridLayout>
#include <QPushButton>