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. --- shemov.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'shemov.cpp') diff --git a/shemov.cpp b/shemov.cpp index 223e6fa..a33c172 100644 --- a/shemov.cpp +++ b/shemov.cpp @@ -45,8 +45,7 @@ #include "listmodelsingleton.h" #include "pictureviewer.h" #include "archivetreeview.h" -#include "smubermodelsingleton.h" -#include "smubermodel.h" +#include "smmodelsingleton.h" #include "seriestreewidget.h" SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) { @@ -121,7 +120,7 @@ void SheMov::closeEvent(QCloseEvent *event){ mFSWidget->writeSettings(); mFSWidget->pictureViewer()->close(); mATree->seriesWidget()->writeSettings(); - delete SmUberModelSingleton::instance(); + delete SmModelSingleton::instance(); writeSettings(); event->accept(); } -- cgit v1.2.3-70-g09d2