actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements

Browse Source 
Fix whitespace changes
This commit is contained in:
Michael Sundqvist
2022-07-10 18:28:56 +03:00
committed by Martin Natano
parent f0680a29fc
commit 0cba3579de
534 changed files with 3456 additions and 3488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderJson.cpp
+6 -6
View File
@@ -10,7 +10,7 @@
#include "Steps.h"
#include "GameManager.h"
void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString> &out )
void NotesLoaderJson::GetApplicableFiles( const RString &sPath, std::vector<RString> &out )
{
GetDirListing( sPath + RString("*.json"), out );
}
@@ -47,8 +47,8 @@ static void Deserialize(StopSegment &seg, const Json::Value &root)
static void Deserialize(TimingData &td, const Json::Value &root)
{
vector<BPMSegment*> vBPMs;
vector<StopSegment*> vStops;
std::vector<BPMSegment*> vBPMs;
std::vector<StopSegment*> vStops;
JsonUtil::DeserializeVectorPointers( vBPMs, Deserialize, root["BpmSegments"] );
JsonUtil::DeserializeVectorPointers( vStops, Deserialize, root["StopSegments"] );
@@ -204,20 +204,20 @@ static void Deserialize( Song &out, const Json::Value &root )
FOREACH_BackgroundLayer( bl )
{
const Json::Value &root3 = root2[bl];
vector<BackgroundChange> &vBgc = out.GetBackgroundChanges(bl);
std::vector<BackgroundChange> &vBgc = out.GetBackgroundChanges(bl);
JsonUtil::DeserializeVectorObjects( vBgc, Deserialize, root3 );
}
}
{
vector<BackgroundChange> &vBgc = out.GetForegroundChanges();
std::vector<BackgroundChange> &vBgc = out.GetForegroundChanges();
JsonUtil::DeserializeVectorObjects( vBgc, Deserialize, root["ForegroundChanges"] );
}
out.m_vsKeysoundFile = JsonUtil::DeserializeArrayStrings(root["KeySounds"]);
{
vector<Steps*> vpSteps;
std::vector<Steps*> vpSteps;
JsonUtil::DeserializeVectorPointersParam<Steps,Song*>( vpSteps, Deserialize, root["Charts"], &out );
for (Steps *step : vpSteps)
out.AddSteps( step );