From 0e814da91c8e041897a4c3f7e6e9234bbc7c6f7a Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 17 Jul 2018 16:37:25 +0300 Subject: [PATCH] Move all files under src/ --- .ci/format.sh | 2 +- CMakeLists.txt | 253 +++++++++--------- cmake/{version.hpp => version.h} | 0 src/{AvatarProvider.cc => AvatarProvider.cpp} | 2 +- {include => src}/AvatarProvider.h | 0 src/{Cache.cc => Cache.cpp} | 1 - {include => src}/Cache.h | 2 +- src/{ChatPage.cc => ChatPage.cpp} | 8 +- {include => src}/ChatPage.h | 0 ...CommunitiesList.cc => CommunitiesList.cpp} | 2 +- {include => src}/CommunitiesList.h | 0 ...iesListItem.cc => CommunitiesListItem.cpp} | 6 +- {include => src}/CommunitiesListItem.h | 0 {include => src}/Config.h | 0 src/{InviteeItem.cc => InviteeItem.cpp} | 4 +- {include => src}/InviteeItem.h | 0 src/Logging.cpp | 2 +- include/Logging.hpp => src/Logging.h | 0 src/{LoginPage.cc => LoginPage.cpp} | 10 +- {include => src}/LoginPage.h | 0 src/{MainWindow.cc => MainWindow.cpp} | 12 +- {include => src}/MainWindow.h | 0 src/{MatrixClient.cc => MatrixClient.cpp} | 0 {include => src}/MatrixClient.h | 0 src/Olm.cpp | 4 +- include/Olm.hpp => src/Olm.h | 0 src/{QuickSwitcher.cc => QuickSwitcher.cpp} | 1 + {include => src}/QuickSwitcher.h | 4 +- src/{RegisterPage.cc => RegisterPage.cpp} | 10 +- {include => src}/RegisterPage.h | 0 ...omInfoListItem.cc => RoomInfoListItem.cpp} | 8 +- {include => src}/RoomInfoListItem.h | 0 src/{RoomList.cc => RoomList.cpp} | 4 +- {include => src}/RoomList.h | 0 src/{RunGuard.cc => RunGuard.cpp} | 0 {include => src}/RunGuard.h | 0 src/{SideBarActions.cc => SideBarActions.cpp} | 6 +- {include => src}/SideBarActions.h | 6 +- src/{Splitter.cc => Splitter.cpp} | 2 +- {include => src}/Splitter.h | 0 src/SuggestionsPopup.cpp | 13 +- .../SuggestionsPopup.h | 1 - ...TextInputWidget.cc => TextInputWidget.cpp} | 2 + {include => src}/TextInputWidget.h | 9 +- src/{TopRoomBar.cc => TopRoomBar.cpp} | 8 +- {include => src}/TopRoomBar.h | 0 src/{TrayIcon.cc => TrayIcon.cpp} | 0 {include => src}/TrayIcon.h | 0 src/{TypingDisplay.cc => TypingDisplay.cpp} | 0 {include => src}/TypingDisplay.h | 0 src/{UserInfoWidget.cc => UserInfoWidget.cpp} | 6 +- {include => src}/UserInfoWidget.h | 0 ...erSettingsPage.cc => UserSettingsPage.cpp} | 6 +- {include => src}/UserSettingsPage.h | 0 src/{Utils.cc => Utils.cpp} | 0 {include => src}/Utils.h | 0 src/{WelcomePage.cc => WelcomePage.cpp} | 2 +- {include => src}/WelcomePage.h | 0 src/dialogs/{CreateRoom.cc => CreateRoom.cpp} | 12 +- {include => src}/dialogs/CreateRoom.h | 0 .../{ImageOverlay.cc => ImageOverlay.cpp} | 3 +- {include => src}/dialogs/ImageOverlay.h | 0 .../{InviteUsers.cc => InviteUsers.cpp} | 10 +- {include => src}/dialogs/InviteUsers.h | 0 src/dialogs/{JoinRoom.cc => JoinRoom.cpp} | 10 +- {include => src}/dialogs/JoinRoom.h | 0 src/dialogs/{LeaveRoom.cc => LeaveRoom.cpp} | 8 +- {include => src}/dialogs/LeaveRoom.h | 0 src/dialogs/{Logout.cc => Logout.cpp} | 8 +- {include => src}/dialogs/Logout.h | 0 src/dialogs/MemberList.cpp | 10 +- .../dialogs/MemberList.h | 0 ...oadOverlay.cc => PreviewUploadOverlay.cpp} | 6 +- .../dialogs/PreviewUploadOverlay.h | 2 +- src/dialogs/ReCaptcha.cpp | 12 +- .../ReCaptcha.hpp => src/dialogs/ReCaptcha.h | 0 .../{ReadReceipts.cc => ReadReceipts.cpp} | 10 +- {include => src}/dialogs/ReadReceipts.h | 0 src/dialogs/RoomSettings.cpp | 27 +- .../dialogs/RoomSettings.h | 0 src/emoji/{Category.cc => Category.cpp} | 0 {include => src}/emoji/Category.h | 0 .../{ItemDelegate.cc => ItemDelegate.cpp} | 0 {include => src}/emoji/ItemDelegate.h | 0 src/emoji/{Panel.cc => Panel.cpp} | 4 +- {include => src}/emoji/Panel.h | 0 src/emoji/{PickButton.cc => PickButton.cpp} | 0 {include => src}/emoji/PickButton.h | 2 +- src/emoji/{Provider.cc => Provider.cpp} | 0 {include => src}/emoji/Provider.h | 0 src/{main.cc => main.cpp} | 6 +- {include => src}/notifications/Manager.h | 0 .../{TimelineItem.cc => TimelineItem.cpp} | 8 +- {include => src}/timeline/TimelineItem.h | 0 .../{TimelineView.cc => TimelineView.cpp} | 8 +- {include => src}/timeline/TimelineView.h | 4 +- ...ViewManager.cc => TimelineViewManager.cpp} | 2 +- .../timeline/TimelineViewManager.h | 0 .../widgets/{AudioItem.cc => AudioItem.cpp} | 2 +- {include => src}/timeline/widgets/AudioItem.h | 0 .../widgets/{FileItem.cc => FileItem.cpp} | 2 +- {include => src}/timeline/widgets/FileItem.h | 0 .../widgets/{ImageItem.cc => ImageItem.cpp} | 4 +- {include => src}/timeline/widgets/ImageItem.h | 0 .../widgets/{VideoItem.cc => VideoItem.cpp} | 0 {include => src}/timeline/widgets/VideoItem.h | 0 src/ui/{Avatar.cc => Avatar.cpp} | 2 +- {include => src}/ui/Avatar.h | 0 src/ui/{Badge.cc => Badge.cpp} | 0 {include => src}/ui/Badge.h | 0 {include => src}/ui/DropShadow.h | 0 src/ui/{FlatButton.cc => FlatButton.cpp} | 0 {include => src}/ui/FlatButton.h | 0 .../{FloatingButton.cc => FloatingButton.cpp} | 0 {include => src}/ui/FloatingButton.h | 0 src/ui/InfoMessage.cpp | 2 +- .../InfoMessage.hpp => src/ui/InfoMessage.h | 0 src/ui/{Label.cc => Label.cpp} | 0 {include => src}/ui/Label.h | 0 ...adingIndicator.cc => LoadingIndicator.cpp} | 0 {include => src}/ui/LoadingIndicator.h | 0 {include => src}/ui/Menu.h | 0 src/ui/{OverlayModal.cc => OverlayModal.cpp} | 0 {include => src}/ui/OverlayModal.h | 0 .../{OverlayWidget.cc => OverlayWidget.cpp} | 0 {include => src}/ui/OverlayWidget.h | 0 {include => src}/ui/Painter.h | 0 src/ui/{RaisedButton.cc => RaisedButton.cpp} | 0 {include => src}/ui/RaisedButton.h | 0 src/ui/{Ripple.cc => Ripple.cpp} | 0 {include => src}/ui/Ripple.h | 0 .../{RippleOverlay.cc => RippleOverlay.cpp} | 0 {include => src}/ui/RippleOverlay.h | 0 src/ui/{ScrollBar.cc => ScrollBar.cpp} | 0 {include => src}/ui/ScrollBar.h | 0 src/ui/{SnackBar.cc => SnackBar.cpp} | 0 {include => src}/ui/SnackBar.h | 0 src/ui/{TextField.cc => TextField.cpp} | 0 {include => src}/ui/TextField.h | 0 src/ui/{Theme.cc => Theme.cpp} | 0 {include => src}/ui/Theme.h | 0 src/ui/{ThemeManager.cc => ThemeManager.cpp} | 0 {include => src}/ui/ThemeManager.h | 0 src/ui/{ToggleButton.cc => ToggleButton.cpp} | 0 {include => src}/ui/ToggleButton.h | 0 145 files changed, 281 insertions(+), 279 deletions(-) rename cmake/{version.hpp => version.h} (100%) rename src/{AvatarProvider.cc => AvatarProvider.cpp} (99%) rename {include => src}/AvatarProvider.h (100%) rename src/{Cache.cc => Cache.cpp} (99%) rename {include => src}/Cache.h (99%) rename src/{ChatPage.cc => ChatPage.cpp} (99%) rename {include => src}/ChatPage.h (100%) rename src/{CommunitiesList.cc => CommunitiesList.cpp} (99%) rename {include => src}/CommunitiesList.h (100%) rename src/{CommunitiesListItem.cc => CommunitiesListItem.cpp} (97%) rename {include => src}/CommunitiesListItem.h (100%) rename {include => src}/Config.h (100%) rename src/{InviteeItem.cc => InviteeItem.cpp} (95%) rename {include => src}/InviteeItem.h (100%) rename include/Logging.hpp => src/Logging.h (100%) rename src/{LoginPage.cc => LoginPage.cpp} (98%) rename {include => src}/LoginPage.h (100%) rename src/{MainWindow.cc => MainWindow.cpp} (99%) rename {include => src}/MainWindow.h (100%) rename src/{MatrixClient.cc => MatrixClient.cpp} (100%) rename {include => src}/MatrixClient.h (100%) rename include/Olm.hpp => src/Olm.h (100%) rename src/{QuickSwitcher.cc => QuickSwitcher.cpp} (99%) rename {include => src}/QuickSwitcher.h (97%) rename src/{RegisterPage.cc => RegisterPage.cpp} (98%) rename {include => src}/RegisterPage.h (100%) rename src/{RoomInfoListItem.cc => RoomInfoListItem.cpp} (99%) rename {include => src}/RoomInfoListItem.h (100%) rename src/{RoomList.cc => RoomList.cpp} (99%) rename {include => src}/RoomList.h (100%) rename src/{RunGuard.cc => RunGuard.cpp} (100%) rename {include => src}/RunGuard.h (100%) rename src/{SideBarActions.cc => SideBarActions.cpp} (97%) rename {include => src}/SideBarActions.h (96%) rename src/{Splitter.cc => Splitter.cpp} (99%) rename {include => src}/Splitter.h (100%) rename include/SuggestionsPopup.hpp => src/SuggestionsPopup.h (99%) rename src/{TextInputWidget.cc => TextInputWidget.cpp} (99%) rename {include => src}/TextInputWidget.h (98%) rename src/{TopRoomBar.cc => TopRoomBar.cpp} (98%) rename {include => src}/TopRoomBar.h (100%) rename src/{TrayIcon.cc => TrayIcon.cpp} (100%) rename {include => src}/TrayIcon.h (100%) rename src/{TypingDisplay.cc => TypingDisplay.cpp} (100%) rename {include => src}/TypingDisplay.h (100%) rename src/{UserInfoWidget.cc => UserInfoWidget.cpp} (98%) rename {include => src}/UserInfoWidget.h (100%) rename src/{UserSettingsPage.cc => UserSettingsPage.cpp} (99%) rename {include => src}/UserSettingsPage.h (100%) rename src/{Utils.cc => Utils.cpp} (100%) rename {include => src}/Utils.h (100%) rename src/{WelcomePage.cc => WelcomePage.cpp} (99%) rename {include => src}/WelcomePage.h (100%) rename src/dialogs/{CreateRoom.cc => CreateRoom.cpp} (98%) rename {include => src}/dialogs/CreateRoom.h (100%) rename src/dialogs/{ImageOverlay.cc => ImageOverlay.cpp} (99%) rename {include => src}/dialogs/ImageOverlay.h (100%) rename src/dialogs/{InviteUsers.cc => InviteUsers.cpp} (98%) rename {include => src}/dialogs/InviteUsers.h (100%) rename src/dialogs/{JoinRoom.cc => JoinRoom.cpp} (95%) rename {include => src}/dialogs/JoinRoom.h (100%) rename src/dialogs/{LeaveRoom.cc => LeaveRoom.cpp} (96%) rename {include => src}/dialogs/LeaveRoom.h (100%) rename src/dialogs/{Logout.cc => Logout.cpp} (97%) rename {include => src}/dialogs/Logout.h (100%) rename include/dialogs/MemberList.hpp => src/dialogs/MemberList.h (100%) rename src/dialogs/{PreviewUploadOverlay.cc => PreviewUploadOverlay.cpp} (99%) rename {include => src}/dialogs/PreviewUploadOverlay.h (98%) rename include/dialogs/ReCaptcha.hpp => src/dialogs/ReCaptcha.h (100%) rename src/dialogs/{ReadReceipts.cc => ReadReceipts.cpp} (99%) rename {include => src}/dialogs/ReadReceipts.h (100%) rename include/dialogs/RoomSettings.hpp => src/dialogs/RoomSettings.h (100%) rename src/emoji/{Category.cc => Category.cpp} (100%) rename {include => src}/emoji/Category.h (100%) rename src/emoji/{ItemDelegate.cc => ItemDelegate.cpp} (100%) rename {include => src}/emoji/ItemDelegate.h (100%) rename src/emoji/{Panel.cc => Panel.cpp} (99%) rename {include => src}/emoji/Panel.h (100%) rename src/emoji/{PickButton.cc => PickButton.cpp} (100%) rename {include => src}/emoji/PickButton.h (98%) rename src/emoji/{Provider.cc => Provider.cpp} (100%) rename {include => src}/emoji/Provider.h (100%) rename src/{main.cc => main.cpp} (98%) rename {include => src}/notifications/Manager.h (100%) rename src/timeline/{TimelineItem.cc => TimelineItem.cpp} (99%) rename {include => src}/timeline/TimelineItem.h (100%) rename src/timeline/{TimelineView.cc => TimelineView.cpp} (99%) rename {include => src}/timeline/TimelineView.h (99%) rename src/timeline/{TimelineViewManager.cc => TimelineViewManager.cpp} (99%) rename {include => src}/timeline/TimelineViewManager.h (100%) rename src/timeline/widgets/{AudioItem.cc => AudioItem.cpp} (99%) rename {include => src}/timeline/widgets/AudioItem.h (100%) rename src/timeline/widgets/{FileItem.cc => FileItem.cpp} (99%) rename {include => src}/timeline/widgets/FileItem.h (100%) rename src/timeline/widgets/{ImageItem.cc => ImageItem.cpp} (99%) rename {include => src}/timeline/widgets/ImageItem.h (100%) rename src/timeline/widgets/{VideoItem.cc => VideoItem.cpp} (100%) rename {include => src}/timeline/widgets/VideoItem.h (100%) rename src/ui/{Avatar.cc => Avatar.cpp} (99%) rename {include => src}/ui/Avatar.h (100%) rename src/ui/{Badge.cc => Badge.cpp} (100%) rename {include => src}/ui/Badge.h (100%) rename {include => src}/ui/DropShadow.h (100%) rename src/ui/{FlatButton.cc => FlatButton.cpp} (100%) rename {include => src}/ui/FlatButton.h (100%) rename src/ui/{FloatingButton.cc => FloatingButton.cpp} (100%) rename {include => src}/ui/FloatingButton.h (100%) rename include/ui/InfoMessage.hpp => src/ui/InfoMessage.h (100%) rename src/ui/{Label.cc => Label.cpp} (100%) rename {include => src}/ui/Label.h (100%) rename src/ui/{LoadingIndicator.cc => LoadingIndicator.cpp} (100%) rename {include => src}/ui/LoadingIndicator.h (100%) rename {include => src}/ui/Menu.h (100%) rename src/ui/{OverlayModal.cc => OverlayModal.cpp} (100%) rename {include => src}/ui/OverlayModal.h (100%) rename src/ui/{OverlayWidget.cc => OverlayWidget.cpp} (100%) rename {include => src}/ui/OverlayWidget.h (100%) rename {include => src}/ui/Painter.h (100%) rename src/ui/{RaisedButton.cc => RaisedButton.cpp} (100%) rename {include => src}/ui/RaisedButton.h (100%) rename src/ui/{Ripple.cc => Ripple.cpp} (100%) rename {include => src}/ui/Ripple.h (100%) rename src/ui/{RippleOverlay.cc => RippleOverlay.cpp} (100%) rename {include => src}/ui/RippleOverlay.h (100%) rename src/ui/{ScrollBar.cc => ScrollBar.cpp} (100%) rename {include => src}/ui/ScrollBar.h (100%) rename src/ui/{SnackBar.cc => SnackBar.cpp} (100%) rename {include => src}/ui/SnackBar.h (100%) rename src/ui/{TextField.cc => TextField.cpp} (100%) rename {include => src}/ui/TextField.h (100%) rename src/ui/{Theme.cc => Theme.cpp} (100%) rename {include => src}/ui/Theme.h (100%) rename src/ui/{ThemeManager.cc => ThemeManager.cpp} (100%) rename {include => src}/ui/ThemeManager.h (100%) rename src/ui/{ToggleButton.cc => ToggleButton.cpp} (100%) rename {include => src}/ui/ToggleButton.h (100%) diff --git a/.ci/format.sh b/.ci/format.sh index 89fa4e88..d87bfb66 100755 --- a/.ci/format.sh +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8204df9c..59c2ce32 100644 --- a/CMakeLists.txt +++ b/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/ImageOverlay.cc - src/dialogs/PreviewUploadOverlay.cc - src/dialogs/InviteUsers.cc - src/dialogs/JoinRoom.cc + src/dialogs/CreateRoom.cpp + src/dialogs/ImageOverlay.cpp + src/dialogs/PreviewUploadOverlay.cpp + src/dialogs/InviteUsers.cpp + src/dialogs/JoinRoom.cpp src/dialogs/MemberList.cpp - src/dialogs/LeaveRoom.cc - src/dialogs/Logout.cc - src/dialogs/ReadReceipts.cc + src/dialogs/LeaveRoom.cpp + src/dialogs/Logout.cpp + src/dialogs/ReadReceipts.cpp src/dialogs/ReCaptcha.cpp src/dialogs/RoomSettings.cpp # Emoji - src/emoji/Category.cc - src/emoji/ItemDelegate.cc - src/emoji/Panel.cc - src/emoji/PickButton.cc - src/emoji/Provider.cc + src/emoji/Category.cpp + src/emoji/ItemDelegate.cpp + src/emoji/Panel.cpp + src/emoji/PickButton.cpp + src/emoji/Provider.cpp # Timeline - src/timeline/TimelineViewManager.cc - src/timeline/TimelineItem.cc - src/timeline/TimelineView.cc - src/timeline/widgets/AudioItem.cc - src/timeline/widgets/FileItem.cc - src/timeline/widgets/ImageItem.cc - src/timeline/widgets/VideoItem.cc + src/timeline/TimelineViewManager.cpp + src/timeline/TimelineItem.cpp + src/timeline/TimelineView.cpp + src/timeline/widgets/AudioItem.cpp + src/timeline/widgets/FileItem.cpp + src/timeline/widgets/ImageItem.cpp + src/timeline/widgets/VideoItem.cpp # UI components - src/ui/Avatar.cc - src/ui/Badge.cc - src/ui/LoadingIndicator.cc + src/ui/Avatar.cpp + src/ui/Badge.cpp + src/ui/LoadingIndicator.cpp src/ui/InfoMessage.cpp - src/ui/FlatButton.cc - src/ui/FloatingButton.cc - src/ui/Label.cc - src/ui/OverlayModal.cc - src/ui/ScrollBar.cc - src/ui/SnackBar.cc - src/ui/RaisedButton.cc - src/ui/Ripple.cc - src/ui/RippleOverlay.cc - src/ui/OverlayWidget.cc - src/ui/TextField.cc - src/ui/ToggleButton.cc - src/ui/Theme.cc - src/ui/ThemeManager.cc + src/ui/FlatButton.cpp + src/ui/FloatingButton.cpp + src/ui/Label.cpp + src/ui/OverlayModal.cpp + src/ui/ScrollBar.cpp + src/ui/SnackBar.cpp + src/ui/RaisedButton.cpp + src/ui/Ripple.cpp + src/ui/RippleOverlay.cpp + src/ui/OverlayWidget.cpp + src/ui/TextField.cpp + src/ui/ToggleButton.cpp + src/ui/Theme.cpp + src/ui/ThemeManager.cpp - src/AvatarProvider.cc - src/Cache.cc - src/ChatPage.cc - src/CommunitiesListItem.cc - src/CommunitiesList.cc - src/InviteeItem.cc - src/LoginPage.cc + src/AvatarProvider.cpp + src/Cache.cpp + src/ChatPage.cpp + src/CommunitiesListItem.cpp + src/CommunitiesList.cpp + src/InviteeItem.cpp + src/LoginPage.cpp src/Logging.cpp - src/MainWindow.cc - src/MatrixClient.cc - src/QuickSwitcher.cc + src/MainWindow.cpp + src/MatrixClient.cpp + src/QuickSwitcher.cpp src/Olm.cpp - src/RegisterPage.cc - src/RoomInfoListItem.cc - src/RoomList.cc - src/RunGuard.cc - src/SideBarActions.cc - src/Splitter.cc + src/RegisterPage.cpp + src/RoomInfoListItem.cpp + src/RoomList.cpp + src/RunGuard.cpp + src/SideBarActions.cpp + src/Splitter.cpp src/SuggestionsPopup.cpp - src/TextInputWidget.cc - src/TopRoomBar.cc - src/TrayIcon.cc - src/TypingDisplay.cc - src/Utils.cc - src/UserInfoWidget.cc - src/UserSettingsPage.cc - src/WelcomePage.cc - src/main.cc + src/TextInputWidget.cpp + src/TopRoomBar.cpp + src/TrayIcon.cpp + src/TypingDisplay.cpp + src/Utils.cpp + src/UserInfoWidget.cpp + src/UserSettingsPage.cpp + src/WelcomePage.cpp + 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(include/ui) +include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_BINARY_DIR}/config) qt5_wrap_cpp(MOC_HEADERS # Dialogs - include/dialogs/CreateRoom.h - include/dialogs/ImageOverlay.h - include/dialogs/PreviewUploadOverlay.h - include/dialogs/InviteUsers.h - include/dialogs/JoinRoom.h - include/dialogs/MemberList.hpp - include/dialogs/LeaveRoom.h - include/dialogs/Logout.h - include/dialogs/ReadReceipts.h - include/dialogs/ReCaptcha.hpp - include/dialogs/RoomSettings.hpp + src/dialogs/CreateRoom.h + src/dialogs/ImageOverlay.h + src/dialogs/PreviewUploadOverlay.h + src/dialogs/InviteUsers.h + src/dialogs/JoinRoom.h + src/dialogs/MemberList.h + src/dialogs/LeaveRoom.h + src/dialogs/Logout.h + src/dialogs/ReadReceipts.h + src/dialogs/ReCaptcha.h + src/dialogs/RoomSettings.h # Emoji - include/emoji/Category.h - include/emoji/ItemDelegate.h - include/emoji/Panel.h - include/emoji/PickButton.h + src/emoji/Category.h + src/emoji/ItemDelegate.h + src/emoji/Panel.h + src/emoji/PickButton.h # Timeline - include/timeline/TimelineItem.h - include/timeline/TimelineView.h - include/timeline/TimelineViewManager.h - include/timeline/widgets/AudioItem.h - include/timeline/widgets/FileItem.h - include/timeline/widgets/ImageItem.h - include/timeline/widgets/VideoItem.h + src/timeline/TimelineItem.h + src/timeline/TimelineView.h + src/timeline/TimelineViewManager.h + src/timeline/widgets/AudioItem.h + src/timeline/widgets/FileItem.h + src/timeline/widgets/ImageItem.h + src/timeline/widgets/VideoItem.h # UI components - include/ui/Avatar.h - include/ui/Badge.h - include/ui/LoadingIndicator.h - include/ui/InfoMessage.hpp - include/ui/FlatButton.h - include/ui/Label.h - include/ui/FloatingButton.h - include/ui/OverlayWidget.h - include/ui/ScrollBar.h - include/ui/SnackBar.h - include/ui/RaisedButton.h - include/ui/Ripple.h - include/ui/RippleOverlay.h - include/ui/TextField.h - include/ui/ToggleButton.h - include/ui/Theme.h - include/ui/ThemeManager.h + src/ui/Avatar.h + src/ui/Badge.h + src/ui/LoadingIndicator.h + src/ui/InfoMessage.h + src/ui/FlatButton.h + src/ui/Label.h + src/ui/FloatingButton.h + src/ui/OverlayWidget.h + src/ui/ScrollBar.h + src/ui/SnackBar.h + src/ui/RaisedButton.h + src/ui/Ripple.h + src/ui/RippleOverlay.h + src/ui/TextField.h + src/ui/ToggleButton.h + src/ui/Theme.h + src/ui/ThemeManager.h - include/notifications/Manager.h + src/notifications/Manager.h - include/AvatarProvider.h - include/Cache.h - include/ChatPage.h - include/CommunitiesListItem.h - include/CommunitiesList.h - include/LoginPage.h - include/MainWindow.h - include/InviteeItem.h - include/QuickSwitcher.h - include/RegisterPage.h - include/RoomInfoListItem.h - include/RoomList.h - include/SideBarActions.h - include/Splitter.h - include/SuggestionsPopup.hpp - include/TextInputWidget.h - include/TopRoomBar.h - include/TrayIcon.h - include/TypingDisplay.h - include/UserInfoWidget.h - include/UserSettingsPage.h - include/WelcomePage.h + src/AvatarProvider.h + src/Cache.h + src/ChatPage.h + src/CommunitiesListItem.h + src/CommunitiesList.h + src/LoginPage.h + src/MainWindow.h + src/InviteeItem.h + src/QuickSwitcher.h + src/RegisterPage.h + src/RoomInfoListItem.h + src/RoomList.h + src/SideBarActions.h + src/Splitter.h + src/SuggestionsPopup.h + src/TextInputWidget.h + src/TopRoomBar.h + src/TrayIcon.h + src/TypingDisplay.h + src/UserInfoWidget.h + src/UserSettingsPage.h + src/WelcomePage.h ) # diff --git a/cmake/version.hpp b/cmake/version.h similarity index 100% rename from cmake/version.hpp rename to cmake/version.h diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cpp similarity index 99% rename from src/AvatarProvider.cc rename to src/AvatarProvider.cpp index b4c1188a..dbfc1945 100644 --- a/src/AvatarProvider.cc +++ b/src/AvatarProvider.cpp @@ -20,7 +20,7 @@ #include "AvatarProvider.h" #include "Cache.h" -#include "Logging.hpp" +#include "Logging.h" #include "MatrixClient.h" namespace AvatarProvider { diff --git a/include/AvatarProvider.h b/src/AvatarProvider.h similarity index 100% rename from include/AvatarProvider.h rename to src/AvatarProvider.h diff --git a/src/Cache.cc b/src/Cache.cpp similarity index 99% rename from src/Cache.cc rename to src/Cache.cpp index 614e8a90..6f71b746 100644 --- a/src/Cache.cc +++ b/src/Cache.cpp @@ -28,7 +28,6 @@ #include #include "Cache.h" -#include "Logging.hpp" #include "Utils.h" //! Should be changed when a breaking change occurs in the cache format. diff --git a/include/Cache.h b/src/Cache.h similarity index 99% rename from include/Cache.h rename to src/Cache.h index 14f991e8..fa8355a5 100644 --- a/include/Cache.h +++ b/src/Cache.h @@ -31,7 +31,7 @@ #include #include -#include "Logging.hpp" +#include "Logging.h" using mtx::events::state::JoinRule; diff --git a/src/ChatPage.cc b/src/ChatPage.cpp similarity index 99% rename from src/ChatPage.cc rename to src/ChatPage.cpp index ff059cee..cc7a5741 100644 --- a/src/ChatPage.cc +++ b/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 "OverlayModal.h" +#include "Olm.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" diff --git a/include/ChatPage.h b/src/ChatPage.h similarity index 100% rename from include/ChatPage.h rename to src/ChatPage.h diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cpp similarity index 99% rename from src/CommunitiesList.cc rename to src/CommunitiesList.cpp index 822ca1d2..c271be89 100644 --- a/src/CommunitiesList.cc +++ b/src/CommunitiesList.cpp @@ -1,6 +1,6 @@ #include "CommunitiesList.h" #include "Cache.h" -#include "Logging.hpp" +#include "Logging.h" #include "MatrixClient.h" #include diff --git a/include/CommunitiesList.h b/src/CommunitiesList.h similarity index 100% rename from include/CommunitiesList.h rename to src/CommunitiesList.h diff --git a/src/CommunitiesListItem.cc b/src/CommunitiesListItem.cpp similarity index 97% rename from src/CommunitiesListItem.cc rename to src/CommunitiesListItem.cpp index df6c5393..8afaebff 100644 --- a/src/CommunitiesListItem.cc +++ b/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) diff --git a/include/CommunitiesListItem.h b/src/CommunitiesListItem.h similarity index 100% rename from include/CommunitiesListItem.h rename to src/CommunitiesListItem.h diff --git a/include/Config.h b/src/Config.h similarity index 100% rename from include/Config.h rename to src/Config.h diff --git a/src/InviteeItem.cc b/src/InviteeItem.cpp similarity index 95% rename from src/InviteeItem.cc rename to src/InviteeItem.cpp index 5ae2a7b6..6e9be0d5 100644 --- a/src/InviteeItem.cc +++ b/src/InviteeItem.cpp @@ -1,8 +1,8 @@ #include -#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; diff --git a/include/InviteeItem.h b/src/InviteeItem.h similarity index 100% rename from include/InviteeItem.h rename to src/InviteeItem.h diff --git a/src/Logging.cpp b/src/Logging.cpp index bccbe389..1b2838f3 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -1,4 +1,4 @@ -#include "Logging.hpp" +#include "Logging.h" #include #include diff --git a/include/Logging.hpp b/src/Logging.h similarity index 100% rename from include/Logging.hpp rename to src/Logging.h diff --git a/src/LoginPage.cc b/src/LoginPage.cpp similarity index 98% rename from src/LoginPage.cc rename to src/LoginPage.cpp index 6a3b925c..dbf9d470 100644 --- a/src/LoginPage.cc +++ b/src/LoginPage.cpp @@ -20,13 +20,13 @@ #include #include "Config.h" -#include "FlatButton.h" -#include "LoadingIndicator.h" #include "LoginPage.h" #include "MatrixClient.h" -#include "OverlayModal.h" -#include "RaisedButton.h" -#include "TextField.h" +#include "ui/FlatButton.h" +#include "ui/LoadingIndicator.h" +#include "ui/OverlayModal.h" +#include "ui/RaisedButton.h" +#include "ui/TextField.h" using namespace mtx::identifiers; diff --git a/include/LoginPage.h b/src/LoginPage.h similarity index 100% rename from include/LoginPage.h rename to src/LoginPage.h diff --git a/src/MainWindow.cc b/src/MainWindow.cpp similarity index 99% rename from src/MainWindow.cc rename to src/MainWindow.cpp index 749e7caf..fdca98c3 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cpp @@ -24,25 +24,25 @@ #include "ChatPage.h" #include "Config.h" -#include "LoadingIndicator.h" -#include "Logging.hpp" +#include "Logging.h" #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/RoomSettings.hpp" +#include "dialogs/MemberList.h" +#include "dialogs/RoomSettings.h" MainWindow *MainWindow::instance_ = nullptr; diff --git a/include/MainWindow.h b/src/MainWindow.h similarity index 100% rename from include/MainWindow.h rename to src/MainWindow.h diff --git a/src/MatrixClient.cc b/src/MatrixClient.cpp similarity index 100% rename from src/MatrixClient.cc rename to src/MatrixClient.cpp diff --git a/include/MatrixClient.h b/src/MatrixClient.h similarity index 100% rename from include/MatrixClient.h rename to src/MatrixClient.h diff --git a/src/Olm.cpp b/src/Olm.cpp index b3bb4316..fe4265d7 100644 --- a/src/Olm.cpp +++ b/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; diff --git a/include/Olm.hpp b/src/Olm.h similarity index 100% rename from include/Olm.hpp rename to src/Olm.h diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cpp similarity index 99% rename from src/QuickSwitcher.cc rename to src/QuickSwitcher.cpp index 3c9725d1..07460efb 100644 --- a/src/QuickSwitcher.cc +++ b/src/QuickSwitcher.cpp @@ -23,6 +23,7 @@ #include #include "QuickSwitcher.h" +#include "SuggestionsPopup.h" RoomSearchInput::RoomSearchInput(QWidget *parent) : TextField(parent) diff --git a/include/QuickSwitcher.h b/src/QuickSwitcher.h similarity index 97% rename from include/QuickSwitcher.h rename to src/QuickSwitcher.h index 254d7a16..24b9adfa 100644 --- a/include/QuickSwitcher.h +++ b/src/QuickSwitcher.h @@ -22,8 +22,8 @@ #include #include -#include "SuggestionsPopup.hpp" -#include "TextField.h" +#include "SuggestionsPopup.h" +#include "ui/TextField.h" Q_DECLARE_METATYPE(std::vector) diff --git a/src/RegisterPage.cc b/src/RegisterPage.cpp similarity index 98% rename from src/RegisterPage.cc rename to src/RegisterPage.cpp index 4894d122..5a02713a 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cpp @@ -19,15 +19,15 @@ #include #include "Config.h" -#include "FlatButton.h" -#include "Logging.hpp" +#include "Logging.h" #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) diff --git a/include/RegisterPage.h b/src/RegisterPage.h similarity index 100% rename from include/RegisterPage.h rename to src/RegisterPage.h diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cpp similarity index 99% rename from src/RoomInfoListItem.cc rename to src/RoomInfoListItem.cpp index 7027115f..172cdb90 100644 --- a/src/RoomInfoListItem.cc +++ b/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; diff --git a/include/RoomInfoListItem.h b/src/RoomInfoListItem.h similarity index 100% rename from include/RoomInfoListItem.h rename to src/RoomInfoListItem.h diff --git a/src/RoomList.cc b/src/RoomList.cpp similarity index 99% rename from src/RoomList.cc rename to src/RoomList.cpp index 418a5d6f..a9328984 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cpp @@ -21,14 +21,14 @@ #include #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, QWidget *parent) : QWidget(parent) diff --git a/include/RoomList.h b/src/RoomList.h similarity index 100% rename from include/RoomList.h rename to src/RoomList.h diff --git a/src/RunGuard.cc b/src/RunGuard.cpp similarity index 100% rename from src/RunGuard.cc rename to src/RunGuard.cpp diff --git a/include/RunGuard.h b/src/RunGuard.h similarity index 100% rename from include/RunGuard.h rename to src/RunGuard.h diff --git a/src/SideBarActions.cc b/src/SideBarActions.cpp similarity index 97% rename from src/SideBarActions.cc rename to src/SideBarActions.cpp index d65900b3..b2a01e3e 100644 --- a/src/SideBarActions.cc +++ b/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} diff --git a/include/SideBarActions.h b/src/SideBarActions.h similarity index 96% rename from include/SideBarActions.h rename to src/SideBarActions.h index a29757dd..f97c72de 100644 --- a/include/SideBarActions.h +++ b/src/SideBarActions.h @@ -5,15 +5,15 @@ #include #include -#include "FlatButton.h" -#include "Menu.h" - namespace mtx { namespace requests { struct CreateRoom; } } +class Menu; +class FlatButton; + class SideBarActions : public QWidget { Q_OBJECT diff --git a/src/Splitter.cc b/src/Splitter.cpp similarity index 99% rename from src/Splitter.cc rename to src/Splitter.cpp index 7b6c9573..f5bbf367 100644 --- a/src/Splitter.cc +++ b/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; diff --git a/include/Splitter.h b/src/Splitter.h similarity index 100% rename from include/Splitter.h rename to src/Splitter.h diff --git a/src/SuggestionsPopup.cpp b/src/SuggestionsPopup.cpp index bcfcb233..5ea78460 100644 --- a/src/SuggestionsPopup.cpp +++ b/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 #include #include +#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; diff --git a/include/SuggestionsPopup.hpp b/src/SuggestionsPopup.h similarity index 99% rename from include/SuggestionsPopup.hpp rename to src/SuggestionsPopup.h index 4a8dd00c..72d6c7eb 100644 --- a/include/SuggestionsPopup.hpp +++ b/src/SuggestionsPopup.h @@ -5,7 +5,6 @@ #include #include -#include "Avatar.h" #include "AvatarProvider.h" #include "Cache.h" #include "ChatPage.h" diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cpp similarity index 99% rename from src/TextInputWidget.cc rename to src/TextInputWidget.cpp index bb72c533..a419ed84 100644 --- a/src/TextInputWidget.cc +++ b/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; diff --git a/include/TextInputWidget.h b/src/TextInputWidget.h similarity index 98% rename from include/TextInputWidget.h rename to src/TextInputWidget.h index 2dcb178f..e7d5f948 100644 --- a/include/TextInputWidget.h +++ b/src/TextInputWidget.h @@ -28,12 +28,8 @@ #include #include -#include "FlatButton.h" -#include "LoadingIndicator.h" -#include "SuggestionsPopup.hpp" - +#include "SuggestionsPopup.h" #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 diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cpp similarity index 98% rename from src/TopRoomBar.cc rename to src/TopRoomBar.cpp index 7b2814b9..c9609788 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cpp @@ -18,14 +18,14 @@ #include #include -#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) diff --git a/include/TopRoomBar.h b/src/TopRoomBar.h similarity index 100% rename from include/TopRoomBar.h rename to src/TopRoomBar.h diff --git a/src/TrayIcon.cc b/src/TrayIcon.cpp similarity index 100% rename from src/TrayIcon.cc rename to src/TrayIcon.cpp diff --git a/include/TrayIcon.h b/src/TrayIcon.h similarity index 100% rename from include/TrayIcon.h rename to src/TrayIcon.h diff --git a/src/TypingDisplay.cc b/src/TypingDisplay.cpp similarity index 100% rename from src/TypingDisplay.cc rename to src/TypingDisplay.cpp diff --git a/include/TypingDisplay.h b/src/TypingDisplay.h similarity index 100% rename from include/TypingDisplay.h rename to src/TypingDisplay.h diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cpp similarity index 98% rename from src/UserInfoWidget.cc rename to src/UserInfoWidget.cpp index 092184f7..1470fc25 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cpp @@ -17,12 +17,12 @@ #include -#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) diff --git a/include/UserInfoWidget.h b/src/UserInfoWidget.h similarity index 100% rename from include/UserInfoWidget.h rename to src/UserInfoWidget.h diff --git a/src/UserSettingsPage.cc b/src/UserSettingsPage.cpp similarity index 99% rename from src/UserSettingsPage.cc rename to src/UserSettingsPage.cpp index 7354e413..4c249369 100644 --- a/src/UserSettingsPage.cc +++ b/src/UserSettingsPage.cpp @@ -24,11 +24,11 @@ #include #include "Config.h" -#include "FlatButton.h" #include "UserSettingsPage.h" -#include +#include "ui/FlatButton.h" +#include "ui/ToggleButton.h" -#include "version.hpp" +#include "version.h" UserSettings::UserSettings() { load(); } diff --git a/include/UserSettingsPage.h b/src/UserSettingsPage.h similarity index 100% rename from include/UserSettingsPage.h rename to src/UserSettingsPage.h diff --git a/src/Utils.cc b/src/Utils.cpp similarity index 100% rename from src/Utils.cc rename to src/Utils.cpp diff --git a/include/Utils.h b/src/Utils.h similarity index 100% rename from include/Utils.h rename to src/Utils.h diff --git a/src/WelcomePage.cc b/src/WelcomePage.cpp similarity index 99% rename from src/WelcomePage.cc rename to src/WelcomePage.cpp index b21da92a..0560222e 100644 --- a/src/WelcomePage.cc +++ b/src/WelcomePage.cpp @@ -20,8 +20,8 @@ #include #include "Config.h" -#include "RaisedButton.h" #include "WelcomePage.h" +#include "ui/RaisedButton.h" WelcomePage::WelcomePage(QWidget *parent) : QWidget(parent) diff --git a/include/WelcomePage.h b/src/WelcomePage.h similarity index 100% rename from include/WelcomePage.h rename to src/WelcomePage.h diff --git a/src/dialogs/CreateRoom.cc b/src/dialogs/CreateRoom.cpp similarity index 98% rename from src/dialogs/CreateRoom.cc rename to src/dialogs/CreateRoom.cpp index 8c2cc641..3c538b49 100644 --- a/src/dialogs/CreateRoom.cc +++ b/src/dialogs/CreateRoom.cpp @@ -3,14 +3,14 @@ #include #include -#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) diff --git a/include/dialogs/CreateRoom.h b/src/dialogs/CreateRoom.h similarity index 100% rename from include/dialogs/CreateRoom.h rename to src/dialogs/CreateRoom.h diff --git a/src/dialogs/ImageOverlay.cc b/src/dialogs/ImageOverlay.cpp similarity index 99% rename from src/dialogs/ImageOverlay.cc rename to src/dialogs/ImageOverlay.cpp index 0e4d9d71..7773f97c 100644 --- a/src/dialogs/ImageOverlay.cc +++ b/src/dialogs/ImageOverlay.cpp @@ -19,9 +19,10 @@ #include #include -#include "Utils.h" #include "dialogs/ImageOverlay.h" +#include "Utils.h" + using namespace dialogs; ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) diff --git a/include/dialogs/ImageOverlay.h b/src/dialogs/ImageOverlay.h similarity index 100% rename from include/dialogs/ImageOverlay.h rename to src/dialogs/ImageOverlay.h diff --git a/src/dialogs/InviteUsers.cc b/src/dialogs/InviteUsers.cpp similarity index 98% rename from src/dialogs/InviteUsers.cc rename to src/dialogs/InviteUsers.cpp index 71cfdf20..bcd163b0 100644 --- a/src/dialogs/InviteUsers.cc +++ b/src/dialogs/InviteUsers.cpp @@ -6,13 +6,13 @@ #include #include -#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; diff --git a/include/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h similarity index 100% rename from include/dialogs/InviteUsers.h rename to src/dialogs/InviteUsers.h diff --git a/src/dialogs/JoinRoom.cc b/src/dialogs/JoinRoom.cpp similarity index 95% rename from src/dialogs/JoinRoom.cc rename to src/dialogs/JoinRoom.cpp index d6e83014..05c0f455 100644 --- a/src/dialogs/JoinRoom.cc +++ b/src/dialogs/JoinRoom.cpp @@ -2,13 +2,13 @@ #include #include -#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) diff --git a/include/dialogs/JoinRoom.h b/src/dialogs/JoinRoom.h similarity index 100% rename from include/dialogs/JoinRoom.h rename to src/dialogs/JoinRoom.h diff --git a/src/dialogs/LeaveRoom.cc b/src/dialogs/LeaveRoom.cpp similarity index 96% rename from src/dialogs/LeaveRoom.cc rename to src/dialogs/LeaveRoom.cpp index 508353c6..9647d19f 100644 --- a/src/dialogs/LeaveRoom.cc +++ b/src/dialogs/LeaveRoom.cpp @@ -2,12 +2,12 @@ #include #include -#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) diff --git a/include/dialogs/LeaveRoom.h b/src/dialogs/LeaveRoom.h similarity index 100% rename from include/dialogs/LeaveRoom.h rename to src/dialogs/LeaveRoom.h diff --git a/src/dialogs/Logout.cc b/src/dialogs/Logout.cpp similarity index 97% rename from src/dialogs/Logout.cc rename to src/dialogs/Logout.cpp index 99913b04..e2449817 100644 --- a/src/dialogs/Logout.cc +++ b/src/dialogs/Logout.cpp @@ -20,12 +20,12 @@ #include #include -#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) diff --git a/include/dialogs/Logout.h b/src/dialogs/Logout.h similarity index 100% rename from include/dialogs/Logout.h rename to src/dialogs/Logout.h diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp index f0f61686..60c2eb0a 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp @@ -3,15 +3,15 @@ #include #include +#include "dialogs/MemberList.h" + #include "AvatarProvider.h" +#include "Cache.h" #include "ChatPage.h" #include "Config.h" -#include "FlatButton.h" #include "Utils.h" - -#include "Avatar.h" -#include "Cache.h" -#include "dialogs/MemberList.hpp" +#include "ui/Avatar.h" +#include "ui/FlatButton.h" using namespace dialogs; diff --git a/include/dialogs/MemberList.hpp b/src/dialogs/MemberList.h similarity index 100% rename from include/dialogs/MemberList.hpp rename to src/dialogs/MemberList.h diff --git a/src/dialogs/PreviewUploadOverlay.cc b/src/dialogs/PreviewUploadOverlay.cpp similarity index 99% rename from src/dialogs/PreviewUploadOverlay.cc rename to src/dialogs/PreviewUploadOverlay.cpp index a3fe4228..7e54ba4e 100644 --- a/src/dialogs/PreviewUploadOverlay.cc +++ b/src/dialogs/PreviewUploadOverlay.cpp @@ -23,13 +23,13 @@ #include #include +#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?"; diff --git a/include/dialogs/PreviewUploadOverlay.h b/src/dialogs/PreviewUploadOverlay.h similarity index 98% rename from include/dialogs/PreviewUploadOverlay.h rename to src/dialogs/PreviewUploadOverlay.h index 48795ca0..8d093c7f 100644 --- a/include/dialogs/PreviewUploadOverlay.h +++ b/src/dialogs/PreviewUploadOverlay.h @@ -22,7 +22,7 @@ #include #include -#include "FlatButton.h" +#include "ui/FlatButton.h" class QMimeData; diff --git a/src/dialogs/ReCaptcha.cpp b/src/dialogs/ReCaptcha.cpp index ba54268c..9181d588 100644 --- a/src/dialogs/ReCaptcha.cpp +++ b/src/dialogs/ReCaptcha.cpp @@ -4,13 +4,13 @@ #include #include -#include "Config.h" -#include "FlatButton.h" -#include "MatrixClient.h" -#include "RaisedButton.h" -#include "Theme.h" +#include "dialogs/ReCaptcha.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; diff --git a/include/dialogs/ReCaptcha.hpp b/src/dialogs/ReCaptcha.h similarity index 100% rename from include/dialogs/ReCaptcha.hpp rename to src/dialogs/ReCaptcha.h diff --git a/src/dialogs/ReadReceipts.cc b/src/dialogs/ReadReceipts.cpp similarity index 99% rename from src/dialogs/ReadReceipts.cc rename to src/dialogs/ReadReceipts.cpp index a2e1faf2..c27146ac 100644 --- a/src/dialogs/ReadReceipts.cc +++ b/src/dialogs/ReadReceipts.cpp @@ -6,14 +6,14 @@ #include #include +#include "dialogs/ReadReceipts.h" + +#include "AvatarProvider.h" +#include "Cache.h" #include "ChatPage.h" #include "Config.h" #include "Utils.h" - -#include "Avatar.h" -#include "AvatarProvider.h" -#include "Cache.h" -#include "dialogs/ReadReceipts.h" +#include "ui/Avatar.h" using namespace dialogs; diff --git a/include/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h similarity index 100% rename from include/dialogs/ReadReceipts.h rename to src/dialogs/ReadReceipts.h diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp index 3f40ae89..cfb25997 100644 --- a/src/dialogs/RoomSettings.cpp +++ b/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 #include #include @@ -22,6 +9,20 @@ #include #include +#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; diff --git a/include/dialogs/RoomSettings.hpp b/src/dialogs/RoomSettings.h similarity index 100% rename from include/dialogs/RoomSettings.hpp rename to src/dialogs/RoomSettings.h diff --git a/src/emoji/Category.cc b/src/emoji/Category.cpp similarity index 100% rename from src/emoji/Category.cc rename to src/emoji/Category.cpp diff --git a/include/emoji/Category.h b/src/emoji/Category.h similarity index 100% rename from include/emoji/Category.h rename to src/emoji/Category.h diff --git a/src/emoji/ItemDelegate.cc b/src/emoji/ItemDelegate.cpp similarity index 100% rename from src/emoji/ItemDelegate.cc rename to src/emoji/ItemDelegate.cpp diff --git a/include/emoji/ItemDelegate.h b/src/emoji/ItemDelegate.h similarity index 100% rename from include/emoji/ItemDelegate.h rename to src/emoji/ItemDelegate.h diff --git a/src/emoji/Panel.cc b/src/emoji/Panel.cpp similarity index 99% rename from src/emoji/Panel.cc rename to src/emoji/Panel.cpp index 89c3f823..710b501e 100644 --- a/src/emoji/Panel.cc +++ b/src/emoji/Panel.cpp @@ -19,8 +19,8 @@ #include #include -#include "DropShadow.h" -#include "FlatButton.h" +#include "ui/DropShadow.h" +#include "ui/FlatButton.h" #include "emoji/Category.h" #include "emoji/Panel.h" diff --git a/include/emoji/Panel.h b/src/emoji/Panel.h similarity index 100% rename from include/emoji/Panel.h rename to src/emoji/Panel.h diff --git a/src/emoji/PickButton.cc b/src/emoji/PickButton.cpp similarity index 100% rename from src/emoji/PickButton.cc rename to src/emoji/PickButton.cpp diff --git a/include/emoji/PickButton.h b/src/emoji/PickButton.h similarity index 98% rename from include/emoji/PickButton.h rename to src/emoji/PickButton.h index 9117e61f..d14067c6 100644 --- a/include/emoji/PickButton.h +++ b/src/emoji/PickButton.h @@ -21,7 +21,7 @@ #include #include -#include "FlatButton.h" +#include "ui/FlatButton.h" namespace emoji { diff --git a/src/emoji/Provider.cc b/src/emoji/Provider.cpp similarity index 100% rename from src/emoji/Provider.cc rename to src/emoji/Provider.cpp diff --git a/include/emoji/Provider.h b/src/emoji/Provider.h similarity index 100% rename from include/emoji/Provider.h rename to src/emoji/Provider.h diff --git a/src/main.cc b/src/main.cpp similarity index 98% rename from src/main.cc rename to src/main.cpp index b776e902..d8bf30ce 100644 --- a/src/main.cc +++ b/src/main.cpp @@ -32,12 +32,12 @@ #include #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 diff --git a/include/notifications/Manager.h b/src/notifications/Manager.h similarity index 100% rename from include/notifications/Manager.h rename to src/notifications/Manager.h diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cpp similarity index 99% rename from src/timeline/TimelineItem.cc rename to src/timeline/TimelineItem.cpp index d756ca26..88ab1963 100644 --- a/src/timeline/TimelineItem.cc +++ b/src/timeline/TimelineItem.cpp @@ -20,12 +20,12 @@ #include #include -#include "Avatar.h" #include "ChatPage.h" #include "Config.h" -#include "Logging.hpp" -#include "Olm.hpp" -#include "Painter.h" +#include "Logging.h" +#include "Olm.h" +#include "ui/Avatar.h" +#include "ui/Painter.h" #include "timeline/TimelineItem.h" #include "timeline/widgets/AudioItem.h" diff --git a/include/timeline/TimelineItem.h b/src/timeline/TimelineItem.h similarity index 100% rename from include/timeline/TimelineItem.h rename to src/timeline/TimelineItem.h diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cpp similarity index 99% rename from src/timeline/TimelineView.cc rename to src/timeline/TimelineView.cpp index 207844e4..a8c04807 100644 --- a/src/timeline/TimelineView.cc +++ b/src/timeline/TimelineView.cpp @@ -22,12 +22,12 @@ #include "Cache.h" #include "ChatPage.h" #include "Config.h" -#include "FloatingButton.h" -#include "InfoMessage.hpp" -#include "Logging.hpp" -#include "Olm.hpp" +#include "Logging.h" +#include "Olm.h" #include "UserSettingsPage.h" #include "Utils.h" +#include "ui/FloatingButton.h" +#include "ui/InfoMessage.h" #include "timeline/TimelineView.h" #include "timeline/widgets/AudioItem.h" diff --git a/include/timeline/TimelineView.h b/src/timeline/TimelineView.h similarity index 99% rename from include/timeline/TimelineView.h rename to src/timeline/TimelineView.h index e6b80637..7b269063 100644 --- a/include/timeline/TimelineView.h +++ b/src/timeline/TimelineView.h @@ -30,8 +30,8 @@ #include #include "MatrixClient.h" -#include "ScrollBar.h" -#include "TimelineItem.h" +#include "timeline/TimelineItem.h" +#include "ui/ScrollBar.h" class StateKeeper { diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cpp similarity index 99% rename from src/timeline/TimelineViewManager.cc rename to src/timeline/TimelineViewManager.cpp index c8e00b66..1decab35 100644 --- a/src/timeline/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cpp @@ -22,7 +22,7 @@ #include #include "Cache.h" -#include "Logging.hpp" +#include "Logging.h" #include "timeline/TimelineView.h" #include "timeline/TimelineViewManager.h" #include "timeline/widgets/AudioItem.h" diff --git a/include/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h similarity index 100% rename from include/timeline/TimelineViewManager.h rename to src/timeline/TimelineViewManager.h diff --git a/src/timeline/widgets/AudioItem.cc b/src/timeline/widgets/AudioItem.cpp similarity index 99% rename from src/timeline/widgets/AudioItem.cc rename to src/timeline/widgets/AudioItem.cpp index 2ed4f4c0..1e3eb0f0 100644 --- a/src/timeline/widgets/AudioItem.cc +++ b/src/timeline/widgets/AudioItem.cpp @@ -22,7 +22,7 @@ #include #include -#include "Logging.hpp" +#include "Logging.h" #include "MatrixClient.h" #include "Utils.h" diff --git a/include/timeline/widgets/AudioItem.h b/src/timeline/widgets/AudioItem.h similarity index 100% rename from include/timeline/widgets/AudioItem.h rename to src/timeline/widgets/AudioItem.h diff --git a/src/timeline/widgets/FileItem.cc b/src/timeline/widgets/FileItem.cpp similarity index 99% rename from src/timeline/widgets/FileItem.cc rename to src/timeline/widgets/FileItem.cpp index b4555b2f..f8d3272d 100644 --- a/src/timeline/widgets/FileItem.cc +++ b/src/timeline/widgets/FileItem.cpp @@ -22,7 +22,7 @@ #include #include -#include "Logging.hpp" +#include "Logging.h" #include "MatrixClient.h" #include "Utils.h" diff --git a/include/timeline/widgets/FileItem.h b/src/timeline/widgets/FileItem.h similarity index 100% rename from include/timeline/widgets/FileItem.h rename to src/timeline/widgets/FileItem.h diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cpp similarity index 99% rename from src/timeline/widgets/ImageItem.cc rename to src/timeline/widgets/ImageItem.cpp index b7adb0fa..19b445db 100644 --- a/src/timeline/widgets/ImageItem.cc +++ b/src/timeline/widgets/ImageItem.cpp @@ -24,11 +24,11 @@ #include #include "Config.h" -#include "Logging.hpp" +#include "ImageItem.h" +#include "Logging.h" #include "MatrixClient.h" #include "Utils.h" #include "dialogs/ImageOverlay.h" -#include "timeline/widgets/ImageItem.h" void ImageItem::downloadMedia(const QUrl &url) diff --git a/include/timeline/widgets/ImageItem.h b/src/timeline/widgets/ImageItem.h similarity index 100% rename from include/timeline/widgets/ImageItem.h rename to src/timeline/widgets/ImageItem.h diff --git a/src/timeline/widgets/VideoItem.cc b/src/timeline/widgets/VideoItem.cpp similarity index 100% rename from src/timeline/widgets/VideoItem.cc rename to src/timeline/widgets/VideoItem.cpp diff --git a/include/timeline/widgets/VideoItem.h b/src/timeline/widgets/VideoItem.h similarity index 100% rename from include/timeline/widgets/VideoItem.h rename to src/timeline/widgets/VideoItem.h diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cpp similarity index 99% rename from src/ui/Avatar.cc rename to src/ui/Avatar.cpp index 2f10db39..4b4cd272 100644 --- a/src/ui/Avatar.cc +++ b/src/ui/Avatar.cpp @@ -1,7 +1,7 @@ #include -#include "Avatar.h" #include "Utils.h" +#include "ui/Avatar.h" Avatar::Avatar(QWidget *parent) : QWidget(parent) diff --git a/include/ui/Avatar.h b/src/ui/Avatar.h similarity index 100% rename from include/ui/Avatar.h rename to src/ui/Avatar.h diff --git a/src/ui/Badge.cc b/src/ui/Badge.cpp similarity index 100% rename from src/ui/Badge.cc rename to src/ui/Badge.cpp diff --git a/include/ui/Badge.h b/src/ui/Badge.h similarity index 100% rename from include/ui/Badge.h rename to src/ui/Badge.h diff --git a/include/ui/DropShadow.h b/src/ui/DropShadow.h similarity index 100% rename from include/ui/DropShadow.h rename to src/ui/DropShadow.h diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cpp similarity index 100% rename from src/ui/FlatButton.cc rename to src/ui/FlatButton.cpp diff --git a/include/ui/FlatButton.h b/src/ui/FlatButton.h similarity index 100% rename from include/ui/FlatButton.h rename to src/ui/FlatButton.h diff --git a/src/ui/FloatingButton.cc b/src/ui/FloatingButton.cpp similarity index 100% rename from src/ui/FloatingButton.cc rename to src/ui/FloatingButton.cpp diff --git a/include/ui/FloatingButton.h b/src/ui/FloatingButton.h similarity index 100% rename from include/ui/FloatingButton.h rename to src/ui/FloatingButton.h diff --git a/src/ui/InfoMessage.cpp b/src/ui/InfoMessage.cpp index b150e61b..3151bedf 100644 --- a/src/ui/InfoMessage.cpp +++ b/src/ui/InfoMessage.cpp @@ -1,5 +1,5 @@ +#include "InfoMessage.h" #include "Config.h" -#include "InfoMessage.hpp" #include #include diff --git a/include/ui/InfoMessage.hpp b/src/ui/InfoMessage.h similarity index 100% rename from include/ui/InfoMessage.hpp rename to src/ui/InfoMessage.h diff --git a/src/ui/Label.cc b/src/ui/Label.cpp similarity index 100% rename from src/ui/Label.cc rename to src/ui/Label.cpp diff --git a/include/ui/Label.h b/src/ui/Label.h similarity index 100% rename from include/ui/Label.h rename to src/ui/Label.h diff --git a/src/ui/LoadingIndicator.cc b/src/ui/LoadingIndicator.cpp similarity index 100% rename from src/ui/LoadingIndicator.cc rename to src/ui/LoadingIndicator.cpp diff --git a/include/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h similarity index 100% rename from include/ui/LoadingIndicator.h rename to src/ui/LoadingIndicator.h diff --git a/include/ui/Menu.h b/src/ui/Menu.h similarity index 100% rename from include/ui/Menu.h rename to src/ui/Menu.h diff --git a/src/ui/OverlayModal.cc b/src/ui/OverlayModal.cpp similarity index 100% rename from src/ui/OverlayModal.cc rename to src/ui/OverlayModal.cpp diff --git a/include/ui/OverlayModal.h b/src/ui/OverlayModal.h similarity index 100% rename from include/ui/OverlayModal.h rename to src/ui/OverlayModal.h diff --git a/src/ui/OverlayWidget.cc b/src/ui/OverlayWidget.cpp similarity index 100% rename from src/ui/OverlayWidget.cc rename to src/ui/OverlayWidget.cpp diff --git a/include/ui/OverlayWidget.h b/src/ui/OverlayWidget.h similarity index 100% rename from include/ui/OverlayWidget.h rename to src/ui/OverlayWidget.h diff --git a/include/ui/Painter.h b/src/ui/Painter.h similarity index 100% rename from include/ui/Painter.h rename to src/ui/Painter.h diff --git a/src/ui/RaisedButton.cc b/src/ui/RaisedButton.cpp similarity index 100% rename from src/ui/RaisedButton.cc rename to src/ui/RaisedButton.cpp diff --git a/include/ui/RaisedButton.h b/src/ui/RaisedButton.h similarity index 100% rename from include/ui/RaisedButton.h rename to src/ui/RaisedButton.h diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cpp similarity index 100% rename from src/ui/Ripple.cc rename to src/ui/Ripple.cpp diff --git a/include/ui/Ripple.h b/src/ui/Ripple.h similarity index 100% rename from include/ui/Ripple.h rename to src/ui/Ripple.h diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cpp similarity index 100% rename from src/ui/RippleOverlay.cc rename to src/ui/RippleOverlay.cpp diff --git a/include/ui/RippleOverlay.h b/src/ui/RippleOverlay.h similarity index 100% rename from include/ui/RippleOverlay.h rename to src/ui/RippleOverlay.h diff --git a/src/ui/ScrollBar.cc b/src/ui/ScrollBar.cpp similarity index 100% rename from src/ui/ScrollBar.cc rename to src/ui/ScrollBar.cpp diff --git a/include/ui/ScrollBar.h b/src/ui/ScrollBar.h similarity index 100% rename from include/ui/ScrollBar.h rename to src/ui/ScrollBar.h diff --git a/src/ui/SnackBar.cc b/src/ui/SnackBar.cpp similarity index 100% rename from src/ui/SnackBar.cc rename to src/ui/SnackBar.cpp diff --git a/include/ui/SnackBar.h b/src/ui/SnackBar.h similarity index 100% rename from include/ui/SnackBar.h rename to src/ui/SnackBar.h diff --git a/src/ui/TextField.cc b/src/ui/TextField.cpp similarity index 100% rename from src/ui/TextField.cc rename to src/ui/TextField.cpp diff --git a/include/ui/TextField.h b/src/ui/TextField.h similarity index 100% rename from include/ui/TextField.h rename to src/ui/TextField.h diff --git a/src/ui/Theme.cc b/src/ui/Theme.cpp similarity index 100% rename from src/ui/Theme.cc rename to src/ui/Theme.cpp diff --git a/include/ui/Theme.h b/src/ui/Theme.h similarity index 100% rename from include/ui/Theme.h rename to src/ui/Theme.h diff --git a/src/ui/ThemeManager.cc b/src/ui/ThemeManager.cpp similarity index 100% rename from src/ui/ThemeManager.cc rename to src/ui/ThemeManager.cpp diff --git a/include/ui/ThemeManager.h b/src/ui/ThemeManager.h similarity index 100% rename from include/ui/ThemeManager.h rename to src/ui/ThemeManager.h diff --git a/src/ui/ToggleButton.cc b/src/ui/ToggleButton.cpp similarity index 100% rename from src/ui/ToggleButton.cc rename to src/ui/ToggleButton.cpp diff --git a/include/ui/ToggleButton.h b/src/ui/ToggleButton.h similarity index 100% rename from include/ui/ToggleButton.h rename to src/ui/ToggleButton.h