--- a/phonebookui/pbkcommonui/inc/cntimageeditorview.h	Wed Jul 21 11:37:51 2010 +0300
+++ b/phonebookui/pbkcommonui/inc/cntimageeditorview.h	Fri Jul 23 12:43:48 2010 +0300
@@ -19,12 +19,12 @@
 #define CNTIMAGEEDITORVIEW_H
 
 #include <QObject>
-#include <hbdocumentloader.h>
+#include <cntdocumentloader.h>
 #include <xqappmgr.h>
 
 #include <cntabstractview.h>
 
-class HbLabel;
+class CntImageLabel;
 class HbListView;
 class XQAiwRequest;
 class ThumbnailManager;
@@ -86,7 +86,7 @@
 #endif
     QContact                *mContact; // own
     QContactAvatar          *mAvatar; // own
-    HbLabel                 *mImageLabel; // owned by layout
+    CntImageLabel           *mImageLabel; // owned by layout
     XQAiwRequest            *mRequest; // own
     XQApplicationManager     mAppManager;
     ThumbnailManager        *mThumbnailManager; // own
@@ -94,7 +94,7 @@
     HbAction                *mSoftkey; // owned by view
     HbAction                *mRemoveImage; // own
     CntAbstractViewManager  *mViewManager;
-    HbDocumentLoader         mDocumentLoader;
+    CntDocumentLoader        mDocumentLoader;
     HbListView              *mListView; // owned by layout
     QStandardItemModel      *mModel; // own
     CntSaveManager          *mSaveManager; // own