summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2018-07-09 00:38:12 -0400
committerGitHub <noreply@github.com>2018-07-09 00:38:12 -0400
commit9487892c18574730fbcfe033b690f831ec06d262 (patch)
treecba3c67f4132525363283da1241ef7a80f44b2b9 /Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
parent8c97fb7cd4b165bc871c727faa249251b2ce8b5f (diff)
parent675260b0f7b164dca59d2888ee2c58a921ca02c1 (diff)
Merge pull request #7226 from lioncash/netplay
Core: Namespace NetPlay utilities under the NetPlay namespace
Diffstat (limited to 'Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
index f526546d1a..a01c2c53c8 100644
--- a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
@@ -94,12 +94,13 @@ int PadMappingDialog::exec()
return QDialog::exec();
}
-PadMappingArray PadMappingDialog::GetGCPadArray()
+
+NetPlay::PadMappingArray PadMappingDialog::GetGCPadArray()
{
return m_pad_mapping;
}
-PadMappingArray PadMappingDialog::GetWiimoteArray()
+NetPlay::PadMappingArray PadMappingDialog::GetWiimoteArray()
{
return m_wii_mapping;
}