diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp index 36f15ba6b..877c99af4 100644 --- a/src/citra_qt/multiplayer/chat_room.cpp +++ b/src/citra_qt/multiplayer/chat_room.cpp @@ -16,7 +16,6 @@ #include "citra_qt/multiplayer/message.h" #include "common/logging/log.h" #include "core/announce_multiplayer_session.h" -#include "ui_chat_room.h" class ChatMessage { public: diff --git a/src/citra_qt/multiplayer/chat_room.h b/src/citra_qt/multiplayer/chat_room.h index 0683b7a69..440860459 100644 --- a/src/citra_qt/multiplayer/chat_room.h +++ b/src/citra_qt/multiplayer/chat_room.h @@ -10,10 +10,7 @@ #include #include #include "network/network.h" - -namespace Ui { -class ChatRoom; -} // namespace Ui +#include "ui_chat_room.h" namespace Core { class AnnounceMultiplayerSession; diff --git a/src/citra_qt/multiplayer/client_room.cpp b/src/citra_qt/multiplayer/client_room.cpp index 243b8adef..2fff32275 100644 --- a/src/citra_qt/multiplayer/client_room.cpp +++ b/src/citra_qt/multiplayer/client_room.cpp @@ -15,7 +15,6 @@ #include "citra_qt/multiplayer/message.h" #include "common/logging/log.h" #include "core/announce_multiplayer_session.h" -#include "ui_client_room.h" ClientRoomWindow::ClientRoomWindow(QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), diff --git a/src/citra_qt/multiplayer/client_room.h b/src/citra_qt/multiplayer/client_room.h index a09212810..f235c4b77 100644 --- a/src/citra_qt/multiplayer/client_room.h +++ b/src/citra_qt/multiplayer/client_room.h @@ -5,10 +5,7 @@ #pragma once #include "citra_qt/multiplayer/chat_room.h" - -namespace Ui { -class ClientRoom; -} +#include "ui_client_room.h" class ClientRoomWindow : public QDialog { Q_OBJECT diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index 218916f68..d623054dd 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -17,7 +17,6 @@ #include "citra_qt/ui_settings.h" #include "core/settings.h" #include "network/network.h" -#include "ui_direct_connect.h" enum class ConnectionType : u8 { TraversalServer, IP }; diff --git a/src/citra_qt/multiplayer/direct_connect.h b/src/citra_qt/multiplayer/direct_connect.h index c824cb557..86259dc3b 100644 --- a/src/citra_qt/multiplayer/direct_connect.h +++ b/src/citra_qt/multiplayer/direct_connect.h @@ -7,10 +7,7 @@ #include #include #include - -namespace Ui { -class DirectConnect; -} +#include "ui_direct_connect.h" class DirectConnectWindow : public QDialog { Q_OBJECT diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 8a3cd3d9f..e8fbd44f8 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -20,8 +20,6 @@ #include "common/logging/log.h" #include "core/announce_multiplayer_session.h" #include "core/settings.h" -#include "ui_chat_room.h" -#include "ui_host_room.h" HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list, std::shared_ptr session) diff --git a/src/citra_qt/multiplayer/host_room.h b/src/citra_qt/multiplayer/host_room.h index 64e6c0ab8..53362ddba 100644 --- a/src/citra_qt/multiplayer/host_room.h +++ b/src/citra_qt/multiplayer/host_room.h @@ -11,10 +11,7 @@ #include #include "citra_qt/multiplayer/chat_room.h" #include "network/network.h" - -namespace Ui { -class HostRoom; -} // namespace Ui +#include "ui_host_room.h" namespace Core { class AnnounceMultiplayerSession; diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index 66632cdcc..e4522af22 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -17,7 +17,6 @@ #include "common/logging/log.h" #include "core/settings.h" #include "network/network.h" -#include "ui_lobby.h" Lobby::Lobby(QWidget* parent, QStandardItemModel* list, std::shared_ptr session) diff --git a/src/citra_qt/multiplayer/lobby.h b/src/citra_qt/multiplayer/lobby.h index c02febf57..80c81a3a0 100644 --- a/src/citra_qt/multiplayer/lobby.h +++ b/src/citra_qt/multiplayer/lobby.h @@ -13,10 +13,7 @@ #include "common/announce_multiplayer_room.h" #include "core/announce_multiplayer_session.h" #include "network/network.h" - -namespace Ui { -class Lobby; -} +#include "ui_lobby.h" class LobbyModel; class LobbyFilterProxyModel;