Namespace Codecs was renamed to StringCodec

diff --git a/source/font.cpp b/source/font.cpp
index 323152dc74b220c6730e024cef11f9ce59637f50..88780331fd10b8144dd6f9cbbce562df4c191634 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -46,7 +46,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
        glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
        float x = 0;
 
@@ -56,13 +56,13 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
        return x;
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec) const
 {
        Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
        draw_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
        MatrixStack::Push push_mtx(bld.matrix());
        Bind bind_tex(get_texture(), true);

diff --git a/source/font.h b/source/font.h
index 6ae5c6d3862426c9bbb74bfb7198fb3444fe3125..14320b8fed58ff1b9d3fefe01c82c474c631f505 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 #include <msp/datafile/objectloader.h>
-#include <msp/strings/utf8.h>
+#include <msp/stringcodec/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -67,7 +67,7 @@ public:
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
 
-       float get_string_width(const std::string &, Codecs::Decoder &) const;
+       float get_string_width(const std::string &, StringCodec::Decoder &) const;
 
        template<class C>
        float get_string_width(const std::string &str) const
@@ -77,10 +77,10 @@ public:
        }
 
        float get_string_width(const std::string &str) const
-       { return get_string_width<Codecs::Utf8>(str); }
+       { return get_string_width<StringCodec::Utf8>(str); }
 
-       void draw_string(const std::string &, Codecs::Decoder &) const;
-       void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+       void draw_string(const std::string &, StringCodec::Decoder &) const;
+       void draw_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
 
        template<class C>
        void draw_string(const std::string &str) const
@@ -90,7 +90,7 @@ public:
        }
 
        void draw_string(const std::string &str) const
-       { draw_string<Codecs::Utf8>(str); }
+       { draw_string<StringCodec::Utf8>(str); }
 
        template<class C>
        void draw_string(const std::string &str, PrimitiveBuilder &pb) const
@@ -100,7 +100,7 @@ public:
        }
 
        void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-       { return draw_string<Codecs::Utf8>(str, pb); }
+       { return draw_string<StringCodec::Utf8>(str, pb); }
 
 private:
        void create_glyph_vertices(const Glyph &, VertexBuilder &) const;