Singleton cleanup

The SmUberModel class wasn't needed at all, so I removed it.

Instead I renamed SmUmberModelSingleton into a real singleton
for all QAbstractItemModel*, though right now it only supports
the SeriesTreeModel and FileTreeModel. But it should eventually
evolve into a singleton for all QAbstractItemModel *. For this
I renamed the class SmUberModelSingleton to SmModelSingleton.

1 files changed, 2 insertions, 3 deletions

diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp
index e919c20..5415655 100644
--- a/seriestreewidget.cpp
+++ b/seriestreewidget.cpp
@@ -19,9 +19,8 @@
 #include <QSettings>
 
 #include "seriestreewidget.h"
-#include "smubermodel.h"
 #include "smtreemodel.h"
-#include "smubermodelsingleton.h"
+#include "smmodelsingleton.h"
 #include "seriestreemodel.h"
 
 SeriesTreeWidget::SeriesTreeWidget(QWidget *parent) : QWidget(parent){
@@ -40,7 +39,7 @@ SeriesTreeWidget::SeriesTreeWidget(QWidget *parent) : QWidget(parent){
 	//the view
 	mView = new SeriesTreeView;
 	mProxy = new SeriesTreeSortModel(this);
-	mModel = SmUberModelSingleton::instance()->seriesModel();
+	mModel = static_cast<SeriesTreeModel*>(SmModelSingleton::instance()->model("SeriesModel"));
 	mProxy->setSourceModel(mModel);
 	mView->setModel(mProxy);
 	mView->setSortingEnabled(true);