1 files changed, 7 insertions, 14 deletions
diff --git a/Swiften/History/HistoryMessage.h b/Swiften/History/HistoryMessage.h
index 03e9206..0bcff99 100644
--- a/Swiften/History/HistoryMessage.h
+++ b/Swiften/History/HistoryMessage.h
@@ -14,14 +14,12 @@ namespace Swift {
 		public:
 			HistoryMessage(
 				const std::string& message,
-				const JID& baseJID,
 				const JID& fromJID,
-				const std::string& displayNick,
-				const boost::posix_time::ptime time) :
+				const JID& toJID,
+				const boost::posix_time::ptime& time) :
 					message_(message),
-					baseJID_(baseJID),
 					fromJID_(fromJID),
-					displayNick_(displayNick),
+					toJID_(toJID),
 					time_(time) {
 			}
 
@@ -29,16 +27,12 @@ namespace Swift {
 				return message_;
 			}
 
-			const JID& getBaseJID() const {
-				return baseJID_;
-			}
-
 			const JID& getFromJID() const {
 				return fromJID_;
 			}
 
-			const std::string& getDisplayNick() const {
-				return displayNick_;
+			const JID& getToJID() const {
+				return toJID_;
 			}
 
 			boost::posix_time::ptime getTime() const {
@@ -46,14 +40,13 @@ namespace Swift {
 			}
 
 			bool operator==(const HistoryMessage& o) const {
-				return baseJID_ == o.baseJID_ && message_ == o.message_ && fromJID_ == o.fromJID_ && displayNick_ == o.displayNick_ && time_ == o.time_;
+				return message_ == o.message_ && fromJID_ == o.fromJID_ && toJID_ == o.toJID_ && time_ == o.time_;
 			}
 
 		private:
 			std::string message_;
-			JID baseJID_;
 			JID fromJID_;
-			std::string displayNick_;
+			JID toJID_;
 			boost::posix_time::ptime time_;
 	};
 }