piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: Namespace NetPlay utilities under the NetPlay namespace

Browse Source 
Previously there was only one function under the NetPlay namespace,
which is kind of silly considering we have all of these other types
and functions existing outside of the namespace.

This moves the rest of them into the namespace.

This gets some general names, like Player, for example, out of the global namespace.
This commit is contained in:
Lioncash
2018-07-06 19:39:42 -04:00
parent 3d1a7737d8
commit 675260b0f7
17 changed files with 119 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinQt/NetPlay/PadMappingDialog.h
View File

@ -8,12 +8,15 @@
#include "Core/NetPlayProto.h"
class NetPlayClient;
class Player;
class QGridLayout;
class QComboBox;
class QDialogButtonBox;
namespace NetPlay
{
class Player;
}
class PadMappingDialog : public QDialog
{
Q_OBJECT
@ -22,8 +25,8 @@ public:
int exec() override;
PadMappingArray GetGCPadArray();
PadMappingArray GetWiimoteArray();
NetPlay::PadMappingArray GetGCPadArray();
NetPlay::PadMappingArray GetWiimoteArray();
private:
void CreateWidgets();
@ -31,12 +34,12 @@ private:
void OnMappingChanged();
PadMappingArray m_pad_mapping;
PadMappingArray m_wii_mapping;
NetPlay::PadMappingArray m_pad_mapping;
NetPlay::PadMappingArray m_wii_mapping;
QGridLayout* m_main_layout;
std::array<QComboBox*, 4> m_gc_boxes;
std::array<QComboBox*, 4> m_wii_boxes;
std::vector<const Player*> m_players;
std::vector<const NetPlay::Player*> m_players;
QDialogButtonBox* m_button_box;
};