IceUtil cleanup (first commit)

3 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index e2f02d6a728..6a56f40bb3d 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -51,7 +51,7 @@ Client::usage()
 int
 Client::run(int argc, char* argv[])
 {
-    IceUtil::Options opts;
+    IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
 
@@ -60,7 +60,7 @@ Client::run(int argc, char* argv[])
     {
         commands = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::BadOptException& e)
+    catch(const IceUtilInternal::BadOptException& e)
     {
         cerr << e.reason << endl;
         usage();
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 8cfa9cd0daa..d7020f46913 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -45,7 +45,7 @@ IceBox::IceBoxService::IceBoxService()
 bool
 IceBox::IceBoxService::start(int argc, char* argv[])
 {
-    IceUtil::Options opts;
+    IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
 
@@ -54,7 +54,7 @@ IceBox::IceBoxService::start(int argc, char* argv[])
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::BadOptException& e)
+    catch(const IceUtilInternal::BadOptException& e)
     {
         error(e.reason);
         usage(argv[0]);
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 54707394347..6171c0ff04b 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -453,9 +453,9 @@ IceBox::ServiceManagerI::load(const string& name, const string& value)
         entryPoint = value.substr(0, pos);
         try
         {
-            args = IceUtil::Options::split(value.substr(pos + 1));
+            args = IceUtilInternal::Options::split(value.substr(pos + 1));
         }
-        catch(const IceUtil::BadOptException& ex)
+        catch(const IceUtilInternal::BadOptException& ex)
         {
             FailureException e(__FILE__, __LINE__);
             e.reason = "ServiceManager: invalid arguments for service `" + name + "':\n" + ex.reason;