diff -r 2e2dc3d30ca8 -r 341166945d65 homescreenapp/hsdomainmodel/inc/hsdatabase.h
--- a/homescreenapp/hsdomainmodel/inc/hsdatabase.h	Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/hsdomainmodel/inc/hsdatabase.h	Fri Jun 25 19:19:22 2010 +0300
@@ -19,20 +19,17 @@
 #define HSDATABASE_H
 
 #include <QObject>
-#include <QScopedPointer>
 #include <QVariantHash>
 
 #include "hsdomainmodel_global.h"
+#include "hstest_global.h"
 
-#include <HbFeedback>
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
 
 class HsSceneData;
 class HsPageData;
 class HsWidgetData;
 class HsWidgetPresentationData;
-class HsGeneralConfiguration;
-class HsFeedbackConfiguration;
-class HsSnapConfiguration;
 
 class HSDOMAINMODEL_EXPORT HsDatabase : public QObject
 {
@@ -57,8 +54,7 @@
     bool commit();
 
     bool scene(HsSceneData &data);
-    bool updateScene(const HsSceneData &data);
-
+    
     bool pages(QList<HsPageData> &data);
     bool page(HsPageData &data);
     bool insertPage(HsPageData &data);
@@ -67,6 +63,7 @@
     
     bool widgets(int pageId, QList<HsWidgetData> &data);
     bool widgets(const QString &uri, QList<HsWidgetData> &data);
+    bool widgets(const QString &uri, const QVariantHash &preferences, int &count);
     bool widget(HsWidgetData &data);
     bool insertWidget(HsWidgetData &data);
     bool updateWidget(const HsWidgetData &data);
@@ -81,10 +78,8 @@
     bool widgetPreference(int widgetId, const QString &key, QVariant &value);
     bool setWidgetPreferences(int widgetId, const QVariantHash &data);
 
-    bool generalConfiguration(HsGeneralConfiguration &data);
-    bool feedbackConfiguration(HsFeedbackConfiguration &data);
-    bool snapConfiguration(HsSnapConfiguration &data);
-    
+    bool configuration(QVariantHash &configuration);
+
 public:
     static void setInstance(HsDatabase *instance);
     static HsDatabase *instance();
@@ -93,12 +88,14 @@
 private:    
     Q_DISABLE_COPY(HsDatabase)
     bool checkConnection() const;
+    bool matchWidgetPreferences(const QVariantHash &preferences, const QMultiMap<QString, QString>& storedPreferences);
 
 private:
     QString mConnectionName;
     QString mDatabaseName;
 
     static HsDatabase *mInstance;
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
 };
 
 #endif // HSDATABASE_H