X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Ffont.cpp;h=4fb643527c83d9ea43058ffb81ead0332a74941e;hp=7281bf418aba8118ab479abf79778f542cb0fb4f;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hpb=3ac3a51c623271da815c8ee60c484445871753bf

diff --git a/source/builders/font.cpp b/source/builders/font.cpp
index 7281bf41..4fb64352 100644
--- a/source/builders/font.cpp
+++ b/source/builders/font.cpp
@@ -1,8 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
 #include <msp/fs/utils.h>
-#include "bindable.h"
-#include "gl.h"
 #include "font.h"
 #include "primitivebuilder.h"
 #include "texture2d.h"
@@ -51,7 +49,7 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 	float x = 0;
 
 	unsigned prev = 0;
-	for(string::const_iterator i=str.begin(); i!=str.end();)
+	for(auto i=str.begin(); i!=str.end();)
 	{
 		unsigned c = dec.decode_char(str, i);
 		if(prev)
@@ -69,7 +67,7 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 
 	unsigned prev = 0;
 	unsigned next = 0;
-	for(string::const_iterator i=str.begin(); (next || i!=str.end());)
+	for(auto i=str.begin(); (next || i!=str.end());)
 	{
 		unsigned c = (next ? next : dec.decode_char(str, i));
 		next = (i!=str.end() ? dec.decode_char(str, i) : 0);
@@ -80,7 +78,7 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 			next = 0;
 		}
 
-		GlyphMap::const_iterator j = glyphs.find(c);
+		auto j = glyphs.find(c);
 		if(j==glyphs.end())
 			continue;
 
@@ -108,7 +106,7 @@ void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &bld) const
 
 float Font::get_glyph_advance(unsigned code, unsigned next) const
 {
-	GlyphMap::const_iterator i = glyphs.find(code);
+	auto i = glyphs.find(code);
 	if(i==glyphs.end())
 		return 0;
 
@@ -116,7 +114,7 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
 
 	if(next)
 	{
-		KerningMap::const_iterator j = kerning.find(CodePair(code, next));
+		auto j = kerning.find(CodePair(code, next));
 		if(j!=kerning.end())
 			advance += j->second;
 	}
@@ -126,7 +124,7 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
 
 unsigned Font::get_ligature(unsigned code, unsigned next) const
 {
-	LigatureMap::const_iterator i = ligatures.find(CodePair(code, next));
+	auto i = ligatures.find(CodePair(code, next));
 	return (i!=ligatures.end() ? i->second : 0);
 }
 
@@ -145,19 +143,8 @@ Font::Glyph::Glyph():
 { }
 
 
-Font::Loader::Loader(Font &f):
-	DataFile::CollectionObjectLoader<Font>(f, 0)
-{
-	init();
-}
-
 Font::Loader::Loader(Font &f, Collection &c):
 	DataFile::CollectionObjectLoader<Font>(f, &c)
-{
-	init();
-}
-
-void Font::Loader::init()
 {
 	add("native_size", &Font::native_size);
 	add("ascent",      &Font::ascent);