--- a/phonebookui/cntcommonui/views/cntimageeditorview.h	Fri Oct 08 11:42:51 2010 +0300
+++ b/phonebookui/cntcommonui/views/cntimageeditorview.h	Fri Oct 15 12:24:46 2010 +0300
@@ -20,17 +20,15 @@
 
 #include <QObject>
 #include <cntdocumentloader.h>
+#include <cntabstractview.h>
 #include <xqappmgr.h>
 
-#include <cntabstractview.h>
-
-class CntImageLabel;
 class HbListView;
+class HbAction;
 class XQAiwRequest;
-class HbAction;
 class QStandardItemModel;
 class QModelIndex;
-class CntSaveManager;
+class CntImageLabel;
 
 QTM_BEGIN_NAMESPACE
 class QContact;
@@ -42,6 +40,7 @@
 class CntImageEditorView : public QObject, public CntAbstractView
 {
     Q_OBJECT
+    friend class TestCntImageEditorView;
 
 public:
     CntImageEditorView();
@@ -54,41 +53,28 @@
     HbView* view() const { return mView; }
     int viewId() const { return imageEditorView; }
     inline void setEngine( CntAbstractEngine& aEngine ){ mEngine = &aEngine; }
-#ifdef PBK_UNIT_TEST
-public:
-#else
+
 private:
-#endif
     void populateModel(QStandardItemModel *model);
     void openCamera();
     void openGallery();
 
-#ifdef PBK_UNIT_TEST
-public slots:
-#else
 private slots:
-#endif
     void showPreviousView();
     void removeImage();
     void handleImageChange(const QVariant &value);
     void thumbnailReady( const QPixmap& pixmap, void *data, int id, int error );
     void setOrientation(Qt::Orientation orientation);
     void listViewActivated(const QModelIndex &index);
-    void handleError(int errorCode, const QString& errorMessage);
     void saveContact();
 
-
-#ifdef PBK_UNIT_TEST
-public:
-#else
 private:
-#endif
     QContact                *mContact; // own
     QContactAvatar          *mAvatar; // own
     CntImageLabel           *mImageLabel; // owned by layout
     XQAiwRequest            *mRequest; // own
     XQApplicationManager     mAppManager;
-    CntThumbnailManager        *mThumbnailManager; // own
+    CntThumbnailManager     *mThumbnailManager; // own
     HbView                  *mView; // own
     HbAction                *mSoftkey; // owned by view
     HbAction                *mRemoveImage; // own
@@ -96,10 +82,9 @@
     CntDocumentLoader        mDocumentLoader;
     HbListView              *mListView; // owned by layout
     QStandardItemModel      *mModel; // own
-    CntSaveManager          *mSaveManager; // own
     
-    CntViewParameters       mArgs;
-    CntAbstractEngine* mEngine;
+    CntViewParameters        mArgs;
+    CntAbstractEngine       *mEngine; // not owned
 };
 
-#endif // CNTIMAGEEDITORVIEW_H
+#endif /* CNTIMAGEEDITORVIEW_H */