From e8f4f398c60060d4edd09065000d977cf38a9bcc Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 23 Jun 2010 20:27:32 +0200 Subject: 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. --- seriestreewidget.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'seriestreewidget.cpp') diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp index e919c20..5415655 100644 --- a/seriestreewidget.cpp +++ b/seriestreewidget.cpp @@ -19,9 +19,8 @@ #include #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(SmModelSingleton::instance()->model("SeriesModel")); mProxy->setSourceModel(mModel); mView->setModel(mProxy); mView->setSortingEnabled(true); -- cgit v1.2.3-70-g09d2