From 7c092c8a8f67d285dea38c1919645bc7a9c6356f Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Mon, 22 Jun 2015 18:52:54 +0100
Subject: [PATCH] List of widgets, not just toolbuttons

---
 online/podcastwidget.cpp     |  2 +-
 widgets/singlepagewidget.cpp | 24 ++++++++----------------
 widgets/singlepagewidget.h   |  3 +--
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/online/podcastwidget.cpp b/online/podcastwidget.cpp
index f9237a291..505712440 100644
--- a/online/podcastwidget.cpp
+++ b/online/podcastwidget.cpp
@@ -49,7 +49,7 @@ PodcastWidget::PodcastWidget(PodcastService *s, QWidget *p)
 
     ToolButton *addSub=new ToolButton(this);
     addSub->setDefaultAction(subscribeAction);
-    init(All, QList<ToolButton *>(), QList<ToolButton *>() <<addSub);
+    init(All, QList<QWidget *>(), QList<QWidget *>() << addSub);
     view->alwaysShowHeader();
     connect(view, SIGNAL(headerClicked(int)), SLOT(headerClicked(int)));
 
diff --git a/widgets/singlepagewidget.cpp b/widgets/singlepagewidget.cpp
index cf7455452..33eac6cba 100644
--- a/widgets/singlepagewidget.cpp
+++ b/widgets/singlepagewidget.cpp
@@ -53,17 +53,17 @@ SinglePageWidget::SinglePageWidget(QWidget *p)
     connect(this, SIGNAL(addSongsToPlaylist(const QString &, const QStringList &)), MPDConnection::self(), SLOT(addToPlaylist(const QString &, const QStringList &)));
 }
 
-void SinglePageWidget::init(int flags, const QList<ToolButton *> &leftXtra, const QList<ToolButton *> &rightXtra)
+void SinglePageWidget::init(int flags, const QList<QWidget *> &leftXtra, const QList<QWidget *> &rightXtra)
 {
     if (0!=btnFlags) {
         return;
     }
     btnFlags=flags;
-    QList<ToolButton *> left;
-    QList<ToolButton *> right=rightXtra;
+    QList<QWidget *> left;
+    QList<QWidget *> right=rightXtra;
 
     if (!right.isEmpty()) {
-        right << 0;
+        right << new SpacerWidget(this);
     }
     if (flags&AddToPlayQueue) {
         ToolButton *addToPlayQueue=new ToolButton(this);
@@ -105,23 +105,15 @@ void SinglePageWidget::init(int flags, const QList<ToolButton *> &leftXtra, cons
 
     if (!left.isEmpty()) {
         QHBoxLayout *ll=new QHBoxLayout();
-        foreach (ToolButton *b, left) {
-            if (!b) {
-                ll->addWidget(new SpacerWidget(this));
-            } else {
-                ll->addWidget(b);
-            }
+        foreach (QWidget *b, left) {
+            ll->addWidget(b);
         }
         static_cast<QGridLayout *>(layout())->addItem(ll, 1, 0, 1, 1);
     }
     if (!right.isEmpty()) {
         QHBoxLayout *rl=new QHBoxLayout();
-        foreach (ToolButton *b, right) {
-            if (!b) {
-                rl->addWidget(new SpacerWidget(this));
-            } else {
-                rl->addWidget(b);
-            }
+        foreach (QWidget *b, right) {
+            rl->addWidget(b);
         }
         static_cast<QGridLayout *>(layout())->addItem(rl, 1, 4, 1, 1);
     }
diff --git a/widgets/singlepagewidget.h b/widgets/singlepagewidget.h
index b1c7fcee7..94393ab17 100644
--- a/widgets/singlepagewidget.h
+++ b/widgets/singlepagewidget.h
@@ -29,7 +29,6 @@
 #include "gui/page.h"
 
 class ItemView;
-class ToolButton;
 class Action;
 
 class SinglePageWidget : public QWidget, public Page
@@ -47,7 +46,7 @@ public:
     SinglePageWidget(QWidget *p);
     virtual void setView(int v);
     void focusSearch();
-    void init(int flags=All, const QList<ToolButton *> &leftXtra=QList<ToolButton *>(), const QList<ToolButton *> &rightXtra=QList<ToolButton *>());
+    void init(int flags=All, const QList<QWidget *> &leftXtra=QList<QWidget *>(), const QList<QWidget *> &rightXtra=QList<QWidget *>());
     virtual QStringList selectedFiles(bool allowPlaylists=false) const { Q_UNUSED(allowPlaylists); return QStringList(); }
     virtual QList<Song> selectedSongs(bool allowPlaylists=false) const { Q_UNUSED(allowPlaylists); return QList<Song>(); }
     void addSelectionToPlaylist(const QString &name, bool replace, quint8 priorty);