From dbd8dffc4e849109aebb372e7242ec6bd46debaa Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Sat, 12 Apr 2014 16:08:57 +0000
Subject: [PATCH] No, public members are not required...

---
 ubuntu/backend/mpdbackend.h | 27 +++++++++++++++------------
 ubuntu/main.cpp             | 12 ++++--------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/ubuntu/backend/mpdbackend.h b/ubuntu/backend/mpdbackend.h
index c0399bf60..4ec979ab7 100644
--- a/ubuntu/backend/mpdbackend.h
+++ b/ubuntu/backend/mpdbackend.h
@@ -83,6 +83,11 @@ public:
     Q_INVOKABLE bool getAlbumsFound() { return AlbumsModel::self()->rowCount()>0; }
     Q_INVOKABLE bool getPlaylistsFound() { return PlaylistsModel::self()->rowCount()>0; }
 
+    PlayQueueProxyModel * getPlayQueueProxyModel() { return &playQueueProxyModel; }
+    MusicLibraryProxyModel * getArtistsProxyModel() { return &artistsProxyModel; }
+    AlbumsProxyModel * getAlbumsProxyModel() { return &albumsProxyModel; }
+    PlaylistsProxyModel * getPlaylistsProxyModel() { return &playlistsProxyModel; }
+
 Q_SIGNALS:
     void onConnectedChanged();
     void onPlayingStatusChanged();
@@ -102,17 +107,6 @@ public Q_SLOTS:
     void mpdConnectionStateChanged(bool connected);
     void albumsUpdated();
 
-private:
-    MPDState lastState;
-    qint32 lastSongId;
-    enum { CS_Init, CS_Connected, CS_Disconnected } connectedState;
-    bool stopAfterCurrent;
-
-    Song current;
-    QString mainText;
-    QString subText;
-    QTimer *statusTimer;
-
 Q_SIGNALS:
     // These are for communicating with MPD object (which is in its own thread, so need to talk via signal/slots)
     void setDetails(const MPDConnectionDetails &det);
@@ -133,7 +127,16 @@ Q_SIGNALS:
 private:
     void updateStatus(MPDStatus * const status);
 
-public:
+private:
+    MPDState lastState;
+    qint32 lastSongId;
+    enum { CS_Init, CS_Connected, CS_Disconnected } connectedState;
+    bool stopAfterCurrent;
+
+    Song current;
+    QString mainText;
+    QString subText;
+    QTimer *statusTimer;
     PlayQueueModel playQueueModel;
     PlayQueueProxyModel playQueueProxyModel;
     MusicLibraryProxyModel artistsProxyModel;
diff --git a/ubuntu/main.cpp b/ubuntu/main.cpp
index 094d1c848..4f3a926d6 100644
--- a/ubuntu/main.cpp
+++ b/ubuntu/main.cpp
@@ -195,15 +195,11 @@ int main(int argc, char *argv[])
     qmlRegisterType<MPDBackend>("MPDBackend", 1, 0, "MPDBackend");
     QQuickView view;
     view.setMinimumSize(QSize(360, 540));
-    view.rootContext()->setContextProperty("artistsModel", MusicLibraryModel::self());
-    view.rootContext()->setContextProperty("albumsModel", AlbumsModel::self());
-    view.rootContext()->setContextProperty("playlistsModel", PlaylistsModel::self());
     view.rootContext()->setContextProperty("backend", &backend);
-    view.rootContext()->setContextProperty("artistsProxyModel", &backend.artistsProxyModel);
-    view.rootContext()->setContextProperty("albumsProxyModel", &backend.albumsProxyModel);
-    view.rootContext()->setContextProperty("playlistsProxyModel", &backend.playlistsProxyModel);
-    view.rootContext()->setContextProperty("playQueueModel", &backend.playQueueModel);
-    view.rootContext()->setContextProperty("playQueueProxyModel", &backend.playQueueProxyModel);
+    view.rootContext()->setContextProperty("artistsProxyModel", backend.getArtistsProxyModel());
+    view.rootContext()->setContextProperty("albumsProxyModel", backend.getAlbumsProxyModel());
+    view.rootContext()->setContextProperty("playlistsProxyModel", backend.getPlaylistsProxyModel());
+    view.rootContext()->setContextProperty("playQueueProxyModel", backend.getPlayQueueProxyModel());
     view.rootContext()->setContextProperty("currentCover", CurrentCover::self());
     view.rootContext()->setContextProperty("appDir", Utils::dataDir(QString(), true));
     view.setResizeMode(QQuickView::SizeRootObjectToView);