--- a/creator/creator.pro	Fri Jun 11 17:49:08 2010 +0300
+++ b/creator/creator.pro	Thu Jun 17 15:34:52 2010 +0300
@@ -142,7 +142,7 @@
 			-lapengine \
 			-lnoteseditor \
 			-lxqservice \
-		    -lQtContacts \ 
+		    -lQtContacts \
 			-lagendainterface 
 
 	creatorDataBlock = \

--- a/creator/engine/inc/creator_note.h	Fri Jun 11 17:49:08 2010 +0300
+++ b/creator/engine/inc/creator_note.h	Thu Jun 17 15:34:52 2010 +0300
@@ -28,7 +28,7 @@
 
 #include <e32base.h>
 //#include <npdapi.h>
-#include <NotesEditor>
+#include <noteseditorinterface.h>
 #include <AgendaUtil>
 #include <AgendaEntry>
 
@@ -59,7 +59,7 @@
 
 private:
     AgendaUtil *iAgendaUtil;
-    NotesEditor *iNotepadApi;	//QT Notes api 
+    NotesEditorInterface *iNotepadApi;	//QT Notes api 
     //CNotepadApi *iNotepadApi;
 
     CNotepadParameters* iParameters;

--- a/creator/engine/src/creator_note.cpp	Fri Jun 11 17:49:08 2010 +0300
+++ b/creator/engine/src/creator_note.cpp	Thu Jun 17 15:34:52 2010 +0300
@@ -72,20 +72,21 @@
 
     iEngine = aEngine;
     iAgendaUtil = new AgendaUtil();
-    iNotepadApi = new NotesEditor(iAgendaUtil);
+    //iNotepadApi = new NotesEditor(iAgendaUtil);
     //iNotepadApi = CNotepadApi::NewL();
     }
 
 CCreatorNotepad::~CCreatorNotepad()
     {
     LOGSTRING("Creator: CCreatorNotepad::~CCreatorNotepad");
-    
+ 
+ /*   
     if(iNotepadApi)
         {
         delete iNotepadApi;
         iNotepadApi = NULL;
         }
-    
+*/    
     if(iAgendaUtil)
         {
         delete iAgendaUtil;
@@ -95,7 +96,7 @@
     if (iParameters)
         {
         delete iParameters;
-        iParameters;
+        iParameters = NULL;
         }
     }
 
@@ -143,8 +144,8 @@
 
     //iNotepadApi->AddContentL(parameters->iNoteText->Des());
     QString textNote = QString::fromUtf16(parameters->iNoteText->Ptr(),parameters->iNoteText->Length());
-    iNotepadApi->edit(textNote);
-    iNotepadApi->close(NotesEditor::CloseWithSave);
+    iNotepadApi->edit(textNote, iAgendaUtil);
+    iNotepadApi->close(NotesEditorInterface::CloseWithSave, iAgendaUtil);
     
     return err;
     }