Create directories for related files

19 files changed, 43 insertions, 31 deletions

diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cc
index 7e8c9e49..334f72c3 100644
--- a/src/AvatarProvider.cc
+++ b/src/AvatarProvider.cc
@@ -17,7 +17,8 @@
 
 #include "AvatarProvider.h"
 #include "MatrixClient.h"
-#include "TimelineItem.h"
+
+#include "timeline/TimelineItem.h"
 
 QSharedPointer<MatrixClient> AvatarProvider::client_;
 
diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 5214d49a..340e75c3 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -35,11 +35,12 @@
 #include "Sync.h"
 #include "TextInputWidget.h"
 #include "Theme.h"
-#include "TimelineViewManager.h"
 #include "TopRoomBar.h"
 #include "TypingDisplay.h"
 #include "UserInfoWidget.h"
 
+#include "timeline/TimelineViewManager.h"
+
 constexpr int MAX_INITIAL_SYNC_FAILURES = 5;
 constexpr int SYNC_RETRY_TIMEOUT        = 10000;
 
diff --git a/src/RoomList.cc b/src/RoomList.cc
index 7560a616..6b8867f3 100644
--- a/src/RoomList.cc
+++ b/src/RoomList.cc
@@ -18,8 +18,9 @@
 #include <QDebug>
 #include <QObject>
 
-#include "JoinRoomDialog.h"
-#include "LeaveRoomDialog.h"
+#include "dialogs/JoinRoomDialog.h"
+#include "dialogs/LeaveRoomDialog.h"
+
 #include "MainWindow.h"
 #include "MatrixClient.h"
 #include "OverlayModal.h"
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index d852ae32..3418e6f1 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -21,13 +21,14 @@
 #include "Config.h"
 #include "FlatButton.h"
 #include "Label.h"
-#include "LeaveRoomDialog.h"
 #include "MainWindow.h"
 #include "Menu.h"
 #include "OverlayModal.h"
 #include "RoomSettings.h"
 #include "TopRoomBar.h"
 
+#include "dialogs/LeaveRoomDialog.h"
+
 TopRoomBar::TopRoomBar(QWidget *parent)
   : QWidget(parent)
   , buttonSize_{32}
diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc
index 3dc1bc89..98977bb3 100644
--- a/src/UserInfoWidget.cc
+++ b/src/UserInfoWidget.cc
@@ -20,11 +20,12 @@
 #include "Avatar.h"
 #include "Config.h"
 #include "FlatButton.h"
-#include "LogoutDialog.h"
 #include "MainWindow.h"
 #include "OverlayModal.h"
 #include "UserInfoWidget.h"
 
+#include "dialogs/LogoutDialog.h"
+
 UserInfoWidget::UserInfoWidget(QWidget *parent)
   : QWidget(parent)
   , display_name_("User")
diff --git a/src/ImageOverlayDialog.cc b/src/dialogs/ImageOverlayDialog.cc
index 7dd4a226..ad87d144 100644
--- a/src/ImageOverlayDialog.cc
+++ b/src/dialogs/ImageOverlayDialog.cc
@@ -19,7 +19,7 @@
 #include <QDesktopWidget>
 #include <QPainter>
 
-#include "ImageOverlayDialog.h"
+#include "dialogs/ImageOverlayDialog.h"
 
 ImageOverlayDialog::ImageOverlayDialog(QPixmap image, QWidget *parent)
   : QWidget{parent}
diff --git a/src/JoinRoomDialog.cc b/src/dialogs/JoinRoomDialog.cc
index a4d241c0..2cee7ef6 100644
--- a/src/JoinRoomDialog.cc
+++ b/src/dialogs/JoinRoomDialog.cc
@@ -3,9 +3,10 @@
 
 #include "Config.h"
 #include "FlatButton.h"
-#include "JoinRoomDialog.h"
 #include "Theme.h"
 
