3 files changed, 4 insertions, 53 deletions
diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h
index 1fac75707d7..a311b0d78cc 100644
--- a/cppe/include/IceE/Config.h
+++ b/cppe/include/IceE/Config.h
@@ -24,7 +24,7 @@
 // Comment this out if you want to build without batch mode on the
 // client side.
 //
-#define ICEE_HAS_BATCH
+//#define ICEE_HAS_BATCH
 
 //
 // Comment this out if you want to build without support for blocking
diff --git a/cppe/include/IceE/Proxy.h b/cppe/include/IceE/Proxy.h
index 0a47d1be6cd..0fe604ef7ad 100644
--- a/cppe/include/IceE/Proxy.h
+++ b/cppe/include/IceE/Proxy.h
@@ -153,47 +153,13 @@ public:
     void __rethrowException(const ::Ice::LocalException&);
     void __checkTwowayOnly(const char*) const;
 
-    ::IceInternal::Handle< ::IceDelegate::Ice::Object> __getDelegate();
-
 protected:
 
-    virtual ::IceInternal::Handle< ::IceDelegate::Ice::Object> __createDelegate();
-
     const ::Ice::Context& __defaultContext() const;
+    void __checkConnection();
 
-private:
-
-    void setup(const ::IceInternal::ReferencePtr&);
-    friend class ::IceInternal::ProxyFactory;
-
+    ::Ice::ConnectionPtr _connection;
     ::IceInternal::ReferencePtr _reference;
-    ::IceInternal::Handle< ::IceDelegate::Ice::Object> _delegate;
-};
-
-} }
-
-namespace IceDelegate { namespace Ice
-{
-
-class ICE_API Object : public ::IceUtil::Shared
-{
-public:
-
-    ~Object();
-
-    bool ice_isA(const ::std::string&, const ::Ice::Context&);
-    void ice_ping(const ::Ice::Context&);
-    ::std::vector< ::std::string> ice_ids(const ::Ice::Context&);
-    ::std::string ice_id(const ::Ice::Context&);
-
-    ::Ice::ConnectionPtr ice_connection();
-
-    void __copyFrom(const ::IceInternal::Handle< ::IceDelegate::Ice::Object>&);
-
-protected:
-
-    ::IceInternal::ReferencePtr __reference;
-    ::Ice::ConnectionPtr __connection;
 
 private:
 
@@ -203,7 +169,7 @@ private:
     ::std::string __ice_id(::IceInternal::Outgoing&);
 
     void setup(const ::IceInternal::ReferencePtr&);
-    friend class ::IceProxy::Ice::Object;
+    friend class ::IceInternal::ProxyFactory;
 };
 
 } }
diff --git a/cppe/include/IceE/ProxyF.h b/cppe/include/IceE/ProxyF.h
index 942fb51dd52..3318aa30fd2 100644
--- a/cppe/include/IceE/ProxyF.h
+++ b/cppe/include/IceE/ProxyF.h
@@ -25,27 +25,12 @@ class Object;
 
 }
 
-namespace IceDelegate
-{
-
-namespace Ice
-{
-
-class Object;
-
-}
-
-}
-
 namespace IceInternal
 {
 
 ICE_API void incRef(::IceProxy::Ice::Object*);
 ICE_API void decRef(::IceProxy::Ice::Object*);
 
-ICE_API void incRef(::IceDelegate::Ice::Object*);
-ICE_API void decRef(::IceDelegate::Ice::Object*);
-
 }
 
 #include <IceE/ProxyHandle.h>