- move iostream from header to source files.

- replace some iostreams to o/istreams only - some minor include fixes closes #2489 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1278 fdac6126-5c0c-442c-9429-916003d36597
2015-06-09 08:58:41 +00:00
parent 23fb3781d4
commit ed3155284c
36 changed files with 85 additions and 49 deletions
--- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
+++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
@@ -53,6 +53,7 @@
 #endif

 #include <iomanip>
+#include <iostream>
 #include <sstream>
 #include <algorithm>
 // --------------------
@@ -62,12 +63,11 @@
 #  include <GL/glut.h>
 #endif
 // --------------------
-#include <qnamespace.h>
-#include <qapplication.h>
-#include <qmenu.h>
-#include <qcursor.h>
-#include <qimage.h>
-#include <qdatetime.h>
+#include <QApplication>
+#include <QMenu>
+#include <QCursor>
+#include <QImage>
+#include <QDateTime>
 #include <QMouseEvent>
 // --------------------
 #include <OpenMesh/Apps/QtViewer/QGLViewerWidget.hh>
--- a/src/OpenMesh/Core/Geometry/VectorT.hh
+++ b/src/OpenMesh/Core/Geometry/VectorT.hh
@@ -69,7 +69,7 @@


 #include <OpenMesh/Core/System/config.h>
-#include <iostream>
+#include <ostream>
 #include <cmath>
 #include <cassert>
 #include <cstring>
--- a/src/OpenMesh/Core/IO/BinaryHelper.cc
+++ b/src/OpenMesh/Core/IO/BinaryHelper.cc
@@ -60,6 +60,7 @@
 #include <OpenMesh/Core/System/config.h>
 // -------------------- STL
 #include <algorithm>
+#include <iostream>
 // -------------------- OpenMesh
 #include <OpenMesh/Core/IO/BinaryHelper.hh>

--- a/src/OpenMesh/Core/IO/BinaryHelper.hh
+++ b/src/OpenMesh/Core/IO/BinaryHelper.hh
@@ -66,7 +66,7 @@
 #else
 #  include <cstdio>
 #endif
-#include <iostream>
+#include <iosfwd>
 // -------------------- OpenMesh


--- a/src/OpenMesh/Core/IO/IOManager.cc
+++ b/src/OpenMesh/Core/IO/IOManager.cc
@@ -60,6 +60,8 @@
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/IO/IOManager.hh>

+#include <iostream>
+

 //== NAMESPACES ===============================================================

--- a/src/OpenMesh/Core/IO/IOManager.hh
+++ b/src/OpenMesh/Core/IO/IOManager.hh
@@ -60,7 +60,7 @@


 // STL
-#include <iostream>
+#include <iosfwd>
 #include <sstream>
 #include <string>
 #include <set>
--- a/src/OpenMesh/Core/IO/reader/BaseReader.cc
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc
@@ -53,7 +53,6 @@
 #include <OpenMesh/Core/IO/reader/BaseReader.hh>
 #include <algorithm>
 #include <string>
-#include <iterator>
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
--- a/src/OpenMesh/Core/IO/reader/BaseReader.hh
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh
@@ -62,10 +62,11 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <cctype>
 #include <functional>
+#include <algorithm>

 // OpenMesh
 #include <OpenMesh/Core/System/config.h>
--- a/src/OpenMesh/Core/IO/reader/OBJReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc
@@ -71,7 +71,9 @@ using std::isspace;
 #include <string.h>
 #endif

-#include <set>
+#include <istream>
+#include <fstream>
+#include <vector>
 #include <algorithm>
 #include <functional>

--- a/src/OpenMesh/Core/IO/reader/OBJReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OBJReader.hh
@@ -61,11 +61,9 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+#include <iosfwd>
 #include <string>
-#include <vector>
 #include <map>
-#include <fstream>

 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/SingletonT.hh>
--- a/src/OpenMesh/Core/IO/reader/OFFReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc
@@ -65,7 +65,6 @@

 //STL
 #include <iostream>
