0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add code comments, fixup some pre C++11 code

Browse source
This commit is contained in:
Chris Beck 2016-10-15 02:30:45 -04:00
parent 683d517d7e
commit df8f42c26d
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/font.cpp
View file

@ -525,8 +525,7 @@ static void set_font_list(const std::vector<subset_descriptor>& fontlist)
{
clear_fonts();
std::vector<subset_descriptor>::const_iterator itor;
for(itor = fontlist.begin(); itor != fontlist.end(); ++itor) {
for(auto itor = fontlist.begin(); itor != fontlist.end(); ++itor) {
if (!check_font_file(itor->name)) continue;
// Insert fonts only if the font file exists
const subset_id subset = font_names.size();
@ -1089,13 +1088,13 @@ bool load_font_config()
const std::vector<std::string> font_order = utils::split(fonts_config["order"]);
std::vector<font::subset_descriptor> fontlist;
std::vector<std::string>::const_iterator font;
for(font = font_order.begin(); font != font_order.end(); ++font) {
for(auto font = font_order.begin(); font != font_order.end(); ++font) {
add_font_to_fontlist(fonts_config, fontlist, *font);
known_fonts.erase(*font);
}
std::set<std::string>::const_iterator kfont;
for(kfont = known_fonts.begin(); kfont != known_fonts.end(); ++kfont) {
for(auto kfont = known_fonts.begin(); kfont != known_fonts.end(); ++kfont) {
add_font_to_fontlist(fonts_config, fontlist, *kfont);
}

4
src/font.hpp
View file

@ -24,6 +24,10 @@
class t_string;
/***
* Note: This is the SDL_TTF code path. For pango cairo code path, see class ttext.
*/
namespace font {
//object which initializes and destroys structures needed for fonts