equal
deleted
inserted
replaced
44 #include "hswidgetpositioningonwidgetadd.h" |
44 #include "hswidgetpositioningonwidgetadd.h" |
45 #include "hsconfiguration.h" |
45 #include "hsconfiguration.h" |
46 #include "hstest_global.h" |
46 #include "hstest_global.h" |
47 #include "hswidgetpositioningonwidgetmove.h" |
47 #include "hswidgetpositioningonwidgetmove.h" |
48 #include "hssystemevents.h" |
48 #include "hssystemevents.h" |
|
49 #include "hsdbupdatethread.h" |
49 |
50 |
50 QTM_USE_NAMESPACE |
51 QTM_USE_NAMESPACE |
51 #define hbApp qobject_cast<HbApplication*>(qApp) |
52 #define hbApp qobject_cast<HbApplication*>(qApp) |
52 |
53 |
53 namespace |
54 namespace |
95 #else |
96 #else |
96 db->setDatabaseName("private/20022f35/homescreen.db"); |
97 db->setDatabaseName("private/20022f35/homescreen.db"); |
97 #endif |
98 #endif |
98 db->open(); |
99 db->open(); |
99 HsDatabase::setInstance(db); |
100 HsDatabase::setInstance(db); |
|
101 QString dbName("private/20022f35/homescreen.db"); |
|
102 #ifdef Q_OS_SYMBIAN |
|
103 dbName = "c:/private/20022f35/homescreen.db"; |
|
104 #endif |
|
105 HsDbUpdateThread *updateDb = new HsDbUpdateThread("update.dbc",dbName,QCoreApplication::instance()); |
|
106 HsDbUpdateThread::setInstance(updateDb); |
|
107 |
100 |
108 |
101 HsConfiguration::setInstance(new HsConfiguration(QCoreApplication::instance())); |
109 HsConfiguration::setInstance(new HsConfiguration(QCoreApplication::instance())); |
102 HsConfiguration::instance()->load(); |
110 HsConfiguration::instance()->load(); |
103 |
111 |
104 HsWidgetPositioningOnOrientationChange::setInstance( |
112 HsWidgetPositioningOnOrientationChange::setInstance( |
126 |
134 |
127 if (hbApp) { // Qt test framework uses QApplication. |
135 if (hbApp) { // Qt test framework uses QApplication. |
128 connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), |
136 connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), |
129 this, SLOT(activityRequested(QString))); |
137 this, SLOT(activityRequested(QString))); |
130 } |
138 } |
|
139 |
131 HSTEST_FUNC_EXIT("HS::HsStateMachine::HsStateMachine"); |
140 HSTEST_FUNC_EXIT("HS::HsStateMachine::HsStateMachine"); |
132 } |
141 } |
133 |
142 |
134 /*! |
143 /*! |
135 Destructor. |
144 Destructor. |
136 */ |
145 */ |
137 HsStateMachine::~HsStateMachine() |
146 HsStateMachine::~HsStateMachine() |
138 { |
147 { |
|
148 HsDbUpdateThread::instance()->quit(); |
139 HsWidgetPositioningOnOrientationChange::setInstance(0); |
149 HsWidgetPositioningOnOrientationChange::setInstance(0); |
140 HsWidgetPositioningOnWidgetAdd::setInstance(0); |
150 HsWidgetPositioningOnWidgetAdd::setInstance(0); |
141 HsWidgetPositioningOnWidgetMove::setInstance(0); |
151 HsWidgetPositioningOnWidgetMove::setInstance(0); |
142 delete mPublisher; |
152 delete mPublisher; |
143 } |
153 } |