diff -r 30f14686fb04 -r 2b1b11a301d2 homescreenapp/hsdomainmodel/inc/hsdatabase.h --- a/homescreenapp/hsdomainmodel/inc/hsdatabase.h Wed Jun 23 18:03:36 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsdatabase.h Tue Jul 06 14:06:53 2010 +0300 @@ -22,6 +22,9 @@ #include #include "hsdomainmodel_global.h" +#include "hstest_global.h" + +HOMESCREEN_TEST_CLASS(TestHsDomainModel) class HsSceneData; class HsPageData; @@ -60,6 +63,7 @@ bool widgets(int pageId, QList &data); bool widgets(const QString &uri, QList &data); + bool widgets(const QString &uri, const QVariantHash &preferences, int &count); bool widget(HsWidgetData &data); bool insertWidget(HsWidgetData &data); bool updateWidget(const HsWidgetData &data); @@ -84,12 +88,14 @@ private: Q_DISABLE_COPY(HsDatabase) bool checkConnection() const; + bool matchWidgetPreferences(const QVariantHash &preferences, const QMultiMap& storedPreferences); private: QString mConnectionName; QString mDatabaseName; static HsDatabase *mInstance; + HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel) }; #endif // HSDATABASE_H