IceUtil cleanup (first commit)

8 files changed, 38 insertions, 32 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index dc08bfcbda9..869042a9734 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -19,6 +19,7 @@
 
 using namespace std;
 using namespace IceUtil;
+using namespace IceUtilInternal;
 
 #ifdef _WIN32
 #   define FREEZE_SCRIPT_DB_MODE 0
@@ -36,7 +37,7 @@ class SliceVisitor : public Slice::ParserVisitor
 {
 public:
 
-    SliceVisitor(IceUtil::XMLOutput&, const Slice::TypePtr&, const Slice::TypePtr&, const string&);
+    SliceVisitor(IceUtilInternal::XMLOutput&, const Slice::TypePtr&, const Slice::TypePtr&, const string&);
 
     virtual bool visitClassDefStart(const Slice::ClassDefPtr&);
     virtual bool visitStructStart(const Slice::StructPtr&);
@@ -46,7 +47,7 @@ public:
 
 private:
 
-    IceUtil::XMLOutput& _out;
+    IceUtilInternal::XMLOutput& _out;
 };
 
 class DescriptorHandler : public IceXML::Handler
@@ -134,21 +135,21 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     bool caseSensitive;
     string dbEnvName, dbName;
 
-    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("d", "debug");
     opts.addOpt("", "ice");
