X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fiso88591.h;h=806bdb1de7d1420c701d5e99dd6ae4d08447e0c1;hb=94ee3a1040f67d9de2e92fc34049642b08d65b3e;hp=4365c0d18081c4dce214fc86d93a65234e07cadb;hpb=b42ed73a1b241c0e93ee03c43c4584b41c549bac;p=libs%2Fcore.git

diff --git a/source/stringcodec/iso88591.h b/source/stringcodec/iso88591.h
index 4365c0d..806bdb1 100644
--- a/source/stringcodec/iso88591.h
+++ b/source/stringcodec/iso88591.h
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_ISO88591_H_
-#define MSP_STRINGS_ISO88591_H_
+#ifndef MSP_STRINGCODEC_ISO88591_H_
+#define MSP_STRINGCODEC_ISO88591_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso88591: 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 "ISO-8859-1"; }
@@ -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