refactor

milkdropper · milkdropper · commit e6a33aa5b36b · 2020-09-01T10:20:28.000+04:00
diff --git a/src/libprojectM/PresetLoader.cpp b/src/libprojectM/PresetLoader.cpp
@@ -159,12 +159,7 @@ const std::vector<std::string> &PresetLoader::getPresetNames() const
 // Get the preset index given a name
 const unsigned int PresetLoader::getPresetIndex(std::string &name) const
 {
-	//Need a better structure than a vector for reverse lookup
-	for (int index = 0; index < _presetNames.size(); index++)
-	{
-		if (_presetNames[index] == name) return index;
-	}
-	return 0;
+	return find(_presetNames.begin(), _presetNames.end(), name) - _presetNames.begin();
 }
 
 int PresetLoader::getPresetRating ( PresetIndex index, const PresetRatingType ratingType ) const

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,7 @@ const std::vector<std::string> &PresetLoader::getPresetNames() const`
`159`	`159`	`// Get the preset index given a name`
`160`	`160`	`const unsigned int PresetLoader::getPresetIndex(std::string &name) const`
`161`	`161`	`{`
`162`		`- //Need a better structure than a vector for reverse lookup`
`163`		`- for (int index = 0; index < _presetNames.size(); index++)`
`164`		`- {`
`165`		`- if (_presetNames[index] == name) return index;`
`166`		`- }`
`167`		`- return 0;`
	`162`	`+ return find(_presetNames.begin(), _presetNames.end(), name) - _presetNames.begin();`
`168`	`163`	`}`
`169`	`164`
`170`	`165`	`int PresetLoader::getPresetRating ( PresetIndex index, const PresetRatingType ratingType ) const`