From 22f528cd21be864797a070b0421b6121800456c0 Mon Sep 17 00:00:00 2001 From: fourtf Date: Tue, 26 Jun 2018 14:39:22 +0200 Subject: [PATCH] put all split widgets inside the same directory --- chatterino.pro | 28 +++++++++---------- src/{Common.h.cpp => Common.cpp} | 0 src/singletons/WindowManager.hpp | 2 +- src/widgets/AttachedWindow.cpp | 2 +- src/widgets/AttachedWindow.hpp | 2 +- src/widgets/Notebook.cpp | 2 +- src/widgets/Notebook.hpp | 2 +- src/widgets/StreamView.cpp | 2 +- src/widgets/Window.cpp | 2 +- src/widgets/helper/ChannelView.cpp | 2 +- src/widgets/helper/NotebookButton.cpp | 2 +- src/widgets/helper/RippleEffectLabel.cpp | 2 +- src/widgets/helper/SplitNode.cpp | 6 ---- src/widgets/helper/SplitNode.hpp | 11 -------- src/widgets/{ => splits}/Split.cpp | 6 ++-- src/widgets/{ => splits}/Split.hpp | 4 +-- .../{helper => splits}/SplitColumn.cpp | 0 .../{helper => splits}/SplitColumn.hpp | 2 +- src/widgets/{ => splits}/SplitContainer.cpp | 4 +-- src/widgets/{ => splits}/SplitContainer.hpp | 2 +- .../{helper => splits}/SplitHeader.cpp | 6 ++-- .../{helper => splits}/SplitHeader.hpp | 0 src/widgets/{helper => splits}/SplitInput.cpp | 6 ++-- src/widgets/{helper => splits}/SplitInput.hpp | 2 +- .../{helper => splits}/SplitOverlay.cpp | 4 +-- .../{helper => splits}/SplitOverlay.hpp | 0 26 files changed, 41 insertions(+), 60 deletions(-) rename src/{Common.h.cpp => Common.cpp} (100%) delete mode 100644 src/widgets/helper/SplitNode.cpp delete mode 100644 src/widgets/helper/SplitNode.hpp rename src/widgets/{ => splits}/Split.cpp (99%) rename src/widgets/{ => splits}/Split.hpp (98%) rename src/widgets/{helper => splits}/SplitColumn.cpp (100%) rename src/widgets/{helper => splits}/SplitColumn.hpp (86%) rename src/widgets/{ => splits}/SplitContainer.cpp (99%) rename src/widgets/{ => splits}/SplitContainer.hpp (99%) rename src/widgets/{helper => splits}/SplitHeader.cpp (99%) rename src/widgets/{helper => splits}/SplitHeader.hpp (100%) rename src/widgets/{helper => splits}/SplitInput.cpp (99%) rename src/widgets/{helper => splits}/SplitInput.hpp (96%) rename src/widgets/{helper => splits}/SplitOverlay.cpp (95%) rename src/widgets/{helper => splits}/SplitOverlay.hpp (100%) diff --git a/chatterino.pro b/chatterino.pro index 0f3328113..935bda8e1 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -96,7 +96,7 @@ SOURCES += \ src/Application.cpp \ src/Channel.cpp \ src/ChannelData.cpp \ - src/Common.h.cpp \ + src/Common.cpp \ src/controllers/accounts/Account.cpp \ src/controllers/accounts/AccountController.cpp \ src/controllers/accounts/AccountModel.cpp \ @@ -184,11 +184,10 @@ SOURCES += \ 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/splits/SplitColumn.cpp \ + src/widgets/splits/SplitHeader.cpp \ + src/widgets/splits/SplitInput.cpp \ + src/widgets/splits/SplitOverlay.cpp \ src/widgets/helper/TitlebarButton.cpp \ src/widgets/Label.cpp \ src/widgets/LastRunCrashDialog.cpp \ @@ -214,8 +213,8 @@ SOURCES += \ 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/splits/Split.cpp \ + src/widgets/splits/SplitContainer.cpp \ src/widgets/StreamView.cpp \ src/widgets/TextInputDialog.cpp \ src/widgets/TooltipWidget.cpp \ @@ -357,11 +356,10 @@ HEADERS += \ 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/splits/SplitColumn.hpp \ + src/widgets/splits/SplitHeader.hpp \ + src/widgets/splits/SplitInput.hpp \ + src/widgets/splits/SplitOverlay.hpp \ src/widgets/helper/TitlebarButton.hpp \ src/widgets/Label.hpp \ src/widgets/LastRunCrashDialog.hpp \ @@ -387,8 +385,8 @@ HEADERS += \ 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/splits/Split.hpp \ + src/widgets/splits/SplitContainer.hpp \ src/widgets/StreamView.hpp \ src/widgets/TextInputDialog.hpp \ src/widgets/Titlebar.hpp \ diff --git a/src/Common.h.cpp b/src/Common.cpp similarity index 100% rename from src/Common.h.cpp rename to src/Common.cpp diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp index 8ce7f8e70..79fa06e59 100644 --- a/src/singletons/WindowManager.hpp +++ b/src/singletons/WindowManager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include "widgets/Window.hpp" namespace chatterino { diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp index b4f60cbae..0adb1ed83 100644 --- a/src/widgets/AttachedWindow.cpp +++ b/src/widgets/AttachedWindow.cpp @@ -2,7 +2,7 @@ #include "Application.hpp" #include "util/DebugCount.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include #include diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp index 78b1b839f..b83ee8f2e 100644 --- a/src/widgets/AttachedWindow.hpp +++ b/src/widgets/AttachedWindow.hpp @@ -3,7 +3,7 @@ #include #include "Channel.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp index 84ac18e07..965d20aeb 100644 --- a/src/widgets/Notebook.cpp +++ b/src/widgets/Notebook.cpp @@ -8,7 +8,7 @@ #include "widgets/helper/NotebookTab.hpp" #include "widgets/helper/Shortcut.hpp" #include "widgets/SettingsDialog.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include "widgets/Window.hpp" #include diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp index 70369b2d5..c25925ca5 100644 --- a/src/widgets/Notebook.hpp +++ b/src/widgets/Notebook.hpp @@ -4,7 +4,7 @@ #include "widgets/BaseWidget.hpp" #include "widgets/helper/NotebookButton.hpp" #include "widgets/helper/NotebookTab.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include #include diff --git a/src/widgets/StreamView.cpp b/src/widgets/StreamView.cpp index 10496a673..74822e6c6 100644 --- a/src/widgets/StreamView.cpp +++ b/src/widgets/StreamView.cpp @@ -3,7 +3,7 @@ #include "Channel.hpp" #include "util/Helpers.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #ifdef USEWEBENGINE #include diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 0783f40d1..bc7191c58 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -12,7 +12,7 @@ #include "widgets/helper/Shortcut.hpp" #include "widgets/Notebook.hpp" #include "widgets/SettingsDialog.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include "widgets/WelcomeDialog.hpp" #include diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index 24528afd4..1f0bf5307 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -11,7 +11,7 @@ #include "singletons/WindowManager.hpp" #include "util/Benchmark.hpp" #include "util/DistanceBetweenPoints.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include "widgets/TooltipWidget.hpp" #include "widgets/UserInfoPopup.hpp" diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp index ff19a00f0..01d8e6fca 100644 --- a/src/widgets/helper/NotebookButton.cpp +++ b/src/widgets/helper/NotebookButton.cpp @@ -2,7 +2,7 @@ #include "singletons/ThemeManager.hpp" #include "widgets/helper/RippleEffectButton.hpp" #include "widgets/Notebook.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include #include diff --git a/src/widgets/helper/RippleEffectLabel.cpp b/src/widgets/helper/RippleEffectLabel.cpp index 8f83bb89b..2186be1f3 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/splits/SplitHeader.hpp" #include #include diff --git a/src/widgets/helper/SplitNode.cpp b/src/widgets/helper/SplitNode.cpp deleted file mode 100644 index 697facca2..000000000 --- a/src/widgets/helper/SplitNode.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "SplitNode.hpp" - -SplitNode::SplitNode() -{ - -} diff --git a/src/widgets/helper/SplitNode.hpp b/src/widgets/helper/SplitNode.hpp deleted file mode 100644 index dc57b0987..000000000 --- a/src/widgets/helper/SplitNode.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef SPLITNODE_HPP -#define SPLITNODE_HPP - - -class SplitNode -{ -public: - SplitNode(); -}; - -#endif // SPLITNODE_HPP \ No newline at end of file diff --git a/src/widgets/Split.cpp b/src/widgets/splits/Split.cpp similarity index 99% rename from src/widgets/Split.cpp rename to src/widgets/splits/Split.cpp index 9ee84ca45..d2b8c07d3 100644 --- a/src/widgets/Split.cpp +++ b/src/widgets/splits/Split.cpp @@ -1,4 +1,4 @@ -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include "Application.hpp" #include "Common.hpp" @@ -14,10 +14,10 @@ #include "widgets/helper/DebugPopup.hpp" #include "widgets/helper/SearchPopup.hpp" #include "widgets/helper/Shortcut.hpp" -#include "widgets/helper/SplitOverlay.hpp" +#include "widgets/splits/SplitOverlay.hpp" #include "widgets/QualityPopup.hpp" #include "widgets/SelectChannelDialog.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include "widgets/TextInputDialog.hpp" #include "widgets/UserInfoPopup.hpp" #include "widgets/Window.hpp" diff --git a/src/widgets/Split.hpp b/src/widgets/splits/Split.hpp similarity index 98% rename from src/widgets/Split.hpp rename to src/widgets/splits/Split.hpp index f51086936..55ffb9fd9 100644 --- a/src/widgets/Split.hpp +++ b/src/widgets/splits/Split.hpp @@ -10,8 +10,8 @@ #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 "widgets/splits/SplitHeader.hpp" +#include "widgets/splits/SplitInput.hpp" #include #include diff --git a/src/widgets/helper/SplitColumn.cpp b/src/widgets/splits/SplitColumn.cpp similarity index 100% rename from src/widgets/helper/SplitColumn.cpp rename to src/widgets/splits/SplitColumn.cpp diff --git a/src/widgets/helper/SplitColumn.hpp b/src/widgets/splits/SplitColumn.hpp similarity index 86% rename from src/widgets/helper/SplitColumn.hpp rename to src/widgets/splits/SplitColumn.hpp index 20bb6321d..4c519c321 100644 --- a/src/widgets/helper/SplitColumn.hpp +++ b/src/widgets/splits/SplitColumn.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include diff --git a/src/widgets/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp similarity index 99% rename from src/widgets/SplitContainer.cpp rename to src/widgets/splits/SplitContainer.cpp index 913a3ea6e..4860f4b70 100644 --- a/src/widgets/SplitContainer.cpp +++ b/src/widgets/splits/SplitContainer.cpp @@ -1,4 +1,4 @@ -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/SplitContainer.hpp" #include "Application.hpp" #include "Common.hpp" #include "singletons/ThemeManager.hpp" @@ -8,7 +8,7 @@ #include "util/LayoutCreator.hpp" #include "widgets/helper/NotebookTab.hpp" #include "widgets/Notebook.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include #include diff --git a/src/widgets/SplitContainer.hpp b/src/widgets/splits/SplitContainer.hpp similarity index 99% rename from src/widgets/SplitContainer.hpp rename to src/widgets/splits/SplitContainer.hpp index f2a8cb78d..8e294459e 100644 --- a/src/widgets/SplitContainer.hpp +++ b/src/widgets/splits/SplitContainer.hpp @@ -3,7 +3,7 @@ #include "widgets/BaseWidget.hpp" #include "widgets/helper/DropPreview.hpp" #include "widgets/helper/NotebookTab.hpp" -#include "widgets/Split.hpp" +#include "widgets/splits/Split.hpp" #include #include diff --git a/src/widgets/helper/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp similarity index 99% rename from src/widgets/helper/SplitHeader.cpp rename to src/widgets/splits/SplitHeader.cpp index 7ce99c035..ebbe2f2dc 100644 --- a/src/widgets/helper/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -1,4 +1,4 @@ -#include "widgets/helper/SplitHeader.hpp" +#include "widgets/splits/SplitHeader.hpp" #include "Application.hpp" #include "providers/twitch/TwitchChannel.hpp" @@ -8,8 +8,8 @@ #include "util/LayoutCreator.hpp" #include "util/UrlFetch.hpp" #include "widgets/Label.hpp" -#include "widgets/Split.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/Split.hpp" +#include "widgets/splits/SplitContainer.hpp" #include "widgets/TooltipWidget.hpp" #include diff --git a/src/widgets/helper/SplitHeader.hpp b/src/widgets/splits/SplitHeader.hpp similarity index 100% rename from src/widgets/helper/SplitHeader.hpp rename to src/widgets/splits/SplitHeader.hpp diff --git a/src/widgets/helper/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp similarity index 99% rename from src/widgets/helper/SplitInput.cpp rename to src/widgets/splits/SplitInput.cpp index 0a05e30c5..2bea4d1f8 100644 --- a/src/widgets/helper/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -1,4 +1,4 @@ -#include "widgets/helper/SplitInput.hpp" +#include "widgets/splits/SplitInput.hpp" #include "Application.hpp" #include "controllers/commands/CommandController.hpp" @@ -10,8 +10,8 @@ #include "util/LayoutCreator.hpp" #include "util/UrlFetch.hpp" #include "widgets/Notebook.hpp" -#include "widgets/Split.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/Split.hpp" +#include "widgets/splits/SplitContainer.hpp" #include #include diff --git a/src/widgets/helper/SplitInput.hpp b/src/widgets/splits/SplitInput.hpp similarity index 96% rename from src/widgets/helper/SplitInput.hpp rename to src/widgets/splits/SplitInput.hpp index 883ffbec8..c042b6d61 100644 --- a/src/widgets/helper/SplitInput.hpp +++ b/src/widgets/splits/SplitInput.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ResizingTextEdit.hpp" +#include "widgets/helper/ResizingTextEdit.hpp" #include "widgets/BaseWidget.hpp" #include "widgets/EmotePopup.hpp" #include "widgets/helper/RippleEffectLabel.hpp" diff --git a/src/widgets/helper/SplitOverlay.cpp b/src/widgets/splits/SplitOverlay.cpp similarity index 95% rename from src/widgets/helper/SplitOverlay.cpp rename to src/widgets/splits/SplitOverlay.cpp index bcbc7f96f..a7124d46d 100644 --- a/src/widgets/helper/SplitOverlay.cpp +++ b/src/widgets/splits/SplitOverlay.cpp @@ -10,8 +10,8 @@ #include "Application.hpp" #include "singletons/ResourceManager.hpp" -#include "widgets/Split.hpp" -#include "widgets/SplitContainer.hpp" +#include "widgets/splits/Split.hpp" +#include "widgets/splits/SplitContainer.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/helper/SplitOverlay.hpp b/src/widgets/splits/SplitOverlay.hpp similarity index 100% rename from src/widgets/helper/SplitOverlay.hpp rename to src/widgets/splits/SplitOverlay.hpp