From 0562415aeb3c12ce7423d7d194874c8de465679d Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Wed, 20 Jul 2005 20:32:48 +0000 Subject: Allow creating 'charset' objects from 'const char*' (for constants). --- src/charset.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/charset.cpp') diff --git a/src/charset.cpp b/src/charset.cpp index 2a39b03f..9c0a2621 100644 --- a/src/charset.cpp +++ b/src/charset.cpp @@ -67,6 +67,12 @@ charset::charset(const string& name) } +charset::charset(const char* name) + : m_name(name) +{ +} + + void charset::parse(const string& buffer, const string::size_type position, const string::size_type end, string::size_type* newPosition) { @@ -89,16 +95,6 @@ void charset::generate(utility::outputStream& os, const string::size_type /* max } -struct X -{ - X(const char**); - - operator const char**() { return x; } - operator char**() { return const_cast (x); } - - const char** x; -}; - void charset::convert(utility::inputStream& in, utility::outputStream& out, const charset& source, const charset& dest) { @@ -261,13 +257,6 @@ charset& charset::operator=(const charset& other) } -charset& charset::operator=(const string& name) -{ - parse(name); - return (*this); -} - - const bool charset::operator==(const charset& value) const { return (utility::stringUtils::isStringEqualNoCase(m_name, value.m_name)); -- cgit v1.2.3