--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Wed Aug 18 09:40:07 2010 +0300
@@ -18,17 +18,11 @@
#ifndef HSALLCOLLECTIONSSTATE_H
#define HSALLCOLLECTIONSSTATE_H
-#include <qstate.h>
-#include <QModelIndex>
-#include <QPointF>
-#include <QPointer>
-
#include "hsbaseviewstate.h"
-#include "hsmenumodewrapper.h"
HS_STATES_TEST_CLASS(MenuStatesTest)
-class HbMenu;
+class QPointF;
class HsMenuViewBuilder;
class HbAbstractViewItem;
class HbAction;
@@ -36,6 +30,7 @@
class HsMenuItemModel;
class HsMenuView;
class HsMainWindow;
+class HsMenuModeWrapper;
class HsAllCollectionsState: public HsBaseViewState
{
@@ -49,24 +44,13 @@
~HsAllCollectionsState();
protected:
signals:
- void sortOrderChanged(HsSortAttribute sortAttribute);
void toAppLibraryState();
-public slots:
- void scrollToBeginning();
private slots:
- bool openTaskSwitcher();
- void listItemActivated(const QModelIndex &index);
void addActivated(const QModelIndex &index);
- void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords);
void addLongPressed(HbAbstractViewItem *item, const QPointF &coords);
void createNewCollection();
void createArrangeCollection();
- void customMenuAction();
- void ascendingMenuAction();
- void descendingMenuAction();
- void stateEntered();
- void addModeEntered();
void normalModeEntered();
void normalModeExited();
void stateExited();
@@ -74,15 +58,7 @@
private:
void construct();
void setMenuOptions();
-private:
- HbAction *mSecondarySoftkeyAction;
- HsSortAttribute mSortAttribute;
- HsMenuView mMenuView;
- HsMenuModeWrapper &mMenuMode;
- HsMenuItemModel *mAllCollectionsModel;
- HsMainWindow &mMainWindow;
- QModelIndex mContextModelIndex;
- QPointer<HbMenu> mContextMenu;
+ void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
};
#endif // HSALLCOLLECTIONSSTATE_H