1 files changed, 1 insertions, 3 deletions
diff --git a/Swiften/Elements/Message.h b/Swiften/Elements/Message.h
index f276ef7..c357cd4 100644
--- a/Swiften/Elements/Message.h
+++ b/Swiften/Elements/Message.h
@@ -12,64 +12,62 @@
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Body.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/Replace.h>
 #include <Swiften/Elements/Stanza.h>
 #include <Swiften/Elements/Subject.h>
 
 namespace Swift {
     class SWIFTEN_API Message : public Stanza {
       public:
             typedef std::shared_ptr<Message> ref;
 
             enum Type { Normal, Chat, Error, Groupchat, Headline };
 
             Message() : type_(Chat) { }
 
             std::string getSubject() const {
                 std::shared_ptr<Subject> subject(getPayload<Subject>());
                 if (subject) {
                     return subject->getText();
                 }
                 return "";
             }
 
             void setSubject(const std::string& subject) {
                 updatePayload(std::make_shared<Subject>(subject));
             }
 
-            // Explicitly convert to bool. In C++11, it would be cleaner to
-            // compare to nullptr.
             bool hasSubject() {
-                return static_cast<bool>(getPayload<Subject>());
+                return getPayload<Subject>() != nullptr;
             }
 
             boost::optional<std::string> getBody() const {
                 std::shared_ptr<Body> body(getPayload<Body>());
                 boost::optional<std::string> bodyData;
                 if (body) {
                     bodyData = body->getText();
                 }
                 return bodyData;
             }
 
             void setBody(const std::string& body) {
                 setBody(boost::optional<std::string>(body));
             }
 
             void setBody(const boost::optional<std::string>& body) {
                 if (body) {
                     updatePayload(std::make_shared<Body>(body.get()));
                 }
                 else {
                     removePayloadOfSameType(std::make_shared<Body>());
                 }
             }
 
             bool isError() {
                 std::shared_ptr<Swift::ErrorPayload> error(getPayload<Swift::ErrorPayload>());
                 return getType() == Message::Error || error;
             }
 
             Type getType() const { return type_; }