mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4831 from wwylele/multiplayer-Wreorder

Browse source 
citra_qt/multiplayer: silent Wreorder warnings
This commit is contained in:
Pengfei Zhu 2019-07-15 07:26:04 +08:00 committed by GitHub
commit 6b916a22c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/multiplayer/host_room.h
View file

@ -49,10 +49,10 @@ private:
void Host(); void Host();
std::unique_ptr<Network::VerifyUser::Backend> CreateVerifyBackend(bool use_validation) const; std::unique_ptr<Network::VerifyUser::Backend> CreateVerifyBackend(bool use_validation) const;
std::unique_ptr<Ui::HostRoom> ui;
std::weak_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session; std::weak_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session;
QStandardItemModel* game_list; QStandardItemModel* game_list;
ComboBoxProxyModel* proxy; ComboBoxProxyModel* proxy;
std::unique_ptr<Ui::HostRoom> ui;
Validation validation; Validation validation;
}; };

3
src/citra_qt/multiplayer/lobby.h
View file

@ -81,13 +81,14 @@ private:
*/ */
QString PasswordPrompt(); QString PasswordPrompt();
std::unique_ptr<Ui::Lobby> ui;
QStandardItemModel* model{}; QStandardItemModel* model{};
QStandardItemModel* game_list{}; QStandardItemModel* game_list{};
LobbyFilterProxyModel* proxy{}; LobbyFilterProxyModel* proxy{};
QFutureWatcher<AnnounceMultiplayerRoom::RoomList> room_list_watcher; QFutureWatcher<AnnounceMultiplayerRoom::RoomList> room_list_watcher;
std::weak_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session; std::weak_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session;
std::unique_ptr<Ui::Lobby> ui;
QFutureWatcher<void>* watcher; QFutureWatcher<void>* watcher;
Validation validation; Validation validation;
}; };