Further style and comment adjustments

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

diff --git a/source/iso2022jp.h b/source/iso2022jp.h
index 4a452d46d4bc04c5f384e12403381d1e29db39d5..8a95f9d461eb96953884f98e3f42a269b5f7bf15 100644 (file)
--- a/source/iso2022jp.h
+++ b/source/iso2022jp.h
@@ -25,35 +25,39 @@ public:
 
        class Encoder: public Codec::Encoder
        {
+       private:
+               Mode mode;
+
        public:
-               Encoder(ErrorMode em=THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
+               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
+
                virtual void encode_char(UnicodeChar, std::string &);
                virtual void sync(std::string &);
                virtual void reset();
        private:
-               Mode mode;
-
                void switch_mode(Mode, std::string &);
                virtual void transliterate(UnicodeChar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
        {
+       private:
+               Mode mode;
+               Codec::Decoder *dec;
+
        public:
                Decoder(ErrorMode =THROW_ON_ERROR);
+
                virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
                virtual void reset();
        private:
-               Mode mode;
-               Codec::Decoder *dec;
-
-               virtual void switch_mode(Mode);
+               void switch_mode(Mode);
        };
 
        virtual const char *get_name() const { return "ISO-2022-JP"; }
 
-       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 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); }
 };
 
 } // namespace Codecs