--- a/homescreenapp/hsapplication/src/hsstatemachine.cpp Wed Jul 14 15:53:30 2010 +0300
+++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp Fri Jul 23 13:47:57 2010 +0300
@@ -92,7 +92,7 @@
{
HSTEST_FUNC_ENTRY("HS::HsStateMachine::HsStateMachine");
- HsDatabase *db = new HsDatabase;
+ HsDatabase *db = new HsDatabase(QCoreApplication::instance());
db->setConnectionName("homescreen.dbc");
#ifdef Q_OS_SYMBIAN
db->setDatabaseName("c:/private/20022f35/homescreen.db");
@@ -102,14 +102,18 @@
db->open();
HsDatabase::setInstance(db);
- HsConfiguration::setInstance(new HsConfiguration);
+ HsConfiguration::setInstance(new HsConfiguration(QCoreApplication::instance()));
HsConfiguration::instance()->load();
HsWidgetPositioningOnOrientationChange::setInstance(
new HsAdvancedWidgetPositioningOnOrientationChange);
-
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+ HsWidgetPositioningOnWidgetAdd::setInstance(
+ new HsWidgetOrganizer);
+#else
HsWidgetPositioningOnWidgetAdd::setInstance(
new HsAnchorPointInBottomRight);
+#endif
HsWidgetPositioningOnWidgetMove::setInstance(
new HsSnapToLines);
@@ -138,6 +142,8 @@
HsStateMachine::~HsStateMachine()
{
HsWidgetPositioningOnOrientationChange::setInstance(0);
+ HsWidgetPositioningOnWidgetAdd::setInstance(0);
+ HsWidgetPositioningOnWidgetMove::setInstance(0);
delete mPublisher;
}