--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Fri Jun 25 19:19:22 2010 +0300
@@ -22,9 +22,7 @@
 #include <qabstractitemmodel.h>
 #include <QPointer>
 
-#include "hsmenustates_global.h"
-#include "hsmenuservice.h"
-#include "hsmenuview.h"
+#include "hsbaseviewstate.h"
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
@@ -38,7 +36,7 @@
 class HsMenuViewBuilder;
 class HsMainWindow;
 
-class HsCollectionState: public QState
+class HsCollectionState: public HsBaseViewState
 {
     Q_OBJECT
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
@@ -58,7 +56,7 @@
     bool openTaskSwitcher();
     void listItemActivated(const QModelIndex &index);
     void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords);
-    void addAppsAction();
+    void addAppsAction(bool addApps = true);
     void addCollectionShortcutToHomeScreenAction();
     void renameAction();
     void deleteAction();