-#include <ios>
 #include <fstream>
 #include <memory>

--- a/src/OpenMesh/Core/IO/reader/OFFReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.hh
@@ -61,10 +61,9 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+#include <iosfwd>
 #include <string>
-#include <stdio.h>
-#include <fstream>
+#include <cstdio>

 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/SingletonT.hh>
--- a/src/OpenMesh/Core/IO/reader/OMReader.cc
+++ b/src/OpenMesh/Core/IO/reader/OMReader.cc
@@ -51,6 +51,8 @@


 //STL
+#include <vector>
+#include <istream>
 #include <fstream>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/reader/OMReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OMReader.hh
@@ -69,7 +69,7 @@
 #include <OpenMesh/Core/IO/reader/BaseReader.hh>

 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>


--- a/src/OpenMesh/Core/IO/reader/PLYReader.cc
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc
@@ -61,6 +61,7 @@

 //STL
 #include <fstream>
+#include <iostream>
 #include <memory>

 #ifndef WIN32
--- a/src/OpenMesh/Core/IO/reader/PLYReader.hh
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh
@@ -61,10 +61,10 @@
 //=== INCLUDES ================================================================


-#include <iostream>
+
+#include <iosfwd>
 #include <string>
-#include <stdio.h>
-#include <fstream>
+#include <cstdio>
 #include <vector>

 #include <OpenMesh/Core/System/config.h>
--- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc
@@ -54,7 +54,6 @@
 #include <OpenMesh/Core/IO/writer/BaseWriter.hh>
 #include <algorithm>
 #include <string>
-#include <iterator>
 #if defined(OM_CC_MIPS)
 #  include <ctype.h>
 #else
--- a/src/OpenMesh/Core/IO/writer/BaseWriter.hh
+++ b/src/OpenMesh/Core/IO/writer/BaseWriter.hh
@@ -62,7 +62,7 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/writer/OMWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc
@@ -60,6 +60,9 @@
 #endif

 #include <fstream>
+#include <ostream>
+#include <vector>
+
 // -------------------- OpenMesh
 #include <OpenMesh/Core/IO/OMFormat.hh>
 #include <OpenMesh/Core/System/omstream.hh>
--- a/src/OpenMesh/Core/IO/writer/OMWriter.hh
+++ b/src/OpenMesh/Core/IO/writer/OMWriter.hh
@@ -62,7 +62,7 @@


 // STD C++
-#include <iostream>
+#include <iosfwd>
 #include <string>

 // OpenMesh
--- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc
@@ -59,6 +59,8 @@

 #include <OpenMesh/Core/IO/SR_store.hh>

+#include <iostream>
+
 //=== NAMESPACES ==============================================================


--- a/src/OpenMesh/Core/Mesh/BaseKernel.cc
+++ b/src/OpenMesh/Core/Mesh/BaseKernel.cc
@@ -47,9 +47,15 @@
 \*===========================================================================*/

 #include <OpenMesh/Core/Mesh/BaseKernel.hh>
+#include <iostream>
+
 namespace OpenMesh
 {

+void BaseKernel::property_stats() const
+{
+  property_stats(std::clog);
+}
 void BaseKernel::property_stats(std::ostream& _ostr) const
 {
  const PropertyContainer::Properties& vps = vprops_.properties();
@@ -168,6 +174,10 @@ void BaseKernel::mprop_stats( std::string& _string ) const

 }

+void BaseKernel::vprop_stats() const
+{
+  vprop_stats(std::clog);
+}
 void BaseKernel::vprop_stats(std::ostream& _ostr ) const
 {
  PropertyContainer::Properties::const_iterator it;
@@ -176,7 +186,10 @@ void BaseKernel::vprop_stats(std::ostream& _ostr ) const
    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);

 }
