Move all files under src/

.ci/format.sh

@@ -9,6 +9,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-FILES=`find include src -type f -type f \( -iname "*.cc" -o -iname "*.h" \)`
+FILES=`find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \)`
 
 clang-format -i $FILES && git diff --exit-code

CMakeLists.txt

@@ -136,7 +136,7 @@ message(STATUS "Version: ${PROJECT_VERSION}")
 
 cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME)
 set(BUILD_USER $ENV{USER})
-configure_file(cmake/version.hpp config/version.hpp)
+configure_file(cmake/version.h config/version.h)
 
 
 #
@@ -144,82 +144,82 @@ configure_file(cmake/version.hpp config/version.hpp)
 #
 set(SRC_FILES
     # Dialogs
-    src/dialogs/CreateRoom.cc
+    src/dialogs/CreateRoom.cpp
-    src/dialogs/ImageOverlay.cc
+    src/dialogs/ImageOverlay.cpp
-    src/dialogs/PreviewUploadOverlay.cc
+    src/dialogs/PreviewUploadOverlay.cpp
-    src/dialogs/InviteUsers.cc
+    src/dialogs/InviteUsers.cpp
-    src/dialogs/JoinRoom.cc
+    src/dialogs/JoinRoom.cpp
     src/dialogs/MemberList.cpp
-    src/dialogs/LeaveRoom.cc
+    src/dialogs/LeaveRoom.cpp
-    src/dialogs/Logout.cc
+    src/dialogs/Logout.cpp
-    src/dialogs/ReadReceipts.cc
+    src/dialogs/ReadReceipts.cpp
     src/dialogs/ReCaptcha.cpp
     src/dialogs/RoomSettings.cpp
 
     # Emoji
-    src/emoji/Category.cc
+    src/emoji/Category.cpp
-    src/emoji/ItemDelegate.cc
+    src/emoji/ItemDelegate.cpp
-    src/emoji/Panel.cc
+    src/emoji/Panel.cpp
-    src/emoji/PickButton.cc
+    src/emoji/PickButton.cpp
-    src/emoji/Provider.cc
+    src/emoji/Provider.cpp
 
     # Timeline
-    src/timeline/TimelineViewManager.cc
+    src/timeline/TimelineViewManager.cpp
-    src/timeline/TimelineItem.cc
+    src/timeline/TimelineItem.cpp
-    src/timeline/TimelineView.cc
+    src/timeline/TimelineView.cpp
-    src/timeline/widgets/AudioItem.cc
+    src/timeline/widgets/AudioItem.cpp
-    src/timeline/widgets/FileItem.cc
+    src/timeline/widgets/FileItem.cpp
-    src/timeline/widgets/ImageItem.cc
+    src/timeline/widgets/ImageItem.cpp
-    src/timeline/widgets/VideoItem.cc
+    src/timeline/widgets/VideoItem.cpp
 
     # UI components
-    src/ui/Avatar.cc
+    src/ui/Avatar.cpp
-    src/ui/Badge.cc
+    src/ui/Badge.cpp
-    src/ui/LoadingIndicator.cc
+    src/ui/LoadingIndicator.cpp
     src/ui/InfoMessage.cpp
-    src/ui/FlatButton.cc
+    src/ui/FlatButton.cpp
-    src/ui/FloatingButton.cc
+    src/ui/FloatingButton.cpp
-    src/ui/Label.cc
+    src/ui/Label.cpp
-    src/ui/OverlayModal.cc
+    src/ui/OverlayModal.cpp
-    src/ui/ScrollBar.cc
+    src/ui/ScrollBar.cpp
-    src/ui/SnackBar.cc
+    src/ui/SnackBar.cpp
-    src/ui/RaisedButton.cc
+    src/ui/RaisedButton.cpp
-    src/ui/Ripple.cc
+    src/ui/Ripple.cpp
-    src/ui/RippleOverlay.cc
+    src/ui/RippleOverlay.cpp
-    src/ui/OverlayWidget.cc
+    src/ui/OverlayWidget.cpp
-    src/ui/TextField.cc
+    src/ui/TextField.cpp
-    src/ui/ToggleButton.cc
+    src/ui/ToggleButton.cpp
-    src/ui/Theme.cc
+    src/ui/Theme.cpp
-    src/ui/ThemeManager.cc
+    src/ui/ThemeManager.cpp
 
-    src/AvatarProvider.cc
+    src/AvatarProvider.cpp
-    src/Cache.cc
+    src/Cache.cpp
-    src/ChatPage.cc
+    src/ChatPage.cpp
-    src/CommunitiesListItem.cc
+    src/CommunitiesListItem.cpp
-    src/CommunitiesList.cc
+    src/CommunitiesList.cpp
-    src/InviteeItem.cc
+    src/InviteeItem.cpp
-    src/LoginPage.cc
+    src/LoginPage.cpp
     src/Logging.cpp
-    src/MainWindow.cc
+    src/MainWindow.cpp
-    src/MatrixClient.cc
+    src/MatrixClient.cpp
-    src/QuickSwitcher.cc
+    src/QuickSwitcher.cpp
     src/Olm.cpp
-    src/RegisterPage.cc
+    src/RegisterPage.cpp
-    src/RoomInfoListItem.cc
+    src/RoomInfoListItem.cpp
-    src/RoomList.cc
+    src/RoomList.cpp
-    src/RunGuard.cc
+    src/RunGuard.cpp
-    src/SideBarActions.cc
+    src/SideBarActions.cpp
-    src/Splitter.cc
+    src/Splitter.cpp
     src/SuggestionsPopup.cpp
-    src/TextInputWidget.cc
+    src/TextInputWidget.cpp
-    src/TopRoomBar.cc
+    src/TopRoomBar.cpp
-    src/TrayIcon.cc
+    src/TrayIcon.cpp
-    src/TypingDisplay.cc
+    src/TypingDisplay.cpp
-    src/Utils.cc
+    src/Utils.cpp
-    src/UserInfoWidget.cc
+    src/UserInfoWidget.cpp
-    src/UserSettingsPage.cc
+    src/UserSettingsPage.cpp
-    src/WelcomePage.cc
+    src/WelcomePage.cpp
-    src/main.cc
+    src/main.cpp
 )
 
 # ExternalProject dependencies
