IceUtil cleanup (first commit)

1 files changed, 11 insertions, 9 deletions

diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index de1bbf839a2..26f39e36d44 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -9,6 +9,8 @@
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/IceUtil.h>
+#include <IceUtil/Options.h>
+#include <IceUtil/StringUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/PythonUtil.h>
 
@@ -116,7 +118,7 @@ PackageVisitor::visitModuleStart(const ModulePtr& p)
         if(!package.empty())
         {
             vector<string> v;
-            if(!IceUtil::splitString(package, ".", v))
+            if(!IceUtilInternal::splitString(package, ".", v))
             {
                 return false;
             }
@@ -384,20 +386,20 @@ usage(const char* n)
 int
 main(int argc, char* argv[])
 {
-    IceUtil::Options opts;
+    IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
-    opts.addOpt("D", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("U", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("I", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
+    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("E");
-    opts.addOpt("", "output-dir", IceUtil::Options::NeedArg);
+    opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "all");
     opts.addOpt("", "no-package");
     opts.addOpt("", "checksum");
-    opts.addOpt("", "prefix", IceUtil::Options::NeedArg);
+    opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "case-sensitive");
      
     vector<string> args;
@@ -405,7 +407,7 @@ main(int argc, char* argv[])
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::BadOptException& e)
+    catch(const IceUtilInternal::BadOptException& e)
     {
         cerr << argv[0] << ": " << e.reason << endl;
         usage(argv[0]);
@@ -532,7 +534,7 @@ main(int argc, char* argv[])
                     file = output + '/' + file;
                 }
 
-                IceUtil::Output out;
+                IceUtilInternal::Output out;
                 out.open(file.c_str());
                 if(!out)
                 {