Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -37,7 +37,7 @@ void ThemeMetricDifficultiesToShow::Read()
|
||||
|
||||
m_v.clear();
|
||||
|
||||
vector<RString> v;
|
||||
std::vector<RString> v;
|
||||
split( ThemeMetric<RString>::GetValue(), ",", v );
|
||||
if(v.empty())
|
||||
{
|
||||
@@ -58,7 +58,7 @@ void ThemeMetricDifficultiesToShow::Read()
|
||||
}
|
||||
}
|
||||
}
|
||||
const vector<Difficulty>& ThemeMetricDifficultiesToShow::GetValue() const { return m_v; }
|
||||
const std::vector<Difficulty>& ThemeMetricDifficultiesToShow::GetValue() const { return m_v; }
|
||||
|
||||
|
||||
ThemeMetricCourseDifficultiesToShow::ThemeMetricCourseDifficultiesToShow( const RString& sGroup, const RString& sName ) :
|
||||
@@ -76,7 +76,7 @@ void ThemeMetricCourseDifficultiesToShow::Read()
|
||||
|
||||
m_v.clear();
|
||||
|
||||
vector<RString> v;
|
||||
std::vector<RString> v;
|
||||
split( ThemeMetric<RString>::GetValue(), ",", v );
|
||||
if(v.empty())
|
||||
{
|
||||
@@ -97,11 +97,11 @@ void ThemeMetricCourseDifficultiesToShow::Read()
|
||||
}
|
||||
}
|
||||
}
|
||||
const vector<CourseDifficulty>& ThemeMetricCourseDifficultiesToShow::GetValue() const { return m_v; }
|
||||
const std::vector<CourseDifficulty>& ThemeMetricCourseDifficultiesToShow::GetValue() const { return m_v; }
|
||||
|
||||
static void RemoveStepsTypes( vector<StepsType>& inout, RString sStepsTypesToRemove )
|
||||
static void RemoveStepsTypes( std::vector<StepsType>& inout, RString sStepsTypesToRemove )
|
||||
{
|
||||
vector<RString> v;
|
||||
std::vector<RString> v;
|
||||
split( sStepsTypesToRemove, ",", v );
|
||||
if( v.size() == 0 ) return; // Nothing to do!
|
||||
|
||||
@@ -115,7 +115,7 @@ static void RemoveStepsTypes( vector<StepsType>& inout, RString sStepsTypesToRem
|
||||
continue;
|
||||
}
|
||||
|
||||
const vector<StepsType>::iterator iter = find( inout.begin(), inout.end(), st );
|
||||
const std::vector<StepsType>::iterator iter = find( inout.begin(), inout.end(), st );
|
||||
if( iter != inout.end() )
|
||||
inout.erase( iter );
|
||||
}
|
||||
@@ -138,7 +138,7 @@ void ThemeMetricStepsTypesToShow::Read()
|
||||
|
||||
RemoveStepsTypes( m_v, ThemeMetric<RString>::GetValue() );
|
||||
}
|
||||
const vector<StepsType>& ThemeMetricStepsTypesToShow::GetValue() const { return m_v; }
|
||||
const std::vector<StepsType>& ThemeMetricStepsTypesToShow::GetValue() const { return m_v; }
|
||||
|
||||
|
||||
RString CommonMetrics::LocalizeOptionItem( const RString &s, bool bOptional )
|
||||
|
||||
Reference in New Issue
Block a user