octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4831 from wwylele/multiplayer-Wreorder 

citra_qt/multiplayer: silent Wreorder warnings
This commit is contained in:
Pengfei Zhu 2019-07-15 07:26:04 +08:00 committed by GitHub
parent e689847b11 9c2fe1eae8
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();
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;
QStandardItemModel* game_list;
ComboBoxProxyModel* proxy;
std::unique_ptr<Ui::HostRoom> ui;
Validation validation;
};

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

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