--- a/meetingrequest/mrgui/mrfieldbuilderpluginextension/src/cesmrconflictpopup.cpp	Tue Apr 27 16:20:14 2010 +0300
+++ b/meetingrequest/mrgui/mrfieldbuilderpluginextension/src/cesmrconflictpopup.cpp	Tue May 11 15:57:15 2010 +0300
@@ -18,8 +18,8 @@
 #include "mesmrcalentry.h"
 #include "mesmrmeetingrequestentry.h"
 
-#include <akninfopopupnotecontroller.h>
-#include <stringloader.h>
+#include <AknInfoPopupNoteController.h>
+#include <StringLoader.h>
 #include <eikenv.h>
 #include <esmrgui.rsg>
 #include <avkon.rsg>
@@ -230,10 +230,6 @@
             CEikonEnv::Static()-> // codescanner::eikonenvstatic
                 HandleError(error);
             }
-        
-        // TODO: use XML layout data. Use this one popup_preview_text_window
-        /*iNote->SetPositionAndAlignment( CESMRLayoutManager::ConflictPopupPosition(),
-                EHLeftVCenter );*/
         iNote->ShowInfoPopupNote();
     }