From fc5a2fefc75647a3b4d9e9a710de15fc150629f3 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 10 Jun 2013 06:30:47 +0200
Subject: [PATCH] * Moved some page-impl out of the headers.

---
 .../widgets/infowidgets/AlbumInfoWidget.cpp           | 10 ++++++++++
 src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h |  2 +-
 .../widgets/infowidgets/ArtistInfoWidget.cpp          | 11 +++++++++++
 .../widgets/infowidgets/ArtistInfoWidget.h            |  2 +-
 .../widgets/infowidgets/TrackInfoWidget.cpp           | 11 +++++++++++
 src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h |  2 +-
 .../widgets/infowidgets/TrackInfoWidget.ui            |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
index f6fb36a1c..ccd971a32 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
@@ -269,3 +269,13 @@ AlbumInfoWidget::changeEvent( QEvent* e )
             break;
     }
 }
+
+
+QPixmap
+AlbumInfoWidget::pixmap() const
+{
+    if ( m_pixmap.isNull() )
+        return Tomahawk::ViewPage::pixmap();
+    else
+        return m_pixmap;
+}
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
index 7909bfe8f..699556fab 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
@@ -64,7 +64,7 @@ public:
     virtual QString title() const { return m_title; }
     virtual QString description() const { return m_description; }
     virtual QString longDescription() const { return m_longDescription; }
-    virtual QPixmap pixmap() const { if ( m_pixmap.isNull() ) return Tomahawk::ViewPage::pixmap(); else return m_pixmap; }
+    virtual QPixmap pixmap() const;
 
     virtual bool isTemporaryPage() const { return true; }
     virtual bool showInfoBar() const { return false; }
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
index 953cf2515..95f405969 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
@@ -108,6 +108,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
     l->addWidget( m_playStatsGauge );
     l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) );
     ui->statsWidget->setLayout( l );
+    TomahawkUtils::unmarginLayout( l );
 
     m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Original, QSize( 48, 48 ) );
     ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Grid, ui->cover->size() ) );
@@ -379,3 +380,13 @@ ArtistInfoWidget::changeEvent( QEvent* e )
             break;
     }
 }
+
+
+QPixmap
+ArtistInfoWidget::pixmap() const
+{
+    if ( m_pixmap.isNull() )
+        return Tomahawk::ViewPage::pixmap();
+    else
+        return m_pixmap;
+}
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
index 23b55677c..73976fa23 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
@@ -75,7 +75,7 @@ public:
     virtual QString title() const { return m_title; }
     virtual QString description() const { return m_description; }
     virtual QString longDescription() const { return m_longDescription; }
-    virtual QPixmap pixmap() const { if ( m_pixmap.isNull() ) return Tomahawk::ViewPage::pixmap(); else return m_pixmap; }
+    virtual QPixmap pixmap() const;
 
     virtual bool isTemporaryPage() const { return true; }
     virtual bool showInfoBar() const { return false; }
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
index 1edad069e..bec5c0ca0 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
@@ -112,6 +112,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
     l->addSpacerItem( new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) );
     ui->statsWidget->setLayout( l );
     ui->statsLabel->setVisible( false );
+    TomahawkUtils::unmarginLayout( l );
 
     QVBoxLayout* layout = new QVBoxLayout();
     layout->addWidget( m_scrollArea );
@@ -309,3 +310,13 @@ TrackInfoWidget::changeEvent( QEvent* e )
             break;
     }
 }
+
+
+QPixmap
+TrackInfoWidget::pixmap() const
+{
+    if ( m_pixmap.isNull() )
+        return Tomahawk::ViewPage::pixmap();
+    else
+        return m_pixmap;
+}
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
index 12138bcde..b14b98606 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
@@ -64,7 +64,7 @@ public:
     virtual QString title() const { return m_title; }
     virtual QString description() const { return QString(); }
     virtual QString longDescription() const { return QString(); }
-    virtual QPixmap pixmap() const { if ( m_pixmap.isNull() ) return Tomahawk::ViewPage::pixmap(); else return m_pixmap; }
+    virtual QPixmap pixmap() const;
 
     virtual bool isBeingPlayed() const;
     virtual bool isTemporaryPage() const { return true; }
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
index 7305c7b23..d6453bbef 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
@@ -149,7 +149,7 @@
       <widget class="QWidget" name="statsWidget" native="true">
        <property name="minimumSize">
         <size>
-         <width>450</width>
+         <width>440</width>
          <height>240</height>
         </size>
        </property>