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. --- smubermodel.cpp | 61 --------------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 smubermodel.cpp (limited to 'smubermodel.cpp') diff --git a/smubermodel.cpp b/smubermodel.cpp deleted file mode 100644 index 2e7ae42..0000000 --- a/smubermodel.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version - 2 of the License, or (at your option) any later version. -*/ - -#include -#include -#include - -#include - -#include "smubermodel.h" -#include "smtreemodel.h" -#include "seriestreemodel.h" -#include "smtreeitem.h" -#include "actormodel.h" - -SmUberModel::SmUberModel(QObject *parent) : QObject(parent), mSeriesModel(0), mFileModel(0), mActorModel(0){ - //db setup - mDb = QSqlDatabase::addDatabase("QPSQL", "treedb"); - mDb.setHostName("hadante"); - mDb.setUserName("shemov"); - mDb.setPassword("shemov"); - mDb.setDatabaseName("shemov2"); - mDb.open(); - mSeriesPartsQuery = new QSqlQuery(mDb); - //mSeriesPartsQuery->prepare("SELECT iseriesparts_id, iseriespart, iseries_id, iquality FROM seriesparts WHERE iseries_id = :id ORDER BY iseriespart"); - - //series model - QStringList seriesHeaders = QStringList() << tr("Series") << QString() << QString() << QString() << QString(); - mSeriesModel = new SeriesTreeModel(seriesHeaders, this); - //populateSeriesmodel(); -} - -SmUberModel::~SmUberModel(){ - delete mSeriesModel; - mDb = QSqlDatabase(); - QSqlDatabase::removeDatabase("treedb"); -} - -/*void SmUberModel::populateSeriesmodel(){ - QSqlQuery seriesQuery("SELECT iseries_id, tseries_name FROM series ORDER BY tseries_name", mDb); - SmTreeItem *root = new SmTreeItem(3); - while(seriesQuery.next()){ - QList seriesData; - seriesData << seriesQuery.value(1) << QVariant() << seriesQuery.value(0); - SmTreeItem *seriesItem = new SmTreeItem(seriesData, root); - root->appendChild(seriesItem); - mSeriesPartsQuery->bindValue(":id", seriesQuery.value(0)); - mSeriesPartsQuery->exec(); - while(mSeriesPartsQuery->next()){ - QList partsData; - QString title = QString("%1 %2").arg(seriesData.at(0).toString()).arg(mSeriesPartsQuery->value(1).toInt()); - partsData << title << mSeriesPartsQuery->value(3) << mSeriesPartsQuery->value(0); - seriesItem->appendChild(new SmTreeItem(partsData, seriesItem)); - } - } - mSeriesModel->setRoot(root); -}*/ -- cgit v1.2.3-70-g09d2