Fixed OutputUtil to not use char* in the API

 * Remove setBeginBlock/setEndBlock unused methods

1 files changed, 10 insertions, 23 deletions

diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 90b3a025912..7e3938171bb 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -70,7 +70,7 @@ IceUtilInternal::OutputBase::OutputBase(ostream& os) :
 }
 
 
-IceUtilInternal::OutputBase::OutputBase(const char* s) :
+IceUtilInternal::OutputBase::OutputBase(const string& s) :
     _out(_fout),
     _pos(0),
     _indent(0),
@@ -86,14 +86,14 @@ IceUtilInternal::OutputBase::~OutputBase()
 }
 
 void
-IceUtilInternal::OutputBase::open(const char* s)
+IceUtilInternal::OutputBase::open(const string& s)
 {
     //
     // Remove any existing file first. This prevents file name
     // mismatches on case-insensitive OSs.
     //
     IceUtilInternal::unlink(s);
-    _fout.open(s);
+    _fout.open(s.c_str());
 }
 
 void
@@ -112,9 +112,9 @@ IceUtilInternal::OutputBase::isOpen()
 }
 
 void
-IceUtilInternal::OutputBase::print(const char* s)
+IceUtilInternal::OutputBase::print(const string& s)
 {
-    size_t len = strlen(s);
+    size_t len = s.size();
     for(unsigned int i = 0; i < len; ++i)
     {
         if(s[i] == '\n')
@@ -264,7 +264,7 @@ IceUtilInternal::Output::Output(const char* s) :
 }
 
 void
-IceUtilInternal::Output::print(const char* s)
+IceUtilInternal::Output::print(const string& s)
 {
     if(_par >= 0)
     {
@@ -276,18 +276,6 @@ IceUtilInternal::Output::print(const char* s)
     OutputBase::print(s);
 }
 
-void 
-IceUtilInternal::Output::setBeginBlock(const char *bb)
-{
-    _blockStart = bb;
-}
-
-void 
-IceUtilInternal::Output::setEndBlock(const char *eb)
-{
-    _blockEnd = eb;
-}
-
 void
 IceUtilInternal::Output::sb()
 {
@@ -332,7 +320,7 @@ IceUtilInternal::operator<<(Output& out, ios_base& (*val)(ios_base&))
 {
     ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }
 
@@ -365,7 +353,7 @@ IceUtilInternal::XMLOutput::XMLOutput(const char* s) :
 }
 
 void
-IceUtilInternal::XMLOutput::print(const char* s)
+IceUtilInternal::XMLOutput::print(const string& s)
 {
     if(_se)
     {
@@ -376,8 +364,7 @@ IceUtilInternal::XMLOutput::print(const char* s)
 
     if(_escape)
     {
-        string escaped = escape(s);
-        OutputBase::print(escaped.c_str());
+        OutputBase::print(escape(s));
     }
     else
     {
@@ -557,7 +544,7 @@ IceUtilInternal::operator<<(XMLOutput& out, ios_base& (*val)(ios_base&))
 {
     ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }