From 2a5d061deef14b3c08fd8580db86c8277f359d76 Mon Sep 17 00:00:00 2001
From: Lucas Lira Gomes <x8lucas8x@gmail.com>
Date: Tue, 29 May 2012 19:39:21 -0300
Subject: [PATCH] * Made ZeroConfAccount less bug prone.

---
 src/accounts/zeroconf/ZeroconfAccount.cpp | 10 +++++-----
 src/accounts/zeroconf/ZeroconfAccount.h   |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/accounts/zeroconf/ZeroconfAccount.cpp b/src/accounts/zeroconf/ZeroconfAccount.cpp
index 44d74e057..364022a37 100644
--- a/src/accounts/zeroconf/ZeroconfAccount.cpp
+++ b/src/accounts/zeroconf/ZeroconfAccount.cpp
@@ -86,7 +86,7 @@ void
 ZeroconfAccount::authenticate()
 {
     if ( !isAuthenticated() )
-        static_cast< ZeroconfPlugin* >( m_sipPlugin.data() )->connectPlugin();
+        sipPlugin()->connectPlugin();
 }
 
 
@@ -94,7 +94,7 @@ void
 ZeroconfAccount::deauthenticate()
 {
     if ( isAuthenticated() )
-        static_cast< ZeroconfPlugin* >( m_sipPlugin.data() )->disconnectPlugin();
+        sipPlugin()->disconnectPlugin();
 }
 
 
@@ -112,7 +112,7 @@ ZeroconfAccount::connectionState() const
         return Disconnected;
 
     // TODO can we get called before sipPlugin()?
-    return static_cast< ZeroconfPlugin* >( m_sipPlugin.data() )->connectionState();
+    return m_sipPlugin.data()->connectionState();
 }
 
 
@@ -120,10 +120,10 @@ SipPlugin*
 ZeroconfAccount::sipPlugin()
 {
     if ( m_sipPlugin.isNull() )
-        m_sipPlugin = QWeakPointer< SipPlugin >( new ZeroconfPlugin( this ) );
+        m_sipPlugin = QWeakPointer< ZeroconfPlugin >( new ZeroconfPlugin( this ) );
 
     return m_sipPlugin.data();
 }
 
 
-Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::ZeroconfFactory )
\ No newline at end of file
+Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::ZeroconfFactory )
diff --git a/src/accounts/zeroconf/ZeroconfAccount.h b/src/accounts/zeroconf/ZeroconfAccount.h
index 30d43e038..136c971c0 100644
--- a/src/accounts/zeroconf/ZeroconfAccount.h
+++ b/src/accounts/zeroconf/ZeroconfAccount.h
@@ -19,6 +19,7 @@
 #ifndef ZEROCONF_ACCOUNTS_H
 #define ZEROCONF_ACCOUNTS_H
 
+#include "Zeroconf.h"
 #include "accounts/Account.h"
 #include "../AccountDllMacro.h"
 
@@ -71,7 +72,7 @@ public:
     QWidget* aclWidget() { return 0; }
 
 private:
-    QWeakPointer< SipPlugin > m_sipPlugin;
+    QWeakPointer< ZeroconfPlugin > m_sipPlugin;
 };
 
 }