+#include "dialogs/JoinRoomDialog.h"
+
 JoinRoomDialog::JoinRoomDialog(QWidget *parent)
   : QFrame(parent)
 {
diff --git a/src/LeaveRoomDialog.cc b/src/dialogs/LeaveRoomDialog.cc
index e9877a24..b0d1679f 100644
--- a/src/LeaveRoomDialog.cc
+++ b/src/dialogs/LeaveRoomDialog.cc
@@ -4,9 +4,10 @@
 
 #include "Config.h"
 #include "FlatButton.h"
-#include "LeaveRoomDialog.h"
 #include "Theme.h"
 
+#include "dialogs/LeaveRoomDialog.h"
+
 LeaveRoomDialog::LeaveRoomDialog(QWidget *parent)
   : QFrame(parent)
 {
diff --git a/src/LogoutDialog.cc b/src/dialogs/LogoutDialog.cc
index cda52016..73e09745 100644
--- a/src/LogoutDialog.cc
+++ b/src/dialogs/LogoutDialog.cc
@@ -22,9 +22,10 @@
 
 #include "Config.h"
 #include "FlatButton.h"
-#include "LogoutDialog.h"
 #include "Theme.h"
 
+#include "dialogs/LogoutDialog.h"
+
 LogoutDialog::LogoutDialog(QWidget *parent)
   : QFrame(parent)
 {
diff --git a/src/EmojiCategory.cc b/src/emoji/EmojiCategory.cc
index 98d79cc0..42f09409 100644
--- a/src/EmojiCategory.cc
+++ b/src/emoji/EmojiCategory.cc
@@ -20,7 +20,8 @@
 #include <QStyleOption>
 
 #include "Config.h"
-#include "EmojiCategory.h"
+
+#include "emoji/EmojiCategory.h"
 
 EmojiCategory::EmojiCategory(QString category, QList<Emoji> emoji, QWidget *parent)
   : QWidget(parent)
diff --git a/src/EmojiItemDelegate.cc b/src/emoji/EmojiItemDelegate.cc
index 691bee17..547d3b4c 100644
--- a/src/EmojiItemDelegate.cc
+++ b/src/emoji/EmojiItemDelegate.cc
@@ -18,7 +18,7 @@
 #include <QDebug>
 #include <QPainter>
 
-#include "EmojiItemDelegate.h"
+#include "emoji/EmojiItemDelegate.h"
 
 EmojiItemDelegate::EmojiItemDelegate(QObject *parent)
   : QStyledItemDelegate(parent)
diff --git a/src/EmojiPanel.cc b/src/emoji/EmojiPanel.cc
index 0daaad68..9df6f193 100644
--- a/src/EmojiPanel.cc
+++ b/src/emoji/EmojiPanel.cc
@@ -20,10 +20,11 @@
 #include <QVBoxLayout>
 
 #include "DropShadow.h"
-#include "EmojiCategory.h"
-#include "EmojiPanel.h"
 #include "FlatButton.h"
 
+#include "emoji/EmojiCategory.h"
+#include "emoji/EmojiPanel.h"
+
 EmojiPanel::EmojiPanel(QWidget *parent)
   : QWidget(parent)
   , shadowMargin_{2}
diff --git a/src/EmojiPickButton.cc b/src/emoji/EmojiPickButton.cc
index a4f83c46..44955a8c 100644
--- a/src/EmojiPickButton.cc
+++ b/src/emoji/EmojiPickButton.cc
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "EmojiPickButton.h"
-#include "EmojiPanel.h"
+#include "emoji/EmojiPickButton.h"
+#include "emoji/EmojiPanel.h"
 
 EmojiPickButton::EmojiPickButton(QWidget *parent)
   : FlatButton(parent)
diff --git a/src/EmojiProvider.cc b/src/emoji/EmojiProvider.cc
index ec053046..838c0340 100644
--- a/src/EmojiProvider.cc
+++ b/src/emoji/EmojiProvider.cc
@@ -17,7 +17,7 @@
 
 #include <QByteArray>
 
-#include "EmojiProvider.h"
+#include "emoji/EmojiProvider.h"
 
 const QList<Emoji> EmojiProvider::people = {
   Emoji{QString::fromUtf8("\xf0\x9f\x98\x80"), ":grinning:"},
diff --git a/src/TimelineItem.cc b/src/timeline/TimelineItem.cc
index 7297abc3..f7dd0f6e 100644
--- a/src/TimelineItem.cc
+++ b/src/timeline/TimelineItem.cc
@@ -22,10 +22,11 @@
 
 #include "Avatar.h"
 #include "Config.h"
-#include "FileItem.h"
-#include "ImageItem.h"
 #include "Sync.h"
-#include "TimelineItem.h"
+
+#include "timeline/TimelineItem.h"
+#include "timeline/widgets/FileItem.h"
+#include "timeline/widgets/ImageItem.h"
 
 static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
 static const QString URL_HTML = "<a href=\"\\1\">\\1</a>";
diff --git a/src/TimelineView.cc b/src/timeline/TimelineView.cc
index 7bbda051..8ccff85a 100644
--- a/src/TimelineView.cc
+++ b/src/timeline/TimelineView.cc
@@ -19,13 +19,14 @@
 #include <QFileInfo>
 #include <QTimer>
 
-#include "FileItem.h"
 #include "FloatingButton.h"
-#include "ImageItem.h"
 #include "RoomMessages.h"
 #include "ScrollBar.h"
 #include "Sync.h"
-#include "TimelineView.h"
+
+#include "timeline/TimelineView.h"
+#include "timeline/widgets/FileItem.h"
+#include "timeline/widgets/ImageItem.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;
diff --git a/src/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
index daec481b..39f07639 100644
--- a/src/TimelineViewManager.cc
+++ b/src/timeline/TimelineViewManager.cc
@@ -22,12 +22,13 @@
 #include <QFileInfo>
 #include <QSettings>
 
-#include "FileItem.h"
-#include "ImageItem.h"
 #include "MatrixClient.h"
 #include "Sync.h"
-#include "TimelineView.h"
-#include "TimelineViewManager.h"
+
+#include "timeline/TimelineView.h"
+#include "timeline/TimelineViewManager.h"
+#include "timeline/widgets/FileItem.h"
+#include "timeline/widgets/ImageItem.h"
 
 TimelineViewManager::TimelineViewManager(QSharedPointer<MatrixClient> client, QWidget *parent)
   : QStackedWidget(parent)
diff --git a/src/FileItem.cc b/src/timeline/widgets/FileItem.cc
index 96fd9c07..8d0100c7 100644
--- a/src/FileItem.cc
+++ b/src/timeline/widgets/FileItem.cc
@@ -24,8 +24,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "FileItem.h"
-#include "ImageOverlayDialog.h"
+#include "timeline/widgets/FileItem.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;
diff --git a/src/ImageItem.cc b/src/timeline/widgets/ImageItem.cc
index 333fd296..106fc79b 100644
--- a/src/ImageItem.cc
+++ b/src/timeline/widgets/ImageItem.cc
@@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "ImageItem.h"
-#include "ImageOverlayDialog.h"
+#include "dialogs/ImageOverlayDialog.h"
+#include "timeline/widgets/ImageItem.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;