[MERGE]

src/core/common/WLogger.cpp

@@ -118,6 +118,11 @@ void WLogger::addStream( WLogStream::SharedPtr s )
     m_outputs.push_back( s );
 }
 
+void WLogger::removeStream( WLogStream::SharedPtr s )
+{
+    m_outputs.remove( s );
+}
+
 wlog::WStreamedLogger::Buffer::~Buffer()
 {
     WLogger::getLogger()->addLogMessage( m_logString.str(), m_source, m_level );

src/core/common/WLogger.h

@@ -74,6 +74,13 @@ public:
      */
     void addStream( WLogStream::SharedPtr s );
 
+    /**
+     * Remove the given stream.
+     *
+     * \param s the stream to remove
+     */
+    void removeStream( WLogStream::SharedPtr s );
+
     /**
      * Set the default format used for log entries.
      *