diff -r 2e2dc3d30ca8 -r 341166945d65 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Thu Jun 24 13:11:40 2010 +0100 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Fri Jun 25 19:19:22 2010 +0300 @@ -50,7 +50,7 @@ /*! Constructor - \param parent owner + \param parent Parent state. \retval void */ HsCollectionNameState::HsCollectionNameState(QState *parent) : @@ -74,7 +74,11 @@ */ void HsCollectionNameState::construct() { - setObjectName(this->parent()->objectName() + "/collectionnamestate"); + setObjectName("/collectionnamestate"); + if (this->parent()) { + setObjectName(this->parent()->objectName() + objectName()); + } + connect(this, SIGNAL(exited()), SLOT(cleanUp())); } @@ -82,9 +86,6 @@ Sets entry event. \param event entry event. */ -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT void HsCollectionNameState::onEntry(QEvent *event) { qDebug("CollectionState::onEntry()"); @@ -104,10 +105,6 @@ HSMENUTEST_FUNC_EXIT("HsCollectionNameState::onEntry"); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT - // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- //