Cleaning up.

[emufront] / src / db / dbfile.cpp

diff --git a/src/db/dbfile.cpp b/src/db/dbfile.cpp
index ac7d496..7bf64e3 100644 (file)
--- a/src/db/dbfile.cpp
+++ b/src/db/dbfile.cpp
@@ -58,26 +58,10 @@ bool DbFile::updateDataObjectToModel(const EmuFrontObject *ob)
     query.bindValue(":updatetime", getCurrentTimeStamp());
     ret = query.exec();
     if (ret) resetModel();
-
-    /*QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
-    tmodel->setFilter(QString("id = %1").arg(plf->getId()));
-    tmodel->select();
-    if (tmodel->rowCount() == 1)
-    {
-        QSqlRecord record = tmodel->record(0);
-        record.setValue("name", plf->getName());
-        record.setValue("type", plf->getType());
-        record.setValue("checksum", plf->getCheckSum());
-        record.setValue("size", plf->getSize());
-        record.setValue("updatetime", getCurrentTimeStamp());
-        tmodel->setRecord(0, record);
-        ret = tmodel->submitAll();
-    }
-    resetModel();*/
     return ret;
 }
 
-bool DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
+int DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
 {
     const EmuFrontFile *fi = dynamic_cast<const EmuFrontFile*>(ob);
     QSqlQuery q;
@@ -93,19 +77,6 @@ bool DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
     if (q.exec())
         id = q.lastInsertId().toInt();
     return id;
-
-    /*int row = 0;
-    QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
-    tmodel->insertRows(row, 1);
-    // the null value for index will be set implicitily
-    // when we don't assign any value to cell 0 in the sql table model
-    //sqlTableModel->setData(sqlTableModel->index(row, 0), NULL);
-    tmodel->setData(sqlTableModel->index(row, File_Name), plf->getName());
-    tmodel->setData(sqlTableModel->index(row, File_FileType), plf->getType());
-    tmodel->setData(sqlTableModel->index(row, File_CheckSum), plf->getCheckSum());
-    tmodel->setData(sqlTableModel->index(row, File_FileSize), plf->getSize());
-    tmodel->setData(sqlTableModel->index(row, File_UpdateTime), getCurrentTimeStamp());
-    return tmodel->submitAll();*/
 }
 
 /*int DbFile::insertFile(const EmuFrontFile *mi)
@@ -175,9 +146,14 @@ QString DbFile::constructSelect(QString whereClause) const
                    "ORDER BY Name").arg(where);
 }
 
+QString DbFile::constructFilterById(int id) const
+{
+    return QString("file.id = %1").arg(id);
+}
+
 QString DbFile::constructSelectById(int id) const
 {
-    return constructSelect(QString("file.id = %1").arg(id));
+    return constructSelect(constructFilterById(id));
 }
 
 QSqlQueryModel* DbFile::getData()
@@ -194,6 +170,5 @@ QSqlQueryModel* DbFile::getData()
 
 EmuFrontObject* DbFile::getFileByChecksum(QString checksum)
 {
-    filterDataObjects(QString("checksum LIKE '%1'").arg(checksum));
-    return getDataObject();
+    return getDataObject(QString("checksum LIKE '%1'").arg(checksum));
 }