database: put Filter and SortDescription into CDatabase::QueryData fo…

…r convenience
Montellese · Oct 28, 2012 · b94d6a9 · b94d6a9
1 parent b847aaf
commit b94d6a9
Show file tree

Hide file tree

Showing 7 changed files with 366 additions and 353 deletions.
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
@@ -708,18 +708,12 @@ bool CDatabase::BuildSQL(const CStdString &strQuery, const Filter &filter, CStdS
   return true;
 }
 
-bool CDatabase::BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, Filter &filter, CStdString &strSQL, CDbUrl &dbUrl)
-{
-  SortDescription sorting;
-  return BuildSQL(strBaseDir, strQuery, filter, strSQL, dbUrl, sorting);
-}
-
-bool CDatabase::BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, Filter &filter, CStdString &strSQL, CDbUrl &dbUrl, SortDescription &sorting /* = SortDescription() */)
+bool CDatabase::BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, QueryData &data, CStdString &strSQL, CDbUrl &dbUrl)
 {
   // parse the base path to get additional filters
   dbUrl.Reset();
-  if (!dbUrl.FromString(strBaseDir) || !GetFilter(dbUrl, filter, sorting))
+  if (!dbUrl.FromString(strBaseDir) || !GetFilter(dbUrl, data))
     return false;
 
-  return BuildSQL(strQuery, filter, strSQL);
+  return BuildSQL(strQuery, data.filter, strSQL);
 }
diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h
@@ -21,6 +21,7 @@
  */
 
 #include "utils/StdString.h"
+#include "utils/SortUtils.h"
 
 namespace dbiplus {
   class Database;
@@ -31,7 +32,6 @@ namespace dbiplus {
 
 class DatabaseSettings; // forward
 class CDbUrl;
-struct SortDescription;
 
 class CDatabase
 {
@@ -136,9 +136,13 @@ class CDatabase
    */
   bool CommitInsertQueries();
 
-  virtual bool GetFilter(CDbUrl &dbUrl, Filter &filter, SortDescription &sorting) { return true; }
-  virtual bool BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, Filter &filter, CStdString &strSQL, CDbUrl &dbUrl);
-  virtual bool BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, Filter &filter, CStdString &strSQL, CDbUrl &dbUrl, SortDescription &sorting);
+  typedef struct {
+    Filter filter;
+    SortDescription sortDescription;
+  } QueryData;
+
+  virtual bool GetFilter(CDbUrl &dbUrl, QueryData &data) { return true; }
+  virtual bool BuildSQL(const CStdString &strBaseDir, const CStdString &strQuery, QueryData &data, CStdString &strSQL, CDbUrl &dbUrl);
 
 protected:
   friend class CDatabaseManager;

diff --git a/xbmc/dialogs/GUIDialogMediaFilter.cpp b/xbmc/dialogs/GUIDialogMediaFilter.cpp
@@ -940,9 +940,10 @@ bool CGUIDialogMediaFilter::GetMinMax(const CStdString &table, const CStdString
     return false;
   }
 
-  CDatabase::Filter extFilter = filter;
+  CDatabase::QueryData data;
+  data.filter = filter;
   CStdString strSQLExtra;
-  if (!db->BuildSQL(m_dbUrl->ToString(), strSQLExtra, extFilter, strSQLExtra, *dbUrl))
+  if (!db->BuildSQL(m_dbUrl->ToString(), strSQLExtra, data, strSQLExtra, *dbUrl))
   {
     delete db;
     delete dbUrl;