diff -r 35368b604b28 -r 6727c5d0afc7 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Thu Sep 02 20:17:27 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Fri Sep 17 08:27:54 2010 +0300 @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -35,14 +34,12 @@ static const char* DOCUMENT_BASE_NAME_MAP [InvalidStateContext][InvalidOperationalContext] = - /*HsItemViewContext, HsButtonContext, HsEmptyLabelContext*/ + /*HsItemViewContext, HsEmptyLabelContext*/ { -/*HsAllAppsContext*/ {"listview", "listview", "listview"}, -/*HsAllCollectionsContext*/ {"listview", "listview", "listview"}, -/*HsInstalledAppsContext*/ {"labeledlistview", "labeledlistview", - "emptylabeledview"}, -/*HsCollectionContext*/ {"labeledlistview", "addcontentlabeledview", - "emptylabeledview"} +/*HsAllAppsContext*/ {"listview", "listview"}, +/*HsAllCollectionsContext*/ {"listview", "listview"}, +/*HsInstalledAppsContext*/ {"labeledlistview", "emptylabeledview"}, +/*HsCollectionContext*/ {"labeledlistview", "emptylabeledview"} }; static const QString DOCUMENT_NAME_PREFIX(QLatin1String(":/xml/")); @@ -52,7 +49,6 @@ static const QString VIEW_NAME(QLatin1String("view")); static const QString LIST_VIEW_NAME(QLatin1String("listView")); static const QString VIEW_LABEL_NAME(QLatin1String("label")); -static const QString ADD_CONTENT_BUTTON_NAME(QLatin1String("addContentButton")); /*! \class HsMenuViewBuilder @@ -116,22 +112,6 @@ } /*! - \return Pointer to the 'Add content' button resulting from last - \a build call. It is - guaranteed to be not NULL if the \a build was called for the context - related to view including label. - The pointer is valid until the HsMenuViewBuilder instance is destroyed. - Memory ownership is not changed. - */ -HbPushButton *HsMenuViewBuilder::currentAddContentButton() -{ - HbPushButton *pushButton = - qobject_cast(currentLoader()->findWidget( - ADD_CONTENT_BUTTON_NAME)); - return pushButton; -} - -/*! \return Pointer to All Applications Action. Guaranteed to be not NULL. The pointer is valid until the HsMenuViewBuilder instance is destroyed. Memory ownership is not changed.