Create directories for related files

CMakeLists.txt

@@ -140,50 +140,27 @@ endif()
 # Declare source and header files.
 #
 set(SRC_FILES
-    src/AvatarProvider.cc
+    # Dialogs
-    src/Cache.cc
+    src/dialogs/ImageOverlayDialog.cc
-    src/ChatPage.cc
+    src/dialogs/JoinRoomDialog.cc
-    src/Deserializable.cc
+    src/dialogs/LeaveRoomDialog.cc
-    src/EmojiCategory.cc
+    src/dialogs/LogoutDialog.cc
-    src/EmojiItemDelegate.cc
-    src/EmojiPanel.cc
-    src/EmojiPickButton.cc
-    src/EmojiProvider.cc
-    src/FileItem.cc
-    src/ImageItem.cc
-    src/ImageOverlayDialog.cc
-    src/InputValidator.cc
-    src/JoinRoomDialog.cc
-    src/LeaveRoomDialog.cc
-    src/Login.cc
-    src/LoginPage.cc
-    src/LogoutDialog.cc
-    src/MainWindow.cc
-    src/MatrixClient.cc
-    src/Profile.cc
-    src/QuickSwitcher.cc
-    src/Register.cc
-    src/RegisterPage.cc
-    src/RoomInfoListItem.cc
-    src/RoomList.cc
-    src/RoomMessages.cc
-    src/RoomState.cc
-    src/SideBarActions.cc
-    src/UserSettingsPage.cc
-    src/Splitter.cc
-    src/Sync.cc
-    src/TextInputWidget.cc
-    src/TimelineItem.cc
-    src/TimelineView.cc
-    src/TimelineViewManager.cc
-    src/TopRoomBar.cc
-    src/TrayIcon.cc
-    src/TypingDisplay.cc
-    src/UserInfoWidget.cc
-    src/Versions.cc
-    src/WelcomePage.cc
-    src/main.cc
 
+    # Emoji
+    src/emoji/EmojiCategory.cc
+    src/emoji/EmojiItemDelegate.cc
+    src/emoji/EmojiPanel.cc
+    src/emoji/EmojiPickButton.cc
+    src/emoji/EmojiProvider.cc
+
+    # Timeline
+    src/timeline/TimelineViewManager.cc
+    src/timeline/TimelineItem.cc
+    src/timeline/TimelineView.cc
+    src/timeline/widgets/FileItem.cc
+    src/timeline/widgets/ImageItem.cc
+
+    # UI components
     src/ui/Avatar.cc
     src/ui/Badge.cc
     src/ui/LoadingIndicator.cc
@@ -201,6 +178,36 @@ set(SRC_FILES
     src/ui/ToggleButton.cc
     src/ui/Theme.cc
     src/ui/ThemeManager.cc
+
+    src/AvatarProvider.cc
+    src/Cache.cc
+    src/ChatPage.cc
+    src/Deserializable.cc
+    src/InputValidator.cc
+    src/Login.cc
+    src/LoginPage.cc
+    src/MainWindow.cc
+    src/MatrixClient.cc
+    src/Profile.cc
+    src/QuickSwitcher.cc
+    src/Register.cc
+    src/RegisterPage.cc
+    src/RoomInfoListItem.cc
+    src/RoomList.cc
+    src/RoomMessages.cc
+    src/RoomState.cc
+    src/SideBarActions.cc
+    src/Splitter.cc
+    src/Sync.cc
+    src/TextInputWidget.cc
+    src/TopRoomBar.cc
+    src/TrayIcon.cc
+    src/TypingDisplay.cc
+    src/UserInfoWidget.cc
+    src/UserSettingsPage.cc
+    src/Versions.cc
+    src/WelcomePage.cc
+    src/main.cc
 )
 
 set(MATRIX_EVENTS
@@ -237,44 +244,33 @@ include_directories(libs/lmdbxx)
 include_directories(${LMDB_INCLUDE_DIR})
 
 qt5_wrap_cpp(MOC_HEADERS
-    include/AvatarProvider.h
+    # Dialogs
-    include/ChatPage.h
+    include/dialogs/ImageOverlayDialog.h
-    include/EmojiCategory.h
+    include/dialogs/JoinRoomDialog.h
-    include/EmojiItemDelegate.h
+    include/dialogs/LeaveRoomDialog.h
-    include/EmojiPanel.h
+    include/dialogs/LogoutDialog.h
-    include/EmojiPickButton.h
-    include/ui/FloatingButton.h
-    include/FileItem.h
-    include/ImageItem.h
-    include/ImageOverlayDialog.h
-    include/JoinRoomDialog.h
-    include/LeaveRoomDialog.h
-    include/LoginPage.h
-    include/LogoutDialog.h
-    include/MainWindow.h
-    include/MatrixClient.h
-    include/QuickSwitcher.h
-    include/RegisterPage.h
-    include/RoomInfoListItem.h
-    include/RoomList.h
-    include/SideBarActions.h
-    include/UserSettingsPage.h
-    include/Splitter.h
-    include/TextInputWidget.h
-    include/TimelineItem.h
-    include/TimelineView.h
-    include/TimelineViewManager.h
-    include/TopRoomBar.h
-    include/TrayIcon.h
-    include/TypingDisplay.h
-    include/UserInfoWidget.h
-    include/WelcomePage.h
 
+    # Emoji
+    include/emoji/EmojiCategory.h
+    include/emoji/EmojiItemDelegate.h
+    include/emoji/EmojiPanel.h
+    include/emoji/EmojiPickButton.h
+    include/emoji/EmojiProvider.h
+
+    # Timeline
+    include/timeline/TimelineItem.h
+    include/timeline/TimelineView.h
+    include/timeline/TimelineViewManager.h
+    include/timeline/widgets/FileItem.h
+    include/timeline/widgets/ImageItem.h
+
+    # UI components
     include/ui/Avatar.h
     include/ui/Badge.h
     include/ui/LoadingIndicator.h
     include/ui/FlatButton.h
     include/ui/Label.h
+    include/ui/FloatingButton.h
     include/ui/OverlayWidget.h
     include/ui/ScrollBar.h
     include/ui/SnackBar.h
@@ -285,6 +281,25 @@ qt5_wrap_cpp(MOC_HEADERS
     include/ui/ToggleButton.h
     include/ui/Theme.h
     include/ui/ThemeManager.h
+
+    include/AvatarProvider.h
+    include/ChatPage.h
+    include/LoginPage.h
+    include/MainWindow.h
+    include/MatrixClient.h
+    include/QuickSwitcher.h
+    include/RegisterPage.h
+    include/RoomInfoListItem.h
+    include/RoomList.h
+    include/SideBarActions.h
+    include/Splitter.h
+    include/TextInputWidget.h
+    include/TopRoomBar.h
+    include/TrayIcon.h
+    include/TypingDisplay.h
+    include/UserInfoWidget.h
+    include/UserSettingsPage.h
+    include/WelcomePage.h
 )
 
 #

include/TextInputWidget.h

@@ -24,11 +24,12 @@
 #include <QTextEdit>
 #include <QWidget>
 
-#include "EmojiPickButton.h"
 #include "FlatButton.h"
 #include "Image.h"
 #include "LoadingIndicator.h"
 
+#include "emoji/EmojiPickButton.h"
+
 namespace msgs = matrix::events::messages;
 
 class FilteredTextEdit : public QTextEdit

src/AvatarProvider.cc

@@ -17,7 +17,8 @@
 
 #include "AvatarProvider.h"
 #include "MatrixClient.h"
-#include "TimelineItem.h"
+
+#include "timeline/TimelineItem.h"
 
 QSharedPointer<MatrixClient> AvatarProvider::client_;
 

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;
 

src/RoomList.cc

@@ -18,8 +18,9 @@
 #include <QDebug>
 #include <QObject>
 
-#include "JoinRoomDialog.h"
+#include "dialogs/JoinRoomDialog.h"
-#include "LeaveRoomDialog.h"
+#include "dialogs/LeaveRoomDialog.h"
+
 #include "MainWindow.h"
 #include "MatrixClient.h"
 #include "OverlayModal.h"

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}

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")

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}

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)
 {

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)
 {

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)
 {

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)

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)

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}

src/emoji/EmojiPickButton.cc

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "EmojiPickButton.h"
+#include "emoji/EmojiPickButton.h"
-#include "EmojiPanel.h"
+#include "emoji/EmojiPanel.h"
 
 EmojiPickButton::EmojiPickButton(QWidget *parent)
   : FlatButton(parent)

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:"},

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>";

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;

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)

src/timeline/widgets/FileItem.cc

@@ -24,8 +24,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "FileItem.h"
+#include "timeline/widgets/FileItem.h"
-#include "ImageOverlayDialog.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;

src/timeline/widgets/ImageItem.cc

@@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "ImageItem.h"
+#include "dialogs/ImageOverlayDialog.h"
-#include "ImageOverlayDialog.h"
+#include "timeline/widgets/ImageItem.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;