Remove deprecated string converter plug-in

9 files changed, 0 insertions, 292 deletions

diff --git a/cpp/include/Ice/DeprecatedStringConverter.h b/cpp/include/Ice/DeprecatedStringConverter.h
deleted file mode 100644
index e5cb0932624..00000000000
--- a/cpp/include/Ice/DeprecatedStringConverter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_DEPRECATED_STRING_CONVERTER_H
-#define ICE_DEPRECATED_STRING_CONVERTER_H
-
-#include <Ice/Config.h>
-#include <Ice/CommunicatorF.h>
-#include <IceUtil/StringConverter.h>
-#include <Ice/Plugin.h>
-
-namespace Ice
-{
-
-typedef IceUtil::StringConverterPtr StringConverterPtr;
-typedef IceUtil::WstringConverterPtr WstringConverterPtr;
-
-//
-// A plug-in that sets the process string converter and wide string in its constructor.
-// Both initialize and destroy are no-op.
-// It's deprecated because if you want to install your own string converters with a
-// plugin, you should simply implement your own Plugin class, derived directly from
-// Ice::Plugin.
-//
-class ICE_API StringConverterPlugin : public Plugin
-{
-public:
-
-    ICE_DEPRECATED_API("StringConverterPlugin is deprecated, use Ice::Plugin instead")
-    StringConverterPlugin(const CommunicatorPtr&, 
-                          const StringConverterPtr&, const WstringConverterPtr& = 0);
-    
-    virtual void initialize();
-    
-    virtual void destroy();
-};
-
-ICE_DEPRECATED_API("is deprecated, use IceUtil::nativeToUTF8(const std::string&, const StringConverterPtr&) instead") 
-ICE_API std::string 
-nativeToUTF8(const StringConverterPtr&, const std::string&);
-
-ICE_DEPRECATED_API("is deprecated, use IceUtil::nativeToUTF8(const std::string&, const StringConverterPtr&) instead") 
-ICE_API std::string 
-nativeToUTF8(const CommunicatorPtr&, const std::string&);
-
-ICE_DEPRECATED_API("is deprecated, use IceUtil::UTF8ToNative(const std::string&, const StringConverterPtr&) instead") 
-ICE_API std::string
-UTF8toNative(const StringConverterPtr&, const std::string&);
-
-ICE_DEPRECATED_API("is deprecated, use IceUtil::UTF8ToNative(const std::string&, const StringConverterPtr&) instead") 
-ICE_API std::string
-UTF8ToNative(const CommunicatorPtr&, const std::string&);
-
-}
-
-#endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index fd9375d26b1..84b30cba8f1 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -13,7 +13,6 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/Config.h>
 #include <Ice/Comparable.h>
-#include <Ice/DeprecatedStringConverter.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
 #include <Ice/PropertiesAdmin.h>
diff --git a/cpp/src/Ice/DeprecatedStringConverter.cpp b/cpp/src/Ice/DeprecatedStringConverter.cpp
deleted file mode 100644
index 4be29815a35..00000000000
--- a/cpp/src/Ice/DeprecatedStringConverter.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <Ice/DeprecatedStringConverter.h>
-
-#include <Ice/Initialize.h>
-#include <Ice/Instance.h>
-#include <IceUtil/StringConverter.h>
-
-namespace Ice
-{
-
-StringConverterPlugin::StringConverterPlugin(const CommunicatorPtr& /*notused*/, 
-                                             const StringConverterPtr& stringConverter, 
-                                             const WstringConverterPtr& wstringConverter) 
-{
-    IceUtil::setProcessStringConverter(stringConverter);
-    IceUtil::setProcessWstringConverter(wstringConverter);
-}
-    
-void StringConverterPlugin::initialize()
-{
-    // no op
-}
-    
-void StringConverterPlugin::destroy()
-{
-    // no op
-}
-
-std::string
-nativeToUTF8(const StringConverterPtr& converter, const std::string& s)
-{
-    return IceUtil::nativeToUTF8(s, converter);
-}
-
-std::string
-nativeToUTF8(const CommunicatorPtr& communicator, const std::string& s)
-{
-    return IceUtil::nativeToUTF8(s, IceInternal::getInstance(communicator)->getStringConverter());
-}
-
-std::string
-UTF8toNative(const StringConverterPtr& converter, const std::string& s)
-{
-    return IceUtil::UTF8ToNative(s, converter);
-}
-
-std::string
-UTF8ToNative(const CommunicatorPtr& communicator, const std::string& s)
-{
-    return IceUtil::UTF8ToNative(s, IceInternal::getInstance(communicator)->getStringConverter());
-}
-
-}
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 1312c5d4234..3f23056288a 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -70,7 +70,6 @@ OBJS		= Acceptor.o \
 		  Connector.o \
 		  ConnectRequestHandler.o \
 		  DefaultsAndOverrides.o \
