QIcon->QPixmap for account icon.

QIcon doesn't make sense in this case, as it is designed to store multiple sizes/active states for icons
that are associated with e.g. toolbuttons. Account icons are just an image that represents the logo of
the account, so only one pixmap is needed.

src/AccountDelegate.cpp

@@ -88,11 +88,11 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option,
 
     // draw the icon if it exists
     pos = mid - ( ICONSIZE / 2 );
-    if( !index.data( Qt::DecorationRole ).value< QIcon >().isNull() ) {
+    if( !index.data( Qt::DecorationRole ).value< QPixmap >().isNull() ) {
         QRect prect = QRect( iconLeftEdge, pos + top, ICONSIZE, ICONSIZE );
 
         painter->save();
-        painter->drawPixmap( prect, index.data( Qt::DecorationRole ).value< QIcon >().pixmap( prect.size() ) );
+        painter->drawPixmap( prect, index.data( Qt::DecorationRole ).value< QPixmap >().scaled( prect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
         painter->restore();
     }
 

src/accounts/twitter/twitteraccount.cpp

@@ -170,9 +170,9 @@ TwitterAccount::connectAuthVerifyReply( const QTweetUser &user )
         emit nowAuthenticated( m_twitterAuth, user );
     }
 }
-QIcon
+QPixmap
 TwitterAccount::icon() const {
-    return QIcon( ":/twitter-icon.png" );
+    return QPixmap( ":/twitter-icon.png" );
 }
 
 

src/accounts/twitter/twitteraccount.h

@@ -46,7 +46,7 @@ public:
 
     QString prettyName() const { return "Twitter"; }
     QString factoryId() const { return "twitteraccount"; }
-    QIcon icon() const { return QIcon( ":/twitter-icon.png" ); }
+    QPixmap icon() const { return QPixmap( ":/twitter-icon.png" ); }
     Account* createAccount( const QString& pluginId = QString() );
 };
 
@@ -58,7 +58,7 @@ public:
     TwitterAccount( const QString &accountId );
     virtual ~TwitterAccount();
 
-    QIcon icon() const;
+    QPixmap icon() const;
 
     void authenticate();
     void deauthenticate();

src/accounts/xmpp/googlewrapper/googlewrapper.cpp

@@ -36,10 +36,10 @@ GoogleWrapperFactory::createAccount( const QString& pluginId )
 }
 
 
-QIcon
+QPixmap
 GoogleWrapperFactory::icon() const
 {
-    return QIcon( ":/gmail-logo.png" );
+    return QPixmap( ":/gmail-logo.png" );
 }
 
 GoogleWrapperSip::GoogleWrapperSip( Account* account )
@@ -93,10 +93,10 @@ GoogleWrapper::~GoogleWrapper()
 }
 
 
-QIcon
+QPixmap
 GoogleWrapper::icon() const
 {
-    return QIcon( ":/gmail-logo.png" );
+    return QPixmap( ":/gmail-logo.png" );
 }
 
 

src/accounts/xmpp/googlewrapper/googlewrapper.h

@@ -38,7 +38,7 @@ public:
 
     virtual QString prettyName() const { return "Google"; }
     virtual QString factoryId() const { return "googleaccount"; }
-    virtual QIcon icon() const;
+    virtual QPixmap icon() const;
     virtual Account* createAccount( const QString& pluginId );
 };
 
@@ -65,7 +65,7 @@ public:
 
     virtual const QString name() const { return QString( "Google" ); }
     virtual const QString friendlyName() const { return "Google"; }
-    virtual QIcon icon() const;
+    virtual QPixmap icon() const;
 
     virtual SipPlugin* sipPlugin();
 

src/accounts/xmpp/xmppaccount.h

@@ -48,7 +48,7 @@ public:
 
     QString prettyName() const { return "XMPP (Jabber)"; }
     QString factoryId() const { return "xmppaccount"; }
-    QIcon icon() const { return QIcon( ":/xmpp-icon.png" ); }
+    QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
     Account* createAccount( const QString& pluginId = QString() );
 };
 
@@ -60,7 +60,7 @@ public:
     XmppAccount( const QString &accountId );
     virtual ~XmppAccount();
 
-    QIcon icon() const { return QIcon( ":/xmpp-icon.png" ); }
+    QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
 
     void authenticate();
     void deauthenticate();

