diff -r 2e2dc3d30ca8 -r 341166945d65 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Thu Jun 24 13:11:40 2010 +0100 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Fri Jun 25 19:19:22 2010 +0300 @@ -57,7 +57,7 @@ /*! Constructor - \param parent: parent state + \param parent Parent state. \retval void */ HsViewAppSettingsState::HsViewAppSettingsState(QState *parent) : @@ -68,7 +68,7 @@ mNotifier(0) { - construct(); + construct(); } /*! @@ -76,8 +76,10 @@ */ void HsViewAppSettingsState::construct() { - setObjectName(this->parent()->objectName() - + "/ViewAppSettingsState"); + setObjectName("/ViewAppSettingsState"); + if (this->parent()) { + setObjectName(this->parent()->objectName() + objectName()); + } } /*! @@ -106,7 +108,8 @@ const int entryId = data.value(itemIdKey()).toInt(); QSharedPointer entry = CaService::instance()->getEntry(entryId); - QString pluginPath(entry->attribute(appSettingsPlugin())); + QString pluginPath; + pluginPath = pluginPath.append("/resource/qt/plugins/appsettings/").append(entry->attribute(appSettingsPlugin())).append(".qtplugin"); QPluginLoader loader(pluginPath); mView = qobject_cast(loader.instance()); @@ -138,7 +141,7 @@ #ifdef COVERAGE_MEASUREMENT #pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT +#endif //COVERAGE_MEASUREMENT (only returns HbMainWindow) /*! Returns pointer to tha main window. \return Pointer to the main window. @@ -152,9 +155,6 @@ #endif //COVERAGE_MEASUREMENT -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT /*! Invoked when plugin view exits */ @@ -162,9 +162,6 @@ { emit exit(); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT /*! Subscribe for memory card remove.