-		  DeprecatedStringConverter.o \
 		  DispatchInterceptor.o \
 		  DynamicLibrary.o \
 		  EndpointFactory.o \
@@ -129,7 +128,6 @@ OBJS		= Acceptor.o \
 		  Stream.o \
 		  StreamI.o \
 		  StreamSocket.o \
-		  StringConverterPlugin.o \
 		  TcpAcceptor.o \
 		  TcpConnector.o \
 		  TcpEndpointI.o \
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index eca43d1d8a3..4cefc074bd5 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -72,7 +72,6 @@ OBJS	       =  .\Acceptor.obj \
 		  .\Connector.obj \
 		  .\ConnectRequestHandler.obj \
 		  .\DefaultsAndOverrides.obj \
-		  .\DeprecatedStringConverter.obj \
 		  .\DispatchInterceptor.obj \
 		  .\DynamicLibrary.obj \
 		  .\EndpointFactory.obj \
@@ -132,7 +131,6 @@ OBJS	       =  .\Acceptor.obj \
 		  .\Stream.obj \
 		  .\StreamI.obj \
 		  .\StreamSocket.obj \
-		  .\StringConverterPlugin.obj \
 		  .\TcpAcceptor.obj \
 		  .\TcpConnector.obj \
 		  .\TcpEndpointI.obj \
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index 870084b80a3..b6541f82b55 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -16,7 +16,6 @@ extern "C"
 
 Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
-Ice::Plugin* createStringConverter(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 
 };
 
@@ -24,5 +23,4 @@ IceInternal::RegisterPluginsInit::RegisterPluginsInit()
 {
     Ice::registerPluginFactory("IceUDP", createIceUDP, true);
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
-    Ice::registerPluginFactory("IceStringConverter", createStringConverter, false);
 }
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
deleted file mode 100644
index 84775e5ad80..00000000000
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/Config.h>
-
-// For deprecated StringConverterPlugin
-#include <IceUtil/DisableWarnings.h>
-#include <Ice/DeprecatedStringConverter.h>
-
-#include <IceUtil/IceUtil.h>
-#include <IceUtil/StringUtil.h>
-
-#include <Ice/Communicator.h>
-#include <Ice/Initialize.h>
-#include <Ice/LocalException.h>
-#include <Ice/LoggerUtil.h>
-
-using namespace IceUtilInternal;
-using namespace Ice;
-using namespace std;
-
-//
-// The entry point for the string converter plugin built-in the Ice library
-//
-extern "C"
-{
-
-ICE_API Plugin*
-createStringConverter(const CommunicatorPtr& communicator, const string& name, const StringSeq& args)
-{
-    StringConverterPtr stringConverter;
-    WstringConverterPtr wstringConverter;
-
-    if(args.size() > 2)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": too many arguments";
-        return 0;
-    }
-
-    try
-    {
-
-#ifdef _WIN32
-        int cp = -1;
-
-        for(size_t i = 0; i < args.size(); ++i)
-        {
-            if(args[i].find("windows=") == 0)
-            {
-                cp = atoi(args[i].substr(strlen("windows=")).c_str());
-            }
-            else if(args[i].find("iconv=") != 0)
-            {
-                Error out(communicator->getLogger());
-                out << "Plugin " << name << ": invalid \"" << args[i] << "\" argument";
-                return 0;
-            }
-        }
-
-        if(cp == -1)
-        {
-            Error out(communicator->getLogger());
-            out << "Plugin " << name << ": missing windows=<code page> argument";
-            return 0;
-        }
-
-        if(cp == 0 || cp == INT_MAX || cp < 0)
-        {
-            Error out(communicator->getLogger());
-            out << "Plugin " << name << ": invalid Windows code page";
-            return 0;
-        }
-
-        stringConverter = new IceUtil::WindowsStringConverter(static_cast<unsigned int>(cp));
-#else
-        StringSeq iconvArgs;
-
-        for(size_t i = 0; i < args.size(); ++i)
-        {
-            if(args[i].find("iconv=") == 0)
-            {
-                if(!IceUtilInternal::splitString(args[i].substr(strlen("iconv=")), ", \t\r\n", iconvArgs))
-                {
-                    Error out(communicator->getLogger());
-                    out << "Plugin " << name << ": invalid iconv argument";
-                    return 0;
-                }
-            }
-            else if(args[i].find("windows=") != 0)
-            {
-                Error out(communicator->getLogger());
-                out << "Plugin " << name << ": invalid \"" << args[i] << "\" argument";
-                return 0;
-            }
-        }
-
-        switch(iconvArgs.size())
-        {
-            case 0:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>;
-                break;
-            }
-            case 1:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>(iconvArgs[0].c_str());
-                break;
-            }
-            case 2:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>(iconvArgs[0].c_str());
-                wstringConverter = new IceUtil::IconvStringConverter<wchar_t>(iconvArgs[1].c_str());
-                break;
-            }
-            default:
-            {
-                assert(0);
-            }
-        }
-
-#endif
-
-        return new StringConverterPlugin(communicator, stringConverter, wstringConverter);
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": creation failed with " << ex.what();
-        return 0;
-    }
-    catch(...)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": creation failed with unknown exception";
-        return 0;
-    }
-}
-
-}
-
-namespace Ice
-{
-
-ICE_API void
-registerIceStringConverter(bool loadOnInitialize)
-{
-    Ice::registerPluginFactory("IceStringConverter", createStringConverter, loadOnInitialize);
-}
-
-}
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
index ede42429f6e..4158110eaae 100644
--- a/cpp/src/Ice/winrt/Makefile.mak
+++ b/cpp/src/Ice/winrt/Makefile.mak
@@ -31,7 +31,6 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\ConnectionRequestHandler.obj \
 		  $(ARCH)\$(CONFIG)\Current.obj \
 		  $(ARCH)\$(CONFIG)\DefaultsAndOverrides.obj \
