renamed userCallbackOnInterrupt to callbackOnInterrupt.

20 files changed, 23 insertions, 23 deletions

diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index e0aaab24e2a..860e49fd6e4 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -722,7 +722,7 @@ TestApp::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     _connection = Freeze::createConnection(communicator(), _envName);
 
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index f43eeedf738..ed7edf33637 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -32,7 +32,7 @@ LibraryClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     int runParser(int, char*[], const Ice::CommunicatorPtr&);
     return runParser(argc, argv, communicator());
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 2d6fceb20e2..a309690b169 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -45,7 +45,7 @@ LibraryCollocated::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::PropertiesPtr properties = communicator()->getProperties();
     
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index 2478d5f7429..74b992e385d 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -32,7 +32,7 @@ PhoneBookClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     int runParser(int, char*[], const Ice::CommunicatorPtr&);
     return runParser(argc, argv, communicator());
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index e979700f651..3bc286cfa32 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -45,7 +45,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index 54a391b24ef..1f0c87211bf 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -52,7 +52,7 @@ CallbackClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::RouterPrx defaultRouter = communicator()->getDefaultRouter();
     if(!defaultRouter)
diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp
index 5c4c8dccb05..66f734bd7b4 100755
--- a/cpp/demo/Glacier2/chat/Client.cpp
+++ b/cpp/demo/Glacier2/chat/Client.cpp
@@ -97,7 +97,7 @@ public:
 	// Since this is an interactive demo we want the custom interrupt
 	// callback to be called when the process is interrupted.
 	//
-	userCallbackOnInterrupt();
+	callbackOnInterrupt();
 
 	{
 	    IceUtil::Mutex::Lock sync(_mutex);
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 0f40c0371a1..29ad4387401 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -49,7 +49,7 @@ CallbackClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     CallbackSenderPrx twoway = CallbackSenderPrx::checkedCast(
 	communicator()->propertyToProxy("Callback.Client.CallbackServer")->
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index f2de173ada6..d6558f8db08 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -39,7 +39,7 @@ HelloClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     HelloPrx twoway = HelloPrx::checkedCast(
 	communicator()->propertyToProxy("Hello.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp
index 0bfe715f5d1..1d07353983b 100644
--- a/cpp/demo/Ice/invoke/Client.cpp
+++ b/cpp/demo/Ice/invoke/Client.cpp
@@ -57,7 +57,7 @@ InvokeClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::ObjectPrx obj = communicator()->propertyToProxy("Printer.Proxy");
 
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index bc10109a1fe..b4a99f35889 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -36,7 +36,7 @@ NestedClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.Client.NestedServer"));
     if(!nested)
diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp
index e0be25f7d61..48c1d9c46ea 100755
--- a/cpp/demo/Ice/session/Client.cpp
+++ b/cpp/demo/Ice/session/Client.cpp
@@ -102,7 +102,7 @@ SessionClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     string name;
     cout << "Please enter your name ==> ";
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index a2c00c008a3..6d06624fcbf 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -41,7 +41,7 @@ ThroughputClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::ObjectPrx base = communicator()->propertyToProxy("Throughput.Throughput");
     ThroughputPrx throughput = ThroughputPrx::checkedCast(base);
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index de4885f7f79..578985d03fa 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -36,7 +36,7 @@ ValueClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     Ice::ObjectPrx base = communicator()->propertyToProxy("Value.Initial");
     InitialPrx initial = InitialPrx::checkedCast(base);
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 830f24aa7ef..f3f692355b5 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -55,7 +55,7 @@ HelloClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     HelloPrx twoway = HelloPrx::checkedCast(
 	communicator()->propertyToProxy("Hello.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 79b21842dfd..779e092f9bd 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -98,7 +98,7 @@ HelloClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
 	communicator()->stringToProxy("DemoIceGrid/Registry"));
diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index b4e9f719f53..c2bae48d5fe 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -98,7 +98,7 @@ HelloClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     IceGrid::RegistryPrx registry = 
 	IceGrid::RegistryPrx::checkedCast(communicator()->stringToProxy("DemoIceGrid/Registry"));
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index bf86e3ee294..e65b69b2164 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -51,7 +51,7 @@ HelloClient::run(int argc, char* argv[])
     // Since this is an interactive demo we want the custom interrupt
     // callback to be called when the process is interrupted.
     //
-    userCallbackOnInterrupt();
+    callbackOnInterrupt();
 
     //
     // First we try to connect to the object with the `hello'
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 4f2c27300e0..ffc228bed3f 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -39,7 +39,7 @@ public:
 
     //
     // Override this to provide a custom application interrupt
-    // hook. You must call userCallbackOnInterrupt for this method to
+    // hook. You must call callbackOnInterrupt for this method to
     // be called. Note that the interruptCallback can be called
     // concurrently with any other thread (including main) in your
     // application and thus must take appropriate concurrency
@@ -68,7 +68,7 @@ public:
     static void destroyOnInterrupt();
     static void shutdownOnInterrupt();
     static void ignoreInterrupt();
-    static void userCallbackOnInterrupt();
+    static void callbackOnInterrupt();
 
     //
     // These methods can be used to temporarily block a signal and
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 434bcdd7768..a2107ae7f97 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -214,7 +214,7 @@ shutdownOnInterruptCallback(int signal)
 }
 
 static void
-userCallbackOnInterruptCallback(int signal)
+callbackOnInterruptCallback(int signal)
 {
     {
 	StaticMutex::Lock lock(_mutex);
@@ -554,7 +554,7 @@ Ice::Application::ignoreInterrupt()
 }
 
 void
-Ice::Application::userCallbackOnInterrupt()
+Ice::Application::callbackOnInterrupt()
 {
     if(_ctrlCHandler != 0)
     {
@@ -564,7 +564,7 @@ Ice::Application::userCallbackOnInterrupt()
 	    _released = true;
 	    _condVar->signal();
 	}
-	_ctrlCHandler->setCallback(userCallbackOnInterruptCallback);
+	_ctrlCHandler->setCallback(callbackOnInterruptCallback);
     }
 }