# HG changeset patch
# User hgs
# Date 1283284155 -19800
# Node ID 7c176670643fd2f1913592df36a4e6ff02c84d9c
# Parent  089681919c6fd27a981a7ef0635dc0c5f9e97839
201035_01

diff -r 089681919c6f -r 7c176670643f messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP
--- a/messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -19,7 +19,7 @@
 
 #include <biouids.h>
 #include <f32file.h>
-#include "regpsdll.h"   // Parser Registry - used to load the parser
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
 #include <biodb.h>
 #include "BIOOP.H"
 #include <msvstd.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP
--- a/messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -42,8 +42,8 @@
 #include <txtfmlyr.h>
 
 #include "BIOSCMDS.H"
-#include "regpsdll.h"   // Parser Registry - used to load the parser
-#include "bsp.h"		// CBaseScriptParser, CBaseScriptParser2
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
+#include "BSP.H"		// CBaseScriptParser, CBaseScriptParser2
 #include "BIOOP.H"
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <biomessageuids.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP
--- a/messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -22,8 +22,8 @@
 #include <biodb.h>	// bio database
 
 #include <biouids.h>	// contains panic codes
-#include "regpsdll.h"   // Parser Registry - used to load the parser
-#include "bsp.h"			// CBaseParser
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
+#include "BSP.H"			// CBaseParser
 
 // CRichText etc. includes
 #include <txtrich.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/biomsgfw/BIUTSRC/BSP.CPP
--- a/messagingfw/biomsgfw/BIUTSRC/BSP.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/biomsgfw/BIUTSRC/BSP.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -15,7 +15,7 @@
 // 
 //
 
-#include "bsp.h"
+#include "BSP.H"
 #include "regpsdll.h"	// CRegisteredParserDll
 #include "msventry.h"	// CMsvServerEntry
 #include <msvuids.h>	// KUidMsvMessageEntry, KUidMsvServiceEntry
diff -r 089681919c6f -r 7c176670643f messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP
--- a/messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -24,7 +24,7 @@
 #include <msvreg.h>
 #include <msvuids.h>
 #include <msvruids.h>
-#include "msvutils.h"
+#include "MSVUTILS.H"
 
 // Specific includes
 #include "MTMUIBAS.H"
diff -r 089681919c6f -r 7c176670643f messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP
--- a/messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -17,7 +17,7 @@
 #include <coemain.h>	// CCoeEnv
 #include <bautils.h>	// BaflUtils
 #include <fbs.h>
-#include "msvutils.h"
+#include "MSVUTILS.H"
  
 // Specific includes
 #include "MTUDCBAS.H"
diff -r 089681919c6f -r 7c176670643f messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -15,7 +15,7 @@
 //
 
 #include "MSVSTORE.H"     // CMsvStore
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <charconv.h>     // CCnvCharacterSetConverter
 #include <txtrich.h>      // CRichText
 #include <s32mem.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -15,7 +15,7 @@
 //
 
 #include <cmsvplainbodytext.h>
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <mmsvstoremanager.h>
 #include "MSVPANIC.H"
 #include <txtrich.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP
--- a/messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP	Wed Sep 01 01:19:15 2010 +0530
@@ -21,7 +21,7 @@
 #include "MSVSTORE.H"
 #include "MSVPANIC.H"
 #include "CMsvCachedStore.h"
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <cmsvplainbodytext.h>
 #include "CMsvAttachmentManager.h"
 #include <cmsvattachment.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp
--- a/messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -13,7 +13,7 @@
 // Description:
 //
     
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 
 
 EXPORT_C  CMultipartBinIterator* CMultipartBinIterator::NewL(CPushMessage& aPushMessage)
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp
--- a/messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -22,7 +22,7 @@
 #include <push/pushlog.h>
 #include <push/pushmessage.h>
 #include <push/pluginkiller.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/ccontenthandlerbase.h>
 
 // Constants
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -21,7 +21,7 @@
 
 // System includes
 #include "cmultiparttextiterator.h"
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 
 // Constants
 _LIT(KReserved, "Reserved");
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h	Wed Sep 01 01:19:15 2010 +0530
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include "cmultipartiteratorbase.h"
 #include <push/ccontenthandlerbase.h>
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 #include <push/pushmessage.h>
 
 // Local includes
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Wed Sep 01 01:19:15 2010 +0530
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include <push/pushmessage.h>
 #include <push/ccontenthandlerbase.h>
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 
 // Local includes
 //
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp
--- a/messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -23,7 +23,7 @@
 #include <push/pushlog.h>
 #include <push/pushmessage.h>
 #include <push/pluginkiller.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/ccontenthandlerbase.h>
 
 
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp
--- a/messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -17,7 +17,7 @@
 
 // System includes
 //
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/pluginkiller.h>
 #include <push/cpushhandlerbase.h>
 #include <push/ccontenthandlerbase.h>
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/pushutils/src/PushMessage.cpp
--- a/messagingfw/wappushfw/pushutils/src/PushMessage.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/pushutils/src/PushMessage.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -15,7 +15,7 @@
     
 // System Include
 #include <push/pushmessage.h>
-#include "wapdecoder.h"
+#include "WapDecoder.h"
 
 // User Include
 #include "chttpresponse.h"
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/pushutils/src/WapDecoder.cpp
--- a/messagingfw/wappushfw/pushutils/src/WapDecoder.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/pushutils/src/WapDecoder.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "wapdecoder.h"
+#include "WapDecoder.h"
 
 const TInt KMaxLongIntSize = 0x1E;	// Long-integer can have maximum 30 OCTETS (WSP Spec)
 
diff -r 089681919c6f -r 7c176670643f messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp
--- a/messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp	Wed Sep 01 01:19:15 2010 +0530
@@ -18,7 +18,7 @@
 #include <wapmsgerr.h>
 #include "CLWatcher.h"
 #include <push/pushmessage.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/cpushhandlerbase.h>
 #include <ecom/ecom.h>
 
diff -r 089681919c6f -r 7c176670643f messagingfw/watcherfw/group/watcher.mmp
--- a/messagingfw/watcherfw/group/watcher.mmp	Tue Aug 31 19:19:29 2010 +0530
+++ b/messagingfw/watcherfw/group/watcher.mmp	Wed Sep 01 01:19:15 2010 +0530
@@ -50,7 +50,7 @@
 LIBRARY flogger.lib
 #endif
 
-DEFFILE		V2_watcher.DEF
+DEFFILE		v2_watcher.DEF
 
 VENDORID 0x70000001