--- a/creator/engine/src/creator_note.cpp	Thu Jun 17 15:34:52 2010 +0300
+++ b/creator/engine/src/creator_note.cpp	Thu Jun 24 14:55:55 2010 +0300
@@ -22,6 +22,7 @@
 #include "creator_note.h" 
 #include "creator_traces.h"
 
+
 const TInt KCreatorDiskSpaceNeededForSingleDeletion( 8192 );
 _LIT( KCreatorNotepadFile, "c:Notepad.dat" );
 
@@ -71,33 +72,23 @@
     LOGSTRING("Creator: CCreatorNotepad::ConstructL");
 
     iEngine = aEngine;
-    iAgendaUtil = new AgendaUtil();
-    //iNotepadApi = new NotesEditor(iAgendaUtil);
-    //iNotepadApi = CNotepadApi::NewL();
+    iNotepadWrapper = CCreatorNotepadWrapper::NewL();
     }
 
 CCreatorNotepad::~CCreatorNotepad()
     {
     LOGSTRING("Creator: CCreatorNotepad::~CCreatorNotepad");
- 
- /*   
-    if(iNotepadApi)
-        {
-        delete iNotepadApi;
-        iNotepadApi = NULL;
-        }
-*/    
-    if(iAgendaUtil)
-        {
-        delete iAgendaUtil;
-        iAgendaUtil = NULL;
-        }
     
     if (iParameters)
         {
         delete iParameters;
-        iParameters = NULL;
+        iParameters;
         }
+    
+    if (iNotepadWrapper)
+    	{
+		delete iNotepadWrapper;
+    	}
     }
 
 //----------------------------------------------------------------------------
@@ -142,10 +133,7 @@
     
     TInt err = KErrNone;
 
-    //iNotepadApi->AddContentL(parameters->iNoteText->Des());
-    QString textNote = QString::fromUtf16(parameters->iNoteText->Ptr(),parameters->iNoteText->Length());
-    iNotepadApi->edit(textNote, iAgendaUtil);
-    iNotepadApi->close(NotesEditorInterface::CloseWithSave, iAgendaUtil);
+    iNotepadWrapper->CreateNoteL(parameters->iNoteText->Des());
     
     return err;
     }
@@ -154,52 +142,7 @@
 void CCreatorNotepad::DeleteAllL()
     {
     LOGSTRING("Creator: CCreatorNotepad::DeleteAllL");
-    QList<AgendaEntry> ael;
-    AgendaUtil::FilterFlags filter = AgendaUtil::FilterFlags(AgendaUtil::IncludeNotes);
-
-    ael = iAgendaUtil->fetchAllEntries(filter);
-    for(int i=0 ; i<ael.count() ; i++)
-    	{
-        iAgendaUtil->deleteEntry(ael[i].id());
-    	}
-    
-    // Open Notes db
- /*   RDbs dbs;
-    User::LeaveIfError( dbs.Connect() );
-    CleanupClosePushL( dbs );
-    RDbNamedDatabase db;
-    TInt openErr( db.Open( dbs, KCreatorNotepadFile, KCreatorNotepadFormat ) );
-    CleanupClosePushL( db );
-    
-    if ( openErr && openErr !=  KErrNotFound )
-        {
-        User::Leave( openErr );
-        }
-    
-    // do not leave if openErr == KErrNotFound, 
-    // it means there is no notes (file) created -> no need to delete
-    
-    if ( openErr !=  KErrNotFound )
-        {
-        TInt retval = iFs.ReserveDriveSpace( KDefaultDrive, KCreatorDiskSpaceNeededForSingleDeletion );
-        if ( retval == KErrNone )
-            {
-            retval = iFs.GetReserveAccess( KDefaultDrive );
-            }
-
-        // Delete all Notes. Ignore rowCount returnvalue
-        db.Execute( KCreatorNotepadDeleteAllSQL );            
-        
-        User::LeaveIfError( db.Compact() );
-        
-        if ( retval == KErrNone )
-            {
-            retval = iFs.ReleaseReserveAccess( KDefaultDrive );
-            }
-        }
-    
-    CleanupStack::PopAndDestroy( &db );
-    CleanupStack::PopAndDestroy( &dbs );*/
+    iNotepadWrapper->DeleteAllL();
     }
 
 //----------------------------------------------------------------------------