return references, not raw pointers for chaining

Author: frs69wq

include/dtlmod/Stream.hpp

@@ -103,17 +103,17 @@ class Stream : public std::enable_shared_from_this<Stream> {
   /// @brief Stream configuration function: set the Engine type to create.
   /// @param engine_type The type of Engine to create when opening the Stream.
   /// @return The calling Stream (enable method chaining).
-  Stream* set_engine_type(const Engine::Type& engine_type);
+  Stream& set_engine_type(const Engine::Type& engine_type);
   /// @brief Stream configuration function: set the Transport Method to use.
   /// @param transport_method the Transport methode to use when opening the Stream.
   /// @return The calling Stream (enable method chaining).
-  Stream* set_transport_method(const Transport::Method& transport_method);
+  Stream& set_transport_method(const Transport::Method& transport_method);
   /// @brief Stream configuration function: specify that metadata must be exported
   /// @return The calling Stream (enable method chaining).
-  Stream* set_metadata_export();
+  Stream& set_metadata_export();
   /// @brief Stream configuration function: specify that metadata must not be exported
   /// @return The calling Stream (enable method chaining).
-  Stream* unset_metadata_export();
+  Stream& unset_metadata_export();
 
   /******* Engine Factory *******/
 

src/DTL.cpp

@@ -56,7 +56,7 @@ DTL::DTL(const std::string& filename)
     if (streams_.find(name) == streams_.end())
       streams_.try_emplace(name, std::make_shared<Stream>(name, this));
     // And set its engine type and transport method
-    streams_[name]->set_engine_type(type)->set_transport_method(transport_method);
+    streams_[name]->set_engine_type(type).set_transport_method(transport_method);
 
     // Check if metadata must be exported for this stream
     if (stream.contains("export_metadata")) {

src/Stream.cpp

@@ -25,10 +25,10 @@ const char* Stream::get_engine_type_str() const
   return it == EnumStrings.end() ? "Out of range" : it->second;
 }
 
-Stream* Stream::set_engine_type(const Engine::Type& engine_type)
+Stream& Stream::set_engine_type(const Engine::Type& engine_type)
 {
   if (engine_type_ == engine_type) // No modification, just return
-    return this;
+    return *this;
 
   // Check if this engine type is known
   if (engine_type != Engine::Type::File && engine_type != Engine::Type::Staging)
@@ -53,7 +53,7 @@ Stream* Stream::set_engine_type(const Engine::Type& engine_type)
   // set the engine type
   engine_type_ = engine_type;
 
-  return this;
+  return *this;
 }
 
 const char* Stream::get_transport_method_str() const
@@ -68,10 +68,10 @@ const char* Stream::get_transport_method_str() const
   return it == EnumStrings.end() ? "Out of range" : it->second;
 }
 
-Stream* Stream::set_transport_method(const Transport::Method& transport_method)
+Stream& Stream::set_transport_method(const Transport::Method& transport_method)
 {
   if (transport_method_ == transport_method) // No modification, just return
-    return this;
+    return *this;
 
   // Check if this transport method is known
   if (transport_method != Transport::Method::File && transport_method != Transport::Method::Mailbox &&
@@ -97,18 +97,18 @@ Stream* Stream::set_transport_method(const Transport::Method& transport_method)
   // Set the transport method
   transport_method_ = transport_method;
 
-  return this;
+  return *this;
 }
 
-Stream* Stream::set_metadata_export()
+Stream& Stream::set_metadata_export()
 {
   metadata_export_ = true;
-  return this;
+  return *this;
 }
-Stream* Stream::unset_metadata_export()
+Stream& Stream::unset_metadata_export()
 {
   metadata_export_ = false;
-  return this;
+  return *this;
 }
 
 /****** Engine Factory ******/