-
+void BaseKernel::hprop_stats() const
+{
+  hprop_stats(std::clog);
+}
 void BaseKernel::hprop_stats(std::ostream& _ostr ) const
 {
  PropertyContainer::Properties::const_iterator it;
@@ -185,6 +198,10 @@ void BaseKernel::hprop_stats(std::ostream& _ostr ) const
    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);

 }
+void BaseKernel::eprop_stats() const
+{
+  eprop_stats(std::clog);
+}
 void BaseKernel::eprop_stats(std::ostream& _ostr ) const
 {
  PropertyContainer::Properties::const_iterator it;
@@ -193,6 +210,10 @@ void BaseKernel::eprop_stats(std::ostream& _ostr ) const
    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);

 }
+void BaseKernel::fprop_stats() const
+{
+  fprop_stats(std::clog);
+}
 void BaseKernel::fprop_stats(std::ostream& _ostr ) const
 {
  PropertyContainer::Properties::const_iterator it;
@@ -201,6 +222,10 @@ void BaseKernel::fprop_stats(std::ostream& _ostr ) const
    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);

 }
+void BaseKernel::mprop_stats() const
+{
+  mprop_stats(std::clog);
+}
 void BaseKernel::mprop_stats(std::ostream& _ostr ) const
 {
  PropertyContainer::Properties::const_iterator it;
--- a/src/OpenMesh/Core/Mesh/BaseKernel.hh
+++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh
@@ -66,6 +66,7 @@
 #include <vector>
 #include <string>
 #include <algorithm>
+#include <iosfwd>
 // --------------------
 #include <OpenMesh/Core/Utils/PropertyContainer.hh>

@@ -688,7 +689,9 @@ protected: //------------------------------------------- synchronize properties

 public:

-  void property_stats(std::ostream& _ostr = std::clog) const;
+  // uses std::clog as output stream
+  void property_stats() const;
+  void property_stats(std::ostream& _ostr) const;

  void vprop_stats( std::string& _string ) const;
  void hprop_stats( std::string& _string ) const;
@@ -696,11 +699,18 @@ public:
  void fprop_stats( std::string& _string ) const;
  void mprop_stats( std::string& _string ) const;

-  void vprop_stats(std::ostream& _ostr = std::clog) const;
-  void hprop_stats(std::ostream& _ostr = std::clog) const;
-  void eprop_stats(std::ostream& _ostr = std::clog) const;
-  void fprop_stats(std::ostream& _ostr = std::clog) const;
-  void mprop_stats(std::ostream& _ostr = std::clog) const;
+  // uses std::clog as output stream
+  void vprop_stats() const;
+  void hprop_stats() const;
+  void eprop_stats() const;
+  void fprop_stats() const;
+  void mprop_stats() const;
+
+  void vprop_stats(std::ostream& _ostr) const;
+  void hprop_stats(std::ostream& _ostr) const;
+  void eprop_stats(std::ostream& _ostr) const;
+  void fprop_stats(std::ostream& _ostr) const;
+  void mprop_stats(std::ostream& _ostr) const;

 public:

--- a/src/OpenMesh/Core/Mesh/Handles.hh
+++ b/src/OpenMesh/Core/Mesh/Handles.hh
@@ -53,7 +53,7 @@
 //== INCLUDES =================================================================

 #include <OpenMesh/Core/System/config.h>
-#include <iostream>
+#include <ostream>


 //== NAMESPACES ===============================================================
--- a/src/OpenMesh/Core/System/mostream.hh
+++ b/src/OpenMesh/Core/System/mostream.hh
@@ -59,7 +59,7 @@
 //== INCLUDES =================================================================

 #include <OpenMesh/Core/System/config.h>
-#include <iostream>
+#include <ostream>
 #if defined( OM_CC_GCC ) && OM_CC_VERSION < 30000
 #  include <streambuf.h>
 #else
--- a/src/OpenMesh/Core/System/omstream.cc
+++ b/src/OpenMesh/Core/System/omstream.cc
@@ -56,6 +56,7 @@
 //== INCLUDES =================================================================

 #include <OpenMesh/Core/System/omstream.hh>
+#include <iostream>


 //== IMPLEMENTATION ========================================================== 
--- a/src/OpenMesh/Core/Utils/BaseProperty.cc
+++ b/src/OpenMesh/Core/Utils/BaseProperty.cc
@@ -47,7 +47,7 @@
 \*===========================================================================*/

 #include <OpenMesh/Core/Utils/BaseProperty.hh>
-#include <iostream>
+#include <ostream>

 namespace OpenMesh
 {
--- a/src/OpenMesh/Core/Utils/Endian.cc
+++ b/src/OpenMesh/Core/Utils/Endian.cc
@@ -57,8 +57,6 @@
 //== INCLUDES =================================================================


-#include <iostream>
-#include <algorithm>
 #include <OpenMesh/Core/Utils/Endian.hh>


--- a/src/OpenMesh/Core/Utils/Endian.hh
+++ b/src/OpenMesh/Core/Utils/Endian.hh
@@ -62,7 +62,6 @@


 #include <OpenMesh/Core/System/config.h>
-#include <iostream>


 //== NAMESPACES ===============================================================
--- a/src/OpenMesh/Core/Utils/Property.hh
+++ b/src/OpenMesh/Core/Utils/Property.hh
@@ -299,8 +299,6 @@ public:
      ++bytes;
    }

-    std::cout << std::endl;
-
    assert( bytes == size_of() );

    return bytes;
@@ -339,8 +337,6 @@ public:
      ++bytes;
    }