src/accounts/zeroconf/zeroconfaccount.cpp

@@ -26,13 +26,13 @@
 using namespace Tomahawk;
 using namespace Accounts;
 
-QIcon* s_icon = 0;
+QPixmap* s_icon = 0;
 
 ZeroconfFactory::ZeroconfFactory()
 {
 #ifndef ENABLE_HEADLESS
     if ( s_icon == 0 )
-        s_icon = new QIcon( ":/zeroconf-icon.png" );
+        s_icon = new QPixmap( ":/zeroconf-icon.png" );
 #endif
 }
 
@@ -53,7 +53,7 @@ ZeroconfFactory::createAccount( const QString& pluginId )
     return new ZeroconfAccount( pluginId.isEmpty() ? generateId( factoryId() ) : pluginId );
 }
 
-QIcon
+QPixmap
 ZeroconfFactory::icon() const
 {
     return *s_icon;
@@ -74,7 +74,7 @@ ZeroconfAccount::~ZeroconfAccount()
 
 }
 
-QIcon
+QPixmap
 ZeroconfAccount::icon() const
 {
     return *s_icon;

src/accounts/zeroconf/zeroconfaccount.h

@@ -41,7 +41,7 @@ public:
     virtual QString prettyName() const { return "Local Network"; }
     virtual bool isUnique() const { return true; }
 #ifndef ENABLE_HEADLESS
-    virtual QIcon icon() const;
+virtual QPixmap icon() const;
 #endif
 
 
@@ -55,7 +55,7 @@ public:
     ZeroconfAccount( const QString &accountId );
     virtual ~ZeroconfAccount();
 
-    QIcon icon() const;
+    QPixmap icon() const;
 
     void authenticate();
     void deauthenticate();

src/libtomahawk/accounts/Account.cpp

@@ -51,7 +51,7 @@ Account::aclWidget()
 }
 
 
-QIcon
+QPixmap
 Account::icon() const
 {
     return QPixmap();

src/libtomahawk/accounts/Account.h

@@ -91,7 +91,7 @@ public:
     QVariantMap acl() const { QMutexLocker locker( &m_mutex ); return m_acl; }
     virtual QWidget* aclWidget() = 0;
 
-    virtual QIcon icon() const = 0;
+    virtual QPixmap icon() const = 0;
 
     virtual ConnectionState connectionState() const = 0;
     virtual bool isAuthenticated() const = 0;
@@ -166,7 +166,7 @@ public:
     // internal name
     virtual QString factoryId() const = 0;
     // if the user can create multiple
-    virtual QIcon icon() const { return QIcon(); }
+    virtual QPixmap icon() const { return QPixmap(); }
     virtual bool isUnique() const { return false; }
 
     virtual Account* createAccount( const QString& accountId = QString() ) = 0;

src/libtomahawk/accounts/ResolverAccount.cpp

@@ -157,7 +157,7 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId )
     codeDir.cd( "../images" );
 
     if ( codeDir.exists() && codeDir.exists( "icon.png" ) )
-        m_icon.addFile( codeDir.absoluteFilePath( "icon.png" ) );
+        m_icon.load( codeDir.absoluteFilePath( "icon.png" ) );
 }
 
 AtticaResolverAccount::~AtticaResolverAccount()
@@ -165,8 +165,8 @@ AtticaResolverAccount::~AtticaResolverAccount()
 
 }
 
-QIcon
+QPixmap
 AtticaResolverAccount::icon() const
 {
-    return QPixmap;
+    return m_icon;
 }

src/libtomahawk/accounts/ResolverAccount.h

@@ -63,7 +63,7 @@ public:
     virtual void removeFromConfig();
 
     // Not relevant
-    virtual QIcon icon() const { return QIcon(); }
+    virtual QPixmap icon() const { return QPixmap(); }
     virtual SipPlugin* sipPlugin() { return 0; }
     virtual Tomahawk::InfoSystem::InfoPlugin* infoPlugin() { return 0; }
     virtual QWidget* aclWidget() { return 0; }
@@ -87,10 +87,10 @@ public:
     explicit AtticaResolverAccount(const QString& accountId);
     virtual ~AtticaResolverAccount();
 
-    virtual QIcon icon() const;
+    virtual QPixmap icon() const;
 
 private:
-    QIcon m_icon;
+    QPixmap m_icon;
 };
 
 }