mass clean-up: adapt usage of std::cout pretty much everywhere

- remove unnecessary includes
- expunge all remaining usages of boost::format
- able to leave out the expliti string(elm) in output
- drop various operator<<, since we're now picking up
  custom string conversions automatically
- delete diagnostics headers, which are now largely superfluous
- use newer helper functions occasionally

I didn't blindly change any usage of <iostream> though;
sometimes, just using the output streams right away
seems adequate.

research/try.cpp

@@ -74,7 +74,6 @@ typedef unsigned int uint;
 #include "lib/meta/trait.hpp"
 #include "lib/format-cout.hpp"
 
-#include <iostream>
 #include <type_traits>
 #include <utility>
 #include <string>

src/common/advice/binding.hpp

@@ -80,10 +80,10 @@
 #include "lib/hash-value.h"
 #include "lib/query-util.hpp"
 
-#include <iostream>
 #include <string>
 #include <set>
 
+
 namespace lumiera{
 namespace advice {
   
@@ -221,12 +221,6 @@ namespace advice {
     };
   
   
-  inline std::ostream&
-  operator<< (std::ostream& os, Binding const& bi)
-  {
-    return os << string(bi);
-  }
-  
   template<typename TY>
   inline Binding const&
   Binding::addTypeGuard()

src/common/advice/index.hpp

@@ -91,13 +91,13 @@
 #include "lib/symbol.hpp"
 #include "include/logging.h"
 #include "lib/iter-adapter-stl.hpp"
+#include "lib/format-util.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 #include "common/advice/binding.hpp"
 
 #include <boost/operators.hpp>
 #include <unordered_map>
-#include <iostream>
 #include <string>
 
 namespace lumiera{
@@ -109,6 +109,7 @@ namespace advice {
   using std::unordered_map;
   using lib::iter_stl::eachVal;
   using lib::iter_stl::eachElm;
+  using util::str;
   using util::for_each;
   using util::contains;
   using util::unConst;
@@ -116,9 +117,6 @@ namespace advice {
   using std::string;
   using std::vector;
   using std::pair;
-  using std::ostream;
-  using std::cout;
-  using std::endl;
   
   
   
@@ -165,6 +163,12 @@ namespace advice {
           
           // using default-copy, thus assuming copy is NO_THROW
           
+          
+          operator string()  const  ///< diagnostics
+            {
+              return "E-" +hash_value(this->first) +"--> "+ this->second ;
+            }
+          
           friend bool
           operator== (Entry const& a, Entry const& b)
           {
@@ -176,12 +180,6 @@ namespace advice {
           {
             return a.second == &p;
           }
-          
-          friend ostream&
-          operator<< (ostream& os, Entry const& ent)
-          {
-            return os << "E-"<<hash_value(ent.first) << "--> " << ent.second ;
-          }
         };
       
       
@@ -241,12 +239,12 @@ namespace advice {
                return false;
              }
            
-           void
-           dump() ///< debugging helper: Cluster contents --> STDOUT
+           operator string()  const  ///< debugging helper: show Cluster contents
              {
-               cout << "elmList("<< elms_.size()<<")" << endl;
-               for (EIter i=elms_.begin(); i!=elms_.end(); ++i)
-                 cout << "E...:"<< (*i) << endl;
+               string dump{"elmList("+str(elms_.size())+")\n"};
+               for (auto const& entry : elms_)
+                 dump += "E...:"+entry+"\n";
+               return dump;
              }
            
            lib::RangeIter<EIter>

src/common/basic-setup.cpp

@@ -30,7 +30,6 @@ extern "C" {
 #include <unistd.h>
 }
 #include <boost/filesystem.hpp>
-#include <iostream>
 #include <fstream>
 
 

src/common/option.cpp

@@ -86,7 +86,7 @@ namespace lumiera {
       
       if (isHelp())
         {
-          std::cerr << *this;
+          cerr << *this;
           exit(-1);
         }
       if (isConfigDefs())

src/common/option.hpp

@@ -25,9 +25,9 @@
 #define LUMIERA_OPTION_H
 
 #include "lib/cmdline.hpp"
+#include "lib/format-cout.hpp"
 
 #include <string>
-#include <iostream>
 #include <boost/program_options.hpp>
 #include <boost/utility.hpp>
 

src/gui/widget/menu-button.hpp

@@ -26,8 +26,6 @@
 
 #include "gui/gtk-base.hpp"
 
-#include <iostream>
-
 
 
 namespace gui {

src/lib/cmdline.cpp

@@ -37,7 +37,6 @@ using boost::algorithm::join;
 using util::noneg;
 
 
-#include <iostream>
 
 namespace lib {
   

src/lib/cmdline.hpp

@@ -26,7 +26,6 @@
 
 #include <vector>
 #include <string>
-#include <iostream>
 
 
 
@@ -61,9 +60,6 @@ namespace lib {
       
     };
    
-   /** for outputting Cmdline objects */
-   inline ostream& operator<< (ostream& os, const Cmdline& cmdL) { return os << (string (cmdL)); }
-   
    
    
 } // namespace lib

src/lib/idi/entry-id.hpp

@@ -50,7 +50,6 @@
 
 #include <boost/functional/hash.hpp>
 #include <boost/operators.hpp>
-#include <iostream>
 #include <string>
 
 
@@ -256,7 +255,6 @@ namespace idi {
       
       operator string()  const;
       
-      friend ostream& operator<<   (ostream& os, EntryID const& id) { return os << string(id); }
       friend bool operator<  (EntryID const& i1, EntryID const& i2) { return i1.getSym()  < i2.getSym(); }
     };
     

src/lib/sub-id.hpp

@@ -38,7 +38,7 @@
  ** 
  ** @todo 1/2016 this idea seems very reasonable, and we should just make it
  **       robust and usable, along the lines pointed out by that draft
- **       - remove the `<iostream>` and `format-util` dependency (!)
+ **       - remove the `format-util` dependency (!)           ////////////////////////////////TICKET #985
  **       - provide a hash implementation for real
  **       - extend to arbitrary number of sub-dimensions (variadic)
  **       - implement comparisons as you'd do for any algebraic type
@@ -59,17 +59,13 @@
 //#include <functional>
 #include <boost/functional/hash.hpp>      /////TODO better push the hash implementation into a cpp file (and btw, do it more seriously!)
 
-#include <iostream>
 #include <string>
 
 
 namespace lib {
 
   using boost::hash_value;
-  
-  using std::ostream;
   using std::string;
-  using std::cout;
   
   
   
@@ -88,12 +84,6 @@ namespace lib {
     };
   
   
-  inline ostream&
-  operator<< (ostream& os, SubID const& sID)
-  {
-    return os << string(sID);
-  }
-  
   inline size_t
   hash_value (SubID const& sID)
   {

src/lib/test/event-log.hpp

@@ -48,11 +48,11 @@
 #include "lib/iter-adapter.hpp"
 #include "lib/iter-cursor.hpp"
 #include "lib/format-util.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/diff/record.hpp"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 #include <memory>
 #include <vector>
 #include <string>
@@ -317,7 +317,7 @@ namespace test{
         {
           if (!isnil (violation_))
             {
-              std::cerr << "__Log_condition_violated__\n"+violation_ <<"\n";
+              cerr << "__Log_condition_violated__\n"+violation_ <<"\n";
               return false;
             }
           return true;

src/lib/test/suite.cpp

@@ -234,7 +234,7 @@ namespace test {
     // Instantiate all tests cases and execute them.
     for ( TestMap::iterator i=tests->begin(); i!=tests->end(); ++i )
       {
-        std::cout << "\n  ----------"<< i->first<< "----------\n";
+        cout << "\n  ----------"<< i->first<< "----------\n";
         Launcher* test = (i->second);
         IS_VALID (test, i->first);
         exitCode_ |= invokeTestCase (*test->makeInstance(), cmdline); // actually no cmdline arguments

src/lib/time/diagnostics.hpp

@@ -47,7 +47,6 @@
 #include "lib/time/timevalue.hpp"
 #include "lib/time.h"
 
-#include <iostream>
 #include <string>
 
 
@@ -55,14 +54,6 @@ namespace lib {
 namespace time {
   
   
-  /** writes time value, formatted as HH:MM:SS:mmm
-   *  @see lumiera_tmpbuf_print_time  */
-  inline std::ostream&
-  operator<< (std::ostream& os, TimeValue const& t)
-  {
-    return os << std::string(Time(t));
-  }
-  
   
   /* === H:M:S:mm component diagnostics === */
   

src/lib/time/display.hpp

@@ -1,52 +0,0 @@
-/*
-  DISPLAY.hpp  -  formatting of time values for display
-
-  Copyright (C)         Lumiera.org
-    2010,               Hermann Vosseler <Ichthyostega@web.de>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-
-#ifndef LIB_TIME_DISPLAY_H
-#define LIB_TIME_DISPLAY_H
-
-#include "lib/time/timecode.hpp"
-#include "lib/time/digxel.hpp"
-
-#include <iostream>
-#include <string>
-
-
-
-namespace lib {
-namespace time {
-  
-  
-   /* === shortcuts for diagnostic output === */
-    
-  /** writes time value, formatted as HH:MM:SS:mmm */
-  inline std::ostream& operator<< (std::ostream& os, Time const& t)  { return os << string(t); }
-  inline std::ostream& operator<< (std::ostream& os, TCode const& t) { return os << string(t); }
-  
-  /** display a single timecode component */
-  template< typename NUM, class FMT>
-  inline std::ostream& operator<< (std::ostream& os, Digxel<NUM,FMT> const& d) { return os << string(d); }
-  
-  
-  
-}} // lib::time
-#endif

src/lib/time/timecode.hpp

@@ -29,7 +29,6 @@
 #include "lib/time/digxel.hpp"
 #include "lib/symbol.hpp"
 
-//#include <iostream>
 #include <boost/operators.hpp>
 #include <boost/lexical_cast.hpp> ///////////////TODO
 #include <string>

src/lib/verb-token.hpp

@@ -91,7 +91,7 @@ namespace lib {
           return (receiver.*handler_)(std::forward<ARGS>(args)...);
         }
       
-      operator string()
+      operator string()  const
         {
           return string(token_);
         }

src/proc/asset.cpp

@@ -23,7 +23,6 @@
 
 #include "proc/asset.hpp"
 #include "proc/assetmanager.hpp"
-#include "proc/asset/asset-format.hpp"
 #include "lib/format-string.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"

src/proc/asset.hpp

@@ -348,21 +348,6 @@ namespace asset {
   ID<KIND> ID<KIND>::INVALID = ID(0);
   
   
-  /** convenient for debugging 
-   * @deprecated to be obsoleted by automatically using
-   *             custom string conversion in ostreams
-   */
-  inline string str (PcAsset const& a) 
-  {
-    if (a)
-      return string (*a.get());
-    else
-      return "Asset(NULL)";
-  }
-  
-  
-  
-  
 }} // namespace proc::asset
 
 

src/proc/asset/asset-format.hpp

@@ -1,54 +0,0 @@
-/*
-  ASSET-FORMAT.hpp  -  helpers for display of asset entities
-
-  Copyright (C)         Lumiera.org
-    2011,               Hermann Vosseler <Ichthyostega@web.de>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-
-#ifndef ASSET_ASSET_FORMAT_H
-#define ASSET_ASSET_FORMAT_H
-
-#include "proc/asset.hpp"
-#include "proc/asset/category.hpp"
-
-#include <iostream>
-
-
-
-namespace proc {
-namespace asset {
-  
-  
-  inline std::ostream&
-  operator<< (std::ostream& os, Category const& cat)
-  {
-    return os << string(cat); 
-  }
-  
-  inline std::ostream&
-  operator<< (std::ostream& os, Asset::Ident const& idi)
-  {
-    return os << string(idi); 
-  }
-  
-  
-  
-  
-}} // namespace proc::asset
-#endif

src/proc/asset/meta/time-grid.cpp

@@ -26,7 +26,6 @@
 #include "proc/assetmanager.hpp"
 #include "lib/time/quantiser.hpp"
 #include "lib/time/timevalue.hpp"
-#include "lib/time/display.hpp"
 #include "lib/format-string.hpp"
 #include "common/advice.hpp"
 #include "lib/util.hpp"

src/proc/asset/struct-scheme.hpp

@@ -39,12 +39,10 @@
 #include "lib/symbol.hpp"
 #include "proc/asset.hpp"
 #include "lib/idi/entry-id.hpp"
+#include "lib/format-string.hpp"
 
 #include <cstdlib>
 
-/////////////////////////////////////////////////////////TICKET #166 : needs to be pushed down into a *.cpp
-#include <boost/format.hpp>
-using boost::format;
 
 
 namespace proc {

src/proc/asset/typed-id.hpp

@@ -54,8 +54,6 @@
 
 //#include <boost/operators.hpp>
 #include <memory>
-//#include <iostream>
-//#include <string>
 
 namespace lumiera{  ///////TODO: shouldn't that be namespace lib? or proc?
 namespace query  {

src/proc/control/command-closure.hpp

@@ -74,14 +74,13 @@
 #include "lib/meta/function-erasure.hpp"
 #include "lib/meta/tuple.hpp"
 #include "lib/meta/maybe-compare.hpp"
-#include "lib/format-util.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 #include "proc/control/argument-erasure.hpp"
 #include "lib/typed-allocation-manager.hpp"
 
 #include <memory>
 #include <functional>
-#include <iostream>
 #include <sstream>
 #include <string>
 
@@ -184,7 +183,7 @@ namespace control {
       ostream&
       dump (ostream& output)  const
         {
-          return BASE::dump (output << util::str (element()) << ',');                            //////////////////TICKET #985 : make str obsolete!
+          return BASE::dump (output << element() << ',');
         }
       
       friend bool

src/proc/control/command-mutation.hpp

@@ -50,18 +50,11 @@
 #include "proc/control/command-closure.hpp"
 #include "proc/control/memento-tie.hpp"
 
-#include <iostream>
-#include <string>
-
 
 
 namespace proc {
 namespace control {
   
-  using std::ostream;
-  using std::string;
-  
-  
   
   
   /**

src/proc/control/styperegistry.hpp

@@ -45,7 +45,6 @@
 //#include <set>
 //#include <vector>
 //#include <memory>
-//#include <boost/format.hpp>
 #include <boost/noncopyable.hpp>
 
 
@@ -54,7 +53,6 @@ namespace control {
 
   
 //  using std::string;
-//  using boost::format;
   
   namespace impl {
   } // (End) impl namespace

src/proc/mobject/test-dummy-mobject.hpp

@@ -46,17 +46,16 @@
 #include "proc/mobject/session/abstractmo.hpp"
 #include "proc/mobject/placement.hpp"
 #include "lib/format-string.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 #include <cstdlib>
 
 using util::_Fmt;
 using util::cStr;
 using std::string;
 using std::rand;
-using std::cout;
 
 
 

tests/basics/streamtypebasicstest.cpp

@@ -27,8 +27,6 @@
 #include "proc/control/stypemanager.hpp"
 #include "teststreamtypes.hpp"
 
-#include <iostream>
-using std::cout;
 using ::test::Test;
 using util::isnil;
 

tests/basics/streamtypelifecycletest.cpp

@@ -29,8 +29,6 @@
 //#include "teststreamtypes.hpp"
 #include "include/lifecycle.h"
 
-#include <iostream>
-using std::cout;
 
 
 

tests/basics/time/digxel-configurations-test.cpp

@@ -23,20 +23,17 @@
 
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
-#include "lib/time/display.hpp"
 #include "lib/time/digxel.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/error.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 #include <cstdlib>
 
 using lumiera::error::LUMIERA_ERROR_ASSERTION;
 using util::isSameObject;
 using lib::test::showType;
 using std::rand;
-using std::cout;
-using std::endl;
 
 
 namespace lib {

tests/basics/time/digxel-test.cpp

@@ -22,22 +22,19 @@
 
 
 #include "lib/test/run.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
 #include "lib/test/test-helper.hpp"
-#include "lib/time/display.hpp"
 #include "lib/time/digxel.hpp"
 #include "lib/util.hpp"
 
 #include <time.h>
 #include <cstdlib>
-#include <iostream>
 
 using lumiera::error::LUMIERA_ERROR_ASSERTION;
 using util::isSameObject;
 using util::isnil;
 using std::rand;
-using std::cout;
-using std::endl;
 
 
 namespace lib {

tests/basics/time/time-basics-test.cpp

@@ -22,22 +22,17 @@
 
 
 #include "lib/test/run.hpp"
-
+#include "lib/time/timevalue.hpp"
+#include "lib/time/diagnostics.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
+
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 #include <cstdlib>
 
 using boost::lexical_cast;
 using util::isnil;
 using std::rand;
-using std::cout;
-using std::endl;
-
-
-#include "lib/time/timevalue.hpp"
-#include "lib/time/diagnostics.hpp"
-
 
 
 namespace lib {

tests/basics/time/time-control-test.cpp

@@ -30,18 +30,16 @@
 #include "lib/meta/generator-combinations.hpp"
 #include "proc/asset/meta/time-grid.hpp"
 #include "lib/scoped-holder.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 #include <string>
 #include <limits>
 
 using lib::test::showType;
 using boost::lexical_cast;
 using util::isnil;
-using std::cout;
-using std::endl;
 using std::string;
 
 

tests/basics/time/time-formats-test.cpp

@@ -27,11 +27,10 @@
 #include "lib/time/timequant.hpp"
 #include "lib/time/timecode.hpp"
 #include "lib/time/mutation.hpp"
-#include "lib/time/display.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 #include <string>
 #include <cstdlib>
 
@@ -39,8 +38,6 @@ using boost::lexical_cast;
 using util::isnil;
 using std::rand;
 using std::string;
-using std::cout;
-using std::endl;
 
 
 namespace lib {

tests/basics/time/time-quantisation-test.cpp

@@ -25,22 +25,16 @@
 #include "lib/test/test-helper.hpp"
 #include "proc/asset/meta/time-grid.hpp"
 #include "lib/time/timequant.hpp"
-#include "lib/time/display.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <iostream>
 #include <cstdlib>
 
 using boost::lexical_cast;
 using util::isnil;
 using util::contains;
 using std::rand;
-using std::cout;
-using std::endl;
-
-using boost::algorithm::join;
 
 
 namespace lib {

tests/basics/time/time-value-test.cpp

@@ -24,17 +24,14 @@
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
-#include "lib/time/display.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 #include <string>
 
 using boost::lexical_cast;
 using util::isnil;
-using std::cout;
-using std::endl;
 using std::string;
 
 using lumiera::error::LUMIERA_ERROR_BOTTOM_VALUE;

tests/basics/visitingtool-concept.cpp

@@ -54,15 +54,14 @@
 
 
 #include "lib/test/run.hpp"
+#include "lib/format-cout.hpp"
+#include "lib/format-string.hpp"
 #include "lib/depend.hpp"
 
-#include <boost/format.hpp>
-#include <iostream>
 #include <vector>
 
-using boost::format;
+using util::_Fmt;
 using std::string;
-using std::cout;
 
 
 namespace lumiera {
@@ -373,7 +372,7 @@ namespace lumiera {
         protected:
           void talk_to (string guy)
             {
-              cout << format ("Hello %s, nice to meet you...\n") % guy;
+              cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy;
             }
         };
       

tests/basics/visitingtool-extended-test.cpp

@@ -23,11 +23,11 @@
 
 #include "lib/test/run.hpp"
 #include "lib/visitor.hpp"
+#include "lib/format-string.hpp"
 
-#include <boost/format.hpp>
 #include <iostream>
 
-using boost::format;
+using util::_Fmt;
 using std::string;
 using std::cout;
 
@@ -64,7 +64,7 @@ namespace test2  {
     protected:
       void talk_to (string guy)
         {
-          cout << format ("Hello %s, nice to meet you...\n") % guy;
+          cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy;
         }
     };
     

tests/basics/visitingtool-test.cpp

@@ -23,11 +23,11 @@
 
 #include "lib/test/run.hpp"
 #include "lib/visitor.hpp"
+#include "lib/format-string.hpp"
 
-#include <boost/format.hpp>
 #include <iostream>
 
-using boost::format;
+using util::_Fmt;
 using std::string;
 using std::cout;
 
@@ -73,7 +73,7 @@ namespace test1 {
     protected:
       void talk_to (string guy)
         {
-          cout << format ("Hello %s, nice to meet you...\n") % guy;
+          cout << _Fmt{"Hello %s, nice to meet you...\n"} % guy;
         }
     };
   

tests/core/application/subsystem-runner-test.cpp

@@ -30,14 +30,13 @@
 #include "lib/symbol.hpp"
 #include "backend/thread-wrapper.hpp"
 #include "lib/query-util.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/error.hpp"
 #include "lib/util.hpp"
 #include "lib/sync.hpp"
 
 #include <functional>
-#include <iostream>
 
-using std::cout;
 using std::bind;
 using util::isnil;
 using util::cStr;
@@ -231,9 +230,6 @@ namespace test  {
           
           operator string ()  const { return "MockSys(\""+id_+"\")"; }
           
-          friend inline ostream&
-          operator<< (ostream& os, MockSys const& subsys) { return os << string(subsys); }
-          
           bool didRun ()  const { return didRun_; }
         };
       

tests/core/backend/media-access-mock-test.cpp

@@ -24,17 +24,16 @@
 #include "backend/media-access-facade.hpp"
 #include "backend/media-access-mock.hpp"
 #include "lib/test/depend-4test.hpp"
+#include "lib/format-cout.hpp"
 
 #include "lib/test/run.hpp"
-#include "lib/time/diagnostics.hpp"
 #include "lib/symbol.hpp"
 
-#include <iostream>
+#include <string>
 
 using lib::test::Depend4Test;
 using lib::Literal;
 using std::string;
-using std::cout;
 
 
 namespace backend {

tests/core/proc/asset/asset-category-test.cpp

@@ -22,18 +22,16 @@
 
 
 #include "lib/test/run.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/format-string.hpp"
 #include "lib/util.hpp"
 
 #include "proc/asset/category.hpp"
-#include "proc/asset/asset-format.hpp"
 
-#include <iostream>
 
 using util::_Fmt;
 using util::isnil;
 using std::string;
-using std::cout;
 
 
 namespace proc {

tests/core/proc/asset/asset-diagnostics.hpp

@@ -35,11 +35,11 @@
 
 #include "proc/assetmanager.hpp"
 #include "lib/format-string.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
 #include <functional>
-#include <iostream>
 
 using util::contains;
 using util::for_each;
@@ -61,7 +61,7 @@ namespace asset {
     else
       {
         _Fmt fmt("%s %|50T.| id=%s  adr=%p smart-ptr=%p use-count=%u");
-        cout << fmt % str(aa) % aa->getID() % aa.get() % &aa % (aa.use_count() - 1) << "\n";        ////////////TICKET #985 : make str obsolete
+        cout << fmt % aa % aa->getID() % aa.get() % &aa % (aa.use_count() - 1) << "\n";
   }   }
   
   

tests/core/proc/asset/basicpipetest.cpp

@@ -33,12 +33,10 @@
 #include "lib/query-util.hpp"
 #include "common/query.hpp"
 
-#include <iostream>
 
 using util::contains;
 using util::isnil;
 using std::string;
-using std::cout;
 
 
 namespace proc  {

tests/core/proc/asset/deleteassettest.cpp

@@ -24,10 +24,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-#include <iostream>
 
 using std::string;
-using std::cout;
 
 
 namespace proc {

tests/core/proc/asset/entry-id-test.cpp

@@ -30,10 +30,10 @@
 #include "proc/mobject/session/fork.hpp"
 #include "lib/meta/trait-special.hpp"
 #include "lib/util-foreach.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/symbol.hpp"
 
 #include <unordered_map>
-#include <iostream>
 #include <string>
 
 using lib::test::showSizeof;
@@ -43,8 +43,6 @@ using util::contains;
 using util::and_all;
 using lib::Literal;
 using std::string;
-using std::cout;
-using std::endl;
 
 
 

tests/core/proc/asset/meta/time-grid-basics-test.cpp

@@ -26,17 +26,14 @@
 
 #include "proc/asset/meta.hpp"
 #include "proc/asset/meta/time-grid.hpp"
-#include "proc/asset/asset-format.hpp"
 #include "lib/time/timevalue.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include <boost/rational.hpp>
-#include <iostream>
 
 using boost::rational_cast;
 using lib::test::randStr;
-using std::cout;
-using std::endl;
 
 
 

tests/core/proc/asset/testclipasset.hpp

@@ -28,10 +28,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-#include <iostream>
 
 using std::string;
-using std::cout;
 
 
 namespace proc {

tests/core/proc/asset/typed-id-test.cpp

@@ -33,10 +33,10 @@
 //#include "proc/mobject/session/fork.hpp"
 //#include "lib/meta/trait-special.hpp"
 #include "lib/util-foreach.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/symbol.hpp"
 
 //#include <unordered_map>
-#include <iostream>
 //#include <string>
 
 //using lib::test::showSizeof;
@@ -49,8 +49,6 @@ using util::isnil;
 using lib::Symbol;
 using lib::P;
 //using std::string;
-using std::cout;
-using std::endl;
 
 
 

tests/core/proc/control/argument-tuple-accept-test.cpp

@@ -26,13 +26,9 @@
 #include "proc/control/argument-tuple-accept.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/meta/tuple.hpp"
-#include "lib/time/diagnostics.hpp"
+#include "lib/format-cout.hpp"
 
 #include <functional>
-#include <iostream>
-
-using std::cout;
-using std::endl;
 
 
 namespace proc {

tests/core/proc/control/command-argument-test.cpp

@@ -25,14 +25,13 @@
 #include "lib/test/test-helper.hpp"
 #include "proc/control/command-argument-holder.hpp"
 #include "lib/scoped-ptrvect.hpp"
-#include "lib/time/diagnostics.hpp"
 #include "lib/meta/tuple.hpp"
 #include "lib/format-string.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
 #include <functional>
-#include <iostream>
 #include <sstream>
 #include <cstdlib>
 #include <string>
@@ -44,11 +43,8 @@ using lib::time::Time;
 using lib::time::TimeVar;
 using lib::time::TimeValue;
 using std::string;
-using std::ostream;
 using std::ostringstream;
 using std::rand;
-using std::cout;
-using std::endl;
 
 
 namespace proc {
@@ -90,11 +86,6 @@ namespace test    {
         
         operator string()  const { return element_; }
         
-        friend ostream&
-        operator<< (ostream& out, const Tracker& tra)
-          {
-            return out << tra.element_;
-          }
         
         friend bool
         operator== (Tracker const& tra1, Tracker const& tra2)

tests/core/proc/control/command-binding-test.cpp

@@ -23,19 +23,14 @@
 
 #include "lib/test/run.hpp"
 #include "proc/control/command-def.hpp"
-
 #include "proc/control/test-dummy-commands.hpp"
-
-#include <iostream>
+#include "lib/format-cout.hpp"
 
 
 namespace proc {
 namespace control {
 namespace test    {
   
-  using std::cout;
-  using std::endl;
-  
   
   
   
@@ -93,7 +88,7 @@ namespace test    {
               ;
           Command com ("test.command3.2");
           CHECK (com.canExec());
-          cout << string(com) << endl;
+          cout << com << endl;
           
           com();
           CHECK ( 2 == command3::check_);

tests/core/proc/control/command-equality-test.cpp

@@ -28,12 +28,12 @@
 #include "proc/control/argument-erasure.hpp"
 #include "proc/control/command-argument-holder.hpp"
 #include "proc/control/memento-tie.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/meta/tuple.hpp"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 
 #include <functional>
-#include <iostream>
 #include <string>
 
 namespace proc {
@@ -50,8 +50,6 @@ namespace test    {
   using std::function;
   using std::bind;
   using std::string;
-  using std::cout;
-  using std::endl;
   
   
   

tests/core/proc/control/command-mutation-test.cpp

@@ -28,17 +28,15 @@
 #include "proc/control/memento-tie.hpp"
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/tuple.hpp"
+#include "lib/format-cout.hpp"
 
 #include <functional>
-#include <iostream>
 #include <cstdlib>
 #include <string>
 
 using std::function;
 using std::string;
 using std::rand;
-using std::cout;
-using std::endl;
 
 
 namespace proc {

tests/core/proc/control/command-use1-test.cpp

@@ -26,12 +26,11 @@
 #include "proc/control/command-invocation.hpp"
 #include "proc/control/command-def.hpp"
 #include "lib/format-util.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include "proc/control/test-dummy-commands.hpp"
 
-#include <iostream>
-
 
 namespace proc {
 namespace control {
@@ -40,8 +39,6 @@ namespace test    {
   using util::isSameObject;
   using util::contains;
   using util::str;
-  using std::cout;
-  using std::endl;
   
   
   
@@ -121,8 +118,8 @@ namespace test    {
           Command com ("test.command1.2");
           CHECK (com);
           CHECK (com == Command::get("test.command1.2"));
-          CHECK (contains (str(com), "test.command1.2"));
-          CHECK (contains (str(com), "{def}"));                               //////////////////TICKET #985  : make str obsolete!
+          CHECK (contains (string(com), "test.command1.2"));
+          CHECK (contains (string(com), "{def}"));
           CHECK (!com.canExec());
           VERIFY_ERROR (UNBOUND_ARGUMENTS, com() );
           CHECK ( 0 == command1::check_);
@@ -307,11 +304,11 @@ namespace test    {
       void
       stringRepresentation()
         {
-          cout << string (Command::get("test.command1.1")) << endl;
-          cout << string (Command::get("test.command1.2")) << endl;
-          cout << string (Command::get("test.command1.3")) << endl;
-          cout << string (Command::get("test.command1.4")) << endl;
-          cout << string (Command()                      ) << endl;
+          cout << Command::get("test.command1.1") << endl;
+          cout << Command::get("test.command1.2") << endl;
+          cout << Command::get("test.command1.3") << endl;
+          cout << Command::get("test.command1.4") << endl;
+          cout << Command()                       << endl;
           
           Command com
             = CommandDef ("test.command1.5")
@@ -319,13 +316,13 @@ namespace test    {
                   .captureUndo (command1::capture)
                   .undoOperation (command1::undoIt);
           
-          cout << string (com) << endl;
+          cout << com << endl;
           com.bind(123);
-          cout << string (com) << endl;
+          cout << com << endl;
           com();
-          cout << string (com) << endl;
+          cout << com << endl;
           com.undo();
-          cout << string (com) << endl;
+          cout << com << endl;
         }
       
       

tests/core/proc/control/command-use3-test.cpp

@@ -24,14 +24,13 @@
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
 #include "proc/control/command-def.hpp"
-#include "lib/util.hpp"
+//#include "lib/format-cout.hpp"
+//#include "lib/util.hpp"
 
 #include "proc/control/test-dummy-commands.hpp"
 
 //#include <functional>
 //#include <boost/ref.hpp>
-//#include <boost/format.hpp>
-//#include <iostream>
 //#include <cstdlib>
 //#include <string>
 
@@ -41,15 +40,11 @@ namespace control {
 namespace test    {
 
 
-//  using boost::format;
-//  using boost::str;
   //using util::contains;
 //  using std::function;
 //  using std::bind;
 //  using std::string;
   //using std::rand;
-  //using std::cout;
-  //using std::endl;
 //  using lib::test::showSizeof;
 //  using util::isSameObject;
 //  using util::contains;

tests/core/proc/control/handling-pattern-standard-impl-test.cpp

@@ -36,6 +36,7 @@
 #include "proc/control/command-impl.hpp"
 #include "proc/control/command-registry.hpp"
 //#include "proc/control/command-def.hpp"
+//#include "lib/format-cout.hpp"
 //#include "lib/symbol.hpp"
 //#include "lib/util.hpp"
 
@@ -43,8 +44,6 @@
 
 //#include <functional>
 //#include <boost/ref.hpp>
-//#include <boost/format.hpp>
-//#include <iostream>
 //#include <cstdlib>
 //#include <string>
 
@@ -54,15 +53,11 @@ namespace control {
 namespace test    {
 
 
-//  using boost::format;
-//  using boost::str;
   //using util::contains;
   using std::function;
 //  using std::bind;
 //  using std::string;
   //using std::rand;
-  //using std::cout;
-  //using std::endl;
 //  using lib::test::showSizeof;
 //  using util::isSameObject;
 //  using util::contains;

tests/core/proc/engine/buff-table-test.cpp

@@ -27,13 +27,11 @@
 #include "proc/engine/procnode.hpp"
 #include "proc/engine/bufftable-obsolete.hpp"
 #include "lib/ref-array.hpp"
+#include "lib/format-cout.hpp"
 
 #include <boost/scoped_ptr.hpp>
-#include <iostream>
 
 using test::Test;
-using std::cout;
-using std::rand;
 
 
 namespace proc {

tests/core/proc/engine/calc-stream-test.cpp

@@ -27,11 +27,9 @@
 #include "proc/engine/engine-service.hpp"
 
 //#include <boost/scoped_ptr.hpp>
-//#include <iostream>
 //#include <ctime>
 
 using test::Test;
-//using std::cout;
 //using std::rand;
 
 

tests/core/proc/engine/dispatcher-interface-test.cpp

@@ -31,13 +31,13 @@
 #include "proc/play/timings.hpp"
 #include "lib/time/timevalue.hpp"
 //#include "lib/time/timequant.hpp"
+//#include "lib/format-cout.hpp"
 #include "lib/depend.hpp"
 #include "lib/itertools.hpp"
 #include "lib/util-coll.hpp"
 #include "lib/util.hpp"
 
 //#include <boost/scoped_ptr.hpp>
-//#include <iostream>
 #include <functional>
 #include <vector>
 
@@ -46,7 +46,6 @@ using util::isnil;
 using util::last;
 using std::vector;
 using std::function;
-//using std::cout;
 //using std::rand;
 
 

tests/core/proc/engine/engine-interface-test.cpp

@@ -34,11 +34,9 @@
 #include "lib/time/timevalue.hpp"
 
 //#include <boost/scoped_ptr.hpp>
-//#include <iostream>
 //#include <ctime>
 
 using test::Test;
-//using std::cout;
 //using std::rand;
 
 

tests/core/proc/engine/node-basic-test.cpp

@@ -22,20 +22,17 @@
 
 
 #include "lib/test/run.hpp"
-//#include "lib/util.hpp"
 #include "proc/engine/nodefactory.hpp"
 #include "proc/engine/nodewiring.hpp"
 #include "proc/engine/stateproxy.hpp"
 #include "proc/engine/channel-descriptor.hpp"
 #include "proc/mobject/session/effect.hpp"
 #include "lib/allocation-cluster.hpp"
+//#include "lib/format-cout.hpp"
+//#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-//#include <iostream>
 
-//using boost::format;
 //using std::string;
-//using std::cout;
 
 
 namespace proc {

tests/core/proc/engine/node-fabrication-test.cpp

@@ -24,12 +24,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
 using std::string;
-using std::cout;
 
 
 namespace proc {

tests/core/proc/engine/node-operation-test.cpp

@@ -24,12 +24,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/engine/node-source-test.cpp

@@ -24,12 +24,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/mobject/builder/buildertooltest.cpp

@@ -31,10 +31,9 @@
 #include "proc/mobject/test-dummy-mobject.hpp"
 #include "backend/media-access-mock.hpp"
 #include "lib/test/depend-4test.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
-
 using util::cStr;
 using std::string;
 using std::cout;
@@ -73,7 +72,7 @@ namespace test    {
           void treat (Clip& c)    
             { 
               Placement<Clip>& pC = getPlacement<Clip>();
-              cout << "Clip on media : "<< str(pC->getMedia()) <<"\n";                            //////////////////TICKET #985 : make str obsolete!
+              cout << "Clip on media : "<< pC->getMedia() <<"\n";
               CHECK (pC->operator==(c));
               log_ = string (pC);
             }

tests/core/proc/mobject/builder/buildsegmenttest.cpp

@@ -24,12 +24,8 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/mobject/controller/rendersegmenttest.cpp

@@ -24,12 +24,7 @@
 #include "lib/test/run.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
-
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/mobject/mobject-interface-test.cpp

@@ -38,8 +38,8 @@
 #include "backend/media-access-mock.hpp"
 #include "lib/test/depend-4test.hpp"
 #include "lib/time/timevalue.hpp"
+#include "lib/format-cout.hpp"
 
-#include <iostream>
 
 
 
@@ -49,9 +49,6 @@ namespace mobject {
 namespace test    {
   
 //  using lib::test::showSizeof;
-  using std::string;
-  using std::cout;
-  using std::endl;
   
   using lib::Symbol;
   using lib::test::Depend4Test;

tests/core/proc/mobject/mobject-ref-test.cpp

@@ -36,9 +36,9 @@
 #include "lib/test/depend-4test.hpp"
 #include "lib/test/test-helper.hpp"
 #include "lib/time/timevalue.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 
 using lib::test::Depend4Test;
 using lib::test::showSizeof;
@@ -47,8 +47,6 @@ using lib::time::FSecs;
 using lib::time::Time;
 using util::isnil;
 using std::string;
-using std::cout;
-using std::endl;
 
 
 namespace proc    {
@@ -188,18 +186,18 @@ namespace test    {
           MORef<Clip> rMO;
           CHECK (!rMO);                     // still empty (not bound)
           CHECK (0==rMO.use_count());
-          cout << string(rMO)     << endl;                 /////////////////////TICKET #527
+          cout << rMO << endl;                             /////////////////////TICKET #527
           cout << showSizeof(rMO) << endl;
           
           // activate by binding to provided ref
           rMO.activate(refObj);
           CHECK (rMO);                     // now bound
-          cout << string(rMO)     << endl;                 /////////////////////TICKET #527
+          cout << rMO << endl;                             /////////////////////TICKET #527
           
           // access MObject (Clip API)
 //        cout << rMO->operator string() << endl;          /////////////////////TICKET #428
           PMedia media = rMO->getMedia();
-          cout << str(media) << endl;                      /////////////////////TICKET #520  ///////TICKET #985 : make str obsolete!
+          cout << media << endl;                           /////////////////////TICKET #520
           Duration mediaLength = media->getLength();
           CHECK (!isnil (mediaLength));
           CHECK (rMO->isValid());
@@ -218,7 +216,7 @@ namespace test    {
           CHECK (refP.use_count() == rMO.use_count());
           CHECK (checkUseCount(refP, 1));   // use count not changed
           CHECK (&refP == placementAdr);    // actually denotes the address of the original Placement in the "session"
-          cout << string(refP) << endl;
+          cout << refP << endl;
           
           ExplicitPlacement exPla = refP.resolve();
           CHECK (exPla.time == start);      // recovered Placement resolves to the same time as provided by the proxied API
@@ -371,8 +369,8 @@ namespace test    {
           CHECK (checkUseCount(rMObj, 2));
           CHECK (checkUseCount(rClip, 2));
           
-          cout << string(rClip) << endl;                         //////////TICKET #527
-          cout << string(rClip->getMedia()->ident) << endl;      //////////TICKET #520
+          cout << rClip << endl;                         //////////TICKET #527
+          cout << rClip->getMedia()->ident << endl;      //////////TICKET #520
         }
     };
   

tests/core/proc/mobject/placement-basic-test.cpp

@@ -29,14 +29,10 @@
 #include "proc/mobject/explicitplacement.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"   ////TODO: avoidable?
 #include "lib/time/timevalue.hpp"
-#include "lib/util.hpp"
+//#include "lib/util.hpp"
 
-#include <iostream>
 
 using lib::time::Time;
-using util::contains;
-using std::string;
-using std::cout;
 
 
 namespace proc    {

tests/core/proc/mobject/placement-hierarchy-test.cpp

@@ -29,20 +29,14 @@
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset/media.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/error.hpp"
 #include "lib/util.hpp"
 
-#include <memory>
-#include <iostream>
 
 using lib::HashIndexed;
 using lib::test::Depend4Test;
 
-using std::shared_ptr;
-using std::string;
-using std::cout;
-using std::endl;
-
 
 namespace proc    {
 namespace mobject {
@@ -114,14 +108,11 @@ namespace test    {
           CHECK (sizeof(pSub1) == sizeof(pSub3));
           CHECK (sizeof(pClip) == sizeof(pSub3));
           
-          cout << string(pSub1) << endl;
-          cout << string(pSub2) << endl;
-          cout << string(pSub3) << endl;
-          cout << string(pSubM) << endl;
-          cout << string(pClip) << endl;
-          cout << pSub1->operator string() << endl;
-          cout << pSub2->operator string() << endl;
-          cout << pSubM->operator string() << endl;
+          cout << pSub1 << endl;
+          cout << pSub2 << endl;
+          cout << pSub3 << endl;
+          cout << pSubM << endl;
+          cout << pClip << endl;
           
           pSub3->specialAPI();
           

tests/core/proc/mobject/placement-object-identity-test.cpp

@@ -35,11 +35,6 @@
 //#include "proc/mobject/test-dummy-mobject.hpp"
 //#include "lib/test/test-helper.hpp"
 
-//#include <iostream>
-//
-//using std::string;
-//using std::cout;
-//using std::endl;
 
 
 namespace proc    {

tests/core/proc/mobject/placement-ref-test.cpp

@@ -30,14 +30,11 @@
 #include "proc/mobject/explicitplacement.hpp"
 #include "proc/mobject/test-dummy-mobject.hpp"
 #include "lib/time/timevalue.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 
 using util::isSameObject;
-using std::string;
-using std::cout;
-using std::endl;
 
 
 namespace proc    {
@@ -108,9 +105,9 @@ namespace test    {
           CHECK (isSameObject (p2, *ref2));
           CHECK (isSameObject (p2, *refX));
           
-          cout << string(*ref1) << endl;
-          cout << string(*ref2) << endl;
-          cout << string(*refX) << endl;
+          cout << *ref1 << endl;
+          cout << *ref2 << endl;
+          cout << *refX << endl;
           
           // PlacementRef mimics placement behaviour
           ref1->specialAPI();

tests/core/proc/mobject/session/addcliptest.cpp

@@ -25,15 +25,12 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/placement.hpp"
+//#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
 using util::contains;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/mobject/session/deletecliptest.cpp

@@ -26,14 +26,11 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/testsession1.hpp"
 #include "proc/mobject/session/clip.hpp"              // TODO: really neded?
+#include "lib/format-cout.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 using proc_interface::AssetManager;
 using proc_interface::PAsset;

tests/core/proc/mobject/session/placement-index-query-test.cpp

@@ -27,11 +27,9 @@
 #include "proc/mobject/session/placement-index-query-resolver.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
 #include "common/query/query-resolver.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
-#include <string>
-
 
 
 namespace proc    {
@@ -43,9 +41,6 @@ namespace test    {
   using session::PathQuery;
   using session::ContentsQuery;
   using util::isSameObject;
-  using std::string;
-  using std::cout;
-  using std::endl;
   
   
   /************************************************************************//**
@@ -103,7 +98,7 @@ namespace test    {
           
           PlacementMO& elm = *ContentsQuery<TestSubMO1>(root).resolveBy(resolver);                  ////////////////////// TICKET #532
           
-          cout << "path to root starting at " << string(elm) << endl;
+          cout << "path to root starting at " << elm << endl;
           discover (PathQuery<MObject> (elm).resolveBy(resolver));
         }
       
@@ -113,7 +108,7 @@ namespace test    {
       discover (IT result)
         {
           for ( ; result; ++result)
-            cout << string(*result) << endl;
+            cout << *result << endl;
         }
       
     };

tests/core/proc/mobject/session/placement-index-test.cpp

@@ -27,19 +27,17 @@
 #include "proc/mobject/session/scope.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset/media.hpp"
+#include "lib/format-string.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/session/testroot.hpp"
 
-#include <boost/format.hpp>
-#include <iostream>
 
-using boost::format;
+using util::_Fmt;
 using util::isSameObject;
 using std::string;
-using std::cout;
-using std::endl;
 
 
 namespace proc    {
@@ -296,7 +294,7 @@ namespace test    {
           uint count (0);
           for ( ; iter; ++iter )
             {
-              cout << indent(level) << "::" << string(*iter) << endl;
+              cout << indent(level) << "::" << *iter << endl;
               
               ++count;
               Iter scopeContents = index.getReferrers (iter->getID());
@@ -304,7 +302,7 @@ namespace test    {
                 discover (index, scopeContents, level+1);
             }
           
-          static format summary ("...%i elements at Level %i");
+          static _Fmt summary{"...%i elements at Level %i"};
           cout << indent(level) << summary % count % level << endl;
           
           CHECK (!iter);

tests/core/proc/mobject/session/placement-scope-test.cpp

@@ -27,9 +27,9 @@
 #include "proc/mobject/session/scope.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
 #include "proc/mobject/session/scope-locator.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 
 using util::isSameObject;
 
@@ -102,8 +102,8 @@ namespace test    {
               PlacementMO& elm = *ii;
               CHECK (elm.isValid());
               Scope const& scope1 = Scope::containing(elm);
-              std::cout << "Scope: " << string(scope1) << std::endl;
-              std::cout << string(elm) << std::endl;
+              cout << "Scope: " << scope1 << endl;
+              cout << elm << endl;
               
               RefPlacement ref (elm);
               Scope const& scope2 = Scope::containing(ref);

tests/core/proc/mobject/session/query-focus-test.cpp

@@ -26,9 +26,7 @@
 #include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/query-focus.hpp"
 #include "proc/mobject/session/scope.hpp"
-
-#include <iostream>
-#include <string>
+#include "lib/format-cout.hpp"
 
 
 
@@ -50,10 +48,6 @@ namespace test    {
   
   
   
-  using std::string;
-  using std::cout;
-  using std::endl;
-  
   
   /*******************************************************************************//**
    * @test handling of current query focus when navigating a system of nested scopes.
@@ -138,7 +132,7 @@ namespace test    {
           CHECK (num_refs > 1);   // because the run() function also holds a ref
           
           QueryFocus subF = QueryFocus::push();
-          cout << string(subF) << endl;
+          cout << subF << endl;
           CHECK (subF == original);
           
           CHECK (       1 == refs(subF) );
@@ -148,25 +142,25 @@ namespace test    {
             QueryFocus subF2 = QueryFocus::push(Scope(subF).getParent());
             CHECK (subF2 != subF);
             CHECK (subF == original);
-            cout << string(subF2) << endl;
+            cout << subF2 << endl;
             
             ScopeQuery<TestSubMO21>::iterator ii = subF2.explore<TestSubMO21>();
             while (ii) // drill down depth first
               {
                 subF2.shift(*ii);
-                cout << string(subF2) << endl;
+                cout << subF2 << endl;
                 ii = subF2.explore<TestSubMO21>();
               }
-            cout << string(subF2) << "<<<--discovery exhausted" << endl;
+            cout << subF2 << "<<<--discovery exhausted" << endl;
             
             subF2.pop(); // releasing this focus and re-attaching to what's on stack top
-            cout << string(subF2) << "<<<--after pop()" << endl;
+            cout << subF2 << "<<<--after pop()" << endl;
             CHECK (subF2 == subF);
             CHECK (2 == refs(subF2));   // both are now attached to the same path
             CHECK (2 == refs(subF));
           }
           // subF2 went out of scope, but no auto-pop happens (because subF is still there)
-          cout << string(subF) << endl;
+          cout << subF << endl;
           
           CHECK (       1 == refs(subF));
           CHECK (num_refs == refs(original));

tests/core/proc/mobject/session/query-resolver-test.cpp

@@ -23,11 +23,11 @@
 
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/depend.hpp"
 
 #include "common/query/query-resolver.hpp"
 
-#include <iostream>
 #include <string>
 
 
@@ -37,8 +37,6 @@ namespace test{
   
   using lib::test::showSizeof;
   using std::string;
-  using std::cout;
-  using std::endl;
   
   
   

tests/core/proc/mobject/session/rebuildfixturetest.cpp

@@ -24,17 +24,10 @@
 #include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/testsession1.hpp"
-#include "lib/util-foreach.hpp"
-#include "lib/util.hpp"
+//#include "lib/format-cout.hpp"
+//#include "lib/util.hpp"
 
-#include <functional>
-#include <iostream>
-
-using std::bind;
-using util::contains; 
-using util::for_each; 
-using std::string;
-using std::cout;
+//using util::contains; 
 
 
 namespace proc    {

tests/core/proc/mobject/session/scope-path-test.cpp

@@ -27,9 +27,9 @@
 #include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/scope-path.hpp"
 #include "proc/mobject/session/test-scope-invalid.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 #include <string>
 
 
@@ -38,8 +38,6 @@ namespace mobject {
 namespace session {
 namespace test    {
   
-  using std::cout;
-  using std::endl;
   using std::string;
   using util::isnil;
   using util::isSameObject;
@@ -312,7 +310,7 @@ namespace test    {
       void
       navigate (const ScopePath refPath, PPIdx index)
         {
-          #define __SHOWPATH(N) cout << "Step("<<N<<"): "<< string(path) << endl;
+          #define __SHOWPATH(N) cout << "Step("<<N<<"): "<< path << endl;
           
           ScopePath path (refPath);               __SHOWPATH(1)
           CHECK (path == refPath);

tests/core/proc/mobject/session/scope-query-test.cpp

@@ -27,10 +27,10 @@
 #include "proc/mobject/session/session-service-explore-scope.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
 #include "proc/mobject/session/clip.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 #include <string>
 
 
@@ -40,12 +40,9 @@ namespace mobject {
 namespace session {
 namespace test    {
   
+  using util::contains;
   using lib::Literal;
   using std::string;
-  using std::cout;
-  using std::endl;
-  
-  using util::contains;
   
   
   namespace { // helpers and shortcuts....
@@ -65,7 +62,7 @@ namespace test    {
     {
       for (IT elm(iter);
            elm; ++elm)
-        cout << string(*elm) << endl;
+        cout << *elm << endl;
     }
     
     void

tests/core/proc/mobject/session/session-modify-parts-test.cpp

@@ -27,6 +27,7 @@
 //#include "proc/assetmanager.hpp"          //////??
 //#include "proc/asset/timeline.hpp"
 #include "proc/asset/sequence.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/util-foreach.hpp"
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/mobject-ref.hpp"
@@ -34,15 +35,12 @@
 #include "common/query.hpp"
 
 #include <functional>
-#include <iostream>
 #include <set>
 
 using std::ref;
 using std::placeholders::_1;
 using util::isSameObject;
 using util::and_all;
-using std::string;
-using std::cout;
 using std::set;
 
 

tests/core/proc/mobject/session/session-service-access-test.cpp

@@ -24,9 +24,10 @@
 #include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "lib/meta/generator.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/depend.hpp"
+
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 #include <string>
 
 
@@ -37,10 +38,7 @@ namespace test    {
   
   using lib::Depend;
   using boost::lexical_cast;
-  using std::ostream;
   using std::string;
-  using std::cout;
-  using std::endl;
   
   
   namespace { // what follows is a simulated (simplified) version
@@ -235,12 +233,6 @@ namespace test    {
     
     /* === Implementation of Session internals === */          //----------------corresponding-to-session-impl.cpp
       
-    inline ostream&
-    operator<< (ostream& os, TSessionImpl const& simpl)
-    {
-      return os << string(simpl);
-    }
-    
     TSessionImpl::operator string() const
     {
       return string("Session-Impl(")
@@ -257,14 +249,14 @@ namespace test    {
     void
     TSessionImpl::externalOperation()
     {
-      cout << *this << "::externalOperation()" << endl;
+      cout << this << "::externalOperation()" << endl;
     }
     
     /* ==== Implementation level API ==== */
     inline void
     TSessionImpl::implementationService()
     {
-      cout << *this << "::implementationService()" << endl;
+      cout << this << "::implementationService()" << endl;
     }
     
     

tests/core/proc/mobject/session/session-structure-test.cpp

@@ -27,13 +27,10 @@
 #include "proc/assetmanager.hpp"          //////??
 #include "proc/asset/timeline.hpp"
 #include "proc/asset/sequence.hpp"
+//#include "lib/format-cout.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
-
 using util::isSameObject;
-using std::string;
-using std::cout;
 
 
 namespace proc    {

tests/core/proc/mobject/session/sessionmanagertest.cpp

@@ -25,12 +25,8 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/testsession1.hpp"
 //#include "lib/util.hpp"
-//#include <boost/format.hpp>
-#include <iostream>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc    {

tests/core/proc/mobject/session/testsession1.hpp

@@ -29,12 +29,9 @@
 #include "lib/error.hpp"
 //#include "lib/util.hpp"
 
-//#include <boost/format.hpp>
-#include <iostream>
+//#include <string>
 
-//using boost::format;
-using std::string;
-using std::cout;
+//using std::string;
 
 
 namespace proc {

tests/core/proc/mobject/session/timeline-sequence-handling-test.cpp

@@ -33,12 +33,9 @@
 #include "common/query.hpp"
 #include "lib/util.hpp"
 
-#include <iostream>
 
 using util::isSameObject;
 using util::contains;
-using std::string;
-using std::cout;
 
 
 namespace proc    {

tests/gui/abstract-tangible-test.cpp

@@ -51,17 +51,15 @@
 #include "test/mock-elm.hpp"
 #include "test/test-nexus.hpp"
 #include "lib/idi/entry-id.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/error.hpp"
 //#include "lib/util.hpp"
 
 
-#include <iostream>
 
 using gui::test::MockElm;
 using lib::test::EventLog;
 using lib::idi::EntryID;
-using std::cout;
-using std::endl;
 
 
 

tests/gui/bus-term-test.cpp

@@ -26,18 +26,16 @@
 #include "test/mock-elm.hpp"
 #include "lib/idi/entry-id.hpp"
 #include "lib/diff/gen-node.hpp"
+#include "lib/format-cout.hpp"
 //#include "lib/util.hpp"
 
 
-#include <iostream>
 
 using lib::idi::EntryID;
 using lib::idi::BareEntryID;
 using gui::test::MockElm;
 using lib::diff::GenNode;
 //using util::contains;
-using std::cout;
-using std::endl;
 
 
 namespace gui  {

tests/gui/session-structure-mapping-test.cpp

@@ -43,16 +43,10 @@
 //#include "lib/util.hpp"
 
 
-//#include <boost/lexical_cast.hpp>
-//#include <iostream>
 //#include <string>
-//#include <map>
 
-//using boost::lexical_cast;
 //using util::contains;
 //using std::string;
-//using std::cout;
-//using std::endl;
 
 
 namespace gui  {

tests/gui/tangible-update-test.cpp

@@ -42,16 +42,10 @@
 //#include "lib/util.hpp"
 
 
-//#include <boost/lexical_cast.hpp>
-//#include <iostream>
 //#include <string>
-//#include <map>
 
-//using boost::lexical_cast;
 //using util::contains;
 //using std::string;
-//using std::cout;
-//using std::endl;
 
 
 namespace gui  {

tests/gui/test-gui-test.cpp

@@ -24,10 +24,7 @@
 #include "lib/test/run.hpp"
 #include "lib/util.hpp"
 #include "gui/model/session-facade.hpp"
-
-#include <iostream>
-
-using std::cout;
+#include "lib/format-cout.hpp"
 
 
 namespace gui {

tests/gui/test/mock-elm.hpp

@@ -66,9 +66,9 @@
 #include "lib/diff/record.hpp"
 #include "lib/idi/genfunc.hpp"
 #include "test/test-nexus.hpp"
+#include "lib/format-cout.hpp"
 #include "lib/symbol.hpp"
 
-#include <iostream>
 #include <string>
 
 
@@ -83,9 +83,6 @@ namespace test{
   
   using lib::Symbol;
   using std::string;
-  using std::cout;
-  using std::cerr;
-  using std::endl;
   
   
   /**
@@ -171,7 +168,7 @@ namespace test{
       doMark (GenNode const& mark)  override
         {
           log_.call (this->identify(), "doMark", mark);
-          cout << this->identify() << " <-- state-mark = "<< string(mark) <<endl;
+          cout << this->identify() << " <-- state-mark = "<< mark <<endl;
           log_.note ("type=mark", "ID="+mark.idi.getSym(), mark);
         }
       

tests/gui/test/test-nexus.cpp

@@ -52,13 +52,11 @@
 #include "lib/idi/genfunc.hpp"
 #include "lib/depend.hpp"
 #include "lib/format-string.hpp"
+#include "lib/format-cout.hpp"
 //#include "lib/util.hpp"
 
-#include <iostream>
 #include <string>
 
-using std::cerr;
-using std::endl;
 using std::string;
 
 using lib::Variant;
@@ -269,7 +267,7 @@ namespace test{
           {
             log().call(this, "act", command);
             log().error ("sent command invocation to ZombieNexus");
-            cerr << "Command " << string(command) << " -> ZombieNexus" <<endl;
+            cerr << "Command " << command << " -> ZombieNexus" <<endl;
           }
         
         virtual void
@@ -277,8 +275,8 @@ namespace test{
           {
             log().call(this, "note", subject, mark);
             log().error ("sent note message to ZombieNexus");
-            cerr << "note message "<< string(mark)
-                 << " FROM:" << string(subject)
+            cerr << "note message "<< mark
+                 << " FROM:"       << subject
                  << " -> ZombieNexus" <<endl;
           }
         
@@ -296,7 +294,7 @@ namespace test{
           {
             log().call(this, "routeAdd", identity, newNode);
             log().error ("attempt to connect against ZombieNexus");
-            cerr << "connect("<<string(identity)<<" -> ZombieNexus" <<endl;
+            cerr << "connect("<< identity <<" -> ZombieNexus" <<endl;
             return *this;
           }
         
@@ -305,7 +303,7 @@ namespace test{
           {
             log().call(this, "routeDetach", node);
             log().error ("disconnect from ZombieNexus");
-            cerr << "disconnect("<<string(node)<<" -> ZombieNexus" <<endl;
+            cerr << "disconnect("<< node <<" -> ZombieNexus" <<endl;
           }
         
         virtual operator string()  const

tests/library/advice/advice-binding-pattern-test.cpp

@@ -23,15 +23,12 @@
 
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
+#include "lib/format-cout.hpp"
 
 #include "lib/time/timevalue.hpp"
 #include "common/advice.hpp"
 
-#include <iostream>
-
 using lib::time::Time;
-using std::cout;
-using std::endl;
 
 
 

tests/library/advice/advice-configuration-test.cpp

@@ -34,7 +34,6 @@
 //#include "lib/util-foreach.hpp"
 //#include "lib/symbol.hpp"
 
-//#include <iostream>
 //#include <string>
 
 //using lib::test::showSizeof;
@@ -47,8 +46,6 @@
 //using lib::Symbol;
 //using lib::P;
 //using std::string;
-//using std::cout;
-//using std::endl;
 
 
 

tests/library/advice/advice-multiplicity-test.cpp

@@ -34,7 +34,6 @@
 //#include "lib/symbol.hpp"
 #include "common/advice.hpp"
 
-//#include <iostream>
 //#include <string>
 
 //using lib::test::showSizeof;
@@ -47,8 +46,6 @@
 //using lib::Symbol;
 //using lib::P;
 //using std::string;
-//using std::cout;
-//using std::endl;