Use singletons for models

Created singletons for the ListModel* and MovieModel*. There should only
be one of each and they were passed around quite a lot.

1 files changed, 8 insertions, 15 deletions

diff --git a/archivefilewidget.cpp b/archivefilewidget.cpp
index 8ddad26..818ac43 100644
--- a/archivefilewidget.cpp
+++ b/archivefilewidget.cpp
@@ -24,8 +24,14 @@
 #include "helper.h"
 #include "actorwidget.h"
 #include "fileinfomodel.h"
-
-ArchiveFileWidget::ArchiveFileWidget(MovieModel *model, QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) , mModel(model){
+#include "listmodelsingleton.h"
+#include "moviemodelsingleton.h"
+
+ArchiveFileWidget::ArchiveFileWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f){
+	//setup
+	mModel = MovieModelSingleton::instance();
+	mGenreModel = ListModelSingleton::instance()->model("genre");
+	mActorsModel = ListModelSingleton::instance()->model("actor");
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 
 	//selected files
@@ -89,19 +95,6 @@ ArchiveFileWidget::ArchiveFileWidget(MovieModel *model, QWidget *parent, Qt::Win
 	setMinimumWidth(600);
 }
 
-void ArchiveFileWidget::setMovieModel(MovieModel *model){
-	mModel = model;
-}
-
-void ArchiveFileWidget::setGenreModel(ListModel *model){
-	mGenreModel = model;
-	mGenre->setModel(mGenreModel);
-}
-
-void ArchiveFileWidget::setActorsModel(ListModel *model){
-	mActorsModel = model;
-}
-
 void ArchiveFileWidget::setFiles(const QStringList &files){
 	mFileList = files;
 	mInfoModel->clear();