--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -25,10 +25,11 @@
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class QStandardItemModel;
+class QModelIndex;
 class HbAction;
 class HsAppsCheckList;
 class HsCollectionNameDialog;
-class HsCollectionsListDialog;
+class HbDialog;
 
 class HsAddAppsToCollectionState: public QState
 {
@@ -54,11 +55,9 @@
 
     void transitToSaveState(const QString &collectionName);
 
-    void transitToAppsCheckListState(const QString &collectionName);
-
     void transitToSaveState(int collectionId);
 
-    void transitToAppsCheckListState(int collectionId);
+    void transitToSelectCollectionState();
 
     void transitToNewCollectionState();
 
@@ -85,6 +84,8 @@
     void cleanData();
 
     void selectApplicationsDone(const QList<int> &appList);
+    
+    void collectionSelected(const QModelIndex &modelIndex);
 
 private slots:
 
@@ -105,6 +106,8 @@
     void construct();
 
     void createStates();
+    
+    QStandardItemModel *standardItemModel(int collectionId);
 
 private:
 
@@ -128,14 +131,13 @@
 
     HsSortAttribute mApplicationsSortAttribute;
 
-    HsSortAttribute mCollectionsSortAttribute;
-
     HsAppsCheckList *mAppsCheckList;
 
     HsCollectionNameDialog *mEditorDialog;
 
-    HsCollectionsListDialog *mListDialog;
+    HbDialog *mListDialog; // not owned
 
+    QStandardItemModel *mModel; // delete with dialog
 };
 
 #endif /* ADDAPPSTOCOLLECTIONSTATE_H */