general: Refactoring and cleanups

1 files changed, 3 insertions, 14 deletions

diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index 374f5ef51..6e98268ce 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -30,26 +30,19 @@ KviIrcUserEntry::KviIrcUserEntry(const QString & szUser, const QString & szHost)
 {
 	m_szUser                  = szUser;
 	m_szHost                  = szHost;
-	m_pAvatar                 = 0;
 	m_nRefs                   = 1;
 	m_iHops                   = -1;
 	m_bAway                   = false;
 	m_bIrcOp                  = false;
 	m_eGender                 = Unknown;
 	m_bBot                    = false;
-	m_bNotFoundRegUserLoockup = false;
+	m_bNotFoundRegUserLookup  = false;
 	m_bUseCustomColor         = false;
 	m_bAvatarRequested        = false;
 	m_iSmartNickColor         = -1;
 	m_szAccountName           = QString();
 }
 
-KviIrcUserEntry::~KviIrcUserEntry()
-{
-	if(m_pAvatar)
-		delete m_pAvatar;
-}
-
 void KviIrcUserEntry::setRealName(const QString & szReal)
 {
 	m_szRealName = szReal.trimmed();
@@ -102,14 +95,10 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
 
 void KviIrcUserEntry::setAvatar(KviAvatar * pAvatar)
 {
-	if(m_pAvatar)
-		delete m_pAvatar;
-	m_pAvatar = pAvatar;
+	m_pAvatar.reset(pAvatar);
 }
 
 KviAvatar * KviIrcUserEntry::forgetAvatar()
 {
-	KviAvatar * pAvatar = m_pAvatar;
-	m_pAvatar = 0;
-	return pAvatar;
+	return m_pAvatar.release();
 }