@@ -252,82 +252,81 @@ if(NOT TWEENY_INCLUDE_DIR)
 endif()
 include_directories(SYSTEM ${TWEENY_INCLUDE_DIR})
 
-include_directories(include)
+include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(include/ui)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/config)
 
 qt5_wrap_cpp(MOC_HEADERS
     # Dialogs
-    include/dialogs/CreateRoom.h
+    src/dialogs/CreateRoom.h
-    include/dialogs/ImageOverlay.h
+    src/dialogs/ImageOverlay.h
-    include/dialogs/PreviewUploadOverlay.h
+    src/dialogs/PreviewUploadOverlay.h
-    include/dialogs/InviteUsers.h
+    src/dialogs/InviteUsers.h
-    include/dialogs/JoinRoom.h
+    src/dialogs/JoinRoom.h
-    include/dialogs/MemberList.hpp
+    src/dialogs/MemberList.h
-    include/dialogs/LeaveRoom.h
+    src/dialogs/LeaveRoom.h
-    include/dialogs/Logout.h
+    src/dialogs/Logout.h
-    include/dialogs/ReadReceipts.h
+    src/dialogs/ReadReceipts.h
-    include/dialogs/ReCaptcha.hpp
+    src/dialogs/ReCaptcha.h
-    include/dialogs/RoomSettings.hpp
+    src/dialogs/RoomSettings.h
 
     # Emoji
-    include/emoji/Category.h
+    src/emoji/Category.h
-    include/emoji/ItemDelegate.h
+    src/emoji/ItemDelegate.h
-    include/emoji/Panel.h
+    src/emoji/Panel.h
-    include/emoji/PickButton.h
+    src/emoji/PickButton.h
 
     # Timeline
-    include/timeline/TimelineItem.h
+    src/timeline/TimelineItem.h
-    include/timeline/TimelineView.h
+    src/timeline/TimelineView.h
-    include/timeline/TimelineViewManager.h
+    src/timeline/TimelineViewManager.h
-    include/timeline/widgets/AudioItem.h
+    src/timeline/widgets/AudioItem.h
-    include/timeline/widgets/FileItem.h
+    src/timeline/widgets/FileItem.h
-    include/timeline/widgets/ImageItem.h
+    src/timeline/widgets/ImageItem.h
-    include/timeline/widgets/VideoItem.h
+    src/timeline/widgets/VideoItem.h
 
     # UI components
-    include/ui/Avatar.h
+    src/ui/Avatar.h
-    include/ui/Badge.h
+    src/ui/Badge.h
-    include/ui/LoadingIndicator.h
+    src/ui/LoadingIndicator.h
-    include/ui/InfoMessage.hpp
+    src/ui/InfoMessage.h
-    include/ui/FlatButton.h
+    src/ui/FlatButton.h
-    include/ui/Label.h
+    src/ui/Label.h
-    include/ui/FloatingButton.h
+    src/ui/FloatingButton.h
-    include/ui/OverlayWidget.h
+    src/ui/OverlayWidget.h
-    include/ui/ScrollBar.h
+    src/ui/ScrollBar.h
-    include/ui/SnackBar.h
+    src/ui/SnackBar.h
-    include/ui/RaisedButton.h
+    src/ui/RaisedButton.h
-    include/ui/Ripple.h
+    src/ui/Ripple.h
-    include/ui/RippleOverlay.h
+    src/ui/RippleOverlay.h
-    include/ui/TextField.h
+    src/ui/TextField.h
-    include/ui/ToggleButton.h
+    src/ui/ToggleButton.h
-    include/ui/Theme.h
+    src/ui/Theme.h
-    include/ui/ThemeManager.h
+    src/ui/ThemeManager.h
 
-    include/notifications/Manager.h
+    src/notifications/Manager.h
 
-    include/AvatarProvider.h
+    src/AvatarProvider.h
-    include/Cache.h
+    src/Cache.h
-    include/ChatPage.h
+    src/ChatPage.h
-    include/CommunitiesListItem.h
+    src/CommunitiesListItem.h
-    include/CommunitiesList.h
+    src/CommunitiesList.h
-    include/LoginPage.h
+    src/LoginPage.h
-    include/MainWindow.h
+    src/MainWindow.h
-    include/InviteeItem.h
+    src/InviteeItem.h
-    include/QuickSwitcher.h
+    src/QuickSwitcher.h
-    include/RegisterPage.h
+    src/RegisterPage.h
-    include/RoomInfoListItem.h
+    src/RoomInfoListItem.h
-    include/RoomList.h
+    src/RoomList.h
-    include/SideBarActions.h
+    src/SideBarActions.h
-    include/Splitter.h
+    src/Splitter.h
-    include/SuggestionsPopup.hpp
+    src/SuggestionsPopup.h
-    include/TextInputWidget.h
+    src/TextInputWidget.h
-    include/TopRoomBar.h
+    src/TopRoomBar.h
-    include/TrayIcon.h
+    src/TrayIcon.h
-    include/TypingDisplay.h
+    src/TypingDisplay.h
-    include/UserInfoWidget.h
+    src/UserInfoWidget.h
-    include/UserSettingsPage.h
+    src/UserSettingsPage.h
-    include/WelcomePage.h
+    src/WelcomePage.h
 )
 
 #

