--- a/homescreenapp/hsdomainmodel/inc/hsdatabase.h Fri Jun 11 13:30:16 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsdatabase.h Wed Jun 23 18:03:36 2010 +0300
@@ -19,20 +19,14 @@
#define HSDATABASE_H
#include <QObject>
-#include <QScopedPointer>
#include <QVariantHash>
#include "hsdomainmodel_global.h"
-#include <HbFeedback>
-
class HsSceneData;
class HsPageData;
class HsWidgetData;
class HsWidgetPresentationData;
-class HsGeneralConfiguration;
-class HsFeedbackConfiguration;
-class HsSnapConfiguration;
class HSDOMAINMODEL_EXPORT HsDatabase : public QObject
{
@@ -57,8 +51,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);
@@ -81,10 +74,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();