DbMediaImageContainer is now a DbFile.

diff --git a/doc/uml-db_layer.dia b/doc/uml-db_layer.dia
index e3fe094..c2524ed 100644 (file)
Binary files a/doc/uml-db_layer.dia and b/doc/uml-db_layer.dia differ

diff --git a/src/db/dbmediaimagecontainer.cpp b/src/db/dbmediaimagecontainer.cpp
index e870f58..8e9d79c 100644 (file)
--- a/src/db/dbmediaimagecontainer.cpp
+++ b/src/db/dbmediaimagecontainer.cpp
@@ -21,10 +21,10 @@
 #include "dbmediaimagecontainer.h"
 
 DbMediaImageContainer::DbMediaImageContainer(QObject *parent)
-    : DbQueryModelManager(parent)
+    : DbFile(parent) // DbQueryModelManager(parent)
 {
     dbMediaImage = new DbMediaImage(parent);
-    dbFile = new DbFile(parent);
+    //dbFile = new DbFile(parent);
 }
 
 bool DbMediaImageContainer::updateDataObjectToModel(const EmuFrontObject *efo)
@@ -114,7 +114,7 @@ void DbMediaImageContainer::storeContainers(QList<MediaImageContainer *> lst, Fi
                 // mediaimagecontainer table: id, fileid, filepathid, updatetime
 
                 // insert the media image container file to file table
-                int micFileId = dbFile->insertDataObjectToModel(mic);
+                int micFileId = DbFile::insertDataObjectToModel(mic);
                 if (micFileId < 0) {
                     throw new EmuFrontException(QString(tr("Inserting media image container %1 to file database failed")).arg(mic->getName()));
                 }

diff --git a/src/db/dbmediaimagecontainer.h b/src/db/dbmediaimagecontainer.h
index 9e636ee..4d7cbdb 100644 (file)
--- a/src/db/dbmediaimagecontainer.h
+++ b/src/db/dbmediaimagecontainer.h
@@ -22,11 +22,11 @@
 
 #include "dbquerymodelmanager.h"
 #include "dbmediaimage.h"
-#include "dbfile.h"
+//#include "dbfile.h"
 #include "../dataobjects/mediaimagecontainer.h"
 #include "../dataobjects/filepathobject.h"
 
-class DbMediaImageContainer : public DbQueryModelManager
+class DbMediaImageContainer : public DbFile // DbQueryModelManager
 {
 public:
     DbMediaImageContainer(QObject *parent);
@@ -45,7 +45,7 @@ private:
     virtual QSqlQueryModel* getData();
     void linkMediaImagesWithContainer(int, QList<int>);
     DbMediaImage *dbMediaImage;
-    DbFile *dbFile;
+    // DbFile *dbFile;
  };
 
 #endif // DBMEDIAIMAGECONTAINER_H