Add move semantics to Variant

[libs/core.git] / source / stringcodec / utf8.h

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index 89eced8db3a315e3e65c7a43ac3133cbafa1881f..c3f4a5930014f46c5d3a46318d2cf5c4f17ef4c6 100644 (file)
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -1,39 +1,39 @@
-#ifndef MSP_STRINGS_UTF8_H_
-#define MSP_STRINGS_UTF8_H_
+#ifndef MSP_STRINGCODEC_UTF8_H_
+#define MSP_STRINGCODEC_UTF8_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Utf8: public Codec
+class MSPCORE_API Utf8: public StandardCodec<Utf8>
 {
 public:
-       class Encoder: public Codec::Encoder
+       class MSPCORE_API Encoder: public Codec::Encoder
        {
        public:
-               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
+               Encoder(ErrorMode em = DEFAULT): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               void encode_char(unichar, std::string &) override;
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               void transliterate(unichar, std::string &) override;
        };
 
-       class Decoder: public Codec::Decoder
+       class MSPCORE_API Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               unichar decode_char(const std::string &, std::string::const_iterator &) override;
        };
 
-       virtual const char *get_name() const { return "UTF-8"; }
+       Utf8(ErrorMode em = DEFAULT): StandardCodec<Utf8>(em) { }
 
-       virtual Encoder *create_encoder(ErrorMode em = THROW_ON_ERROR) const { return new Encoder(em); }
-       virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
+       const char *get_name() const override { return "UTF-8"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif