# HG changeset patch # User hgs # Date 1276778092 -10800 # Node ID d8e625c87f33b5a1bf83f5effcfe6cbd44b021c5 # Parent 1c71b77fbc9346dd6802df9ca4acf378fe978016 201023_1 diff -r 1c71b77fbc93 -r d8e625c87f33 creator/creator.pro --- 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 = \ diff -r 1c71b77fbc93 -r d8e625c87f33 creator/engine/inc/creator_note.h --- 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 //#include -#include +#include #include #include @@ -59,7 +59,7 @@ private: AgendaUtil *iAgendaUtil; - NotesEditor *iNotepadApi; //QT Notes api + NotesEditorInterface *iNotepadApi; //QT Notes api //CNotepadApi *iNotepadApi; CNotepadParameters* iParameters; diff -r 1c71b77fbc93 -r d8e625c87f33 creator/engine/src/creator_note.cpp --- 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; }