X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fiso885915.h;h=f52fdac9e802a8c9e5d386d43316086e59751b36;hb=3e3868860d4f4ca1bbe55fbf271c804307cea3c9;hp=06c53018fba231a2c2afda76c0150069822a0c3c;hpb=967785734be5c3fc6f75da122c2d93ebbb338271;p=libs%2Fcore.git

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index 06c5301..f52fdac 100644
--- a/source/stringcodec/iso885915.h
+++ b/source/stringcodec/iso885915.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ISO885915_H_
-#define MSP_STRINGS_ISO885915_H_
+#ifndef MSP_STRINGCODEC_ISO885915_H_
+#define MSP_STRINGCODEC_ISO885915_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso885915: public Codec
 {
@@ -14,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
@@ -24,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-15"; }
@@ -33,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