Use nullptr instead of 0 for pointers

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

diff --git a/source/stringcodec/iso2022jp.h b/source/stringcodec/iso2022jp.h
index 73ffec3e71eda5a158798cc37bbb803ba4d5623c..a304c5646308be67ec44a95ad880fd8028df7f7f 100644 (file)
--- a/source/stringcodec/iso2022jp.h
+++ b/source/stringcodec/iso2022jp.h
@@ -6,7 +6,7 @@
 namespace Msp {
 namespace StringCodec {
 
-class Iso2022Jp: public Codec
+class Iso2022Jp: public StandardCodec<Iso2022Jp>
 {
 public:
        enum Mode
@@ -19,38 +19,37 @@ public:
        class 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 encode_char(unichar, std::string &);
                virtual void sync(std::string &);
                virtual void reset();
        private:
                void switch_mode(Mode, std::string &);
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class 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 unichar decode_char(const std::string &, std::string::const_iterator &);
                virtual void reset();
        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); }
+       virtual const char *get_name() const { return "ISO-2022-JP"; }
 };
 
 } // namespace StringCodec