KviIrcUserEntry: Make setAvatar accept unique_ptr

3 files changed, 25 insertions, 10 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);
 }
diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h
index 3b4e8c997..890ec56f7 100644
--- a/src/kvilib/irc/KviIrcUserEntry.h
+++ b/src/kvilib/irc/KviIrcUserEntry.h
@@ -90,7 +90,7 @@ protected:
 	bool        m_bAway;
 	bool        m_bIrcOp;
 
-	std::unique_ptr<KviAvatar> m_pAvatar;
+	std::unique_ptr<KviAvatar> m_upAvatar;
 
 	int         m_nRefs;
 	bool        m_bBot;
@@ -190,11 +190,20 @@ public:
 
 	/**
 	* \brief Sets the avatar of the user
+	* \param upAvatar The avatar
+	* \return void
+	* \warning The ownership passes to this class!
+	*/
+	void setAvatar(std::unique_ptr<KviAvatar> upAvatar = nullptr);
+
+	/**
+	* \brief Sets the avatar of the user
 	* \param pAvatar The avatar
 	* \return void
 	* \warning The ownership passes to this class!
+	* \warning This is an overload function for backwards compatibility
 	*/
-	void setAvatar(KviAvatar * pAvatar = nullptr);
+	void setAvatar(KviAvatar * upAvatar = nullptr);
 
 	/**
 	* \brief Sets the user global flags (eg: "G*")
@@ -291,7 +300,7 @@ public:
 	* \brief Returns the avatar of the user
 	* \return KviAvatar
 	*/
-	KviAvatar * avatar(){ return m_pAvatar.get(); };
+	KviAvatar * avatar(){ return m_upAvatar.get(); };
 
 	/**
 	* \brief Returns the number of references of the user in the database
@@ -303,7 +312,7 @@ public:
 	* \brief Removes the avatar associated to the user
 	* \return KviAvatar *
 	*/
-	KviAvatar * forgetAvatar();
+	std::unique_ptr<KviAvatar> forgetAvatar();
 
 	/**
 	* \brief Returns true if kvirc already made an attempt to download user's avatar
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 309bda5bc..b43201e9c 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -1303,7 +1303,7 @@ bool KviUserListView::nickChange(const QString & szOldNick, const QString & szNe
 		bool bIrcOp       = pEntry->m_pGlobalData->isIrcOp();
 		int iHops         = pEntry->m_pGlobalData->hops();
 
-		KviAvatar * pAv   = pEntry->m_pGlobalData->forgetAvatar();
+		std::unique_ptr<KviAvatar> upAv = pEntry->m_pGlobalData->forgetAvatar();
 
 		KviIrcUserEntry::Gender gender = pEntry->m_pGlobalData->gender();
 		bool bBot = pEntry->m_pGlobalData->isBot();
@@ -1323,9 +1323,9 @@ bool KviUserListView::nickChange(const QString & szOldNick, const QString & szNe
 		pEntry->m_bSelected = bSelect;
 		pEntry->m_iTemperature += KVI_USERACTION_NICK;
 
-		if(pAv)
+		if(upAv)
 		{
-			pEntry->m_pGlobalData->setAvatar(pAv);
+			pEntry->m_pGlobalData->setAvatar(std::move(upAv));
 			avatarChanged(szNewNick);
 		}
 		return true;