Restored some abstraction to Databasemanager.

diff --git a/src/db/databasemanager.cpp b/src/db/databasemanager.cpp
index 8c26071..64ed170 100644 (file)
--- a/src/db/databasemanager.cpp
+++ b/src/db/databasemanager.cpp
@@ -113,8 +113,10 @@ EmuFrontObject* DatabaseManager::getDataObject(int id)
     return plf;*/
 }
 
-EmuFrontObject* DatabaseManager::getDataObject()
+EmuFrontObject* DatabaseManager::getDataObject(QString filter)
 {
+    qDebug() << "Filtering data object" << filter;
+    filterDataObjects(filter);
     qDebug() << "...done filtering.";
     return getFilteredDataObject();
 }

diff --git a/src/db/databasemanager.h b/src/db/databasemanager.h
index 9ff9683..77ac619 100644 (file)
--- a/src/db/databasemanager.h
+++ b/src/db/databasemanager.h
@@ -39,7 +39,7 @@ public:
     QSqlQueryModel* getDataModel();
     EmuFrontObject* getDataObjectFromModel(QModelIndex*);
     EmuFrontObject* getDataObject(int id);
-    EmuFrontObject* getDataObject();
+    EmuFrontObject* getDataObject(QString filter);
     virtual bool updateDataObjectToModel(const EmuFrontObject*) = 0;
     virtual bool insertDataObjectToModel(const EmuFrontObject*) = 0;
     virtual bool deleteDataObjectFromModel(QModelIndex*) = 0;

diff --git a/src/db/dbfile.cpp b/src/db/dbfile.cpp
index ac7d496..b0079f6 100644 (file)
--- a/src/db/dbfile.cpp
+++ b/src/db/dbfile.cpp
@@ -194,6 +194,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));
 }