Remove Charset_Transcoder; hardwire UTF-8/Latin-1 conversions into charset.cpp

4 files changed, 0 insertions, 43 deletions

diff --git a/include/charset.h b/include/charset.h
index 81d8f5bca..2cd0b6e3f 100644
--- a/include/charset.h
+++ b/include/charset.h
@@ -12,18 +12,6 @@
 
 namespace Botan {
 
-/*************************************************
-* Character Set Transcoder Interface             *
-*************************************************/
-class Charset_Transcoder
-   {
-   public:
-      virtual std::string transcode(const std::string&,
-                                    Character_Set, Character_Set) const = 0;
-
-      virtual ~Charset_Transcoder() {}
-   };
-
 namespace Charset {
 
 /*************************************************
diff --git a/include/def_char.h b/include/def_char.h
deleted file mode 100644
index 407cedfb0..000000000
--- a/include/def_char.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************
-* Default Character Set Handling Header File     *
-* (C) 1999-2007 The Botan Project                *
-*************************************************/
-
-#ifndef BOTAN_DEFAULT_CHARSET_H__
-#define BOTAN_DEFAULT_CHARSET_H__
-
-#include <botan/charset.h>
-
-namespace Botan {
-
-/*************************************************
-* Default Character Set Transcoder Object        *
-*************************************************/
-class Default_Charset_Transcoder : public Charset_Transcoder
-   {
-   public:
-      std::string transcode(const std::string&,
-                            Character_Set, Character_Set) const;
-   };
-
-}
-
-#endif
diff --git a/include/libstate.h b/include/libstate.h
index dc9835799..f8a1c6939 100644
--- a/include/libstate.h
+++ b/include/libstate.h
@@ -62,9 +62,6 @@ class Library_State
       void set_x509_state(class X509_GlobalState*);
       class X509_GlobalState& x509_state();
 
-      void set_transcoder(class Charset_Transcoder*);
-      std::string transcode(const std::string,
-                            Character_Set, Character_Set) const;
    private:
       Library_State(const Library_State&) {}
       Library_State& operator=(const Library_State&) { return (*this); }
@@ -82,7 +79,6 @@ class Library_State
       std::map<std::string, Allocator*> alloc_factory;
       mutable Allocator* cached_default_allocator;
 
-      class Charset_Transcoder* transcoder;
       RandomNumberGenerator* rng;
       std::vector<Allocator*> allocators;
       std::vector<EntropySource*> entropy_sources;
diff --git a/include/modules.h b/include/modules.h
index a5036ded3..0ef6cb36c 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -19,7 +19,6 @@ class Modules
    {
    public:
       virtual class Mutex_Factory* mutex_factory() const = 0;
-      virtual class Charset_Transcoder* transcoder() const = 0;
 
       virtual std::string default_allocator() const = 0;
 
@@ -37,7 +36,6 @@ class Builtin_Modules : public Modules
    {
    public:
       class Mutex_Factory* mutex_factory() const;
-      class Charset_Transcoder* transcoder() const;
 
       std::string default_allocator() const;