src/AvatarProvider.cpp

@@ -20,7 +20,7 @@
 
 #include "AvatarProvider.h"
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 namespace AvatarProvider {

src/Cache.cpp

@@ -28,7 +28,6 @@
 #include <variant.hpp>
 
 #include "Cache.h"
-#include "Logging.hpp"
 #include "Utils.h"
 
 //! Should be changed when a breaking change occurs in the cache format.

src/Cache.h

@@ -31,7 +31,7 @@
 #include <mtxclient/crypto/client.hpp>
 #include <mutex>
 
-#include "Logging.hpp"
+#include "Logging.h"
 
 using mtx::events::state::JoinRule;
 

src/ChatPage.cpp

@@ -23,22 +23,22 @@
 #include "AvatarProvider.h"
 #include "Cache.h"
 #include "ChatPage.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "Olm.hpp"
+#include "Olm.h"
-#include "OverlayModal.h"
 #include "QuickSwitcher.h"
 #include "RoomList.h"
 #include "SideBarActions.h"
 #include "Splitter.h"
 #include "TextInputWidget.h"
-#include "Theme.h"
 #include "TopRoomBar.h"
 #include "TypingDisplay.h"
 #include "UserInfoWidget.h"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/OverlayModal.h"
+#include "ui/Theme.h"
 
 #include "notifications/Manager.h"
 

src/CommunitiesList.cpp

@@ -1,6 +1,6 @@
 #include "CommunitiesList.h"
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 #include <QLabel>

src/CommunitiesListItem.cpp

@@ -1,8 +1,8 @@
 #include "CommunitiesListItem.h"
-#include "Painter.h"
-#include "Ripple.h"
-#include "RippleOverlay.h"
 #include "Utils.h"
+#include "ui/Painter.h"
+#include "ui/Ripple.h"
+#include "ui/RippleOverlay.h"
 
 CommunitiesListItem::CommunitiesListItem(QString group_id, QWidget *parent)
   : QWidget(parent)

src/InviteeItem.cpp

@@ -1,8 +1,8 @@
 #include <QHBoxLayout>
 
-#include "FlatButton.h"
 #include "InviteeItem.h"
-#include "Theme.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
 
 constexpr int SidePadding = 10;
 constexpr int IconSize    = 13;

src/Logging.cpp

@@ -1,4 +1,4 @@
-#include "Logging.hpp"
+#include "Logging.h"
 
 #include <iostream>
 #include <spdlog/sinks/file_sinks.h>

src/LoginPage.cpp

@@ -20,13 +20,13 @@
 #include <mtx/identifiers.hpp>
 
 #include "Config.h"
-#include "FlatButton.h"
-#include "LoadingIndicator.h"
 #include "LoginPage.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
+#include "ui/FlatButton.h"
-#include "RaisedButton.h"
+#include "ui/LoadingIndicator.h"
-#include "TextField.h"
+#include "ui/OverlayModal.h"
+#include "ui/RaisedButton.h"
+#include "ui/TextField.h"
 
 using namespace mtx::identifiers;
 

src/MainWindow.cpp

@@ -24,25 +24,25 @@
 
 #include "ChatPage.h"
 #include "Config.h"
-#include "LoadingIndicator.h"
+#include "Logging.h"
-#include "Logging.hpp"
 #include "LoginPage.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
 #include "RegisterPage.h"
-#include "SnackBar.h"
 #include "TrayIcon.h"
 #include "UserSettingsPage.h"
 #include "WelcomePage.h"
+#include "ui/LoadingIndicator.h"
+#include "ui/OverlayModal.h"
+#include "ui/SnackBar.h"
 
 #include "dialogs/CreateRoom.h"
 #include "dialogs/InviteUsers.h"
 #include "dialogs/JoinRoom.h"
 #include "dialogs/LeaveRoom.h"
 #include "dialogs/Logout.h"
-#include "dialogs/MemberList.hpp"
+#include "dialogs/MemberList.h"
-#include "dialogs/RoomSettings.hpp"
+#include "dialogs/RoomSettings.h"
 
 MainWindow *MainWindow::instance_ = nullptr;
 

src/Olm.cpp

@@ -1,7 +1,7 @@
-#include "Olm.hpp"
+#include "Olm.h"
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 using namespace mtx::crypto;

src/QuickSwitcher.cpp

@@ -23,6 +23,7 @@
 #include <QtConcurrent>
 
 #include "QuickSwitcher.h"
+#include "SuggestionsPopup.h"
 
 RoomSearchInput::RoomSearchInput(QWidget *parent)
   : TextField(parent)

src/QuickSwitcher.h

@@ -22,8 +22,8 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "SuggestionsPopup.hpp"
+#include "SuggestionsPopup.h"
-#include "TextField.h"
+#include "ui/TextField.h"
 
 Q_DECLARE_METATYPE(std::vector<RoomSearchResult>)
 

src/RegisterPage.cpp

@@ -19,15 +19,15 @@
 #include <QTimer>
 
 #include "Config.h"
-#include "FlatButton.h"
+#include "Logging.h"
-#include "Logging.hpp"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "RaisedButton.h"
 #include "RegisterPage.h"
-#include "TextField.h"
+#include "ui/FlatButton.h"
+#include "ui/RaisedButton.h"
+#include "ui/TextField.h"
 
-#include "dialogs/ReCaptcha.hpp"
+#include "dialogs/ReCaptcha.h"
 
 RegisterPage::RegisterPage(QWidget *parent)
   : QWidget(parent)

src/RoomInfoListItem.cpp

@@ -24,12 +24,12 @@
 
 #include "Cache.h"
 #include "Config.h"
-#include "Menu.h"
-#include "Ripple.h"
-#include "RippleOverlay.h"
 #include "RoomInfoListItem.h"
-#include "Theme.h"
 #include "Utils.h"
+#include "ui/Menu.h"
+#include "ui/Ripple.h"
+#include "ui/RippleOverlay.h"
+#include "ui/Theme.h"
 
 constexpr int MaxUnreadCountDisplayed = 99;
 

src/RoomList.cpp

@@ -21,14 +21,14 @@
 #include <QTimer>
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
 #include "RoomInfoListItem.h"
 #include "RoomList.h"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/OverlayModal.h"
 
 RoomList::RoomList(QSharedPointer<UserSettings> userSettings, QWidget *parent)
   : QWidget(parent)

src/SideBarActions.cpp

@@ -5,9 +5,11 @@
 
 #include "Config.h"
 #include "MainWindow.h"
-#include "OverlayModal.h"
 #include "SideBarActions.h"
-#include "Theme.h"
+#include "ui/FlatButton.h"
+#include "ui/Menu.h"
+#include "ui/OverlayModal.h"
+#include "ui/Theme.h"
 
 SideBarActions::SideBarActions(QWidget *parent)
   : QWidget{parent}

src/SideBarActions.h

@@ -5,15 +5,15 @@
 #include <QResizeEvent>
 #include <QWidget>
 
-#include "FlatButton.h"
-#include "Menu.h"
-
 namespace mtx {
 namespace requests {
 struct CreateRoom;
 }
 }
 
+class Menu;
+class FlatButton;
+
 class SideBarActions : public QWidget
 {
         Q_OBJECT

src/Splitter.cpp

@@ -23,7 +23,7 @@
 
 #include "Config.h"
 #include "Splitter.h"
-#include "Theme.h"
+#include "ui/Theme.h"
 
 constexpr auto MaxWidth = (1 << 24) - 1;
 

src/SuggestionsPopup.cpp

@@ -1,14 +1,13 @@
-#include "Avatar.h"
-#include "AvatarProvider.h"
-#include "Config.h"
-#include "DropShadow.h"
-#include "SuggestionsPopup.hpp"
-#include "Utils.h"
-
 #include <QPaintEvent>
 #include <QPainter>
 #include <QStyleOption>
 
+#include "Config.h"
+#include "SuggestionsPopup.h"
+#include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/DropShadow.h"
+
 constexpr int PopupHMargin    = 4;
 constexpr int PopupItemMargin = 3;
 

src/SuggestionsPopup.h

@@ -5,7 +5,6 @@
 #include <QPoint>
 #include <QWidget>
 
-#include "Avatar.h"
 #include "AvatarProvider.h"
 #include "Cache.h"
 #include "ChatPage.h"

src/TextInputWidget.cpp

@@ -36,6 +36,8 @@
 #include "Config.h"
 #include "TextInputWidget.h"
 #include "Utils.h"
+#include "ui/FlatButton.h"
+#include "ui/LoadingIndicator.h"
 
 static constexpr size_t INPUT_HISTORY_SIZE = 127;
 static constexpr int MAX_TEXTINPUT_HEIGHT  = 120;

src/TextInputWidget.h

@@ -28,12 +28,8 @@
 #include <QTextEdit>
 #include <QWidget>
 
-#include "FlatButton.h"
+#include "SuggestionsPopup.h"
-#include "LoadingIndicator.h"
-#include "SuggestionsPopup.hpp"
-
 #include "dialogs/PreviewUploadOverlay.h"
-
 #include "emoji/PickButton.h"
 
 namespace dialogs {
@@ -42,6 +38,9 @@ class PreviewUploadOverlay;
 
 struct SearchResult;
 
+class FlatButton;
+class LoadingIndicator;
+
 class FilteredTextEdit : public QTextEdit
 {
         Q_OBJECT

src/TopRoomBar.cpp

@@ -18,14 +18,14 @@
 #include <QDebug>
 #include <QStyleOption>
 
-#include "Avatar.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "MainWindow.h"
-#include "Menu.h"
-#include "OverlayModal.h"
 #include "TopRoomBar.h"
 #include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/Menu.h"
+#include "ui/OverlayModal.h"
 
 TopRoomBar::TopRoomBar(QWidget *parent)
   : QWidget(parent)

src/UserInfoWidget.cpp

@@ -17,12 +17,12 @@
 
 #include <QTimer>
 
-#include "Avatar.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "MainWindow.h"
-#include "OverlayModal.h"
 #include "UserInfoWidget.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/OverlayModal.h"
 
 UserInfoWidget::UserInfoWidget(QWidget *parent)
   : QWidget(parent)

src/UserSettingsPage.cpp

@@ -24,11 +24,11 @@
 #include <QSettings>
 
 #include "Config.h"
-#include "FlatButton.h"
 #include "UserSettingsPage.h"
-#include <ToggleButton.h>
+#include "ui/FlatButton.h"
+#include "ui/ToggleButton.h"
 
-#include "version.hpp"
+#include "version.h"
 
 UserSettings::UserSettings() { load(); }
 

src/WelcomePage.cpp

@@ -20,8 +20,8 @@
 #include <QStyleOption>
 
 #include "Config.h"
-#include "RaisedButton.h"
 #include "WelcomePage.h"
+#include "ui/RaisedButton.h"
 
 WelcomePage::WelcomePage(QWidget *parent)
   : QWidget(parent)

src/dialogs/CreateRoom.cpp

@@ -3,14 +3,14 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
-#include "Theme.h"
-#include "ToggleButton.h"
-
 #include "dialogs/CreateRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+#include "ui/ToggleButton.h"
+
 using namespace dialogs;
 
 CreateRoom::CreateRoom(QWidget *parent)

src/dialogs/ImageOverlay.cpp

@@ -19,9 +19,10 @@
 #include <QDesktopWidget>
 #include <QPainter>
 
-#include "Utils.h"
 #include "dialogs/ImageOverlay.h"
 
+#include "Utils.h"
+
 using namespace dialogs;
 
 ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent)

src/dialogs/InviteUsers.cpp

@@ -6,13 +6,13 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
-
-#include "InviteeItem.h"
 #include "dialogs/InviteUsers.h"
 
+#include "Config.h"
+#include "InviteeItem.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
+
 #include "mtx.hpp"
 
 using namespace dialogs;

src/dialogs/JoinRoom.cpp

@@ -2,13 +2,13 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
-#include "Theme.h"
-
 #include "dialogs/JoinRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 JoinRoom::JoinRoom(QWidget *parent)

src/dialogs/LeaveRoom.cpp

@@ -2,12 +2,12 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "Theme.h"
-
 #include "dialogs/LeaveRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 LeaveRoom::LeaveRoom(QWidget *parent)

src/dialogs/Logout.cpp

@@ -20,12 +20,12 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "Theme.h"
-
 #include "dialogs/Logout.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 Logout::Logout(QWidget *parent)

src/dialogs/MemberList.cpp

@@ -3,15 +3,15 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
+#include "dialogs/MemberList.h"
+
 #include "AvatarProvider.h"
+#include "Cache.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "Utils.h"
-
+#include "ui/Avatar.h"
-#include "Avatar.h"
+#include "ui/FlatButton.h"
-#include "Cache.h"
-#include "dialogs/MemberList.hpp"
 
 using namespace dialogs;
 

src/dialogs/PreviewUploadOverlay.cpp

@@ -23,13 +23,13 @@
 #include <QMimeDatabase>
 #include <QVBoxLayout>
 
+#include "dialogs/PreviewUploadOverlay.h"
+
 #include "Config.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "Utils.h"
 
-#include "dialogs/PreviewUploadOverlay.h"
-
 using namespace dialogs;
 
 constexpr const char *DEFAULT = "Upload %1?";

src/dialogs/PreviewUploadOverlay.h

@@ -22,7 +22,7 @@
 #include <QPixmap>
 #include <QWidget>
 
-#include "FlatButton.h"
+#include "ui/FlatButton.h"
 
 class QMimeData;
 

src/dialogs/ReCaptcha.cpp

@@ -4,13 +4,13 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
+#include "dialogs/ReCaptcha.h"
-#include "FlatButton.h"
-#include "MatrixClient.h"
-#include "RaisedButton.h"
-#include "Theme.h"
 
-#include "dialogs/ReCaptcha.hpp"
+#include "Config.h"
+#include "MatrixClient.h"
+#include "ui/FlatButton.h"
+#include "ui/RaisedButton.h"
+#include "ui/Theme.h"
 
 using namespace dialogs;
 

src/dialogs/ReadReceipts.cpp

@@ -6,14 +6,14 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
+#include "dialogs/ReadReceipts.h"
+
+#include "AvatarProvider.h"
+#include "Cache.h"
 #include "ChatPage.h"
 #include "Config.h"
 #include "Utils.h"
-
+#include "ui/Avatar.h"
-#include "Avatar.h"
-#include "AvatarProvider.h"
-#include "Cache.h"
-#include "dialogs/ReadReceipts.h"
 
 using namespace dialogs;
 

src/dialogs/RoomSettings.cpp

@@ -1,16 +1,3 @@
-#include "Avatar.h"
-#include "ChatPage.h"
-#include "Config.h"
-#include "FlatButton.h"
-#include "Logging.hpp"
-#include "MatrixClient.h"
-#include "Painter.h"
-#include "TextField.h"
-#include "Theme.h"
-#include "Utils.h"
-#include "dialogs/RoomSettings.hpp"
-#include "ui/ToggleButton.h"
-
 #include <QApplication>
 #include <QComboBox>
 #include <QLabel>
@@ -22,6 +9,20 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
+#include "dialogs/RoomSettings.h"
+
+#include "ChatPage.h"
+#include "Config.h"
+#include "Logging.h"
+#include "MatrixClient.h"
+#include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/Painter.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+#include "ui/ToggleButton.h"
+
 using namespace dialogs;
 using namespace mtx::events;
 

src/emoji/Panel.cpp

@@ -19,8 +19,8 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include "DropShadow.h"
+#include "ui/DropShadow.h"
-#include "FlatButton.h"
+#include "ui/FlatButton.h"
 
 #include "emoji/Category.h"
 #include "emoji/Panel.h"

src/emoji/PickButton.h

@@ -21,7 +21,7 @@
 #include <QTimer>
 #include <QWidget>
 
-#include "FlatButton.h"
+#include "ui/FlatButton.h"
 
 namespace emoji {
 

src/main.cpp

@@ -32,12 +32,12 @@
 #include <QTranslator>
 
 #include "Config.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "RaisedButton.h"
 #include "RunGuard.h"
-#include "version.hpp"
+#include "ui/RaisedButton.h"
+#include "version.h"
 
 #if defined(Q_OS_LINUX)
 #include <boost/stacktrace.hpp>

src/timeline/TimelineItem.cpp

@@ -20,12 +20,12 @@
 #include <QMenu>
 #include <QTimer>
 
-#include "Avatar.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "Logging.hpp"
+#include "Logging.h"
-#include "Olm.hpp"
+#include "Olm.h"
-#include "Painter.h"
+#include "ui/Avatar.h"
+#include "ui/Painter.h"
 
 #include "timeline/TimelineItem.h"
 #include "timeline/widgets/AudioItem.h"

src/timeline/TimelineView.cpp

@@ -22,12 +22,12 @@
 #include "Cache.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "FloatingButton.h"
+#include "Logging.h"
-#include "InfoMessage.hpp"
+#include "Olm.h"
-#include "Logging.hpp"
-#include "Olm.hpp"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/FloatingButton.h"
+#include "ui/InfoMessage.h"
 
 #include "timeline/TimelineView.h"
 #include "timeline/widgets/AudioItem.h"

src/timeline/TimelineView.h

@@ -30,8 +30,8 @@
 #include <mtx/responses/messages.hpp>
 
 #include "MatrixClient.h"
-#include "ScrollBar.h"
+#include "timeline/TimelineItem.h"
-#include "TimelineItem.h"
+#include "ui/ScrollBar.h"
 
 class StateKeeper
 {

src/timeline/TimelineViewManager.cpp

@@ -22,7 +22,7 @@
 #include <QSettings>
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "timeline/TimelineView.h"
 #include "timeline/TimelineViewManager.h"
 #include "timeline/widgets/AudioItem.h"

src/timeline/widgets/AudioItem.cpp

@@ -22,7 +22,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 #include "Utils.h"