X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Futf8.h;h=cb4924aeeed36b0960668e08f315c70bbc86663e;hb=3e3868860d4f4ca1bbe55fbf271c804307cea3c9;hp=0281b314069f320259e063ac8c2cc0c28a1ec1cd;hpb=b42ed73a1b241c0e93ee03c43c4584b41c549bac;p=libs%2Fcore.git

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index 0281b31..cb4924a 100644
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_UTF8_H_
-#define MSP_STRINGS_UTF8_H_
+#ifndef MSP_STRINGCODEC_UTF8_H_
+#define MSP_STRINGCODEC_UTF8_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Utf8: public Codec
 {
@@ -21,9 +14,9 @@ public:
 	public:
 		Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-		virtual void encode_char(UnicodeChar, std::string &);
+		virtual void encode_char(unichar, std::string &);
 	private:
-		virtual void transliterate(UnicodeChar, std::string &);
+		virtual void transliterate(unichar, std::string &);
 	};
 
 	class Decoder: public Codec::Decoder
@@ -31,7 +24,7 @@ public:
 	public:
 		Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-		virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+		virtual unichar decode_char(const std::string &, std::string::const_iterator &);
 	};
 
 	virtual const char *get_name() const { return "UTF-8"; }
@@ -40,7 +33,7 @@ public:
 	virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif