KviIrcUserEntry: Make setAvatar accept unique_ptr

1 files changed, 9 insertions, 3 deletions

diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index 6e98268ce..e380ee176 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -93,12 +93,18 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
 	}
 }
 
+void KviIrcUserEntry::setAvatar(std::unique_ptr<KviAvatar> upAvatar)
+{
+	m_upAvatar = std::move(upAvatar);
+}
+
+// Overload function for backwards compatibility
 void KviIrcUserEntry::setAvatar(KviAvatar * pAvatar)
 {
-	m_pAvatar.reset(pAvatar);
+	m_upAvatar.reset(pAvatar);
 }
 
-KviAvatar * KviIrcUserEntry::forgetAvatar()
+std::unique_ptr<KviAvatar> KviIrcUserEntry::forgetAvatar()
 {
-	return m_pAvatar.release();
+	return std::move(m_upAvatar);
 }