From 0a15aaaa123482ecf7b2490a13e33a884416d51c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 6 Jul 2016 20:33:05 +0200 Subject: Move DiscIO enums to a new file At first there weren't many enums in Volume.h, but the number has been growing, and I'm planning to add one more for regions. To not make Volume.h too large, and to avoid needing to include Volume.h in code that doesn't use volume objects, I'm moving the enums to a new file. I'm also turning them into enum classes while I'm at it. --- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/NetPlay/NetWindow.cpp') diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 4f41921cca..c1c5881db2 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -34,6 +34,8 @@ #include "Core/NetPlayProto.h" #include "Core/NetPlayServer.h" +#include "DiscIO/Enums.h" + #include "DolphinWX/Frame.h" #include "DolphinWX/GameListCtrl.h" #include "DolphinWX/ISOFile.h" @@ -69,7 +71,7 @@ static wxString FailureReasonStringForHostLabel(int reason) static std::string BuildGameName(const GameListItem& game) { // Lang needs to be consistent - DiscIO::IVolume::ELanguage const lang = DiscIO::IVolume::LANGUAGE_ENGLISH; + const DiscIO::Language lang = DiscIO::Language::LANGUAGE_ENGLISH; std::vector info; if (!game.GetUniqueID().empty()) info.push_back(game.GetUniqueID()); -- cgit v1.2.3