Clean up headers

include/AvatarProvider.h

@@ -18,12 +18,11 @@
 #pragma once
 
 #include <QImage>
-#include <QObject>
 #include <QSharedPointer>
 #include <QUrl>
 
-#include "MatrixClient.h"
+class MatrixClient;
-#include "TimelineItem.h"
+class TimelineItem;
 
 class AvatarProvider : public QObject
 {

include/Cache.h

@@ -20,7 +20,7 @@
 #include <QDir>
 #include <lmdb++.h>
 
-#include "RoomState.h"
+class RoomState;
 
 class Cache
 {

include/ChatPage.h

@@ -17,23 +17,27 @@
 
 #pragma once
 
+#include <QHBoxLayout>
+#include <QMap>
 #include <QPixmap>
 #include <QTimer>
 #include <QWidget>
 
-#include "Cache.h"
+class Cache;
-#include "MatrixClient.h"
+class MatrixClient;
-#include "QuickSwitcher.h"
+class OverlayModal;
-#include "RoomList.h"
+class QuickSwitcher;
-#include "RoomSettings.h"
+class RoomList;
-#include "RoomState.h"
+class RoomSettings;
-#include "SideBarActions.h"
+class RoomState;
-#include "Splitter.h"
+class SideBarActions;
-#include "TextInputWidget.h"
+class Splitter;
-#include "TimelineViewManager.h"
+class SyncResponse;
-#include "TopRoomBar.h"
+class TextInputWidget;
-#include "TypingDisplay.h"
+class TimelineViewManager;
-#include "UserInfoWidget.h"
+class TopRoomBar;
+class TypingDisplay;
+class UserInfoWidget;
 
 constexpr int CONSENSUS_TIMEOUT    = 1000;
 constexpr int SHOW_CONTENT_TIMEOUT = 3000;

include/Deserializable.h

@@ -21,7 +21,6 @@
 
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonValue>
 
 class DeserializationException : public std::exception
 {

include/EmojiCategory.h

@@ -17,15 +17,14 @@
 
 #pragma once
 
-#include <QHBoxLayout>
 #include <QLabel>
+#include <QLayout>
 #include <QListView>
 #include <QStandardItemModel>
-#include <QVBoxLayout>
-#include <QWidget>
 
 #include "EmojiItemDelegate.h"
-#include "EmojiProvider.h"
+
+class EmojiProvider;
 
 class EmojiCategory : public QWidget
 {

include/EmojiPanel.h

@@ -20,11 +20,11 @@
 #include <QGraphicsOpacityEffect>
 #include <QPropertyAnimation>
 #include <QScrollArea>
-#include <QWidget>
 
-#include "EmojiCategory.h"
 #include "EmojiProvider.h"
 
+class EmojiCategory;
+
 class EmojiPanel : public QWidget
 {
         Q_OBJECT

include/EmojiPickButton.h

@@ -20,9 +20,10 @@
 #include <QEvent>
 #include <QWidget>
 
-#include "EmojiPanel.h"
 #include "FlatButton.h"
 
+class EmojiPanel;
+
 class EmojiPickButton : public FlatButton
 {
         Q_OBJECT

include/EmojiProvider.h

@@ -17,9 +17,7 @@
 
 #pragma once
 
-#include <QFile>
 #include <QList>
-#include <QMap>
 
 struct Emoji
 {

include/ImageItem.h

@@ -24,6 +24,7 @@
 
 #include "Image.h"
 #include "MatrixClient.h"
+#include "MessageEvent.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;

include/InputValidator.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <QRegExp>
 #include <QRegExpValidator>
 
 class InputValidator

include/JoinRoomDialog.h

@@ -3,7 +3,7 @@
 #include <QFrame>
 #include <QLineEdit>
 
-#include "FlatButton.h"
+class FlatButton;
 
 class JoinRoomDialog : public QFrame
 {

include/LeaveRoomDialog.h

@@ -2,7 +2,7 @@
 
 #include <QFrame>
 
-#include "FlatButton.h"
+class FlatButton;
 
 class LeaveRoomDialog : public QFrame
 {

include/LoginPage.h

@@ -17,18 +17,17 @@
 
 #pragma once
 
-#include <QHBoxLayout>
 #include <QLabel>
+#include <QLayout>
 #include <QSharedPointer>
-#include <QVBoxLayout>
 #include <QWidget>
 
-#include "FlatButton.h"
+class FlatButton;
-#include "LoadingIndicator.h"
+class LoadingIndicator;
-#include "MatrixClient.h"
+class MatrixClient;
-#include "OverlayModal.h"
+class OverlayModal;
-#include "RaisedButton.h"
+class RaisedButton;
-#include "TextField.h"
+class TextField;
 
 class LoginPage : public QWidget
 {

include/LogoutDialog.h

@@ -19,7 +19,7 @@
 
 #include <QFrame>
 
-#include "FlatButton.h"
+class FlatButton;
 
 class LogoutDialog : public QFrame
 {

include/MainWindow.h

@@ -19,16 +19,18 @@
 
 #include <QMainWindow>
 #include <QSharedPointer>
+#include <QStackedWidget>
+#include <QSystemTrayIcon>
 
-#include "ChatPage.h"
+class ChatPage;
-#include "LoadingIndicator.h"
+class LoadingIndicator;
-#include "LoginPage.h"
+class LoginPage;
-#include "MatrixClient.h"
+class MatrixClient;
-#include "OverlayModal.h"
+class OverlayModal;
-#include "RegisterPage.h"
+class RegisterPage;
-#include "SnackBar.h"
+class SnackBar;
-#include "TrayIcon.h"
+class TrayIcon;
-#include "WelcomePage.h"
+class WelcomePage;
 
 class MainWindow : public QMainWindow
 {

include/MatrixClient.h

@@ -17,12 +17,13 @@
 
 #pragma once
 
-#include <QtNetwork/QNetworkAccessManager>
+#include <QNetworkAccessManager>
 
 #include "MessageEvent.h"
-#include "Profile.h"
+
-#include "RoomMessages.h"
+class SyncResponse;
-#include "Sync.h"
+class Profile;
+class RoomMessages;
 
 /*
  * MatrixClient provides the high level API to communicate with

include/Profile.h

@@ -20,7 +20,7 @@
 #include <QJsonDocument>
 #include <QUrl>
 
-#include "Deserializable.h"
+class Deserializable;
 
 class ProfileResponse : public Deserializable
 {

include/Register.h

@@ -19,7 +19,7 @@
 
 #include <QJsonDocument>
 
-#include "Deserializable.h"
+class Deserializable;
 
 class RegisterRequest
 {

include/RegisterPage.h

@@ -17,17 +17,15 @@
 
 #pragma once
 
-#include <QHBoxLayout>
 #include <QLabel>
+#include <QLayout>
 #include <QSharedPointer>
-#include <QVBoxLayout>
-#include <QWidget>
 
-#include "Avatar.h"
+class Avatar;
-#include "FlatButton.h"
+class FlatButton;
-#include "MatrixClient.h"
+class MatrixClient;
-#include "RaisedButton.h"
+class RaisedButton;
-#include "TextField.h"
+class TextField;
 
 class RegisterPage : public QWidget
 {

include/RoomInfoListItem.h

@@ -21,11 +21,12 @@
 #include <QSharedPointer>
 #include <QWidget>
 
-#include "Menu.h"
-#include "RippleOverlay.h"
-#include "RoomSettings.h"
 #include "RoomState.h"
 
+class Menu;
+class RippleOverlay;
+class RoomSettings;
+
 struct DescInfo
 {
         QString username;

include/RoomList.h

@@ -17,19 +17,22 @@
 
 #pragma once
 
+#include <QMap>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSharedPointer>
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "JoinRoomDialog.h"
+class JoinRoomDialog;
-#include "LeaveRoomDialog.h"
+class LeaveRoomDialog;
-#include "MatrixClient.h"
+class MatrixClient;
-#include "OverlayModal.h"
+class OverlayModal;
-#include "RoomInfoListItem.h"
+class RoomInfoListItem;
-#include "RoomState.h"
+class RoomSettings;
-#include "Sync.h"
+class RoomState;
+class Sync;
+struct DescInfo;
 
 class RoomList : public QWidget
 {

include/SideBarActions.h

@@ -1,7 +1,10 @@
+#pragma once
+
 #include <QHBoxLayout>
 #include <QResizeEvent>
+#include <QWidget>
 
-#include <FlatButton.h>
+#include "FlatButton.h"
 
 class SideBarActions : public QWidget
 {

include/Sync.h

@@ -18,9 +18,7 @@
 #pragma once
 
 #include <QJsonArray>
-#include <QJsonDocument>
 #include <QMap>
-#include <QString>
 
 #include "Deserializable.h"
 

include/TimelineItem.h

@@ -19,12 +19,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QWidget>
 
-#include "ImageItem.h"
-#include "Sync.h"
-
-#include "Avatar.h"
 #include "Emote.h"
 #include "Image.h"
 #include "MessageEvent.h"
@@ -32,6 +27,9 @@
 #include "RoomInfoListItem.h"
 #include "Text.h"
 
+class ImageItem;
+class Avatar;
+
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;
 

include/TimelineView.h

@@ -17,24 +17,23 @@
 
 #pragma once
 
-#include <QHBoxLayout>
+#include <QLayout>
 #include <QList>
 #include <QScrollArea>
-#include <QVBoxLayout>
-#include <QWidget>
-
-#include "ScrollBar.h"
-#include "Sync.h"
-#include "TimelineItem.h"
 
 #include "Emote.h"
 #include "Image.h"
 #include "MessageEvent.h"
 #include "Notice.h"
-#include "RoomInfoListItem.h"
 #include "Text.h"
 
 class FloatingButton;
+class MatrixClient;
+class RoomMessages;
+class ScrollBar;
+class Timeline;
+class TimelineItem;
+struct DescInfo;
 
 namespace msgs   = matrix::events::messages;
 namespace events = matrix::events;

include/TimelineViewManager.h

@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include <QDebug>
+#include <QMap>
 #include <QSharedPointer>
 #include <QStackedWidget>
-#include <QWidget>
 
-#include "MatrixClient.h"
+class JoinedRoom;
-#include "MessageEvent.h"
+class MatrixClient;
-#include "RoomInfoListItem.h"
+class RoomInfoListItem;
-#include "Sync.h"
+class Rooms;
-#include "TimelineView.h"
+class TimelineView;
+struct DescInfo;
 
 class TimelineViewManager : public QStackedWidget
 {

include/TopRoomBar.h

@@ -18,22 +18,21 @@
 #pragma once
 
 #include <QAction>
-#include <QDebug>
 #include <QIcon>
 #include <QImage>
 #include <QLabel>
+#include <QMenu>
 #include <QPaintEvent>
 #include <QSharedPointer>
 #include <QVBoxLayout>
-#include <QWidget>
 
-#include "Avatar.h"
+class Avatar;
-#include "FlatButton.h"
+class FlatButton;
-#include "Label.h"
+class Label;
-#include "LeaveRoomDialog.h"
+class LeaveRoomDialog;
-#include "Menu.h"
+class Menu;
-#include "OverlayModal.h"
+class OverlayModal;
-#include "RoomSettings.h"
+class RoomSettings;
 
 static const QString URL_HTML = "<a href=\"\\1\" style=\"color: #333333\">\\1</a>";
 static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");

include/TrayIcon.h

@@ -20,7 +20,6 @@
 #include <QAction>
 #include <QIcon>
 #include <QIconEngine>
-#include <QMenu>
 #include <QPainter>
 #include <QRect>
 #include <QSystemTrayIcon>

include/UserInfoWidget.h

@@ -17,15 +17,13 @@
 
 #pragma once
 
-#include <QtWidgets/QHBoxLayout>
+#include <QLabel>
-#include <QtWidgets/QLabel>
+#include <QLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
 
-#include "Avatar.h"
+class Avatar;
-#include "FlatButton.h"
+class FlatButton;
-#include "LogoutDialog.h"
+class LogoutDialog;
-#include "OverlayModal.h"
+class OverlayModal;
 
 class UserInfoWidget : public QWidget
 {

include/Versions.h

@@ -20,7 +20,7 @@
 #include <QJsonDocument>
 #include <QVector>
 
-#include "Deserializable.h"
+class Deserializable;
 
 class VersionsResponse : public Deserializable
 {

include/WelcomePage.h

@@ -17,7 +17,9 @@
 
 #pragma once
 
-#include "RaisedButton.h"
+#include <QWidget>
+
+class RaisedButton;
 
 class WelcomePage : public QWidget
 {

include/ui/FlatButton.h

@@ -5,9 +5,9 @@
 #include <QPushButton>
 #include <QStateMachine>
 
-#include "RippleOverlay.h"
 #include "Theme.h"
 
+class RippleOverlay;
 class FlatButton;
 
 class FlatButtonStateMachine : public QStateMachine

src/AvatarProvider.cc

@@ -16,6 +16,8 @@
  */
 
 #include "AvatarProvider.h"
+#include "MatrixClient.h"
+#include "TimelineItem.h"
 
 QSharedPointer<MatrixClient> AvatarProvider::client_;
 

src/Cache.cc

@@ -18,12 +18,12 @@
 #include <stdexcept>
 
 #include <QDebug>
-#include <QDir>
 #include <QFile>
 #include <QStandardPaths>
 
 #include "Cache.h"
 #include "MemberEventContent.h"
+#include "RoomState.h"
 
 namespace events = matrix::events;
 

src/ChatPage.cc

@@ -21,16 +21,26 @@
 #include <QtConcurrent>
 
 #include "AvatarProvider.h"
+#include "Cache.h"
 #include "ChatPage.h"
 #include "MainWindow.h"
+#include "MatrixClient.h"
+#include "OverlayModal.h"
+#include "QuickSwitcher.h"
+#include "RoomList.h"
+#include "RoomSettings.h"
+#include "RoomState.h"
+#include "SideBarActions.h"
 #include "Splitter.h"
+#include "StateEvent.h"
 #include "Sync.h"
+#include "TextInputWidget.h"
 #include "Theme.h"
 #include "TimelineViewManager.h"
+#include "TopRoomBar.h"
+#include "TypingDisplay.h"
 #include "UserInfoWidget.h"
 
-#include "StateEvent.h"
-
 constexpr int MAX_INITIAL_SYNC_FAILURES = 5;
 constexpr int SYNC_RETRY_TIMEOUT        = 10000;
 

src/Deserializable.cc

@@ -15,10 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-
 #include "Deserializable.h"
 
 DeserializationException::DeserializationException(const std::string &msg)

src/EmojiCategory.cc

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QScrollBar>
 
 #include "Config.h"

src/EmojiPanel.cc

@@ -16,11 +16,9 @@
  */
 
 #include <QPushButton>
-#include <QScrollArea>
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include "Avatar.h"
 #include "DropShadow.h"
 #include "EmojiCategory.h"
 #include "EmojiPanel.h"

src/EmojiPickButton.cc

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

src/EmojiProvider.cc

@@ -16,11 +16,6 @@
  */
 
 #include <QByteArray>
-#include <QDebug>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
 
 #include "EmojiProvider.h"
 

src/ImageItem.cc

@@ -19,7 +19,6 @@
 #include <QDebug>
 #include <QDesktopServices>
 #include <QFileInfo>
-#include <QImage>
 #include <QPainter>
 #include <QPixmap>
 

src/ImageOverlayDialog.cc

@@ -16,11 +16,8 @@
  */
 
 #include <QApplication>
-#include <QDebug>
 #include <QDesktopWidget>
 #include <QPainter>
-#include <QScreen>
-#include <QTimer>
 
 #include "ImageOverlayDialog.h"
 

src/JoinRoomDialog.cc

@@ -2,6 +2,7 @@
 #include <QVBoxLayout>
 
 #include "Config.h"
+#include "FlatButton.h"
 #include "JoinRoomDialog.h"
 #include "Theme.h"
 

src/LeaveRoomDialog.cc

@@ -2,6 +2,7 @@
 #include <QVBoxLayout>
 
 #include "Config.h"
+#include "FlatButton.h"
 #include "LeaveRoomDialog.h"
 #include "Theme.h"
 

src/Login.cc

@@ -15,10 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-
 #include "Deserializable.h"
 #include "Login.h"
 

src/LoginPage.cc

@@ -15,11 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
-
 #include "Config.h"
+#include "FlatButton.h"
 #include "InputValidator.h"
+#include "LoadingIndicator.h"
 #include "LoginPage.h"
+#include "MatrixClient.h"
+#include "OverlayModal.h"
+#include "RaisedButton.h"
+#include "TextField.h"
 
 LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
   : QWidget(parent)

src/LogoutDialog.cc

@@ -19,6 +19,7 @@
 #include <QVBoxLayout>
 
 #include "Config.h"
+#include "FlatButton.h"
 #include "LogoutDialog.h"
 #include "Theme.h"
 

src/MainWindow.cc

@@ -15,15 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MainWindow.h"
-#include "Config.h"
-
 #include <QApplication>
 #include <QLayout>
 #include <QNetworkReply>
 #include <QSettings>
 #include <QShortcut>
-#include <QSystemTrayIcon>
+
+#include "ChatPage.h"
+#include "Config.h"
+#include "LoadingIndicator.h"
+#include "LoginPage.h"
+#include "MainWindow.h"
+#include "MatrixClient.h"
+#include "OverlayModal.h"
+#include "RegisterPage.h"
+#include "SnackBar.h"
+#include "TrayIcon.h"
+#include "WelcomePage.h"
 
 MainWindow *MainWindow::instance_ = nullptr;
 

src/MatrixClient.cc

@@ -30,8 +30,11 @@
 
 #include "Login.h"
 #include "MatrixClient.h"
+#include "MessageEvent.h"
 #include "Profile.h"
 #include "Register.h"
+#include "RoomMessages.h"
+#include "Sync.h"
 #include "Versions.h"
 
 MatrixClient::MatrixClient(QString server, QObject *parent)

src/Profile.cc

@@ -15,10 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QUrl>
-
 #include "Deserializable.h"
 #include "Profile.h"
 

src/QuickSwitcher.cc

@@ -16,7 +16,6 @@
  */
 
 #include <QCompleter>
-#include <QDebug>
 #include <QStringListModel>
 #include <QTimer>
 

src/Register.cc

@@ -15,10 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-
 #include "Deserializable.h"
 #include "Register.h"
 

src/RegisterPage.cc

@@ -15,12 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
+#include "Avatar.h"
-#include <QToolTip>
-
 #include "Config.h"
+#include "FlatButton.h"
 #include "InputValidator.h"
+#include "MatrixClient.h"
+#include "RaisedButton.h"
 #include "RegisterPage.h"
+#include "TextField.h"
 
 RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
   : QWidget(parent)

src/RoomInfoListItem.cc

@@ -15,14 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QMouseEvent>
 #include <QPainter>
 
 #include "Config.h"
+#include "Menu.h"
 #include "Ripple.h"
+#include "RippleOverlay.h"
 #include "RoomInfoListItem.h"
-#include "RoomState.h"
+#include "RoomSettings.h"
 #include "Theme.h"
 
 RoomInfoListItem::RoomInfoListItem(QSharedPointer<RoomSettings> settings,

src/RoomList.cc

@@ -16,12 +16,16 @@
  */
 
 #include <QDebug>
-#include <QJsonArray>
-#include <QRegularExpression>
 
+#include "JoinRoomDialog.h"
+#include "LeaveRoomDialog.h"
 #include "MainWindow.h"
+#include "MatrixClient.h"
+#include "OverlayModal.h"
 #include "RoomInfoListItem.h"
 #include "RoomList.h"
+#include "RoomSettings.h"
+#include "RoomState.h"
 #include "Sync.h"
 
 RoomList::RoomList(QSharedPointer<MatrixClient> client, QWidget *parent)

src/RoomState.cc

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QJsonArray>
 #include <QSettings>
 

src/SideBarActions.cc

@@ -1,9 +1,8 @@
-#include <QDebug>
 #include <QIcon>
 
 #include "Config.h"
+#include "SideBarActions.h"
 #include "Theme.h"
-#include <SideBarActions.h>
 
 SideBarActions::SideBarActions(QWidget *parent)
   : QWidget{ parent }

src/Sync.cc

@@ -16,12 +16,7 @@
  */
 
 #include <QDebug>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
 
-#include "Deserializable.h"
 #include "Sync.h"
 
 void

src/TimelineItem.cc

@@ -16,14 +16,16 @@
  */
 
 #include <QDateTime>
-#include <QDebug>
 #include <QFontDatabase>
 #include <QRegExp>
+#include <QSettings>
 #include <QTextEdit>
 
+#include "Avatar.h"
 #include "AvatarProvider.h"
 #include "Config.h"
 #include "ImageItem.h"
+#include "Sync.h"
 #include "TimelineItem.h"
 #include "TimelineViewManager.h"
 

src/TimelineView.cc

@@ -17,21 +17,16 @@
 
 #include <QApplication>
 #include <QDebug>
-#include <QJsonArray>
-#include <QScrollBar>
 #include <QSettings>
-#include <QtWidgets/QLabel>
+#include <QTimer>
-#include <QtWidgets/QSpacerItem>
-
-#include "Event.h"
-#include "MessageEvent.h"
-#include "MessageEventContent.h"
 
 #include "FloatingButton.h"
 #include "ImageItem.h"
+#include "RoomMessages.h"
+#include "ScrollBar.h"
+#include "Sync.h"
 #include "TimelineItem.h"
 #include "TimelineView.h"
-#include "TimelineViewManager.h"
 
 namespace events = matrix::events;
 namespace msgs   = matrix::events::messages;

src/TimelineViewManager.cc

@@ -21,9 +21,9 @@
 #include <QDebug>
 #include <QFileInfo>
 #include <QSettings>
-#include <QStackedWidget>
-#include <QWidget>
 
+#include "MatrixClient.h"
+#include "Sync.h"
 #include "TimelineView.h"
 #include "TimelineViewManager.h"
 

src/TopRoomBar.cc

@@ -17,8 +17,15 @@
 
 #include <QStyleOption>
 
+#include "Avatar.h"
 #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"
 
 TopRoomBar::TopRoomBar(QWidget *parent)

src/TrayIcon.cc

@@ -17,6 +17,7 @@
 
 #include <QApplication>
 #include <QList>
+#include <QMenu>
 #include <QTimer>
 
 #include "TrayIcon.h"

src/TypingDisplay.cc

@@ -1,4 +1,3 @@
-#include <QDebug>
 #include <QPainter>
 #include <QPoint>
 

src/UserInfoWidget.cc

@@ -15,12 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QTimer>
 
+#include "Avatar.h"
 #include "Config.h"
 #include "FlatButton.h"
+#include "LogoutDialog.h"
 #include "MainWindow.h"
+#include "OverlayModal.h"
 #include "UserInfoWidget.h"
 
 UserInfoWidget::UserInfoWidget(QWidget *parent)

src/Versions.cc

@@ -16,9 +16,6 @@
  */
 
 #include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
 #include <QRegExp>
 
 #include "Deserializable.h"

src/WelcomePage.cc

@@ -19,6 +19,7 @@
 #include <QLayout>
 
 #include "Config.h"
+#include "RaisedButton.h"
 #include "WelcomePage.h"
 
 WelcomePage::WelcomePage(QWidget *parent)

src/main.cc

@@ -19,6 +19,7 @@
 #include <QDesktopWidget>
 #include <QFontDatabase>
 #include <QLibraryInfo>
+#include <QSettings>
 #include <QTranslator>
 
 #include "MainWindow.h"

src/ui/Avatar.cc

@@ -1,6 +1,4 @@
-#include <QIcon>
 #include <QPainter>
-#include <QWidget>
 
 #include "Avatar.h"
 

src/ui/LoadingIndicator.cc

@@ -1,6 +1,5 @@
 #include "LoadingIndicator.h"
 
-#include <QDebug>
 #include <QPoint>
 #include <QtGlobal>
 

src/ui/OverlayModal.cc

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QPainter>
 #include <QVBoxLayout>