Add move semantics to Variant

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

diff --git a/source/stringcodec/iso2022jp.h b/source/stringcodec/iso2022jp.h
index cfce718d433b16fdb498ab361f34ff23af6584e6..0bb1ad3f559f220f4a5e115ab6bcaafd5ff3ba96 100644 (file)
--- a/source/stringcodec/iso2022jp.h
+++ b/source/stringcodec/iso2022jp.h
@@ -1,12 +1,13 @@
-#ifndef MSP_STRINGS_ISO2022JP_H_
-#define MSP_STRINGS_ISO2022JP_H_
+#ifndef MSP_STRINGCODEC_ISO2022JP_H_
+#define MSP_STRINGCODEC_ISO2022JP_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Iso2022Jp: public Codec
+class MSPCORE_API Iso2022Jp: public StandardCodec<Iso2022Jp>
 {
 public:
        enum Mode
@@ -16,44 +17,43 @@ public:
                JISX0208
        };
 
-       class Encoder: public Codec::Encoder
+       class MSPCORE_API Encoder: public Codec::Encoder
        {
        private:
-               Mode mode;
+               Mode mode = ASCII;
 
        public:
-               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
+               Encoder(ErrorMode em = DEFAULT): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
-               virtual void sync(std::string &);
-               virtual void reset();
+               void encode_char(unichar, std::string &) override;
+               void sync(std::string &) override;
+               void reset() override;
        private:
                void switch_mode(Mode, std::string &);
-               virtual void transliterate(UnicodeChar, std::string &);
+               void transliterate(unichar, std::string &) override;
        };
 
-       class Decoder: public Codec::Decoder
+       class MSPCORE_API Decoder: public Codec::Decoder
        {
        private:
-               Mode mode;
-               Codec::Decoder *dec;
+               Mode mode = ASCII;
+               Codec::Decoder *dec = nullptr;
 
        public:
-               Decoder(ErrorMode =THROW_ON_ERROR);
+               Decoder(ErrorMode = DEFAULT);
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
-               virtual void reset();
+               unichar decode_char(const std::string &, std::string::const_iterator &) override;
+               void reset() override;
        private:
                void switch_mode(Mode);
        };
 
-       virtual const char *get_name() const { return "ISO-2022-JP"; }
+       Iso2022Jp(ErrorMode em = DEFAULT): StandardCodec<Iso2022Jp>(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 "ISO-2022-JP"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif