1 files changed, 29 insertions, 26 deletions

diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 1ab96ca8bfe..28f6e401acd 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -11,24 +11,27 @@
 #include <Callback.h>
 
 using namespace std;
-using namespace Ice;
 using namespace Demo;
 
 class CallbackReceiverI : public CallbackReceiver
 {
 public:
 
-    virtual void callback(const Current&)
+    virtual void callback(const Ice::Current&)
     {
 	cout << "received callback" << endl;
     }
 };
 
-class CallbackClient : public Application
+class CallbackClient : public Ice::Application
 {
 public:
 
     virtual int run(int, char*[]);
+
+private:
+
+    void menu();
 };
 
 int
@@ -38,27 +41,10 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config");
 }
 
-void
-menu()
-{
-    cout <<
-	"usage:\n"
-	"t: send callback as twoway\n"
-	"o: send callback as oneway\n"
-	"O: send callback as batch oneway\n"
-	"d: send callback as datagram\n"
-	"D: send callback as batch datagram\n"
-	"f: flush all batch requests\n"
-	"S: switch secure mode on/off\n"
-	"s: shutdown server\n"
-	"x: exit\n"
-	"?: help\n";
-}
-
 int
 CallbackClient::run(int argc, char* argv[])
 {
-    PropertiesPtr properties = communicator()->getProperties();
+    Ice::PropertiesPtr properties = communicator()->getProperties();
     const char* proxyProperty = "Callback.Client.CallbackServer";
     std::string proxy = properties->getProperty(proxyProperty);
     if(proxy.empty())
@@ -67,7 +53,7 @@ CallbackClient::run(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
 
-    ObjectPrx base = communicator()->stringToProxy(proxy);
+    Ice::ObjectPrx base = communicator()->stringToProxy(proxy);
     CallbackSenderPrx twoway = CallbackSenderPrx::checkedCast(base->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
     {
@@ -79,12 +65,12 @@ CallbackClient::run(int argc, char* argv[])
     CallbackSenderPrx datagram = CallbackSenderPrx::uncheckedCast(twoway->ice_datagram());
     CallbackSenderPrx batchDatagram = CallbackSenderPrx::uncheckedCast(twoway->ice_batchDatagram());
     
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Client");
-    adapter->add(new CallbackReceiverI, stringToIdentity("callbackReceiver"));
+    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Client");
+    adapter->add(new CallbackReceiverI, Ice::stringToIdentity("callbackReceiver"));
     adapter->activate();
 
     CallbackReceiverPrx twowayR = CallbackReceiverPrx::uncheckedCast(
-	adapter->createProxy(stringToIdentity("callbackReceiver")));
+	adapter->createProxy(Ice::stringToIdentity("callbackReceiver")));
     CallbackReceiverPrx onewayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_oneway());
     CallbackReceiverPrx datagramR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_datagram());
 
@@ -180,7 +166,7 @@ CallbackClient::run(int argc, char* argv[])
 		menu();
 	    }
 	}
-	catch(const Exception& ex)
+	catch(const Ice::Exception& ex)
 	{
 	    cerr << ex << endl;
 	}
@@ -189,3 +175,20 @@ CallbackClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
+
+void
+CallbackClient::menu()
+{
+    cout <<
+	"usage:\n"
+	"t: send callback as twoway\n"
+	"o: send callback as oneway\n"
+	"O: send callback as batch oneway\n"
+	"d: send callback as datagram\n"
+	"D: send callback as batch datagram\n"
+	"f: flush all batch requests\n"
+	"S: switch secure mode on/off\n"
+	"s: shutdown server\n"
+	"x: exit\n"
+	"?: help\n";
+}