-		  $(ARCH)\$(CONFIG)\DeprecatedStringConverter.obj \
 		  $(ARCH)\$(CONFIG)\DispatchInterceptor.obj \
 		  $(ARCH)\$(CONFIG)\DynamicLibrary.obj \
 		  $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj \
@@ -109,7 +108,6 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\SlicedData.obj \
 		  $(ARCH)\$(CONFIG)\StreamI.obj \
 		  $(ARCH)\$(CONFIG)\Stream.obj \
-		  $(ARCH)\$(CONFIG)\StringConverterPlugin.obj \
 		  $(ARCH)\$(CONFIG)\ThreadPool.obj \
 		  $(ARCH)\$(CONFIG)\TraceLevels.obj \
 		  $(ARCH)\$(CONFIG)\TraceUtil.obj \
diff --git a/cpp/src/Ice/winrt/RegisterPluginsInit.cpp b/cpp/src/Ice/winrt/RegisterPluginsInit.cpp
index 28fcc8b4f2b..45ccddbe1dc 100644
--- a/cpp/src/Ice/winrt/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/winrt/RegisterPluginsInit.cpp
@@ -19,7 +19,6 @@ extern "C"
 
 Plugin* createIceUDP(const CommunicatorPtr&, const string&, const StringSeq&);
 Plugin* createIceTCP(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createStringConverter(const CommunicatorPtr&, const string&, const StringSeq&);
 Plugin* createIceSSL(const CommunicatorPtr&, const string&, const StringSeq&);
 Plugin* createIceDiscovery(const CommunicatorPtr&, const string&, const StringSeq&);
 Plugin* createIceLocatorDiscovery(const CommunicatorPtr&, const string&, const StringSeq&);
@@ -41,7 +40,6 @@ RegisterPluginsInit::RegisterPluginsInit()
 {
     registerPluginFactory("IceUDP", createIceUDP, true);
     registerPluginFactory("IceTCP", createIceTCP, true);
-    registerPluginFactory("IceStringConverter", createStringConverter, false);
     registerPluginFactory("IceSSL", createIceSSL, true);
     registerPluginFactory("IceDiscovery", createIceDiscovery, false);
     registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false);