From d4cc5cfc9b2e9a3a4c260d406453f1fc3215906c Mon Sep 17 00:00:00 2001
From: Jan Osusky <Jan.Osusky@iblsoft.com>
Date: Fri, 21 Aug 2020 13:13:55 +0200
Subject: [PATCH] Editorial changes in DSN attributes

---
 src/vmime/net/dsnAttributes.cpp      |  8 ++++----
 src/vmime/net/dsnAttributes.hpp      |  8 ++++----
 src/vmime/net/smtp/SMTPTransport.cpp | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vmime/net/dsnAttributes.cpp b/src/vmime/net/dsnAttributes.cpp
index e76faa00..122e0c81 100644
--- a/src/vmime/net/dsnAttributes.cpp
+++ b/src/vmime/net/dsnAttributes.cpp
@@ -34,25 +34,25 @@ namespace vmime {
 namespace net {
 
 
-dsnAttributes::dsnAttributes(string dsnNotify, string dsnRet, string dsnEnvelopId)
+dsnAttributes::dsnAttributes(const string& dsnNotify, const string& dsnRet, const string& dsnEnvelopId)
 	: m_notifications(dsnNotify), m_returnFormat(dsnRet), m_envelopId(dsnEnvelopId) {
 
 }
 
 
-string dsnAttributes::notificationConditions() const {
+string dsnAttributes::getNotificationConditions() const {
 
 	return m_notifications;
 }
 
 
-string dsnAttributes::returnFormat() const {
+string dsnAttributes::getReturnFormat() const {
 
 	return m_returnFormat;
 }
 
 
-string dsnAttributes::envelopId() const {
+string dsnAttributes::getEnvelopId() const {
 
 	return m_envelopId;
 }
diff --git a/src/vmime/net/dsnAttributes.hpp b/src/vmime/net/dsnAttributes.hpp
index debb9940..9453e858 100644
--- a/src/vmime/net/dsnAttributes.hpp
+++ b/src/vmime/net/dsnAttributes.hpp
@@ -70,25 +70,25 @@ public:
 	  * @param dsnRet content of DSN - full message or headers only ("FULL" or "HDRS")
 	  * @param dsnEnvelopId envelop ID to be able to pair the DSN with original message (plain text not in "<" ">")
 	  */
-	dsnAttributes(string dsnNotify, string dsnRet, string dsnEnvelopId);
+	dsnAttributes(const string& dsnNotify, const string& dsnRet, const string& dsnEnvelopId);
 
 	/** Returns comma separated list of notification conditions as specified in RFC 1891
 	  *
 	  * @return comma separated list of notification conditions as specified in RFC 1891
 	  */
-	string notificationConditions() const;
+	string getNotificationConditions() const;
 
 	/** Returns requested format of the notification (RET parameter of the ESMTP MAIL command).
 	  *
 	  * @return requested format of the notification.
 	  */
-	string returnFormat() const;
+	string getReturnFormat() const;
 
 	/** Returns envelop ID used pair the DSN with the original message.
 	  *
 	  * @return envelop ID used pair the DSN with the original message.
 	  */
-	string envelopId() const;
+	string getEnvelopId() const;
 
 private:
 
diff --git a/src/vmime/net/smtp/SMTPTransport.cpp b/src/vmime/net/smtp/SMTPTransport.cpp
index 7ccedd88..f5dd3858 100644
--- a/src/vmime/net/smtp/SMTPTransport.cpp
+++ b/src/vmime/net/smtp/SMTPTransport.cpp
@@ -231,8 +231,8 @@ void SMTPTransport::sendEnvelope(
 		commands->addCommand(
 			SMTPCommand::MAIL(
 				sender, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0,
-				dsnAttrs.notificationConditions(),
-				dsnAttrs.envelopId()
+				dsnAttrs.getNotificationConditions(),
+				dsnAttrs.getEnvelopId()
 			)
 		);
 
@@ -241,8 +241,8 @@ void SMTPTransport::sendEnvelope(
 		commands->addCommand(
 			SMTPCommand::MAIL(
 				expeditor, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0,
-				dsnAttrs.notificationConditions(),
-				dsnAttrs.envelopId()
+				dsnAttrs.getNotificationConditions(),
+				dsnAttrs.getEnvelopId()
 			)
 		);
 	}
@@ -255,7 +255,7 @@ void SMTPTransport::sendEnvelope(
 
 		const mailbox& mbox = *recipients.getMailboxAt(i);
 		commands->addCommand(SMTPCommand::RCPT(mbox, hasSMTPUTF8 && needSMTPUTF8,
-											   dsnAttrs.notificationConditions()));
+											   dsnAttrs.getNotificationConditions()));
 	}
 
 	// Prepare sending of message data