Fixed SeriesTreeModel

There was no serious problem with the database schema. Maybe I should
have gone to bed earlier. Updating and changing series names now works.

4 files changed, 13 insertions, 7 deletions

diff --git a/moviemodel.cpp b/moviemodel.cpp
index d9b0c22..c77172d 100644
--- a/moviemodel.cpp
+++ b/moviemodel.cpp
@@ -56,7 +56,7 @@ MovieModel::MovieModel(QObject *parent) : QAbstractItemModel(parent) {
 	QSqlQuery *c9 = new QSqlQuery;
 	c9->prepare("UPDATE movies set ipartno = :value WHERE imovid = :id");
 	mColumnQueries << c9;
-	populate();
+	//populate();
 }
 
 MovieModel::~MovieModel(){
diff --git a/seriestreemodel.cpp b/seriestreemodel.cpp
index 53098d1..62e2edc 100644
--- a/seriestreemodel.cpp
+++ b/seriestreemodel.cpp
@@ -19,7 +19,7 @@ SeriesTreeModel::SeriesTreeModel(QStringList &headers, QObject *parent) : SmTree
 	mSeriesPartsQuery = new QSqlQuery(mDb);
 	mSeriesPartsQuery->prepare("SELECT iseriesparts_id, iseriespart FROM seriesparts WHERE iseries_id = :id ORDER BY iseriespart");
 	mUpdateSeriesIdQuery = new QSqlQuery(mDb);
-	mUpdateSeriesIdQuery->prepare("UPDATE series SET iseries_id = :newid WHERE iseries_id = :oldid");
+	mUpdateSeriesIdQuery->prepare("UPDATE seriesparts SET iseries_id = :newid WHERE iseries_id = :oldid");
 	mUpdateSeriesNameQuery = new QSqlQuery(mDb);
 	mUpdateSeriesNameQuery->prepare("UPDATE series SET tseries_name = :newname WHERE iseries_id = :id");
 	mDeleteSeriesQuery = new QSqlQuery(mDb);
@@ -28,13 +28,12 @@ SeriesTreeModel::SeriesTreeModel(QStringList &headers, QObject *parent) : SmTree
 }
 
 SeriesTreeModel::~SeriesTreeModel(){
-	qDebug() << "dtor!";
 	delete mSeriesPartsQuery;
 	delete mUpdateSeriesIdQuery;
 	delete mUpdateSeriesNameQuery;
 	delete mDeleteSeriesQuery;
 	mDb.close();
-	QSqlDatabase::removeDatabase("treedb");
+	mDb = QSqlDatabase();
 }
 
 Qt::ItemFlags SeriesTreeModel::flags(const QModelIndex &index) const{
@@ -109,7 +108,7 @@ bool SeriesTreeModel::setData(const QModelIndex &index, const QVariant &value, i
 			//change of series name
 			if(index.column() == Name){
 				QModelIndex newSeries = findValue(value, index.parent(), index.column());
-				int oldSeriesId = index.data(SeriesId).toInt();
+				int oldSeriesId = index.data(SeriesIdRole).toInt();
 				if(newSeries != QModelIndex()){
 					//new series name already exists
 					int newSeriesId = newSeries.data(SeriesIdRole).toInt();
@@ -133,6 +132,8 @@ bool SeriesTreeModel::setData(const QModelIndex &index, const QVariant &value, i
 						}
 						reset();
 						return true;
+					}else{
+						return false;
 					}
 				}else{
 					//rename series
diff --git a/shemov.cpp b/shemov.cpp
index aa29bdc..4969713 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -45,6 +45,8 @@
 #include "listmodelsingleton.h"
 #include "pictureviewer.h"
 #include "archivetreeview.h"
+#include "smubermodelsingleton.h"
+#include "smubermodel.h"
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) {
 	qApp->setWindowIcon(QIcon(":/shemov.png"));
@@ -116,6 +118,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 void SheMov::closeEvent(QCloseEvent *event){
 	mFSWidget->writeSettings();
 	mFSWidget->pictureViewer()->close();
+	delete SmUberModelSingleton::instance();
 	writeSettings();
 	event->accept();
 }
diff --git a/smubermodel.cpp b/smubermodel.cpp
index 205b8d7..2e7ae42 100644
--- a/smubermodel.cpp
+++ b/smubermodel.cpp
@@ -9,6 +9,8 @@
 #include <QList>
 #include <QVariant>
 
+#include <QDebug>
+
 #include "smubermodel.h"
 #include "smtreemodel.h"
 #include "seriestreemodel.h"
@@ -18,7 +20,7 @@
 SmUberModel::SmUberModel(QObject *parent) : QObject(parent), mSeriesModel(0), mFileModel(0), mActorModel(0){
 	//db setup
 	mDb = QSqlDatabase::addDatabase("QPSQL", "treedb");
-	mDb.setHostName("localhost");
+	mDb.setHostName("hadante");
 	mDb.setUserName("shemov");
 	mDb.setPassword("shemov");
 	mDb.setDatabaseName("shemov2");
@@ -34,8 +36,8 @@ SmUberModel::SmUberModel(QObject *parent) : QObject(parent), mSeriesModel(0), mF
 
 SmUberModel::~SmUberModel(){
 	delete mSeriesModel;
+	mDb = QSqlDatabase();
 	QSqlDatabase::removeDatabase("treedb");
-	//delete mSeriesPartsQuery;
 }
 
 /*void SmUberModel::populateSeriesmodel(){