--- a/phonebookui/pbkcommonui/inc/cntcontactcardview.h	Fri Apr 16 14:53:18 2010 +0300
+++ b/phonebookui/pbkcommonui/inc/cntcontactcardview.h	Mon May 03 12:24:20 2010 +0300
@@ -15,100 +15,50 @@
 *
 */
 
-#ifndef CNTCOMMLAUNCHERVIEW_H
-#define CNTCOMMLAUNCHERVIEW_H
-
-#include <QObject>
-#include "cntbaseview.h"
-#include "qtpbkglobal.h"
+#ifndef CNTCONTACTCARDVIEW_H
+#define CNTCONTACTCARDVIEW_H
 
-class QGraphicsWidget;
-class HbScrollArea;
-class QGraphicsLinearLayout;
-class CntContactCardDataContainer;
-class CntContactCardHeadingItem;
-class ThumbnailManager;
-class CntContactCardDetailItem;
+#include <cntabstractview.h>
+#include "qtpbkglobal.h"
+#include <QObject>
+
+class HbView;
+class CntContactCardViewPrivate;
+class CntAbstractViewManager;
+
 QTM_BEGIN_NAMESPACE
 class QContact;
+class QContactDetail;
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
-class QTPBK_EXPORT CntContactCardView : public CntBaseView
+class QTPBK_EXPORT CntContactCardView : public QObject, public CntAbstractView
 {
     Q_OBJECT
-
-public slots:
-    virtual void aboutToCloseView();
-    void onItemActivated();
-    virtual void editContact();
-	void viewHistory();
-    void onLongPressed(const QPointF &aCoords);
-    void setPreferredAction(const QString &aAction, const QContactDetail &aDetail);
-    void thumbnailReady(const QPixmap& pixmap, void *data, int id, int error);
-	void keyPressEvent(QKeyEvent *event);
-    void doChangeImage();
-    void doRemoveImage();
-    void drawMenu(const QPointF &aCoords);
-	
-#ifdef PBK_UNIT_TEST
-public slots:
-#else
-private slots:
-#endif
-    void sendBusinessCard();
-    void addToGroup();
-    void deleteContact();
-    void handleExecutedCommand(QString command, QContact contact);
-    void setAsFavorite();
-    void removeFromFavorite();
-
+    
 public:
-    CntContactCardView(CntViewManager *viewManager, QGraphicsItem *parent = 0);
+    CntContactCardView();
     ~CntContactCardView();
-
-    CntViewParameters::ViewId viewId() const { return CntViewParameters::commLauncherView; }
-    virtual void activateView(const CntViewParameters &viewParameters);
-
+  
 signals:
-    void preferredUpdated();
-
-private:
-    void doViewImage();
-
-#ifdef PBK_UNIT_TEST
-public:
-#else
-private:
-#endif
-    void resizeEvent(QGraphicsSceneResizeEvent *event);
-    virtual void addActionsToToolBar();
-    virtual void addMenuItems();
+    void backPressed();  
+    void viewActivated(QContact, QContactDetail);
+    
+public: // From CntAbstractView
+    void activate(CntAbstractViewManager* aMgr, const CntViewParameters aArgs);
+    void deactivate();
+    HbView* view() const;
     
-    bool isFavoriteGroupCreated();
-
-#ifdef PBK_UNIT_TEST
-public:
-#else
-protected:
-#endif
-    HbScrollArea                *mScrollArea;
-    QGraphicsWidget             *mContainerWidget;
-    QGraphicsLinearLayout       *mContainerLayout;
-    QContact                    *mContact;
-    QGraphicsWidget             *mDetailsWidget;
-    CntContactCardDataContainer *mDataContainer;
-    CntContactCardHeadingItem   *mHeadingItem;
-    ThumbnailManager            *mThumbnailManager;
-    QContact                    *mGroupContact;
-    QContactAvatar              *mAvatar;
-    bool                         mIsGroupMember;
-    bool                         mIsHandlingMenu;
-    QMap<QString, CntContactCardDetailItem*> mPreferredItems;
-    int                         mFavoriteGroupId;
+    bool isDefault() const;
+    int viewId() const;
+     
+private:
+    CntContactCardViewPrivate* const d_ptr;
+    Q_DECLARE_PRIVATE_D(d_ptr, CntContactCardView)
+    Q_DISABLE_COPY(CntContactCardView)    
 };
 
-#endif // CNTCOMMLAUNCHERVIEW_H
+#endif // CNTCONTACTCARDVIEW_H
 
 // EOF