-    std::cout << std::endl;
-
    return bytes;
  }

--- a/src/OpenMesh/Core/Utils/SingletonT.hh
+++ b/src/OpenMesh/Core/Utils/SingletonT.hh
@@ -65,7 +65,6 @@

 // STL
 #include <stdexcept>
-#include <iostream>


 //== NAMESPACES ===============================================================
--- a/src/OpenMesh/Core/Utils/vector_cast.hh
+++ b/src/OpenMesh/Core/Utils/vector_cast.hh
@@ -64,8 +64,6 @@
 #include <OpenMesh/Core/System/config.h>
 #include <OpenMesh/Core/Utils/vector_traits.hh>
 #include <OpenMesh/Core/Utils/GenProg.hh>
-#include <iostream>
-#include <algorithm>
 #include <OpenMesh/Core/Geometry/VectorT.hh>


--- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc
+++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc
@@ -63,6 +63,7 @@

 #include <OpenMesh/Core/System/config.hh>
 #include <OpenMesh/Core/System/omstream.hh>
+#include <ostream>
 #include <OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh>
 #include <OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh>

@@ -135,7 +136,7 @@ initialize( void )

  if (n_subdiv_rules_ != 1)
  {
-    std::cerr << "Error! More than one subdivision rules not allowed!\n";
+    ::omerr() << "Error! More than one subdivision rules not allowed!\n";
    return false;
  }

--- a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh
+++ b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh
@@ -58,7 +58,7 @@
 #include <OpenMesh/Core/System/omstream.hh>
 #include <OpenMesh/Core/Utils/GenProg.hh>
 #include <OpenMesh/Core/Mesh/Attributes.hh>
-#include <iostream>
+#include <ostream>


 //== NAMESPACES ===============================================================
--- a/src/OpenMesh/Tools/Utils/Timer.hh
+++ b/src/OpenMesh/Tools/Utils/Timer.hh
@@ -59,7 +59,7 @@

 #include <OpenMesh/Core/System/config.hh>
 //
-#include <iostream>
+#include <ostream>
 #include <string>
 #if defined(OM_CC_MIPS)
 #  include <assert.h>
--- a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc
+++ b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc
@@ -56,6 +56,7 @@
 //== INCLUDES =================================================================

 #include <OpenMesh/Tools/VDPM/ViewingParameters.hh>
+#include <iostream>

 //== NAMESPACES ===============================================================