diff -r c18f9fa7f42e -r 640d30f4fb64 phonebookui/cntcommonui/views/cnthistoryview.h --- a/phonebookui/cntcommonui/views/cnthistoryview.h Fri Oct 08 11:42:51 2010 +0300 +++ b/phonebookui/cntcommonui/views/cnthistoryview.h Fri Oct 15 12:24:46 2010 +0300 @@ -20,16 +20,17 @@ #include #include -#include +#include class HbListView; -class CntHistoryModel; class HbView; -class QModelIndex; class HbAction; class HbDocumentLoader; +class HbAbstractViewItem; class XQAiwRequest; -class HbAbstractViewItem; +class QModelIndex; +class CntHistoryModel; + QTM_BEGIN_NAMESPACE class QContact; @@ -40,6 +41,7 @@ class CntHistoryView : public QObject, public CntAbstractView { Q_OBJECT + friend class TestCntHistoryView; public: // From CntAbstractView CntHistoryView(); @@ -57,32 +59,25 @@ void handleClearHistory(int action); void itemActivated(const QModelIndex &index); void showPreviousView(); + void showRootView(); void showClearHistoryMenu(); - void showRootView(); void contactDeletedFromOtherSource(const QList& contactIds); - void onLongPressed (HbAbstractViewItem *item, const QPointF &coords); - - private: HbDocumentLoader* docLoader(); -#ifdef PBK_UNIT_TEST -public: -#else -private: -#endif - HbListView* mHistoryListView; // not own - CntHistoryModel* mHistoryModel; // own - HbView* mView; // not own - HbDocumentLoader* mDocumentLoader; // own - CntAbstractViewManager* mViewMgr; // not own - HbAction* mBackKey; // not own - QContact* mContact; // own - HbAction* mClearHistory; // not own - CntViewParameters mArgs; - XQAiwRequest* mRequest; - CntAbstractEngine* mEngine; +private: + HbListView *mHistoryListView; // not own + CntHistoryModel *mHistoryModel; // own + HbView *mView; // not own + HbDocumentLoader *mDocumentLoader; // own + CntAbstractViewManager *mViewMgr; // not own + HbAction *mBackKey; // not own + QContact *mContact; // own + HbAction *mClearHistory; // not own + CntViewParameters mArgs; + XQAiwRequest *mRequest; + CntAbstractEngine *mEngine; }; #endif // CNTHISTORYVIEW_H