Commit 208172ce authored by Matthieu Gallien's avatar Matthieu Gallien 🎵 Committed by Nate Graham
Browse files

remove ViewsListData in ElisaApplication to save a bit of code

parent 65263591
......@@ -27,7 +27,6 @@
#include "managemediaplayercontrol.h"
#include "manageheaderbar.h"
#include "databaseinterface.h"
#include "viewslistdata.h"
#include "elisa_settings.h"
#include <KConfigCore/KAuthorized>
......@@ -102,8 +101,6 @@ public:
std::unique_ptr<ManageHeaderBar> mManageHeaderBar;
std::unique_ptr<ViewsListData> mViewsListData;
QQmlApplicationEngine *mEngine = nullptr;
QFileSystemWatcher mConfigFileWatcher;
......@@ -359,9 +356,6 @@ void ElisaApplication::setQmlEngine(QQmlApplicationEngine *engine)
void ElisaApplication::initializeModels()
{
d->mViewsListData = std::make_unique<ViewsListData>();
Q_EMIT viewsListDataChanged();
d->mMusicManager = std::make_unique<MusicListenersManager>();
Q_EMIT musicManagerChanged();
......@@ -546,11 +540,6 @@ ManageHeaderBar *ElisaApplication::manageHeaderBar() const
return d->mManageHeaderBar.get();
}
ViewsListData *ElisaApplication::viewsListData() const
{
return d->mViewsListData.get();
}
bool ElisaApplication::showProgressOnTaskBar() const
{
auto currentConfiguration = Elisa::ElisaConfiguration::self();
......
......@@ -38,7 +38,6 @@ class AudioWrapper;
class ManageAudioPlayer;
class ManageMediaPlayerControl;
class ManageHeaderBar;
class ViewsListData;
class QQmlApplicationEngine;
class ElisaApplicationPrivate;
......@@ -82,8 +81,6 @@ class ELISALIB_EXPORT ElisaApplication : public QObject
READ manageHeaderBar
NOTIFY manageHeaderBarChanged)
Q_PROPERTY(ViewsListData* viewsListData READ viewsListData NOTIFY viewsListDataChanged)
Q_PROPERTY(bool showProgressOnTaskBar
READ showProgressOnTaskBar
NOTIFY showProgressOnTaskBarChanged)
......@@ -121,8 +118,6 @@ public:
ManageHeaderBar *manageHeaderBar() const;
ViewsListData* viewsListData() const;
bool showProgressOnTaskBar() const;
bool showSystemTrayIcon() const;
......@@ -156,8 +151,6 @@ Q_SIGNALS:
void showSystemTrayIconChanged();
void viewsListDataChanged();
public Q_SLOTS:
void appHelpActivated();
......
......@@ -140,7 +140,7 @@ RowLayout {
ViewsModel {
id: pageModel
viewsData: elisa.viewsListData
viewsData: viewManager.viewsListData
}
ViewSelector {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment