Rename namespace Codecs to StringCodec

diff --git a/source/stringcodec/ascii.cpp b/source/stringcodec/ascii.cpp
index cb6281ab83e1d862e0223d2197fe22ce6f136642..84e44fcb6899f4c8bbe7cc4538ab08a1ccf95dcc 100644 (file)
--- a/source/stringcodec/ascii.cpp
+++ b/source/stringcodec/ascii.cpp
@@ -19,7 +19,7 @@ const char *translit_katakana[0x60]=
 }*/
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Ascii::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -102,5 +102,5 @@ UnicodeChar Ascii::Decoder::decode_char(const string &str, string::const_iterato
                return *i++;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/ascii.h b/source/stringcodec/ascii.h
index cec099bd720c4df7fc3a3a4728a0956341820c27..91f903115e3497e46a54516b9335ac9993523c75 100644 (file)
--- a/source/stringcodec/ascii.h
+++ b/source/stringcodec/ascii.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ASCII_H_
-#define MSP_STRINGS_ASCII_H_
+#ifndef MSP_STRINGCODEC_ASCII_H_
+#define MSP_STRINGCODEC_ASCII_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Ascii: public Codec
 {
@@ -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

diff --git a/source/stringcodec/codec.cpp b/source/stringcodec/codec.cpp
index a7127205db3c5118aea20c27a8748ff82ebb461f..ed54ac938b33e6fbf12e763dccd615706696468a 100644 (file)
--- a/source/stringcodec/codec.cpp
+++ b/source/stringcodec/codec.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 bool Codec::detect(const string &str) const
 {
@@ -166,5 +166,5 @@ Codec *detect_codec(const string &str)
                return new Windows1252;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index 53775206ea1915026b79e5ed75d02b227d74dca0..ab2a3ea7c8491edc0297ae81ffddd1ae4e20c23e 100644 (file)
--- a/source/stringcodec/codec.h
+++ b/source/stringcodec/codec.h
@@ -1,11 +1,11 @@
-#ifndef MSP_STRINGS_CODEC_H_
-#define MSP_STRINGS_CODEC_H_
+#ifndef MSP_STRINGCODEC_CODEC_H_
+#define MSP_STRINGCODEC_CODEC_H_
 
 #include <string>
 #include <msp/core/except.h>
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 typedef int UnicodeChar;
 
@@ -192,7 +192,7 @@ Codec *create_codec(const std::string &);
 The codec must be deleted when it's no longer needed. */
 Codec *detect_codec(const std::string &);
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif

diff --git a/source/stringcodec/codecutils.cpp b/source/stringcodec/codecutils.cpp
index b58c3994ba23f478fe7efa13c42f43908c0d67d2..37d81a7dd5ba96f8c52a4eb85ad0db809ee4cd7a 100644 (file)
--- a/source/stringcodec/codecutils.cpp
+++ b/source/stringcodec/codecutils.cpp
@@ -1,7 +1,7 @@
 #include "codecutils.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 int transform_mapping_or_direct(const int *mapping, unsigned map_size, int ch, bool reverse)
 {
@@ -16,5 +16,5 @@ int transform_mapping_or_direct(const int *mapping, unsigned map_size, int ch, b
        return ch;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/codecutils.h b/source/stringcodec/codecutils.h
index c389056f60531eca12522fba40004b986d82316a..395949e8e814e8d3e3cef04b3f097b0c4f8b029e 100644 (file)
--- a/source/stringcodec/codecutils.h
+++ b/source/stringcodec/codecutils.h
@@ -1,12 +1,12 @@
-#ifndef MSP_STRINGS_CODECUTILS_H_
-#define MSP_STRINGS_CODECUTILS_H_
+#ifndef MSP_STRINGCODEC_CODECUTILS_H_
+#define MSP_STRINGCODEC_CODECUTILS_H_
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 int transform_mapping_or_direct(const int *mapping, unsigned map_size, int ch, bool reverse);
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif

diff --git a/source/stringcodec/iso2022jp.cpp b/source/stringcodec/iso2022jp.cpp
index f0b37fd50aeb2eccfd63a9cadcd014649542fc10..564892febfdc0e394b1a5f3ba9dc6bbcc83e07bd 100644 (file)
--- a/source/stringcodec/iso2022jp.cpp
+++ b/source/stringcodec/iso2022jp.cpp
@@ -6,7 +6,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Iso2022Jp::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -150,5 +150,5 @@ void Iso2022Jp::Decoder::switch_mode(Mode m)
        }
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/iso2022jp.h b/source/stringcodec/iso2022jp.h
index cfce718d433b16fdb498ab361f34ff23af6584e6..73ffec3e71eda5a158798cc37bbb803ba4d5623c 100644 (file)
--- a/source/stringcodec/iso2022jp.h
+++ b/source/stringcodec/iso2022jp.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ISO2022JP_H_
-#define MSP_STRINGS_ISO2022JP_H_
+#ifndef MSP_STRINGCODEC_ISO2022JP_H_
+#define MSP_STRINGCODEC_ISO2022JP_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso2022Jp: public Codec
 {
@@ -53,7 +53,7 @@ public:
        virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif

diff --git a/source/stringcodec/iso646fi.cpp b/source/stringcodec/iso646fi.cpp
index 3ccfc9d6c57eba6a9c8c05a4a1285f76b7ea3c28..b6aa883df43f387c553564552b79243a060aa4c7 100644 (file)
--- a/source/stringcodec/iso646fi.cpp
+++ b/source/stringcodec/iso646fi.cpp
@@ -24,7 +24,7 @@ const int mapping[map_size*2]=
 
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Iso646Fi::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -59,5 +59,5 @@ UnicodeChar Iso646Fi::Decoder::decode_char(const string &str, string::const_iter
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 8fc5e8339fa8b3175f948a008d55f4fb9417cde8..1767ca8e842021ff75f2a7e675a475c50b204db5 100644 (file)
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ISO646FI_H_
-#define MSP_STRINGS_ISO646FI_H_
+#ifndef MSP_STRINGCODEC_ISO646FI_H_
+#define MSP_STRINGCODEC_ISO646FI_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso646Fi: public Codec
 {
@@ -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

diff --git a/source/stringcodec/iso88591.cpp b/source/stringcodec/iso88591.cpp
index a5f3c55bb402a57348372644911f27cf50e7ae42..19c1b8908131ec443d091f00685db282a0401986 100644 (file)
--- a/source/stringcodec/iso88591.cpp
+++ b/source/stringcodec/iso88591.cpp
@@ -3,7 +3,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Iso88591::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -27,5 +27,5 @@ UnicodeChar Iso88591::Decoder::decode_char(const string &str, string::const_iter
        return static_cast<unsigned char>(*i++);
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/iso88591.h b/source/stringcodec/iso88591.h
index d779ff071bf2cf70bb2b0905501b833214748262..060a6d4efc19850c09068881572fbe46a83e8aa2 100644 (file)
--- a/source/stringcodec/iso88591.h
+++ b/source/stringcodec/iso88591.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ISO88591_H_
-#define MSP_STRINGS_ISO88591_H_
+#ifndef MSP_STRINGCODEC_ISO88591_H_
+#define MSP_STRINGCODEC_ISO88591_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso88591: public Codec
 {
@@ -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

diff --git a/source/stringcodec/iso885915.cpp b/source/stringcodec/iso885915.cpp
index 7aef9d34ef980c1b84356238ee5fffce8eb81ca7..8e121adda4068a636222936dac3bd9c2a2b23c99 100644 (file)
--- a/source/stringcodec/iso885915.cpp
+++ b/source/stringcodec/iso885915.cpp
@@ -23,7 +23,7 @@ const int mapping[map_size*2]=
 
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Iso885915::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -59,5 +59,5 @@ UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_ite
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index 06c53018fba231a2c2afda76c0150069822a0c3c..e92eb08edda7f24d62ebe783044e3352a7992bf5 100644 (file)
--- 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
 {
@@ -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

diff --git a/source/stringcodec/jisx0201.cpp b/source/stringcodec/jisx0201.cpp
index d5987e596b39f10cca85297f977fdbdd617afc40..f6a69ad2330cbb0160d55294215f864277bce2bf 100644 (file)
--- a/source/stringcodec/jisx0201.cpp
+++ b/source/stringcodec/jisx0201.cpp
@@ -3,7 +3,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void JisX0201::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -47,5 +47,5 @@ UnicodeChar JisX0201::Decoder::decode_char(const string &str, string::const_iter
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/jisx0201.h b/source/stringcodec/jisx0201.h
index 67a6e7860858a1ffa3d290eddb3e2f70c02adbe6..2ad0112d21916237f66b6e2001099601991b7190 100644 (file)
--- a/source/stringcodec/jisx0201.h
+++ b/source/stringcodec/jisx0201.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_JISX201_H_
-#define MSP_STRINGS_JISX201_H_
+#ifndef MSP_STRINGCODEC_JISX201_H_
+#define MSP_STRINGCODEC_JISX201_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class JisX0201: public Codec
 {
@@ -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

diff --git a/source/stringcodec/jisx0208.cpp b/source/stringcodec/jisx0208.cpp
index b8d8e057ad52c1b36fde3a90146eef6c43771496..7df625422b27ff140aeeae8ce771db65e03cc661 100644 (file)
--- a/source/stringcodec/jisx0208.cpp
+++ b/source/stringcodec/jisx0208.cpp
@@ -5,7 +5,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
 {
@@ -82,5 +82,5 @@ Kuten ucs_to_jisx0208(UnicodeChar c)
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index c5f52d5ecc9a66d9f987ade23f704bdfa5106a2b..4fb85a2658d8a8ce5c7ea692974ee2284be4701a 100644 (file)
--- a/source/stringcodec/jisx0208.h
+++ b/source/stringcodec/jisx0208.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_JISX0208_H_
-#define MSP_STRINGS_JISX0208_H_
+#ifndef MSP_STRINGCODEC_JISX0208_H_
+#define MSP_STRINGCODEC_JISX0208_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 /**
 Codec for the JIS X 0208 encoding.  This is not particularly useful as a
@@ -52,7 +52,7 @@ struct Kuten
 extern UnicodeChar jisx0208_to_ucs(Kuten);
 extern Kuten ucs_to_jisx0208(UnicodeChar);
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif

diff --git a/source/stringcodec/utf8.cpp b/source/stringcodec/utf8.cpp
index d7b55ffb6041a04eff8b3007e3eee23e26c4452f..4d3cea50dab27d33fc8030b18e484c0e620466dc 100644 (file)
--- a/source/stringcodec/utf8.cpp
+++ b/source/stringcodec/utf8.cpp
@@ -3,7 +3,7 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Utf8::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -81,5 +81,5 @@ UnicodeChar Utf8::Decoder::decode_char(const string &str, string::const_iterator
                return *i++;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index 89eced8db3a315e3e65c7a43ac3133cbafa1881f..b976291b23cc1d0c3990e5de05e25e56abaeced3 100644 (file)
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_UTF8_H_
-#define MSP_STRINGS_UTF8_H_
+#ifndef MSP_STRINGCODEC_UTF8_H_
+#define MSP_STRINGCODEC_UTF8_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Utf8: public Codec
 {
@@ -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

diff --git a/source/stringcodec/windows1252.cpp b/source/stringcodec/windows1252.cpp
index 33527e4c92c3fea8df76276a04562f7f9c546450..dc03172ce42063df056a005b6025e9d94e7cba77 100644 (file)
--- a/source/stringcodec/windows1252.cpp
+++ b/source/stringcodec/windows1252.cpp
@@ -16,7 +16,7 @@ unsigned short table[32]=
 
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 void Windows1252::Encoder::encode_char(UnicodeChar ch, string &buf)
 {
@@ -61,5 +61,5 @@ UnicodeChar Windows1252::Decoder::decode_char(const string &str, string::const_i
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/windows1252.h b/source/stringcodec/windows1252.h
index f790f39503bd5f2c8d4e34813dce05b5398bd661..e764965f6a882e6a5d21da672c4a7207529897e8 100644 (file)
--- a/source/stringcodec/windows1252.h
+++ b/source/stringcodec/windows1252.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_WINDOWS1252_H_
-#define MSP_STRINGS_WINDOWS1252_H_
+#ifndef MSP_STRINGCODEC_WINDOWS1252_H_
+#define MSP_STRINGCODEC_WINDOWS1252_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Windows1252: public Codec
 {
@@ -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

diff --git a/transcode.cpp b/transcode.cpp
index cfa24a911446605b6b260c7cb7b3579c9866b01b..e8ba3eb5e05ca2b9a322288156f69fc19813ca4b 100644 (file)
--- a/transcode.cpp
+++ b/transcode.cpp
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include <iostream>
 #include <string>
-#include <msp/strings/codec.h>
+#include <msp/stringcodec/codec.h>
 
 using namespace std;
 using namespace Msp;
@@ -14,17 +14,17 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       Codecs::Codec *from = Codecs::create_codec(argv[1]);
-       Codecs::Codec *to = Codecs::create_codec(argv[2]);
+       StringCodec::Codec *from = StringCodec::create_codec(argv[1]);
+       StringCodec::Codec *to = StringCodec::create_codec(argv[2]);
 
-       Codecs::Decoder *from_dec = from->create_decoder(Codecs::TRANSLITERATE);
-       Codecs::Encoder *to_enc = to->create_encoder(Codecs::TRANSLITERATE);
+       StringCodec::Decoder *from_dec = from->create_decoder(StringCodec::TRANSLITERATE);
+       StringCodec::Encoder *to_enc = to->create_encoder(StringCodec::TRANSLITERATE);
 
        string line;
        while(getline(cin, line))
        {
                line += '\n';
-               Codecs::ustring ustr;
+               StringCodec::ustring ustr;
                from_dec->decode(line, ustr);
                string result;
                to_enc->encode(ustr, result);