Option: remove getNbChilds function

Clement Champetier · Clement Champetier · commit ed0345f64966 · 2014-10-09T14:48:58.000+02:00
Use getChilds().size().
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -44,17 +44,17 @@ void displayOptions( const std::vector<avtranscoder::Option>& options )
 		}
 		else if( option.getType() == avtranscoder::eOptionBaseTypeChoice )
 		{
-			std::cout << "Nb choices: " << option.getNbChilds() << std::endl;
+			std::cout << "Nb choices: " << option.getChilds().size() << std::endl;
 			std::cout << "Default choice index: " << option.getDefaultChildIndex() << std::endl;
-			for(size_t i = 0; i < option.getNbChilds(); ++i )
+			for(size_t i = 0; i < option.getChilds().size(); ++i )
 				std::cout << "Choice " << i << ": " << 
 					option.getChild( i ).getName() << " // " << 
 					option.getChild( i ).getHelp() << std::endl;
 		}
 		else if( option.getType() == avtranscoder::eOptionBaseTypeGroup )
 		{
-			std::cout << "Nb choices: " << option.getNbChilds() << std::endl;
-			for(size_t i = 0; i < option.getNbChilds(); ++i )
+			std::cout << "Nb choices: " << option.getChilds().size() << std::endl;
+			for(size_t i = 0; i < option.getChilds().size(); ++i )
 				std::cout << "Element " << i << ": " << 
 					option.getChild( i ).getName() << " // " <<
 					option.getChild( i ).getDefaultValueBool() << std::endl;
diff --git a/src/AvTranscoder/option/Option.hpp b/src/AvTranscoder/option/Option.hpp
@@ -74,7 +74,6 @@ class Option
 	bool hasChild() const { return ! _childOptions.empty(); }
 	const std::vector<Option>& getChilds() { return _childOptions; }
 	const Option& getChild( size_t index ) { return _childOptions.at( index ); }
-	size_t getNbChilds() const { return _childOptions.size(); }
 	int getDefaultChildIndex() const { return _defaultChildIndex; }
 	
 	void setDefaultChildIndex( size_t index ) { _defaultChildIndex = index; }
diff --git a/src/AvTranscoder/option/context.cpp b/src/AvTranscoder/option/context.cpp
@@ -77,7 +77,7 @@ void Context::loadOptions( void* av_class, int req_flags )
 				if( parentOption.getType() == eOptionBaseTypeChoice )
 				{
 					if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )
-						parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
+						parentOption.setDefaultChildIndex( parentOption.getChilds().size() - 1 );
 				}
 
 				parentFound = true;

Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,17 @@ void displayOptions( const std::vector<avtranscoder::Option>& options )`
`44`	`44`	`}`
`45`	`45`	`else if( option.getType() == avtranscoder::eOptionBaseTypeChoice )`
`46`	`46`	`{`
`47`		`- std::cout << "Nb choices: " << option.getNbChilds() << std::endl;`
	`47`	`+ std::cout << "Nb choices: " << option.getChilds().size() << std::endl;`
`48`	`48`	`std::cout << "Default choice index: " << option.getDefaultChildIndex() << std::endl;`
`49`		`- for(size_t i = 0; i < option.getNbChilds(); ++i )`
	`49`	`+ for(size_t i = 0; i < option.getChilds().size(); ++i )`
`50`	`50`	`std::cout << "Choice " << i << ": " <<`
`51`	`51`	`option.getChild( i ).getName() << " // " <<`
`52`	`52`	`option.getChild( i ).getHelp() << std::endl;`
`53`	`53`	`}`
`54`	`54`	`else if( option.getType() == avtranscoder::eOptionBaseTypeGroup )`
`55`	`55`	`{`
`56`		`- std::cout << "Nb choices: " << option.getNbChilds() << std::endl;`
`57`		`- for(size_t i = 0; i < option.getNbChilds(); ++i )`
	`56`	`+ std::cout << "Nb choices: " << option.getChilds().size() << std::endl;`
	`57`	`+ for(size_t i = 0; i < option.getChilds().size(); ++i )`
`58`	`58`	`std::cout << "Element " << i << ": " <<`
`59`	`59`	`option.getChild( i ).getName() << " // " <<`
`60`	`60`	`option.getChild( i ).getDefaultValueBool() << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void Context::loadOptions( void* av_class, int req_flags )`
`77`	`77`	`if( parentOption.getType() == eOptionBaseTypeChoice )`
`78`	`78`	`{`
`79`	`79`	`if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )`
`80`		`- parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );`
	`80`	`+ parentOption.setDefaultChildIndex( parentOption.getChilds().size() - 1 );`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`parentFound = true;`