--- a/webengine/wmlengine/src/MVC/include/MVCShell.h Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCShell.h Fri Mar 19 09:52:28 2010 +0200
@@ -15,10 +15,14 @@
*
*/
+
#ifndef __MVCSHELL_H
#define __MVCSHELL_H
+
#include <apmstd.h>
+#include "BrsrStatusCodes.h"
+#include "BrsrTypes.h"
#include <badesca.h>
#include <bldvariant.hrh>
#include <charconv.h>
@@ -27,9 +31,7 @@
#include <f32file.h>
#include <ApEngineConsts.h>
-#include <brctldialogsprovider.h>
-#include "BrsrStatusCodes.h"
-#include "BrsrTypes.h"
+#include "BrCtlDialogsProvider.h"
#include "HEDDocumentListener.h"
#include "httploader_mlinkresolvercallbacks.h"
@@ -40,7 +42,7 @@
#include "nw_scrproxy.h"
#include "nw_wae.h"
#include "nwx_defs.h"
-#include <nwx_status.h>
+#include "nwx_status.h"
#include "urlloader_urlresponse.h"
#include "EmbeddedDocExitObserver.h"
//R
@@ -48,10 +50,12 @@
//#include "webkitview.h"
#include "wmlcontrol.h"
+
#ifdef __SERIES60_WIM
#include "WimUi.h"
#endif __SERIES60_WIM
+
enum TUrlLoadState
{
// We are now loading the URL