3 files changed, 10 insertions, 6 deletions
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index e860437f..5ec19014 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -3630,8 +3630,9 @@ void QMailMessageBodyPrivate::deserialize(Stream &stream)
 
     This enum type is used to describe the format in which body data should be presented.
 
-    \value Encoded      The body data should be presented in encoded form.
-    \value Decoded      The body data should be presented in unencoded form.
+    \value UndefinedEncoding The encoding is not defined
+    \value Encoded           The body data should be presented in encoded form.
+    \value Decoded           The body data should be presented in unencoded form.
 */
 
 /*!
diff --git a/src/libraries/qmfclient/qmailmessage.h b/src/libraries/qmfclient/qmailmessage.h
index 90c37b8d..61575969 100644
--- a/src/libraries/qmfclient/qmailmessage.h
+++ b/src/libraries/qmfclient/qmailmessage.h
@@ -261,7 +261,7 @@ public:
     };
 
     enum EncodingFormat {
-        None = 0,
+        UndefinedEncoding = 0,
         Encoded = 1,
         Decoded = 2
     };
@@ -404,7 +404,8 @@ public:
     void setContentDisposition(const QMailMessageContentDisposition& disposition);
 
     // Body management interface:
-    virtual void setBody(const QMailMessageBody &body, QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::None);
+    virtual void setBody(const QMailMessageBody &body,
+                         QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::UndefinedEncoding);
     QMailMessageBody body() const;
 
     bool hasBody() const;
@@ -916,7 +917,8 @@ public:
 
     void removeHeaderField( const QString &id ) override;
 
-    void setBody(const QMailMessageBody &body, QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::None) override;
+    void setBody(const QMailMessageBody &body,
+                 QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::UndefinedEncoding) override;
 
     // Overrides of QMMMD functions where the data needs to be stored to the part container also:
 
diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h
index 422cebe4..cd24ddad 100644
--- a/src/libraries/qmfclient/qmailmessage_p.h
+++ b/src/libraries/qmfclient/qmailmessage_p.h
@@ -224,7 +224,8 @@ public:
     // Note: this returns a reference:
     QMailMessageBody& body();
     const QMailMessageBody& body() const;
-    void setBody(const QMailMessageBody& body, QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::None);
+    void setBody(const QMailMessageBody& body,
+                 QMailMessageBody::EncodingFormat encodingStatus = QMailMessageBody::UndefinedEncoding);
     void setBodyProperties(const QMailMessageContentType &type, QMailMessageBody::TransferEncoding encoding);
 
     bool hasBody() const;