-    opts.addOpt("o", "", IceUtil::Options::NeedArg);
-    opts.addOpt("f", "", IceUtil::Options::NeedArg);
-    opts.addOpt("", "load", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
+    opts.addOpt("o", "", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("f", "", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "load", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("e");
-    opts.addOpt("", "key", IceUtil::Options::NeedArg);
-    opts.addOpt("", "value", IceUtil::Options::NeedArg);
-    opts.addOpt("", "select", IceUtil::Options::NeedArg);
+    opts.addOpt("", "key", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "value", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "select", IceUtilInternal::Options::NeedArg);
     opts.addOpt("c", "catalog");
     opts.addOpt("", "case-sensitive");
 
@@ -157,7 +158,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     {
         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]);
@@ -399,7 +400,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         valueType = l.front();
 
         ostringstream os;
-        IceUtil::XMLOutput out(os);
+        IceUtilInternal::XMLOutput out(os);
 
         out << se("dumpdb");
 
@@ -613,7 +614,7 @@ main(int argc, char* argv[])
 //
 // SliceVisitor
 //
-FreezeScript::SliceVisitor::SliceVisitor(IceUtil::XMLOutput& out, const Slice::TypePtr& keyType,
+FreezeScript::SliceVisitor::SliceVisitor(IceUtilInternal::XMLOutput& out, const Slice::TypePtr& keyType,
                                          const Slice::TypePtr& valueType, const string& selectExpr) :
     _out(out)
 {
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
index 8b2a15300cc..9261c8175f6 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ b/cpp/src/FreezeScript/DumpDescriptors.cpp
@@ -13,6 +13,7 @@
 #include <FreezeScript/Functions.h>
 #include <FreezeScript/Exception.h>
 #include <FreezeScript/Util.h>
+#include <IceUtil/InputUtil.h>
 #include <db_cxx.h>
 #include <set>
 
@@ -1575,7 +1576,7 @@ FreezeScript::SymbolTableI::getConstantValue(const string& name) const
             case Slice::Builtin::KindLong:
             {
                 Ice::Long n;
-                if(!IceUtil::stringToInt64(value, n))
+                if(!IceUtilInternal::stringToInt64(value, n))
                 {
                     assert(false);
                 }
diff --git a/cpp/src/FreezeScript/Print.cpp b/cpp/src/FreezeScript/Print.cpp
index 32753b8e2f1..9f6cfa526fc 100644
--- a/cpp/src/FreezeScript/Print.cpp
+++ b/cpp/src/FreezeScript/Print.cpp
@@ -13,6 +13,7 @@
 
 using namespace std;
 using namespace IceUtil;
+using namespace IceUtilInternal;
 
 namespace FreezeScript
 {
@@ -39,7 +40,7 @@ private:
 
     void printObjectMembers(const Slice::ClassDefPtr&, const DataMemberMap&);
 
-    IceUtil::Output _out;
+    IceUtilInternal::Output _out;
     typedef map<const ObjectData*, int> ObjectHistoryMap;
     ObjectHistoryMap _objectHistory;
     int _objectCount;
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.cpp b/cpp/src/FreezeScript/TransformAnalyzer.cpp
index 4095b87007c..171bda5f1a9 100644
--- a/cpp/src/FreezeScript/TransformAnalyzer.cpp
+++ b/cpp/src/FreezeScript/TransformAnalyzer.cpp
@@ -15,6 +15,7 @@
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
+using namespace IceUtilInternal;
 
 namespace FreezeScript
 {
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.h b/cpp/src/FreezeScript/TransformAnalyzer.h
index 73539de5d67..52d92fdbeda 100644
--- a/cpp/src/FreezeScript/TransformAnalyzer.h
+++ b/cpp/src/FreezeScript/TransformAnalyzer.h
@@ -35,7 +35,7 @@ private:
 
     Slice::UnitPtr _old;
     Slice::UnitPtr _new;
-    IceUtil::XMLOutput _out;
+    IceUtilInternal::XMLOutput _out;
     AnalyzeTransformVisitor* _visitor;
 };
 
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index e0cc80114e8..98979c9c980 100644
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -9,6 +9,7 @@
 
 #include <FreezeScript/TransformVisitor.h>
 #include <FreezeScript/Util.h>
+#include <IceUtil/InputUtil.h>
 
 using namespace std;
 
@@ -76,7 +77,7 @@ FreezeScript::TransformVisitor::visitInteger(const IntegerDataPtr& dest)
             {
                 string str = s->getValue();
                 Ice::Long value;
-                if(IceUtil::stringToInt64(str, value))
+                if(IceUtilInternal::stringToInt64(str, value))
                 {
                     dest->setValue(value, false);
                 }
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index 148d3867f68..c28cc62f95a 100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -18,6 +18,7 @@
 #include <Freeze/Catalog.h>
 #include <Freeze/Initialize.h>
 #include <IceXML/Parser.h>
+#include <IceUtil/InputUtil.h>
 #include <db_cxx.h>
 
 using namespace std;
@@ -2383,7 +2384,7 @@ FreezeScript::SymbolTableI::getConstantValue(const string& name) const
             case Slice::Builtin::KindLong:
             {
                 Ice::Long n;
-                if(!IceUtil::stringToInt64(value, n))
+                if(!IceUtilInternal::stringToInt64(value, n))
                 {
                     assert(false);
                 }
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 566bb4a01e2..dbd64cae3ea 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -234,26 +234,26 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     string dbEnvName, dbName, dbEnvNameNew;
     bool allDb = false;
 
-    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("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("d", "debug");
-    opts.addOpt("o", "", IceUtil::Options::NeedArg);
+    opts.addOpt("o", "", IceUtilInternal::Options::NeedArg);
     opts.addOpt("i");
     opts.addOpt("p");
     opts.addOpt("c");
     opts.addOpt("w");
-    opts.addOpt("f", "", IceUtil::Options::NeedArg);
-    opts.addOpt("", "include-old", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("", "include-new", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("", "old", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("", "new", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
+    opts.addOpt("f", "", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "include-old", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("", "include-new", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("", "old", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("", "new", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("a");
     opts.addOpt("e");
-    opts.addOpt("", "key", IceUtil::Options::NeedArg);
-    opts.addOpt("", "value", IceUtil::Options::NeedArg);
+    opts.addOpt("", "key", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "value", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "case-sensitive");
 
     vector<string> args;
@@ -261,7 +261,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     {
         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]);