--- a/browserplugins/browseraudiovideoplugin/data/10282810.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/data/10282810.rss Thu Jan 07 12:48:02 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
#include "BrowserAudioVideoPlugin.rls"
// RESOURCE DEFINITIONS
--- a/browserplugins/browseraudiovideoplugin/data/BrowserAudioVideoPlugin.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/data/BrowserAudioVideoPlugin.rss Thu Jan 07 12:48:02 2010 +0200
@@ -30,7 +30,7 @@
#include <BrowserAudioVideoPlugin.mbg>
#include "BrowserAudioVideoPlugin.hrh"
-#include <BrowserAudioVideoPlugin.loc>
+#include <browseraudiovideoplugin.loc>
// RESOURCE DEFINITIONS
--- a/browserplugins/browseraudiovideoplugin/group/BLD.INF Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/group/BLD.INF Thu Jan 07 12:48:02 2010 +0200
@@ -24,7 +24,7 @@
PRJ_EXPORTS
// export localization files
-../loc/BrowserAudioVideoPlugin.loc APP_LAYER_LOC_EXPORT_PATH(BrowserAudioVideoPlugin.loc)
+../loc/browseraudiovideoplugin.loc APP_LAYER_LOC_EXPORT_PATH(browseraudiovideoplugin.loc)
../rom/BrowserAudioVideoPlugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(BrowserAudioVideoPlugin.iby)
../rom/BrowserAudioVideoPluginResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(BrowserAudioVideoPluginResources.iby)
--- a/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -49,8 +49,7 @@
END
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_LIBC_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
USERINCLUDE ../inc
--- a/browserplugins/browseraudiovideoplugin/src/BavpApi.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/src/BavpApi.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,11 +15,10 @@
*
*/
-
// INCLUDE FILES
#include <Uri16.h>
#include <mmf/common/MmfControllerFrameworkBase.h>
-#include "stdlib.h"
+#include <stdlib.h>
#include "BavpLogger.h"
#include "BavpPlugin.h"
--- a/browserplugins/browseraudiovideoplugin/src/BavpMain.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/src/BavpMain.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -21,7 +21,7 @@
#include <e32std.h> // For _LIT
#include <npapi.h> // For NPError
#include <npupp.h> // For NPNetscapeFuncs
-#include <implementationproxy.h>
+#include <ecom/implementationproxy.h>
#include <cecombrowserplugininterface.h>
#include "BavpLogger.h"
--- a/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
// INCLUDE FILES
#include <BrowserAudioVideoPlugin.rsg>
#include <StringLoader.h>
--- a/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -28,9 +28,10 @@
#include <pluginadapterinterface.h>
#include <BrowserAudioVideoPlugin.rsg> // For text
+#include <brctldefs.h>
+
#include "BavpLogger.h"
#include "BavpView.h"
-#include "brctldefs.h"
#include "BavpController.h"
#include "BavpPlugin.h"
--- a/browserplugins/browsergpsplugin/data/1028286f.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsergpsplugin/data/1028286f.rss Thu Jan 07 12:48:02 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
#include "GpsPlugin.rls"
// RESOURCE DEFINITIONS
--- a/browserplugins/browsergpsplugin/group/GpsPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsergpsplugin/group/GpsPluginEcom.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
#include <platform/mw/browser_platform_variant.hrh>
@@ -36,7 +35,6 @@
END
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
USERINCLUDE ../inc
SOURCEPATH ../src
@@ -59,6 +57,5 @@
LIBRARY SatInfo.lib
LIBRARY flogger.lib
-
DEFFILE npGpsPlugin.def
NOSTRICTDEF
--- a/browserplugins/browsergpsplugin/src/GpsPluginEcomMain.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsergpsplugin/src/GpsPluginEcomMain.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "GpsPlugin.h"
-#include <implementationproxy.h>
+#include <ecom/implementationproxy.h>
#include <cecombrowserplugininterface.h>
--- a/browserplugins/browsersysteminfoplugin/data/10282853.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsersysteminfoplugin/data/10282853.rss Thu Jan 07 12:48:02 2010 +0200
@@ -15,8 +15,7 @@
*
*/
-
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
#include "SystemInfoPlugin.rls"
// RESOURCE DEFINITIONS
--- a/browserplugins/browsersysteminfoplugin/group/SystemInfoPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsersysteminfoplugin/group/SystemInfoPluginEcom.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -36,8 +36,7 @@
END
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
-APP_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
USERINCLUDE ../inc
SOURCEPATH ../src
--- a/browserplugins/browsersysteminfoplugin/src/SystemInfoMain.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserplugins/browsersysteminfoplugin/src/SystemInfoMain.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
-#include <implementationproxy.h>
+#include <ecom/implementationproxy.h>
#include <cecombrowserplugininterface.h>
#include "SystemInfoPlugin.h"
--- a/browserui/browser/BrowserAppInc/BrowserAppDocument.h Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppInc/BrowserAppDocument.h Thu Jan 07 12:48:02 2010 +0200
@@ -17,11 +17,10 @@
*
*/
-
#ifndef __BROWSERAPPDOCUMENT_H
#define __BROWSERAPPDOCUMENT_H
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
#include "BrowserUtil.h"
#include <akndoc.h>
--- a/browserui/browser/BrowserAppInc/BrowserAppUi.h Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppInc/BrowserAppUi.h Thu Jan 07 12:48:02 2010 +0200
@@ -16,11 +16,9 @@
*
*/
-
#ifndef __BROWSERAPPUI_H
#define __BROWSERAPPUI_H
-
// INCLUDE FILES
#include <browser_platform_variant.hrh>
#include <aknviewappui.h>
@@ -29,12 +27,12 @@
#include "ApiProvider.h"
#include "BrowserBuild.h"
#include "WmlBrowserBuild.h"
-#include "recenturlstore.h"
+#include <recenturlstore.h>
#include <favouritesdb.h>
-#include "downloadedcontenthandler.h"
+#include <downloadedcontenthandler.h>
#include "WindowInfoProvider.h"
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
// FORWARD DECLARATIONS
class CBrowserViewBase;
--- a/browserui/browser/BrowserAppSrc/BrowserAppDocument.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserAppDocument.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -17,10 +17,9 @@
*
*/
-
#include "BrowserAppDocument.h"
#include "BrowserAppUi.h"
-#include "favouritesitem.h"
+#include <favouritesitem.h>
#include <brctlinterface.h>
#include "CommonConstants.h"
--- a/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -23,7 +23,7 @@
#include <u32std.h>
#include <eikapp.h>
#include <eikstart.h>
-#include "MemoryManager.h"
+#include <MemoryManager.h>
#include <OOMMonitorSession.h>
const int KFreeMemoryTarget = 6000000;
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -17,7 +17,6 @@
*
*/
-
// INCLUDES
#include <browser_platform_variant.hrh>
#include <BrowserNG.rsg>
@@ -30,7 +29,7 @@
#include <aplistitemlist.h>
#include <aplistitem.h>
#include <apparc.h>
-#include "favouritesfile.h"
+#include <favouritesfile.h>
#include <aknmessagequerydialog.h>
#include <FeatMgr.h>
#include <internetconnectionmanager.h>
@@ -49,7 +48,7 @@
#include <browserplugininterface.h>
#include <oommonitorplugin.h>
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
#include "BrowserLauncherService.h"
#include "cookiemanagerclient.h"
@@ -59,7 +58,7 @@
#endif //__SERIES60_HELP
#include "BrowserAppDocument.h"
-#include "downloadedcontenthandler.h"
+#include <downloadedcontenthandler.h>
#include "BrowserBmOTABinSender.h"
#include "BrowserCommandLineParser.h"
#include "BrowserApplication.h"
@@ -83,7 +82,7 @@
#include <data_caging_path_literals.hrh>
#include <brctldefs.h>
-#include "browserdialogsprovider.h"
+#include <browserdialogsprovider.h>
#include "BrowserSoftkeysObserver.h"
#include "BrowserLoadObserver.h"
#include "BrowserSpecialLoadObserver.h"
@@ -2819,6 +2818,13 @@
}
SetViewToBeActivatedIfNeededL( KUidBrowserBookmarksViewId );
}
+ else if ( IsEmbeddedModeOn())
+ {
+ if( !iExitInProgress )
+ {
+ ExitBrowser( ETrue );
+ }
+ }
else
{
if(CalledFromAnotherApp() && (!IsEmbeddedModeOn()))
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -71,7 +71,7 @@
#include "Preferences.h"
#include "BrowserPreferences.h"
#include "Display.h"
-#include "favouriteswapap.h"
+#include <favouriteswapap.h>
#include "BrowserBookmarksModel.h"
#include "BrowserDialogs.h"
#include "BrowserUtil.h"
@@ -81,7 +81,7 @@
#include "BrowserAdaptiveListPopup.h"
#include "BrowserApplication.h"
#include "logger.h"
-#include "favouritesfile.h"
+#include <favouritesfile.h>
#include "BrowserWindowManager.h"
#include "BrowserWindow.h"
#include "BrowserPopupEngine.h"
@@ -248,7 +248,8 @@
( aCommand == EWmlCmdHistory ) ||
( aCommand == EWmlCmdGoToAddress ) ||
( aCommand == EWmlCmdShowShortcutKeymap ) ||
- ( aCommand == EWmlCmdShowMiniature ) ) )
+ ( aCommand == EWmlCmdShowMiniature )||
+ ( aCommand == EWmlCmdShowToolBar)) )
{
iWasContentFullScreenMode = iContentFullScreenMode;
EnableFullScreenModeL( EFalse );
@@ -3159,6 +3160,11 @@
#endif
StatusPane()->MakeVisible( ETrue );
iContainer->SetRect(ClientRect());
+ // Remove any timer that has already been set
+ if ( iPeriodic )
+ {
+ iPeriodic->Cancel();
+ }
}
else
{
--- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -38,11 +38,8 @@
#include <aknutils.h>
#include <browseruisdkcrkeys.h>
-#include <centralrepository.h>
#include <AknLayout2ScalableDef.h>
-#include <AknFepInternalCRKeys.h>
#include <aknlayoutfont.h>
-#include <PtiDefs.h>
#include <aknlayoutscalable_avkon.cdl.h>
#include "CommonConstants.h"
@@ -50,7 +47,7 @@
#include "BrowserAppUi.h"
#include "BrowserUtil.h"
#include "browser.hrh"
-#include "favouriteslimits.h"
+#include <favouriteslimits.h>
#include "BrowserAdaptiveListPopup.h"
#include "BrowserContentView.h"
@@ -233,18 +230,10 @@
EAknEditorNumericInputMode );
}
TInt editorFlags = ((iFindKeywordMode) ? EAknEditorFlagDefault : EAknEditorFlagLatinInputModesOnly) |EAknEditorFlagUseSCTNumericCharmap;
-#ifdef RD_INTELLIGENT_TEXT_INPUT
- TInt physicalKeyboards = 0;
- CRepository* aknFepRepository = CRepository::NewL( KCRUidAknFep );
- User::LeaveIfNull( aknFepRepository );
- aknFepRepository->Get( KAknFepPhysicalKeyboards, physicalKeyboards );
- delete aknFepRepository;
+ // Always disable T9 input for goto url
+ editorFlags = (editorFlags | EAknEditorFlagNoT9);
- if ( physicalKeyboards && EPtiKeyboardQwerty3x11 ) {
- editorFlags = (editorFlags | EAknEditorFlagNoT9);
- }
-#endif
iEditor->SetAknEditorFlags( editorFlags );
iEditor->SetAknEditorPermittedCaseModes ( EAknEditorUpperCase |
@@ -301,10 +290,9 @@
//
void CBrowserGotoPane::HandleFindSizeChanged()
{
- if ( !AknLayoutUtils::PenEnabled() )
+
+ if ( iSearchEditor && !iFindKeywordMode)
{
- if ( iSearchEditor && !iFindKeywordMode)
- {
TRect clientRect = CBrowserAppUi::Static()->ClientRect();
TAknWindowLineLayout findWindow = AknLayout::popup_find_window();
@@ -314,9 +302,11 @@
// Now Increase the height of rect to make room for two editors (Goto + search)//
findWindowRect.iTl.iY -= ( findWindow.iH );
SetRect( findWindowRect );
- }
- else
- {
+ }
+
+ else if ( !AknLayoutUtils::PenEnabled() )
+ {
+
TRect parentrect = iAvkonAppUi->ApplicationRect();
TAknLayoutRect lrect;
@@ -326,9 +316,8 @@
AknLayoutUtils::LayoutControl ( this,
lrect.Rect(),
AknLayout::popup_find_window() );
- }
}
- else
+ else if( AknLayoutUtils::PenEnabled() )
{
// The ClientRect() will be the application rectangle minus any
// toolbars/menu bars etc.
--- a/browserui/browser/BrowserAppSrc/BrowserLauncherService.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserLauncherService.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -17,10 +17,9 @@
*
*/
-
// INCLUDES
#include "BrowserLauncherService.h"
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
#include "LauncherServerCommands.hrh"
#include "BrowserAppDocument.h"
#include "BrowserAppUi.h"
@@ -29,7 +28,7 @@
#include <AiwGenericParam.h>
#include <s32mem.h>
#include "BrowserSpecialLoadObserver.h"
-#include "mconnection.h"
+#include <mconnection.h>
// -----------------------------------------------------------------------------
// CBrowserLauncherService::~CBrowserLauncherService()
--- a/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -122,10 +122,10 @@
case TBrCtlDefs::EEventLoadError:
{
if(LoadStatus( ELoadStatusSecurePage ))
- {
- ClearStatus();
- UpdateSecureIndicatorL();
- }
+ {
+ UpdateSecureIndicatorL();
+ }
+ ClearStatus();
SetStatus( ELoadStatusMainError );
break;
}
@@ -149,7 +149,7 @@
break;
}
case TBrCtlDefs::EEventExitingSecurePage:
- case TBrCtlDefs::EEventSubmittingToNonSecurePage:
+ case TBrCtlDefs::EEventSubmittingToNonSecurePage:
{
ClearStatus( ELoadStatusSecurePage );
ClearStatus( ELoadStatusAllItemIsSecure );
--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -52,7 +52,7 @@
#include <bldvariant.hrh>
#include "commonconstants.h"
#include "BrowserAppUi.h"
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
#include "SettingsContainer.h" // for TEncoding
#include "BrowserUtil.h" // for Util::AllocateUrlWithSchemeL
#include "logger.h"
--- a/browserui/browser/BrowserAppSrc/BrowserShortcutKeyMap.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserShortcutKeyMap.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -33,6 +33,7 @@
#include "ApiProvider.h"
#include "BrowserUIVariant.hrh"
#include "BrowserAppUi.h"
+#include <AknBidiTextUtils.h>
// CONSTANTS
_LIT( KKeyMapSvgFile, "browser.mif" );
@@ -564,9 +565,10 @@
lineWidthArray->AppendL(pCurrCell->rLine1.Width());
lineWidthArray->AppendL(pCurrCell->rLine2.Width());
- CArrayFixFlat<TPtrC> *WrappedArray = new( ELeave ) CArrayFixFlat<TPtrC>(3);
- AknTextUtils::WrapToArrayL( *(pCurrCell->lineText), *lineWidthArray, *iLineFont, *WrappedArray );
-
+ CArrayFixFlat<TPtrC> *WrappedArray = new( ELeave ) CArrayFixFlat<TPtrC>(3);
+ pCurrCell->lineText = pCurrCell->lineText->ReAllocL(pCurrCell->lineText->Length() + lineWidthArray->Count() * KAknBidiExtraSpacePerLine);
+ TPtr ptr(pCurrCell->lineText->Des());
+ AknBidiTextUtils::ConvertToVisualAndWrapToArrayL( ptr,*lineWidthArray, *iLineFont, *WrappedArray, EFalse );
iSpriteBitmapContext->UseFont( iLineFont );
iSpriteBitmapContext->DrawText(WrappedArray->At(0),
pCurrCell->rLine2, iLineFont->FontMaxHeight(), CGraphicsContext::ECenter, 0);
--- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -26,7 +26,7 @@
#include "BrowserWindow.h"
#include "BrowserContentView.h"
#include "BrowserContentViewContainer.h"
-#include "browserdialogsprovider.h"
+#include <browserdialogsprovider.h>
#include "BrowserDialogsProviderProxy.h"
#include "BrowserSoftkeysObserver.h"
#include "BrowserSpecialLoadObserver.h"
--- a/browserui/browser/FavouritesInc/BrowserFavouritesModel.h Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesModel.h Thu Jan 07 12:48:02 2010 +0200
@@ -17,7 +17,6 @@
*
*/
-
#ifndef BROWSER_FAVOURITES_MODEL_H
#define BROWSER_FAVOURITES_MODEL_H
@@ -26,8 +25,8 @@
#include <e32base.h>
#include <favouritesdbobserver.h>
#include "BrowserBookmarksOrder.h"
-#include "favouritesdb.h"
-#include "favouritesfile.h"
+#include <favouritesdb.h>
+#include <favouritesfile.h>
#include "ApiProvider.h"
// FORWARD DECLARATION
--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h Thu Jan 07 12:48:02 2010 +0200
@@ -29,7 +29,7 @@
#include "CommandVisibility.h"
#include "CommsModel.h"
#include "BrowserFavouritesModel.h"
-#include "favouriteslimits.h"
+#include <favouriteslimits.h>
// FORWARD DECLARATION
class CFavouritesItemList;
--- a/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -17,14 +17,12 @@
*
*/
-
-
// INCLUDE FILES
-#include <e32std.h>
+#include <e32std.h>
#include <AknPopup.h>
#include <AknListQueryDialog.h>
#include <AknIconArray.h>
-#include "recenturlstore.h"
+#include <recenturlstore.h>
#include <AknsUtils.h>
#include <AknsListBoxBackgroundControlContext.h>
#include <AppApacLayout.cdl.h>
@@ -47,7 +45,6 @@
#include "eikon.hrh"
-
// CONSTANTS
const TInt KMaxIcons = 2;
const TInt KListLengthToShow = 64;//the length of the string in the list
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -42,8 +42,8 @@
#include <csxhelp/browser.hlp.hrh>
#endif // __SERIES60_HELP
#include "Logger.h"
-#include "e32event.h"
-#include "browseruisdkcrkeys.h"
+#include <e32event.h>
+#include <browseruisdkcrkeys.h>
#include <StringLoader.h>
// CONSTANTS
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -37,10 +37,6 @@
#include <AppLayout.cdl.h>
#include <AknLayout.cdl.h>
-#include <centralrepository.h>
-#include <AknFepInternalCRKeys.h>
-#include <PtiDefs.h>
-
#include "BrowserBookmarksGotoPane.h"
#include "BrowserUtil.h"
#include "commonconstants.h"
@@ -569,18 +565,10 @@
// In Search Mode we allow all types of inputs
TInt editorFlags( (iSearchPaneMode ? EAknEditorFlagDefault : EAknEditorFlagLatinInputModesOnly) | EAknEditorFlagUseSCTNumericCharmap );
-#ifdef RD_INTELLIGENT_TEXT_INPUT
- TInt physicalKeyboards = 0;
- CRepository* aknFepRepository = CRepository::NewL( KCRUidAknFep );
- User::LeaveIfNull( aknFepRepository );
- aknFepRepository->Get( KAknFepPhysicalKeyboards, physicalKeyboards );
- delete aknFepRepository;
+ // Always disable T9 input for goto url
+ editorFlags = (editorFlags | EAknEditorFlagNoT9);
- if ( physicalKeyboards && EPtiKeyboardQwerty3x11 ) {
- editorFlags = (editorFlags | EAknEditorFlagNoT9);
- }
-#endif
iEditor->SetAknEditorFlags( editorFlags );
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
// INCLUDE FILES
#include <cdownloadmgruidownloadslist.h>
#include <cdownloadmgruidownloadmenu.h>
@@ -1590,6 +1589,21 @@
// ----------------------------------------------------------------------------
void CBrowserBookmarksView::MoveItemsL()
{
+
+ // Get the Uid of currently highlighted bookmark item from listbox.
+ // NOTE: Listbox indexes is based on "visible" items in list box, our order
+ // array has visible and invisible items, we have to use Uid to find items.
+ const CFavouritesItem* toItem = Container()->Listbox()->CurrentItem();
+ TInt toUid(NULL);
+ if ( toItem ) {
+ toUid = toItem->Uid();
+ if (toUid == (*iItemsToMove)[0])
+ { // Moving to same location so change nothing, cleanup, & exit
+ CancelMoveItemsL();
+ return;
+ }
+ }
+
// Get a copy of the ordered array, it may contain visible and hidden items.
CArrayFixFlat<TInt>* orderArray =
new (ELeave) CArrayFixFlat<TInt>(KGranularityHigh);
@@ -1597,20 +1611,17 @@
orderArray->AppendL( & ( iCurrentOrder->GetBookMarksOrder()[0] ),
iCurrentOrder->GetBookMarksOrder().Count() );
+
+ if ( toUid == NULL ) {
+ toUid = (*orderArray)[orderArray->Count()-1] ;
+ }
+
// Create a sorted "bookmarks to be moved" array
CArrayFixFlat<TInt>* sortedItemsToMove =
new (ELeave) CArrayFixFlat<TInt>(KGranularityHigh);
CleanupStack::PushL( sortedItemsToMove );
- // Get the Uid of currently highlighted bookmark item from listbox.
- // NOTE: Listbox indexes is based on "visible" items in list box, our order
- // array has visible and invisible items, we have to use Uid to find items.
- const CFavouritesItem* toItem = Container()->Listbox()->CurrentItem();
- TInt toUid( (*orderArray)[orderArray->Count()-1] );
- if ( toItem ) {
- toUid = toItem->Uid();
- }
// Walk our copy of the ordered bookmark array and
// 1. Delete the bookmark items to be moved from the ordered array
@@ -2775,8 +2786,10 @@
Toolbar()->SetItemDimmed( EWmlCmdDelete, needToDimDeleteBtn, ETrue );
//set EWmlCmdAddBookmark dim in RecentlyVisitedUrl Folder
Toolbar()->SetItemDimmed( EWmlCmdAddBookmark, iInAdaptiveBookmarksFolder, ETrue);
-
-
+ if(iManualItemMovingGoingOn)
+ {
+ DimToolbarButtons(ETrue);
+ }
}
}
// End of File
--- a/browserui/browser/FavouritesSrc/BrowserFavouritesModel.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesModel.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -35,7 +35,7 @@
#include "BrowserFavouritesModelObserver.h"
#include "BrowserUtil.h"
#include "BrowserDialogs.h"
-#include "browserdialogsprovider.h"
+#include <browserdialogsprovider.h>
#include "BrowserFavouritesView.h"
#include "Browser.hrh"
--- a/browserui/browser/FeedsInc/FeedsClientUtilities.h Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FeedsInc/FeedsClientUtilities.h Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#ifndef FEEDS_CLIENT_UTILITIES_H
#define FEEDS_CLIENT_UTILITIES_H
@@ -26,9 +25,10 @@
#include "FeedsWaitDialog.h"
#include "FeedsFileSearchAgent.h"
#include "CommonConstants.h"
-#include "feedsinterface.h"
-#include "feedsmap.h"
-#include "transaction.h"
+#include <feedsinterface.h>
+#include <feedsmap.h>
+#include <transaction.h>
+
// CONSTANTS
// MACROS
--- a/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <AknView.h>
#include <AknViewAppUi.h>
#include <BaUtils.h>
@@ -26,7 +25,6 @@
#include <eikmenup.h>
#include <StringLoader.h>
-
#include <BrowserNG.rsg>
#include <brctldialogsprovider.h>
#include <browserdialogsprovider.h>
--- a/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -36,7 +36,7 @@
#include <BrowserNG.rsg>
#include "FeedsFeedContainer.h"
#include "FeedsFeedView.h"
-#include "xmlencoding.h"
+#include <xmlencoding.h>
#include "ApiProvider.h"
#include "BrowserSpecialLoadObserver.h"
#include "Display.h"
--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,6 +15,7 @@
*
*/
+#include <Browser_platform_variant.hrh>
#include <AknNavi.h>
#include <AknNaviDe.h>
#include <AknNaviLabel.h>
@@ -55,7 +56,7 @@
#include "BrowserAppUi.h"
#include "BrowserDialogs.h"
#include "BrowserUtil.h"
-
+#include <AknUtils.h>
// It's also the size of the icon array without favicon
const TInt KFirstFaviconIndex = 6;
const TInt KDateSize = 30; // Size of Date strings
@@ -349,7 +350,11 @@
}
}
// Toolbar buttons status should be changed when focus is moved from feed to folder or viceversa
- else if(aEventType == MEikListBoxObserver::EEventItemClicked)
+ else if ( (aEventType == MEikListBoxObserver::EEventItemClicked)
+#ifdef BRDO_TOUCH_ENABLED_FF
+ ||(aEventType == MEikListBoxObserver::EEventFlickStopped)
+#endif // BRDO_TOUCH_ENABLED_FF
+ )
{
UpdateToolbarButtonsState();
}
@@ -1567,6 +1572,11 @@
CleanupStack::PopAndDestroy( dateFormat );//dateFormat
//
timestamp.Append(temp);
+ // Convert to locale specific numbers
+ if (TBidiText::ERightToLeft == AknTextUtils::CurrentScriptDirectionality ())
+ {
+ AknTextUtils::DisplayTextLanguageSpecificNumberConversion(timestamp);
+ }
}
// If there is a favicon for this url then add it to the icon list
--- a/browserui/browser/Group/BrowserCommon.mmpi Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Group/BrowserCommon.mmpi Thu Jan 07 12:48:02 2010 +0200
@@ -50,10 +50,8 @@
#endif //__RSS_FEEDS
APP_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
-APP_LAYER_LIBC_SYSTEMINCLUDE
-APP_LAYER_HTTP_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE // for schemeHandler
#include "browserlogger.inc"
--- a/browserui/browser/Group/bld.inf Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Group/bld.inf Thu Jan 07 12:48:02 2010 +0200
@@ -65,9 +65,9 @@
../SrcData/backup_registration.xml /epoc32/data/z/private/10008d39/backup_registration.xml
../SrcData/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10008d39/backup_registration.xml
../SrcData/backup_registration.xml /epoc32/release/winscw/urel/z/private/10008d39/backup_registration.xml
-../loc/BrowserHp.loc APP_LAYER_LOC_EXPORT_PATH(BrowserHp.loc)
-../loc/Feeds.loc APP_LAYER_LOC_EXPORT_PATH(Feeds.loc)
-../loc/WmlBrowser.loc APP_LAYER_LOC_EXPORT_PATH(WmlBrowser.loc)
+../loc/browserhp.loc APP_LAYER_LOC_EXPORT_PATH(browserhp.loc)
+../loc/feeds.loc APP_LAYER_LOC_EXPORT_PATH(feeds.loc)
+../loc/wmlbrowser.loc APP_LAYER_LOC_EXPORT_PATH(wmlbrowser.loc)
../Rom/BrowserLauncher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(BrowserLauncher.iby)
../Rom/BrowserUi.iby CORE_APP_LAYER_IBY_EXPORT_PATH(BrowserUi.iby)
--- a/browserui/browser/Launcher2/src/BrowserLauncher.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Launcher2/src/BrowserLauncher.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,14 +15,12 @@
*
*/
-
-
// INCLUDE FILES
-#include "browserlauncher.h"
+#include <browserlauncher.h>
#include "BrowserLauncherExtension.h"
#include "logger.h"
#include "BrowserUiPrivateCRKeys.h"
-#include "browseroverriddensettings.h"
+#include <browseroverriddensettings.h>
#include "Browser.hrh"
#include <favouriteslimits.h> // Context Id:s
--- a/browserui/browser/Launcher2/src/BrowserLauncherExtension.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Launcher2/src/BrowserLauncherExtension.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,13 +15,11 @@
*
*/
-
-
// INCLUDE FILES
-#include "browserlauncher.h"
+#include <browserlauncher.h>
#include "BrowserLauncherExtension.h"
#include "logger.h"
-#include "downloadedcontenthandler.h"
+#include <downloadedcontenthandler.h>
#include <favouriteslimits.h> // Context Id:s
#include <eikenv.h>
@@ -30,9 +28,6 @@
#include <coecntrl.h>
#include <eikappui.h>
-
-
-
NONSHARABLE_CLASS( CLauncherCommandAbsorbingControl ) : public CCoeControl
{
public:
--- a/browserui/browser/Launcher2/src/LauncherServerBase.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Launcher2/src/LauncherServerBase.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -17,13 +17,12 @@
*
*/
-
// INCLUDES
#include "LauncherClientService.h"
#include "LauncherServerBase.h"
#include "LauncherServerCommands.hrh"
-#include "browseroverriddensettings.h"
-#include "browserlauncher.h"
+#include <browseroverriddensettings.h>
+#include <browserlauncher.h>
#include "BrowserAppDocument.h"
#include "BrowserAppUi.h"
#include "eikenv.h"
--- a/browserui/browser/Rom/Browser_stub_32.pkg Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/Rom/Browser_stub_32.pkg Thu Jan 07 12:48:02 2010 +0200
@@ -2,7 +2,7 @@
; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
; All rights reserved.
; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
; which accompanies this distribution, and is available
; at the URL "http://www.eclipse.org/legal/epl-v10.html".
;
--- a/browserui/browser/SrcData/BrowserHp.rssi Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/SrcData/BrowserHp.rssi Thu Jan 07 12:48:02 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <BrowserHp.loc>
+#include <browserhp.loc>
// RESOURCE IDENTIFIER
RESOURCE TBUF r_lhp_title { buf = qtn_lhp_title; }
@@ -47,4 +47,4 @@
RESOURCE TBUF r_lhp_browser_forum { buf = qtn_lhp_browser_forum; }
RESOURCE TBUF r_lhp_join_discussion_1 { buf = qtn_lhp_join_discussion_1; }
RESOURCE TBUF r_lhp_join_discussion_2 { buf = qtn_lhp_join_discussion_2; }
-// end of file
\ No newline at end of file
+// end of file
--- a/browserui/browser/SrcData/BrowserInitial.rssi Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/SrcData/BrowserInitial.rssi Thu Jan 07 12:48:02 2010 +0200
@@ -24,7 +24,7 @@
// INCLUDES
#include "Browser.hrh"
-#include <WmlBrowser.loc>
+#include <wmlbrowser.loc>
#include <browser.mbg>
#include <bldvariant.hrh>
--- a/browserui/browser/SrcData/BrowserWindowSelection.rssi Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/SrcData/BrowserWindowSelection.rssi Thu Jan 07 12:48:02 2010 +0200
@@ -24,7 +24,7 @@
// INCLUDES
#include "Browser.hrh"
-#include <WmlBrowser.loc>
+#include <wmlbrowser.loc>
#include <browser.mbg>
#include <bldvariant.hrh>
--- a/browserui/browser/SrcData/Feeds.rssi Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/SrcData/Feeds.rssi Thu Jan 07 12:48:02 2010 +0200
@@ -25,7 +25,7 @@
#include "Browser.hrh"
#include "Feeds.hrh"
-#include <Feeds.loc>
+#include <feeds.loc>
#include "feeds_toolbar.rssi"
--- a/browserui/browser/loc/Feeds.loc Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/browser/loc/Feeds.loc Thu Jan 07 12:48:02 2010 +0200
@@ -495,7 +495,7 @@
#define qtn_feeds_unnamed_item "Unnamed item"
-/* Strings copied from wmlBrowser.loc */
+/* Strings copied from wmlbrowser.loc */
/* -------------------------------------------------------------------- */
//d:DO element menu item
//l:list_single_popup_submenu_pane_t1
--- a/browserui/videoservices/data/VideoServices.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/videoservices/data/VideoServices.rss Thu Jan 07 12:48:02 2010 +0200
@@ -23,7 +23,7 @@
#include <eikon.rh>
#include "VideoServices.hrh"
-#include "VideoServices.loc"
+#include "videoservices.loc"
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.mbg>
--- a/browserui/videoservices/data/VideoServices_caption.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/videoservices/data/VideoServices_caption.rss Thu Jan 07 12:48:02 2010 +0200
@@ -16,7 +16,7 @@
*/
-#include "VideoServices.loc"
+#include "videoservices.loc"
#include <apcaptionfile.rh>
RESOURCE CAPTION_DATA
--- a/browserui/videoservices/group/bld.inf Thu Dec 17 08:47:18 2009 +0200
+++ b/browserui/videoservices/group/bld.inf Thu Jan 07 12:48:02 2010 +0200
@@ -27,7 +27,7 @@
PRJ_EXPORTS
../rom/VideoServices.iby CORE_APP_LAYER_IBY_EXPORT_PATH(VideoServices.iby)
../rom/VideoServicesResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(VideoServicesResources.iby)
-../loc/VideoServices.loc APP_LAYER_LOC_EXPORT_PATH(VideoServices.loc)
+../loc/videoservices.loc APP_LAYER_LOC_EXPORT_PATH(videoservices.loc)
../conf/videoservices.confml APP_LAYER_CONFML(videoservices.confml)
../conf/videoservices_10281893.crml APP_LAYER_CRML(videoservices_10281893.crml)
--- a/pushmtm/Data/PushMtmUi.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Data/PushMtmUi.rss Thu Jan 07 12:48:02 2010 +0200
@@ -23,7 +23,7 @@
#include "PushMtmCommands.hrh"
#include "PushMtmUi.hrh"
-#include <PushMtmUi.loc>
+#include <pushmtmui.loc>
#include <eikon.rh>
#include <uikon.rh>
#include <uikon.hrh>
--- a/pushmtm/Data/PushRegistry.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Data/PushRegistry.rss Thu Jan 07 12:48:02 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <PushMtmUi.loc>
+#include <pushmtmui.loc>
#include "PushMtmDef.hrh"
#include <mtmconfig.rh>
#include <msvstd.hrh>
--- a/pushmtm/Data/PushViewer.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Data/PushViewer.rss Thu Jan 07 12:48:02 2010 +0200
@@ -24,8 +24,8 @@
// INCLUDES
#include "PushViewer.hrh"
-#include <PushViewer.loc>
-#include <PushMtmUi.loc>
+#include <pushviewer.loc>
+#include <pushmtmui.loc>
#include <uikon.rh>
#include <eikon.rh>
#include <avkon.rh>
--- a/pushmtm/Group/Bld.inf Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Group/Bld.inf Thu Jan 07 12:48:02 2010 +0200
@@ -33,8 +33,8 @@
#ifndef __S60_32__
../rom/wappush.iby CORE_APP_LAYER_IBY_EXPORT_PATH(wappush.iby)
#endif
-../loc/PushMtmUi.loc APP_LAYER_LOC_EXPORT_PATH(PushMtmUi.loc)
-../loc/PushViewer.loc APP_LAYER_LOC_EXPORT_PATH(PushViewer.loc)
+../loc/pushmtmui.loc APP_LAYER_LOC_EXPORT_PATH(pushmtmui.loc)
+../loc/pushviewer.loc APP_LAYER_LOC_EXPORT_PATH(pushviewer.loc)
../conf/pushmtm.confml APP_LAYER_CONFML(pushmtm.confml)
../conf/pushmtm_10008D42.crml APP_LAYER_CRML(pushmtm_10008D42.crml)
--- a/pushmtm/Group/PushMtmCliSrv.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Group/PushMtmCliSrv.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,14 +15,11 @@
*
*/
-
-
#include <defaultcaps.hrh>
#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
#include <platform/mw/browser_platform_variant.hrh>
-
TARGET PushMtmCliSrv.dll
TARGETTYPE dll
UID 0x10004845 0x10008D42
@@ -38,8 +35,9 @@
USERINCLUDE ../MtmUiInc
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
-APP_LAYER_PUSH_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_32__)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(push)
+#endif
SOURCEPATH ../MtmCliSrvSrc
SOURCE PushMtmClient.cpp
@@ -59,13 +57,12 @@
LIBRARY euser.lib
LIBRARY msgs.lib
LIBRARY PushMtmUtil.lib
-LIBRARY SISLPushMsgUtils.lib
+LIBRARY SISLPushMsgUtils.lib
#ifdef __TEST_LOG_MMP
DEBUGLIBRARY flogger.lib
#endif
-
#if defined(ARMCC)
DEFFILE ../EABI/PUSHMTMCLISRVU_EKA2.def
#else
--- a/pushmtm/Group/PushMtmUi.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Group/PushMtmUi.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <defaultcaps.hrh>
#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
@@ -47,8 +46,9 @@
USERINCLUDE ../ViewerInc
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_PUSH_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_32__)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(push)
+#endif
SOURCEPATH ../MtmUiSrc
SOURCE PushLoadServiceOp.cpp
--- a/pushmtm/Group/PushMtmUtil.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Group/PushMtmUtil.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <defaultcaps.hrh>
#include <data_caging_paths.hrh>
#include <bldvariant.hrh>
@@ -33,7 +32,9 @@
USERINCLUDE ../Inc
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_PUSH_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_32__)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(push)
+#endif
SOURCEPATH ../MtmUtilSrc
SOURCE PushAsyncOpRunner.cpp
@@ -79,7 +80,6 @@
LIBRARY SISLPushMsgUtils.lib
LIBRARY CENTRALREPOSITORY.lib
-
#if defined(ARMCC)
DEFFILE ../EABI/PUSHMTMUTILU_EKA2.def
#else
--- a/pushmtm/Group/PushViewer.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Group/PushViewer.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <defaultcaps.hrh>
#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
@@ -35,8 +34,9 @@
USERINCLUDE ../MtmUtilInc
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_PUSH_SYSTEMINCLUDE
-
+#if defined(__PLATFORM_VERSION_32__)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(push)
+#endif
SOURCEPATH ../ViewerSrc
SOURCE PushViewerApp.cpp
@@ -78,7 +78,6 @@
DEBUGLIBRARY flogger.lib
#endif
-
START RESOURCE ../Data/PushViewer.rss
DEPENDS avkon.rsg
HEADER
@@ -90,7 +89,6 @@
TARGETPATH APP_RESOURCE_DIR
END // RESOURCE
-
START RESOURCE ../Data/PushViewer_reg.rss
DEPENDS pushviewer.rsg
// Do not change the UID below.
--- a/pushmtm/MtmCliSrvSrc/PushMtmGcOperation.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmCliSrvSrc/PushMtmGcOperation.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -23,7 +23,7 @@
#include "PushMtmCliSrvPanic.h"
#include "PushMtmUtil.h"
#include "PushMtmLog.h"
-#include <CSIPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
#include <msvids.h>
// ================= MEMBER FUNCTIONS =======================
@@ -38,13 +38,13 @@
TRequestStatus& aObserverRequestStatus )
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::NewL")
-
+
CPushMtmGcOperation* self = new (ELeave) CPushMtmGcOperation
( aSession, aFolderId, aObserverRequestStatus );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop(); // self
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::NewL")
return self;
}
@@ -56,12 +56,12 @@
CPushMtmGcOperation::~CPushMtmGcOperation()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::~CPushMtmGcOperation")
-
+
Cancel();
delete iEntrySel;
delete iEntryWrapper;
delete iUtil;
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::~CPushMtmGcOperation")
}
@@ -72,9 +72,9 @@
void CPushMtmGcOperation::DoSyncL()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::DoSyncL")
-
+
InitL();
-
+
for ( iCurrentIndex = 0; iCurrentIndex < iCount; ++iCurrentIndex )
{
// iCurrentIndex indicate the current entry in the selection.
@@ -84,7 +84,7 @@
// Release unnecessary resources.
delete iEntrySel;
iEntrySel = NULL;
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::DoSyncL")
}
@@ -92,10 +92,10 @@
// CPushMtmGcOperation::CPushMtmGcOperation
// ---------------------------------------------------------
//
-CPushMtmGcOperation::CPushMtmGcOperation( CMsvSession& aSession,
- TMsvId aFolderId,
- TRequestStatus& aObserverRequestStatus )
-: CPushMtmOperation( aSession, KMsvNullIndexEntryId, aObserverRequestStatus ),
+CPushMtmGcOperation::CPushMtmGcOperation( CMsvSession& aSession,
+ TMsvId aFolderId,
+ TRequestStatus& aObserverRequestStatus )
+: CPushMtmOperation( aSession, KMsvNullIndexEntryId, aObserverRequestStatus ),
iState( EInit ), iFolderId( aFolderId ), iCurrentIndex( 0 )
{
}
@@ -116,7 +116,7 @@
void CPushMtmGcOperation::InitL()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::InitL")
-
+
if ( !iUtil )
{
iUtil = CPushMtmUtil::NewL( iMsvSession );
@@ -152,7 +152,7 @@
{
iEntryWrapper = CSIPushMsgEntry::NewL();
}
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::InitL")
}
@@ -163,7 +163,7 @@
void CPushMtmGcOperation::GcCurrentL()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::GcCurrentL")
-
+
PUSHLOG_WRITE_FORMAT(" iCurrentIndex: %d",iCurrentIndex)
TMsvId entryId( iEntrySel->At(iCurrentIndex) );
@@ -173,8 +173,8 @@
User::LeaveIfError
( iMsvSession.GetEntry( entryId, dummyService, tEntry ) );
- __ASSERT_DEBUG( tEntry.iMtm == KUidMtmWapPush &&
- tEntry.iBioType == KUidWapPushMsgSI.iUid,
+ __ASSERT_DEBUG( tEntry.iMtm == KUidMtmWapPush &&
+ tEntry.iBioType == KUidWapPushMsgSI.iUid,
CliSrvPanic( EPushMtmCliSrvPanBadType ) );
#endif // _DEBUG
@@ -188,7 +188,7 @@
{
PUSHLOG_WRITE(" Expired")
// The message has expired. Delete it.
- CMsvEntry* cParent =
+ CMsvEntry* cParent =
iMsvSession.GetEntryL( iEntryWrapper->Entry().Parent() );
CleanupStack::PushL( cParent );
// Delete the message.
@@ -196,7 +196,7 @@
CleanupStack::PopAndDestroy(); // cParent
}
}
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::GcCurrentL")
}
@@ -207,7 +207,7 @@
void CPushMtmGcOperation::RunL()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::RunL")
-
+
if ( iState == EInit )
{
InitL();
@@ -225,7 +225,7 @@
}
else if ( iState == EGarbageCollecting )
{
- __ASSERT_DEBUG( iCount,
+ __ASSERT_DEBUG( iCount,
CliSrvPanic( EPushMtmCliSrvPanEmptySelection ) );
// iCurrentIndex indicate the current entry in the selection.
GcCurrentL();
@@ -243,10 +243,10 @@
}
else
{
- __ASSERT_DEBUG( EFalse,
+ __ASSERT_DEBUG( EFalse,
CliSrvPanic( EPushMtmCliSrvPanCommandNotSupported ) );
}
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::RunL")
}
@@ -257,9 +257,9 @@
void CPushMtmGcOperation::DoCancel()
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::DoCancel")
-
+
CPushMtmOperation::DoCancel();
-
+
PUSHLOG_LEAVEFN("CPushMtmGcOperation::DoCancel")
}
@@ -271,7 +271,7 @@
{
PUSHLOG_ENTERFN("CPushMtmGcOperation::RunError")
PUSHLOG_WRITE_FORMAT(" aError: %d",aError)
-
+
TBool doContinue( EFalse );
PUSHLOG_WRITE_FORMAT(" iState: %d",iState)
@@ -295,7 +295,7 @@
}
else
{
- __ASSERT_DEBUG( EFalse,
+ __ASSERT_DEBUG( EFalse,
CliSrvPanic( EPushMtmCliSrvPanCommandNotSupported ) );
}
--- a/pushmtm/MtmUiSrc/PushLoadServiceOp.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUiSrc/PushLoadServiceOp.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -26,8 +26,8 @@
#include "PushMtmUtil.h"
#include "PushMtmSettings.h"
#include "PushAuthenticationUtilities.h"
-#include <CSIPushMsgEntry.h>
-#include <CSLPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
+#include <push/CSLPushMsgEntry.h>
#include <eikenv.h>
#include <apmstd.h>
#include <schemehandler.h>
@@ -51,13 +51,13 @@
// CPushLoadServiceOp::NewL
// ---------------------------------------------------------
//
-CPushLoadServiceOp* CPushLoadServiceOp::NewL( CMsvSession& aSession,
- TMsvId aEntryId,
- TRequestStatus& aObserverStatus )
+CPushLoadServiceOp* CPushLoadServiceOp::NewL( CMsvSession& aSession,
+ TMsvId aEntryId,
+ TRequestStatus& aObserverStatus )
{
PUSHLOG_ENTERFN("CPushLoadServiceOp::NewL")
- CPushLoadServiceOp* self =
+ CPushLoadServiceOp* self =
new (ELeave) CPushLoadServiceOp( aSession, aEntryId, aObserverStatus );
CleanupStack::PushL( self );
self->ConstructL();
@@ -97,11 +97,11 @@
{
PUSHLOG_WRITE(" Msg is expired.")
// The entry is expired.
-
+
// Display a confirmation dialog.
TParse* fileParser = new (ELeave) TParse;
CleanupStack::PushL( fileParser );
- fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
+ fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
AssureResourceL( fileParser->FullName() );
CleanupStack::PopAndDestroy( fileParser ); // fileParser
fileParser = NULL;
@@ -130,10 +130,10 @@
// CPushLoadServiceOp::CPushLoadServiceOp
// ---------------------------------------------------------
//
-CPushLoadServiceOp::CPushLoadServiceOp( CMsvSession& aSession,
- TMsvId aEntryId,
- TRequestStatus& aObserverStatus )
-: CPushMtmUiOperation( aSession, aEntryId, aObserverStatus ),
+CPushLoadServiceOp::CPushLoadServiceOp( CMsvSession& aSession,
+ TMsvId aEntryId,
+ TRequestStatus& aObserverStatus )
+: CPushMtmUiOperation( aSession, aEntryId, aObserverStatus ),
iDone( EFalse )
{
PUSHLOG_WRITE("CPushLoadServiceOp constructing")
@@ -143,7 +143,7 @@
// CPushLoadServiceOp::ConstructL
// ---------------------------------------------------------
//
-void CPushLoadServiceOp::ConstructL()
+void CPushLoadServiceOp::ConstructL()
{
PUSHLOG_ENTERFN("CPushLoadServiceOp::ConstructL")
@@ -154,7 +154,7 @@
// Initialize iTEntry.
TMsvId service;
User::LeaveIfError( iMsvSession.GetEntry( iEntryId, service, iTEntry ) );
- __ASSERT_ALWAYS( iTEntry.iMtm == KUidMtmWapPush,
+ __ASSERT_ALWAYS( iTEntry.iMtm == KUidMtmWapPush,
UiPanic( EPushMtmUiPanBadMtm ) );
PUSHLOG_LEAVEFN("CPushLoadServiceOp::ConstructL")
@@ -205,7 +205,7 @@
{
context = CSIPushMsgEntry::NewL();
}
- else if ( bioType == KUidWapPushMsgSL.iUid &&
+ else if ( bioType == KUidWapPushMsgSL.iUid &&
FeatureManager::FeatureSupported( KFeatureIdPushSL ) )
{
context = CSLPushMsgEntry::NewL();
@@ -242,7 +242,7 @@
// CPushLoadServiceOp::AuthenticateL
// ---------------------------------------------------------
//
-TBool CPushLoadServiceOp::AuthenticateL( const CPushMsgEntryBase& aPushMsg,
+TBool CPushLoadServiceOp::AuthenticateL( const CPushMsgEntryBase& aPushMsg,
const CPushMtmSettings& aMtmSettings ) const
{
PUSHLOG_ENTERFN("CPushLoadServiceOp::AuthenticateL");
@@ -270,10 +270,10 @@
isAuthenticated = ExecuteUserQueryL( R_PUSHLS_SL_CACHE_NOT_AUTH );
}
}
- else if
- (
- sl.Action() == CSLPushMsgEntry::ESLPushMsgExecuteHigh &&
- aMtmSettings.ServiceLoadingType() == CPushMtmSettings::EAutomatic
+ else if
+ (
+ sl.Action() == CSLPushMsgEntry::ESLPushMsgExecuteHigh &&
+ aMtmSettings.ServiceLoadingType() == CPushMtmSettings::EAutomatic
)
{
PUSHLOG_WRITE(" SL high + auto");
@@ -375,7 +375,7 @@
iSchemeHandler = NULL;
HBufC* validatedUrl = ValidateLC( url );
iSchemeHandler = CSchemeHandler::NewL( *validatedUrl );
-
+
if( (url.Mid(0,7).Compare(_L("http://")) == 0) || (url.Mid(0,8).Compare(_L("https://")) == 0))
{
TRAPD( err, iSchemeHandler->HandleUrlStandaloneL());
@@ -390,7 +390,7 @@
if( err != KErrNone)
SignalObserver( err );
}
-
+
}
CleanupStack::PopAndDestroy( context ); // context, needed for 'url'
--- a/pushmtm/MtmUiSrc/PushMessageInfoDialog.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUiSrc/PushMessageInfoDialog.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -24,9 +24,9 @@
#include "PushMtmUiPanic.h"
#include "PushMtmUtil.h"
#include "PushMtmLog.h"
-#include <CSIPushMsgEntry.h>
-#include <CSLPushMsgEntry.h>
-#include <CUnknownPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
+#include <push/CSLPushMsgEntry.h>
+#include <push/CUnknownPushMsgEntry.h>
#include <PushMtmUi.rsg>
#include <AknLists.h>
#include <msvapi.h>
@@ -56,7 +56,7 @@
// ---------------------------------------------------------
//
CPushMessageInfoDialog::CPushMessageInfoDialog()
-: CAknPopupList(),
+: CAknPopupList(),
iResourceLoader( *iCoeEnv )
{
}
@@ -92,8 +92,8 @@
{
PUSHLOG_ENTERFN("CPushMessageInfoDialog::ConstructL");
- __ASSERT_DEBUG( !iListBox &&
- !iListBoxModel,
+ __ASSERT_DEBUG( !iListBox &&
+ !iListBoxModel,
UiPanic( EPushMtmUiPanAlreadyInitialized ) );
FeatureManager::InitializeLibL();
@@ -101,7 +101,7 @@
// Add resource file.
TParse* fileParser = new (ELeave) TParse;
// Unnecessary to call CleanupStack::PushL( fileParser );
- fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
+ fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
iResourceFile = fileParser->FullName();
PUSHLOG_WRITE_FORMAT(" iResourceFile: <%S>",&iResourceFile);
delete fileParser;
@@ -111,7 +111,7 @@
// Construct list box's model first
// This list box will be used by an CAknPopupList object.
- __ASSERT_DEBUG( !iListBoxModel && !iListBox,
+ __ASSERT_DEBUG( !iListBoxModel && !iListBox,
UiPanic( EPushMtmUiPanAlreadyInitialized ) );
iListBoxModel = new (ELeave) CDesCArrayFlat( KArrayGranularity );
// Construct list box.
@@ -119,7 +119,7 @@
// ========================================================
// Layout info of CAknSingleHeadingPopupMenuStyleListBox
- TAknTextLineLayout textLayout =
+ TAknTextLineLayout textLayout =
AknLayout::List_pane_texts__menu_single_heading__Line_2(0);
// Font of the second column of the given list box
@@ -129,19 +129,19 @@
TInt itemCount = 0; // No need to set
TInt titleVisible = 1; // known value (we always have title)
TRect main_pane = iAvkonAppUi->ClientRect();
-
+
TAknLayoutRect popup_menu_graphic_window;
popup_menu_graphic_window.LayoutRect( main_pane,
AknLayout::popup_menu_graphic_window(itemCount) );
-
+
TAknLayoutRect menu_heading_pane;
menu_heading_pane.LayoutRect( popup_menu_graphic_window.Rect(),
AknLayout::list_menu_heading_pane(titleVisible, itemCount) );
-
+
TAknLayoutRect list_item;
list_item.LayoutRect( menu_heading_pane.Rect(),
AknLayout::list_single_heading_popup_menu_pane(itemCount) );
-
+
TAknLayoutText text;
text.LayoutText( list_item.Rect(), textLayout );
@@ -151,8 +151,8 @@
// Add items to the list.
AddMessageInfoItemsL( aMsvSession, aId );
- CAknPopupList::ConstructL( iListBox,
- R_AVKON_SOFTKEYS_OK_EMPTY__OK,
+ CAknPopupList::ConstructL( iListBox,
+ R_AVKON_SOFTKEYS_OK_EMPTY__OK,
AknPopupLayouts::EMenuGraphicHeadingWindow );
iListBox->ConstructL( this, EAknListBoxViewerFlags );
@@ -177,7 +177,7 @@
// CPushMessageInfoDialog::AddMessageInfoItemL
// ---------------------------------------------------------
//
-void CPushMessageInfoDialog::AddMessageInfoItemL( TInt aHeaderResourceId,
+void CPushMessageInfoDialog::AddMessageInfoItemL( TInt aHeaderResourceId,
const TDesC& aText ) const
{
__ASSERT_DEBUG( iListBoxModel, UiPanic( EPushMtmUiPanNotInitialized ) );
@@ -193,16 +193,16 @@
AknTextUtils::DisplayTextLanguageSpecificNumberConversion( paramTextCopyPtr );
}
- HBufC* header = ( aHeaderResourceId == KNoResource ?
- KNullDesC().AllocLC() :
+ HBufC* header = ( aHeaderResourceId == KNoResource ?
+ KNullDesC().AllocLC() :
iCoeEnv->AllocReadResourceLC( aHeaderResourceId ) );
- CArrayFix<TPtrC>* wrappedArray =
+ CArrayFix<TPtrC>* wrappedArray =
new ( ELeave ) CArrayFixFlat<TPtrC>( KArrayGranularity );
CleanupStack::PushL( wrappedArray );
AknTextUtils::WrapToArrayL
- ( paramTextCopyPtr, iSecondColumnWidth,
+ ( paramTextCopyPtr, iSecondColumnWidth,
*iSecondColumnFont, *wrappedArray );
// visual is directly not used, but wrappedArray points to it
@@ -211,10 +211,10 @@
for ( TInt loop = 0; loop < lines; ++loop )
{
TPtrC current = ( *wrappedArray )[loop];
- // Allocate a buffer for the new list box item text
+ // Allocate a buffer for the new list box item text
// (including header, separator and wrapped text)
HBufC* currentFormattedLine = HBufC::NewLC
- ( ((loop==0) ? header->Length() : /*KSpace().Length()*/1) +
+ ( ((loop==0) ? header->Length() : /*KSpace().Length()*/1) +
/*KTab().Length()*/1 + current.Length() );
TPtr currentFormattedLinePtr = currentFormattedLine->Des(); // writeable
@@ -256,7 +256,7 @@
}
#ifdef __TEST_LOG__
- // The following section will call LEAVEable functions, but
+ // The following section will call LEAVEable functions, but
// they are only for logging purposes.
_LIT( KDateFormat, "%E%D%X%N%Y %1 %2 %3" );
_LIT( KTimeFormat, "%-B%:0%J%:1%T%:2%S%:3%+B" );
@@ -279,7 +279,7 @@
// CPushMessageInfoDialog::AddMessageInfoItemsL
// ---------------------------------------------------------
//
-void CPushMessageInfoDialog::AddMessageInfoItemsL( CMsvSession& aMsvSession,
+void CPushMessageInfoDialog::AddMessageInfoItemsL( CMsvSession& aMsvSession,
TMsvId aId ) const
{
PUSHLOG_ENTERFN("CPushMessageInfoDialog::AddMessageInfoItemsL");
@@ -330,12 +330,12 @@
TPtrC8 from8( msg->From() );
if ( from8.Length() )
{
- // Copy the 8-bit text into a 16-bit one and convert the string to
+ // Copy the 8-bit text into a 16-bit one and convert the string to
// decoded form.
HBufC* from16 = HBufC::NewMaxLC( from8.Length() );
from16->Des().Copy( from8 );
- HBufC* convertedFrom =
+ HBufC* convertedFrom =
CPushMtmUtil::ConvertUriToDisplayFormL( *from16 );
CleanupStack::PushL( convertedFrom );
//
@@ -355,7 +355,7 @@
if ( url.Length() )
{
//
- HBufC* convertedUrl =
+ HBufC* convertedUrl =
CPushMtmUtil::ConvertUriToDisplayFormL( url );
CleanupStack::PushL( convertedUrl );
//
@@ -373,7 +373,7 @@
if ( url.Length() )
{
//
- HBufC* convertedUrl =
+ HBufC* convertedUrl =
CPushMtmUtil::ConvertUriToDisplayFormL( url );
CleanupStack::PushL( convertedUrl );
//
@@ -426,9 +426,9 @@
TBuf<32> time;
TBuf<32> date;
- HBufC* dateFormatString =
+ HBufC* dateFormatString =
iCoeEnv->AllocReadResourceLC( R_QTN_DATE_USUAL_WITH_ZERO );
- HBufC* timeFormatString =
+ HBufC* timeFormatString =
iCoeEnv->AllocReadResourceLC( R_QTN_TIME_USUAL_WITH_ZERO );
// ************************************************************************
@@ -482,12 +482,12 @@
}
}
- CleanupStack::PopAndDestroy( 2, dateFormatString );
+ CleanupStack::PopAndDestroy( 2, dateFormatString );
// timeFormatString, dateFormatString
// ************************************************************************
// Information item: Size.
- // Convert the message size given in bytes into kilobytes. Round the
+ // Convert the message size given in bytes into kilobytes. Round the
// value up, if necessary.
// ************************************************************************
TReal messageSize( 0 );
@@ -518,11 +518,11 @@
{
++messageSizeInt;
}
- HBufC* size =
+ HBufC* size =
StringLoader::LoadLC( R_QTN_SIZE_KB, messageSizeInt, iCoeEnv );
// From avkon.loc:
// #define qtn_size_kb " %N kB"
- // We don't need white spaces at the beginning of the size string, so
+ // We don't need white spaces at the beginning of the size string, so
// remove them:
size->Des().Trim();
AddMessageInfoItemL( R_PUSHMID_SIZE, *size );
--- a/pushmtm/MtmUiSrc/PushMessageInfoOp.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUiSrc/PushMessageInfoOp.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,8 +15,6 @@
*
*/
-
-
// INCLUDE FILES
#include "PushMessageInfoOp.h"
--- a/pushmtm/MtmUiSrc/PushViewMessageOp.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUiSrc/PushViewMessageOp.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -24,7 +24,7 @@
#include "PushMtmUiPanic.h"
#include "PushMtmLog.h"
#include "PushMtmUtil.h"
-#include <CSIPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
#include <eikenv.h>
#include <aknappui.h>
#include <uikon.hrh>
@@ -45,13 +45,13 @@
// CPushLoadServiceOp::NewL
// ---------------------------------------------------------
//
-CPushViewMessageOp* CPushViewMessageOp::NewL( CMsvSession& aSession,
- TMsvId aEntryId,
- TRequestStatus& aObserverStatus )
+CPushViewMessageOp* CPushViewMessageOp::NewL( CMsvSession& aSession,
+ TMsvId aEntryId,
+ TRequestStatus& aObserverStatus )
{
PUSHLOG_ENTERFN("CPushViewMessageOp::NewL")
- CPushViewMessageOp* self =
+ CPushViewMessageOp* self =
new (ELeave) CPushViewMessageOp( aSession, aEntryId, aObserverStatus );
CleanupStack::PushL( self );
self->ConstructL();
@@ -95,9 +95,9 @@
// CPushViewMessageOp::CPushViewMessageOp
// ---------------------------------------------------------
//
-CPushViewMessageOp::CPushViewMessageOp( CMsvSession& aSession,
- TMsvId aEntryId,
- TRequestStatus& aObserverStatus )
+CPushViewMessageOp::CPushViewMessageOp( CMsvSession& aSession,
+ TMsvId aEntryId,
+ TRequestStatus& aObserverStatus )
: CPushMtmUiOperation( aSession, aEntryId, aObserverStatus ),
iIsCancelled( EFalse )
{
@@ -108,7 +108,7 @@
// CPushViewMessageOp::ConstructL
// ---------------------------------------------------------
//
-void CPushViewMessageOp::ConstructL()
+void CPushViewMessageOp::ConstructL()
{
CPushMtmUiOperation::ConstructL();
}
@@ -123,7 +123,7 @@
if ( iDocHandler )
{
- // Content handler is running; we just need to close it,
+ // Content handler is running; we just need to close it,
// NotifyExit has already been called.
delete iDocHandler;
iDocHandler = NULL;
@@ -139,7 +139,7 @@
TMsvId service;
User::LeaveIfError( iMsvSession.GetEntry( iEntryId, service, tEntry ) );
- __ASSERT_ALWAYS( tEntry.iMtm == KUidMtmWapPush,
+ __ASSERT_ALWAYS( tEntry.iMtm == KUidMtmWapPush,
UiPanic( EPushMtmUiPanBadMtm ) );
CSIPushMsgEntry* si = NULL;
@@ -171,7 +171,7 @@
TDataType dataType( KTextPlainString );
CAiwGenericParamList& paramList = iDocHandler->InParamListL();
- RFile tempFile;
+ RFile tempFile;
iDocHandler->SaveTempFileL
( *text8, dataType, KNullDesC, tempFile );
PUSHLOG_WRITE(" SaveTempFileL OK");
@@ -185,7 +185,7 @@
PUSHLOG_WRITE(" PopAndDestroy( 2, si ) OK");
// Signal the observer when the viewer is terminated.
- // Until then we are observeing the message
+ // Until then we are observeing the message
// (delete & replacement notification).
//ObserveEntryEventL(); // (2)
// Now we are observing two things: the viewer (1) and the entry (2).
@@ -208,7 +208,7 @@
iIsCancelled = ETrue;
CancelObserveEntryEvent();
- // If there is DocHandler, then it means that we are active and
+ // If there is DocHandler, then it means that we are active and
// waiting for NotifyExit to be called.
if ( iDocHandler )
{
@@ -243,7 +243,7 @@
// CPushViewMessageOp::HandleEntryEventL
// ---------------------------------------------------------
//
-void CPushViewMessageOp::HandleEntryEventL( TMsvEntryEvent aEvent,
+void CPushViewMessageOp::HandleEntryEventL( TMsvEntryEvent aEvent,
TAny* /*aArg1*/, TAny* /*aArg2*/, TAny* /*aArg3*/ )
{
PUSHLOG_ENTERFN("CPushViewMessageOp::HandleEntryEventL");
@@ -251,8 +251,8 @@
if ( aEvent == EMsvEntryChanged )
{
PUSHLOG_WRITE(" Changed");
- // We don't have to bother with such case that the
- // content changes, but the entry is saved as 'read' in
+ // We don't have to bother with such case that the
+ // content changes, but the entry is saved as 'read' in
// this case, because this operation handles only SI messages.
//TODO NotifyAndCancelL( R_PUSHMISC_INFO_REPLACED );
}
@@ -280,7 +280,7 @@
// Add resource file.
TParse* fileParser = new (ELeave) TParse;
CleanupStack::PushL( fileParser );
- fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
+ fileParser->Set( KPushMtmUiResourceFileAndDrive, &KDC_MTM_RESOURCE_DIR, NULL );
AssureResourceL( fileParser->FullName() );
CleanupStack::PopAndDestroy( fileParser ); // fileParser
fileParser = NULL;
--- a/pushmtm/MtmUtilSrc/PushAuthenticationUtilitiesWL.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUtilSrc/PushAuthenticationUtilitiesWL.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -25,7 +25,7 @@
#include "PushMtmSettings.h"
#include "PushMtmUtilPanic.h"
#include "PushMtmLog.h"
-#include <PushMessage.h>
+#include <push/PushMessage.h>
#include <PushEntry.h>
// ================= MEMBER FUNCTIONS =======================
@@ -35,9 +35,9 @@
// ---------------------------------------------------------
//
EXPORT_C TBool TPushAuthenticationUtil::AuthenticateMsgL
- (
- const CPushMtmSettings& aMtmSettings,
- const CPushMessage& aPushMsg
+ (
+ const CPushMtmSettings& aMtmSettings,
+ const CPushMessage& aPushMsg
)
{
PUSHLOG_ENTERFN("TPushAuthenticationUtil::AuthenticateMsgL")
@@ -94,9 +94,9 @@
// ---------------------------------------------------------
//
EXPORT_C TBool TPushAuthenticationUtil::AuthenticateMsgL
- (
- const CPushMtmSettings& aMtmSettings,
- const CPushMsgEntryBase& aPushMsg
+ (
+ const CPushMtmSettings& aMtmSettings,
+ const CPushMsgEntryBase& aPushMsg
)
{
PUSHLOG_ENTERFN("TPushAuthenticationUtil::AuthenticateMsgL 2")
--- a/pushmtm/MtmUtilSrc/PushMtmUtil.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/MtmUtilSrc/PushMtmUtil.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -22,8 +22,8 @@
#include "PushMtmUtil.h"
#include "PushMtmUtilPanic.h"
#include "PushMtmLog.h"
-#include <CSIPushMsgEntry.h>
-#include <CSLPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
+#include <push/CSLPushMsgEntry.h>
#include <msvids.h>
#include <msvuids.h>
#include <msvapi.h>
@@ -57,7 +57,7 @@
// CPushMtmUtil::MarkServiceUnreadL
// ---------------------------------------------------------
//
-EXPORT_C void CPushMtmUtil::MarkServiceUnreadL( TMsvId aEntryId,
+EXPORT_C void CPushMtmUtil::MarkServiceUnreadL( TMsvId aEntryId,
TBool aUnread )
{
PUSHLOG_ENTERFN("CPushMtmUtil::MarkServiceUnreadL")
@@ -84,8 +84,8 @@
// ---------------------------------------------------------
//
EXPORT_C CMsvEntrySelection* CPushMtmUtil::FindMessagesL
- ( TMsvId aFolderId,
- TUid aMsgType,
+ ( TMsvId aFolderId,
+ TUid aMsgType,
TBool aRecursive )
{
CMsvEntrySelection* sel = new (ELeave) CMsvEntrySelection;
@@ -138,10 +138,10 @@
//
EXPORT_C CMsvEntrySelection* CPushMtmUtil::FindPushFoldersL()
{
- // Only the Inbox, the Documents folder and the user
+ // Only the Inbox, the Documents folder and the user
// defined folders can contain push messages.
// The user defined folders can only be in the Documents folder.
- // (See the definition of CMsgFolderSelectionListArray::ConstructL
+ // (See the definition of CMsgFolderSelectionListArray::ConstructL
// in msgavkon for more details.)
CMsvEntrySelection* pushFolders = new (ELeave) CMsvEntrySelection;
CleanupStack::PushL( pushFolders );
@@ -172,7 +172,7 @@
( iMsvSession, KDocumentsIndexEntryId, selOrd );
CleanupStack::PushL( documentsFolder );
- CMsvEntrySelection* userDefFolders =
+ CMsvEntrySelection* userDefFolders =
documentsFolder->ChildrenWithTypeL( KUidMsvFolderEntry );
CleanupStack::PopAndDestroy(); // documentsFolder
CleanupStack::PushL( userDefFolders );
@@ -181,7 +181,7 @@
const TInt count( userDefFolders->Count() );
for ( TInt i = 0; i < count; ++i )
{
- // However Templates folder is in Documents, no messages
+ // However Templates folder is in Documents, no messages
// can be moved there - it cannot contain push messages.
if ( userDefFolders->At( i ) != KTemplatesIndexEntryId )
{
@@ -204,7 +204,7 @@
{
CMsvEntrySelection* matching = new (ELeave) CMsvEntrySelection;
CleanupStack::PushL( matching );
-
+
CSIPushMsgEntry* siEntry = CSIPushMsgEntry::NewL();
CleanupStack::PushL( siEntry );
@@ -231,16 +231,16 @@
// CPushMtmUtil::FindUrlLC
// ---------------------------------------------------------
//
-EXPORT_C CMsvEntrySelection* CPushMtmUtil::FindUrlLC( const TDesC& aUrl,
+EXPORT_C CMsvEntrySelection* CPushMtmUtil::FindUrlLC( const TDesC& aUrl,
TUid aPushType )
{
- __ASSERT_ALWAYS( aPushType == KUidWapPushMsgSI ||
- aPushType == KUidWapPushMsgSL,
+ __ASSERT_ALWAYS( aPushType == KUidWapPushMsgSI ||
+ aPushType == KUidWapPushMsgSL,
UtilPanic( EPushMtmUtilPanBadBioType ) );
CMsvEntrySelection* matching = new (ELeave) CMsvEntrySelection;
CleanupStack::PushL( matching );
-
+
CMsvEntrySelection* all = FindMessagesL( aPushType );
CleanupStack::PushL( all );
@@ -332,7 +332,7 @@
//
EXPORT_C void CPushMtmUtil::SetAttrs( TMsvEntry& aContext, TUint32 aAttrs )
{
- aContext.iMtmData2 = aContext.iMtmData2 |
+ aContext.iMtmData2 = aContext.iMtmData2 |
(aAttrs<<KPushMtmShiftOnlyAttrs);
}
@@ -342,7 +342,7 @@
//
EXPORT_C void CPushMtmUtil::ResetAttrs( TMsvEntry& aContext, TUint32 aAttrs )
{
- aContext.iMtmData2 = aContext.iMtmData2 &
+ aContext.iMtmData2 = aContext.iMtmData2 &
~(aAttrs<<KPushMtmShiftOnlyAttrs);
}
@@ -352,7 +352,7 @@
//
EXPORT_C TUint32 CPushMtmUtil::Attrs( const TMsvEntry& aContext )
{
- return (aContext.iMtmData2 >> KPushMtmShiftOnlyAttrs) &
+ return (aContext.iMtmData2 >> KPushMtmShiftOnlyAttrs) &
KPushMtmMaskOnlyAttrs;
}
@@ -378,7 +378,7 @@
// CPushMtmUtil::CPushMtmUtil
// ---------------------------------------------------------
//
-CPushMtmUtil::CPushMtmUtil( CMsvSession& aMsvSession )
+CPushMtmUtil::CPushMtmUtil( CMsvSession& aMsvSession )
: iMsvSession( aMsvSession )
{
}
@@ -395,9 +395,9 @@
// CPushMtmUtil::FindMessagesL
// ---------------------------------------------------------
//
-void CPushMtmUtil::FindMessagesL( TMsvId aFolderId,
- TUid aMsgType,
- TBool aRecursive,
+void CPushMtmUtil::FindMessagesL( TMsvId aFolderId,
+ TUid aMsgType,
+ TBool aRecursive,
CMsvEntrySelection& aResult )
{
// Find the push entries of the specified type in the specified folder.
@@ -442,7 +442,7 @@
// Find messages in the subfolders if required.
if ( aRecursive )
{
- CMsvEntrySelection* subFolders =
+ CMsvEntrySelection* subFolders =
thisFolder->ChildrenWithTypeL( KUidMsvFolderEntry );
CleanupStack::PushL( subFolders );
--- a/pushmtm/Plugins/Data/10008D3E.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/Data/10008D3E.rss Thu Jan 07 12:48:02 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
// System includes
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// User includes
#include "WhiteListAdapterUids.h"
--- a/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <platform_paths.hrh>
#include <platform/mw/browser_platform_variant.hrh>
@@ -45,11 +44,15 @@
USERINCLUDE ../../MtmUtilInc
USERINCLUDE ../../MtmUiInc
+/* todo: to be removed once push header are updated */
+USERINCLUDE /epoc32/include/push
+
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
-APP_LAYER_PUSH_SYSTEMINCLUDE
-APP_LAYER_HTTP_SYSTEMINCLUDE
-APP_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_32__)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(push)
+SYSTEMINCLUDE APP_LAYER_PUBLIC_EXPORT_PATH(ecom)
+#endif
SOURCEPATH ../PushContentHandler
SOURCE CCOContentHandler.cpp
@@ -65,8 +68,8 @@
#ifdef __SERIES60_PUSH_SL
SOURCE PushMtmAutoFetchOperation.cpp
SOURCE PushMtmFetchOperation.cpp
-SOURCE PushMtmCacheSupply.cpp
-SOURCE PushMtmCacheDataSupplier.cpp
+SOURCE PushMtmCacheSupply.cpp
+SOURCE PushMtmCacheDataSupplier.cpp
#endif // __SERIES60_PUSH_SL
SOURCE si_dict.c
SOURCE sl_dict.c
--- a/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
#include <platform_paths.hrh>
#include <platform/mw/browser_platform_variant.hrh>
#include <defaultcaps.hrh>
@@ -48,7 +47,6 @@
USERINCLUDE ../../MtmUtilInc
APP_LAYER_SYSTEMINCLUDE
-APP_LAYER_ECOM_SYSTEMINCLUDE
// SOURCE FILES
--- a/pushmtm/Plugins/PushContentHandler/101F854C.rss Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/101F854C.rss Thu Jan 07 12:48:02 2010 +0200
@@ -17,7 +17,7 @@
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
#include "PushContentHandlerDef.hrh"
--- a/pushmtm/Plugins/PushContentHandler/CCOContentHandler.h Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CCOContentHandler.h Thu Jan 07 12:48:02 2010 +0200
@@ -22,12 +22,9 @@
// INCLUDE FILES
-//#include "PushMtmDef.hrh"
#include "PushContentHandlerDef.hrh"
-#include <CContentHandlerBase.h>
+#include <push/CContentHandlerBase.h>
#include <E32Base.h>
-//#include <msvstd.h>
-//#include <msvapi.h>
// CONSTANTS
@@ -43,11 +40,11 @@
// CLASS DECLARATION
-/**
-* CCOContentHandler Handles Cache Operation Content
+/**
+* CCOContentHandler Handles Cache Operation Content
*
* This handler takes ownership of the CO message and processes it
-* according to the processing rules
+* according to the processing rules
* [WAP Cache Operation version 31-July-2001].
* Also S60 specific requirements are applied.
*
@@ -81,26 +78,26 @@
void ConstructL();
private: // Methods from CPushHandlerBase
-
+
/**
- * HandleMessage Async. Version. Takes ownership of Push Message and
+ * HandleMessage Async. Version. Takes ownership of Push Message and
* sets self active to continue processing message.
* @param aPushMsg CPushMessage to process.
- * @param aStatus Request status variable for use in asynchronous
+ * @param aStatus Request status variable for use in asynchronous
* operations.
* @return None.
*/
void HandleMessageL( CPushMessage* aPushMsg, TRequestStatus& aStatus );
/**
- * HandleMessage Sync. Version. Takes ownership of Push Message and
+ * HandleMessage Sync. Version. Takes ownership of Push Message and
* sets self active to continue processing message.
- * Initial State: Set data members then go to the next state
+ * Initial State: Set data members then go to the next state
* @param aPushMsg CPushMessage to process.
*/
void HandleMessageL( CPushMessage* aPushMsg );
- /**
+ /**
* Same functionality as DoCancel()
*/
void CancelHandleMessage();
--- a/pushmtm/Plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,14 +15,12 @@
*
*/
-
-
// INCLUDE FILES
#include "CMultiPartMixedContentHandler.h"
-#include <PushDispatcher.h>
-#include <CMultiPartTextIterator.h>
-#include <CMultiPartBinIterator.h>
+#include <push/pushdispatcher.h>
+#include <push/cmultiparttextiterator.h>
+#include <push/cmultipartbiniterator.h>
// Constants
@@ -31,19 +29,19 @@
_LIT(KErrPushMsgNull, "NULL CPushMessage");
#endif
-/**
+/**
* Static Factory Construction
*
* @param aFs Reference to a file session
* @param aLibrary Reference to DLL Library Object
- * @param aIndex Index number corresponding to the Unknown App Handler Class
+ * @param aIndex Index number corresponding to the Unknown App Handler Class
* 'EMultiPartMixedContentHandler'
*
* @return fully initialized instance of this class
*/
CMultiPartMixedContentHandler* CMultiPartMixedContentHandler::NewL()
{
- CMultiPartMixedContentHandler* self =
+ CMultiPartMixedContentHandler* self =
new (ELeave) CMultiPartMixedContentHandler;
CleanupStack::PushL(self);
self->ConstructL();
@@ -51,7 +49,7 @@
return self;
}
-/**
+/**
* Destructor
*/
CMultiPartMixedContentHandler::~CMultiPartMixedContentHandler()
@@ -66,9 +64,9 @@
*
* @param aFs Reference to a file session
* @param aLibrary Reference to DLL Library Object
- * @param aIndex Index number corresponding to the Unknown App Handler Class
+ * @param aIndex Index number corresponding to the Unknown App Handler Class
* 'EMultiPartMixedContentHandler'
- */
+ */
CMultiPartMixedContentHandler::CMultiPartMixedContentHandler()
: CContentHandlerBase()
{
@@ -84,7 +82,7 @@
#ifdef __TEST_MULTIPART_MIX_SUPP
-/**
+/**
* Creates a Multipart Binary Iterator that will be used for splitting apart the binary
* mulitpart.
*
@@ -102,10 +100,10 @@
iMultiMessage = CMultipartBinIterator::NewL(*iMessage);
else
User::Leave(KErrCorrupt);
-
+
iMultiMessage->FirstL();
iState = EHandlePart;
-
+
IdleComplete();
}
@@ -118,15 +116,15 @@
{
CPushMessage* msgPart = iMultiMessage->PartL();
CleanupStack::PushL(msgPart);
-
+
TPtrC contentType;
msgPart->GetContentType(contentType);
- CContentHandlerBase& contentHandler =
+ CContentHandlerBase& contentHandler =
PushContentTypeDispatcher::GetHandlerL( contentType, *iLog, *iManager );
iContentHandler = &contentHandler;
CleanupStack::Pop(msgPart);
- // treat as an acknowledged message always to ensure
+ // treat as an acknowledged message always to ensure
// sequential creation of handlers
iContentHandler->HandleMessageL(msgPart, iStatus);
iState = ENextPart;
@@ -141,25 +139,25 @@
{
if (iMultiMessage->NextL())
iState = EHandlePart;
- else
+ else
iState = EDone;
-
+
IdleComplete();
}
#endif // __TEST_MULTIPART_MIX_SUPP
-/**
+/**
* The Asynchronous entry point for this plug-in to handle the CPushMessage.
- *
+ *
* Since we really didn't start an async event, make it look as though our
- * asynchronous request has been completed.
+ * asynchronous request has been completed.
*
* @param aPushMsg A WAP binary multipart.mixed message that will be processed
- * @param aStatus The TRequestStatus of the caller indicating that this will
+ * @param aStatus The TRequestStatus of the caller indicating that this will
* be used aysnchronously
*/
-void CMultiPartMixedContentHandler::HandleMessageL( CPushMessage* aPushMsg,
+void CMultiPartMixedContentHandler::HandleMessageL( CPushMessage* aPushMsg,
TRequestStatus& aStatus )
{
__ASSERT_DEBUG( aPushMsg != NULL, User::Panic(KErrPushMsgNull, KErrNone));
@@ -181,11 +179,11 @@
}
-/**
+/**
* The Synchronous entry point for this plug-in to handle the CPushMessage.
*
* @param aPushMsg A WAP binary multipart.mixed message that will be processed
- * @param aStatus The TRequestStatus of the caller indicating that this will be
+ * @param aStatus The TRequestStatus of the caller indicating that this will be
* used aysnchronously
*/
void CMultiPartMixedContentHandler::HandleMessageL( CPushMessage* aPushMsg )
@@ -206,7 +204,7 @@
#endif // __TEST_MULTIPART_MIX_SUPP
}
-/**
+/**
* Cancels Asynronous requests on called handler.
*/
void CMultiPartMixedContentHandler::CancelHandleMessage()
@@ -224,7 +222,7 @@
User::Panic(KReserved, KErrNotSupported);
}
-/**
+/**
* Cancels Asynronous requests on caller and completes self.
*/
void CMultiPartMixedContentHandler::DoCancel()
@@ -236,7 +234,7 @@
Complete( KErrCancel );
}
-/**
+/**
* State machine to step through the multipart message until it is done
*
* State EHandlePart: Starts the processing of each part of the multipart
@@ -281,7 +279,7 @@
}
}
-/**
+/**
* Clean up
*/
TInt CMultiPartMixedContentHandler::RunError(TInt aError)
--- a/pushmtm/Plugins/PushContentHandler/CMultiPartMixedContentHandler.h Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CMultiPartMixedContentHandler.h Thu Jan 07 12:48:02 2010 +0200
@@ -15,24 +15,21 @@
*
*/
-
-
#ifndef __CMULTIPARTMIXEDCONTENTHANDLER_H__
#define __CMULTIPARTMIXEDCONTENTHANDLER_H__
-
// INCLUDE FILES
#include "PushMtmDef.hrh"
#include "PushContentHandlerDef.hrh"
-#include <CContentHandlerBase.h>
+#include <push/ccontenthandlerbase.h>
#include <E32Base.h>
// CONSTANTS
-const TUid KUidPushMultiPartMixedContentHandler = {
+const TUid KUidPushMultiPartMixedContentHandler = {
EUidPushMultiPartMixedContentHandler };
-_LIT(KMultiPartMixedContentHandlerData,
+_LIT(KMultiPartMixedContentHandlerData,
"application/vnd.wap.multipart.mixed||multipart/mixed");
// FORWARD DECLARATIONS
@@ -42,14 +39,14 @@
// CLASS DECLARATION
/**
-* The MultiPart/Mixed Content Handler
+* The MultiPart/Mixed Content Handler
*
-* Takes apart the mulitpart message, creating a new sub message from each
+* Takes apart the mulitpart message, creating a new sub message from each
* part, then calls on new Push Handlers to process each sub message.
*
-* All multipart/mixed messages are dropped if __TEST_MULTIPART_MIX_SUPP
+* All multipart/mixed messages are dropped if __TEST_MULTIPART_MIX_SUPP
* is not defined.
-*/
+*/
class CMultiPartMixedContentHandler : public CContentHandlerBase
{
public: // Constructors and destructor
@@ -77,7 +74,7 @@
#endif // __TEST_MULTIPART_MIX_SUPP
private: // Methods from CPushHandlerBase
-
+
void HandleMessageL(CPushMessage* aPushMsg, TRequestStatus& aStatus);
void HandleMessageL(CPushMessage* aPushMsg);
@@ -100,16 +97,16 @@
enum TState
{
- ELoadMsgData,
- EHandlePart,
- ENextPart,
+ ELoadMsgData,
+ EHandlePart,
+ ENextPart,
EDone
};
CMultipartIteratorBase* iMultiMessage;
CContentHandlerBase* iContentHandler;
-
+
};
--- a/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -15,12 +15,10 @@
*
*/
-
-
// INCLUDE FILES
#include "CMultiPartRelAndAltContentHandler.h"
-#include <CMultiPartIteratorBase.h>
+#include <push/cmultipartiteratorbase.h>
#include <msvids.h>
// Constants
--- a/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h Thu Jan 07 12:48:02 2010 +0200
@@ -24,14 +24,14 @@
//
#include "PushMtmDef.hrh"
#include "PushContentHandlerDef.hrh"
-#include <CContentHandlerBase.h>
+#include <push/CContentHandlerBase.h>
#include <E32Base.h>
#include <msvstd.h>
#include <msvapi.h>
// Constants
//
-const TUid KUidPushMultiPartRelAndAltContentHandler = {
+const TUid KUidPushMultiPartRelAndAltContentHandler = {
EUidPushMultiPartRelAndAltContentHandler };
// Forward class declarations
@@ -40,15 +40,15 @@
class CMultipartIteratorBase;
/**
-* The MultiPart/Alternative & Multipart/Alternative Content Handler
+* The MultiPart/Alternative & Multipart/Alternative Content Handler
*
* Saves the whole message in the Message Server, each part getting saved as a child
* entry to the main part.
-*
-* All multipart/rel+alt messages are dropped if __TEST_MULTIPART_REL_SUPP
+*
+* All multipart/rel+alt messages are dropped if __TEST_MULTIPART_REL_SUPP
* is not defined.
*/
-class CMultiPartRelAndAltContentHandler : public CContentHandlerBase,
+class CMultiPartRelAndAltContentHandler : public CContentHandlerBase,
public MMsvSessionObserver
{
public: // Methods
@@ -68,7 +68,7 @@
#ifdef __TEST_MULTIPART_REL_SUPP
void LoadMultiPartMsgL();
-
+
void HandlePartL();
void NextPartL();
@@ -82,7 +82,7 @@
#endif // __TEST_MULTIPART_REL_SUPP
private: // Methods from CPushHandlerBase
-
+
void HandleMessageL(CPushMessage* aPushMsg, TRequestStatus& aStatus);
void HandleMessageL(CPushMessage* aPushMsg);
@@ -103,7 +103,7 @@
private: // from MMsvSessionObserver
- void HandleSessionEventL( TMsvSessionEvent aEvent,
+ void HandleSessionEventL( TMsvSessionEvent aEvent,
TAny* aArg1, TAny* aArg2, TAny* aArg3);
private: // Attributes
@@ -111,8 +111,8 @@
enum TState
{
ELoadMsgData,
- EHandlePart,
- EDone,
+ EHandlePart,
+ EDone,
ENextPart
};
--- a/pushmtm/Plugins/PushContentHandler/CPushContentHandlerBase.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CPushContentHandlerBase.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -30,7 +30,7 @@
#include "StringResourceReader.h"
#include "PushContentHandlerPanic.h"
#include <PushEntry.h>
-#include <PushMessage.h>
+#include <push/pushmessage.h>
#include <msvstd.h>
#include <mtclreg.h>
#include <mtclbase.h>
--- a/pushmtm/Plugins/PushContentHandler/CPushContentHandlerBase.h Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CPushContentHandlerBase.h Thu Jan 07 12:48:02 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDE FILES
-#include <CContentHandlerBase.h>
+#include <push/CContentHandlerBase.h>
#include <E32Base.h>
#include <msvstd.h>
#include <msvapi.h>
@@ -37,14 +37,14 @@
// CLASS DECLARATION
-/**
-* CPushContentHandlerBase class stands as a base class for almost all push
-* content handlers of the Push MTM. It collects the generic functionality of
-* a push content handler, such as garbage collection when receiving new
-* service message, supporting CMsvSession, CPushMtmUtil and CPushMtmSettings
+/**
+* CPushContentHandlerBase class stands as a base class for almost all push
+* content handlers of the Push MTM. It collects the generic functionality of
+* a push content handler, such as garbage collection when receiving new
+* service message, supporting CMsvSession, CPushMtmUtil and CPushMtmSettings
* objects.
*/
-class CPushContentHandlerBase : public CContentHandlerBase,
+class CPushContentHandlerBase : public CContentHandlerBase,
public MMsvSessionObserver
{
protected: // Constructors and destructor
@@ -55,7 +55,7 @@
CPushContentHandlerBase();
/**
- * Symbian OS constructor. CActiveScheduler::Add( this ) is called in
+ * Symbian OS constructor. CActiveScheduler::Add( this ) is called in
* this method!!
*/
void ConstructL();
@@ -82,13 +82,13 @@
protected: // From MMsvSessionObserver
/**
- * Msv session events are handled by this method. This implementation
+ * Msv session events are handled by this method. This implementation
* is empty.
* @return None.
*/
- void HandleSessionEventL( TMsvSessionEvent aEvent,
- TAny* aArg1,
- TAny* aArg2,
+ void HandleSessionEventL( TMsvSessionEvent aEvent,
+ TAny* aArg1,
+ TAny* aArg2,
TAny* aArg3);
protected: // Data
--- a/pushmtm/Plugins/PushContentHandler/CSIContentHandler.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CSIContentHandler.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -28,7 +28,7 @@
#include "PushContentHandlerPanic.h"
#include "si_dict.h"
#include "PushContentHandlerUtils.h"
-#include <CSIPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
#include <msvids.h>
#include <PushMtmUi.rsg>
#include <nw_dom_node.h>
@@ -130,10 +130,10 @@
// ---------------------------------------------------------
//
CSIContentHandler::CSIContentHandler()
-: CPushContentHandlerBase(),
- iSavedMsgId( KMsvNullIndexEntryId ),
- iPushMsgAction( KErrNotFound ),
- iExpiresTime( Time::NullTTime() ),
+: CPushContentHandlerBase(),
+ iSavedMsgId( KMsvNullIndexEntryId ),
+ iPushMsgAction( KErrNotFound ),
+ iExpiresTime( Time::NullTTime() ),
iCreatedTime( Time::NullTTime() )
{
}
@@ -187,7 +187,7 @@
User::Leave( KErrCorrupt );
}
- // Get content type. It will tell us wheather the msg body is encoded or
+ // Get content type. It will tell us wheather the msg body is encoded or
// textual.
TPtrC contentType;
iMessage->GetContentType( contentType );
@@ -205,7 +205,7 @@
*/
// Add SI dictionary.
- NW_WBXML_Dictionary_t* dictArray[ KNoOfDictArrays ] =
+ NW_WBXML_Dictionary_t* dictArray[ KNoOfDictArrays ] =
{ (NW_WBXML_Dictionary_t*)&NW_SI_WBXMLDictionary };
NW_Status_t stat = NW_STAT_SUCCESS;
@@ -218,7 +218,7 @@
NW_Byte* buffer = (NW_Byte*)bodyPtr.Ptr();
NW_Int32 length = (NW_Int32)bodyPtr.Size();
// Let's use the content type now.
- NW_Bool encoded = ( contentType.CompareF( KSiTextContentType ) == 0 ) ?
+ NW_Bool encoded = ( contentType.CompareF( KSiTextContentType ) == 0 ) ?
NW_FALSE : NW_TRUE;
// SI public identifier.
NW_Uint32 publicID = NW_SI_PublicId;
@@ -230,13 +230,13 @@
CDocumentTreeOwner* docTreeOwner = new (ELeave) CDocumentTreeOwner;
CleanupStack::PushL( docTreeOwner );
NW_DOM_DocumentNode_t* domNode = NW_DOM_DocumentNode_BuildTree
- (
- &domHandle,
- buffer,
- length,
- encoded,
- publicID,
- extTNotStringTable
+ (
+ &domHandle,
+ buffer,
+ length,
+ encoded,
+ publicID,
+ extTNotStringTable
);
if (!domNode)
{
@@ -274,7 +274,7 @@
}
PUSHLOG_WRITE("CSIContentHandler::ParsePushMsgL: before calling getDocumentElement")
- NW_DOM_ElementNode_t* siElement =
+ NW_DOM_ElementNode_t* siElement =
NW_DOM_DocumentNode_getDocumentElement( domNode );
PUSHLOG_WRITE("CSIContentHandler::ParsePushMsgL: after calling getDocumentElement")
if (!siElement)
@@ -336,17 +336,17 @@
PUSHLOG_WRITE_FORMAT("CSIContentHandler::ParsePushMsgL: getNodeName ErrCode: %d", NwxStatusToErrCode( stat ))
User::LeaveIfError( NwxStatusToErrCode( stat ) );
NW_Byte* nameBuf = NW_String_getStorage( name );
- NW_Uint16 nameLen = NW_String_getCharCount( name,
+ NW_Uint16 nameLen = NW_String_getCharCount( name,
iCharEncoding );
TPtrC8 namePtr( nameBuf, nameLen );
- if ( type == NW_DOM_ELEMENT_NODE &&
+ if ( type == NW_DOM_ELEMENT_NODE &&
namePtr.CompareF( KIndication ) == 0 )
{
// We found the indication element. Parse it.
PUSHLOG_WRITE("CSIContentHandler::ParsePushMsgL: indication under si found.")
indicationFound = ETrue;
- NW_DOM_ElementNode_t* indicationElement =
+ NW_DOM_ElementNode_t* indicationElement =
REINTERPRET_CAST( NW_DOM_ElementNode_t*, node );
ParseIndicationL( *indicationElement );
}
@@ -416,7 +416,7 @@
***********************************/
if ( NW_DOM_Node_hasChildNodes( &aIndication ) )
{
- NW_DOM_TextNode_t* textNode =
+ NW_DOM_TextNode_t* textNode =
NW_DOM_Node_getFirstChild( &aIndication );
User::LeaveIfNull( textNode );
@@ -437,7 +437,7 @@
// CSIContentHandler::ParseIndAttributeL
// ---------------------------------------------------------
//
-void CSIContentHandler::ParseIndAttributeL( NW_DOM_AttributeHandle_t&
+void CSIContentHandler::ParseIndAttributeL( NW_DOM_AttributeHandle_t&
aAttrHandle )
{
PUSHLOG_ENTERFN("CSIContentHandler::ParseIndAttributeL")
@@ -492,7 +492,7 @@
{
User::LeaveIfError( NwxStatusToErrCode( stat ) );
NW_Byte* storage = NW_String_getStorage( val );
- NW_Uint16 length = NW_String_getCharCount( val,
+ NW_Uint16 length = NW_String_getCharCount( val,
iCharEncoding );
if ( length == 0 )
{
@@ -574,7 +574,7 @@
NW_String_t* val = NW_String_new();
User::LeaveIfNull( val );
stringOwner->SetString( val );
- stat = NW_DOM_AttributeHandle_getValue( &aAttrHandle, val );
+ stat = NW_DOM_AttributeHandle_getValue( &aAttrHandle, val );
User::LeaveIfError( NwxStatusToErrCode( stat ) );
NW_Byte* storage = NW_String_getStorage( val );
NW_Uint16 length = NW_String_getCharCount( val, iCharEncoding );
@@ -589,7 +589,7 @@
}
else
{
- __ASSERT_DEBUG( EFalse,
+ __ASSERT_DEBUG( EFalse,
ContHandPanic( EPushContHandPanUnexpSiToken ) );
}
@@ -707,7 +707,7 @@
}
else
{
- __ASSERT_DEBUG( resultOnStack,
+ __ASSERT_DEBUG( resultOnStack,
ContHandPanic( EPushContHandPanSiResNotOnStack ) );
// This may change the address of ucs2buffer so we need to put
// it on the cleanup stack again!!
@@ -831,9 +831,9 @@
PUSHLOG_WRITE_FORMAT(" Storage: 0x%x",NW_String_getStorage(&aString));
PUSHLOG_WRITE_FORMAT(" Byte count: %d",NW_String_getByteCount(&aString)-1);
- // We will use NW_String_getByteCount(&aString)-1 as size, because
+ // We will use NW_String_getByteCount(&aString)-1 as size, because
// NW_String_getByteCount(&aString) includes NULL terminator.
- const TPtrC8 src( NW_String_getStorage(&aString),
+ const TPtrC8 src( NW_String_getStorage(&aString),
NW_String_getByteCount(&aString)-1 );
HBufC16* ucs2buffer = ConvertToUnicodeL( src, id );
@@ -852,7 +852,7 @@
iCharacterSetConverter = CCnvCharacterSetConverter::NewL();
RFs& fs = iMsvSession->FileSession();
- iCharacterSetsAvailable =
+ iCharacterSetsAvailable =
CCnvCharacterSetConverter::CreateArrayOfCharacterSetsAvailableL( fs );
PUSHLOG_LEAVEFN("CSIContentHandler::InitialiseCharacterSetConverterL")
@@ -898,7 +898,7 @@
// CSIContentHandler::SetSIPushMsgEntryFieldsL
// ---------------------------------------------------------
//
-void CSIContentHandler::SetSIPushMsgEntryFieldsL( CSIPushMsgEntry&
+void CSIContentHandler::SetSIPushMsgEntryFieldsL( CSIPushMsgEntry&
aSIPushMsgEntry )
{
PUSHLOG_ENTERFN("CSIContentHandler::SetSIPushMsgEntryFieldsL")
@@ -924,7 +924,7 @@
}
}
- __ASSERT_DEBUG( ActionFlag(),
+ __ASSERT_DEBUG( ActionFlag(),
ContHandPanic( EPushContHandPanUnspecSiAction ) );
if ( ActionFlag() )
{
@@ -960,18 +960,18 @@
if ( srvAddress.Length() == 0 )
{
// Read from resource.
- HBufC* details =
+ HBufC* details =
iStrRscReader->AllocReadResourceLC( R_PUSHMISC_UNK_SENDER );
aSIPushMsgEntry.SetMsgDetailsL( *details );
CleanupStack::PopAndDestroy( details );
}
else
{
- // Convert the "From" information to the format required by the UI
+ // Convert the "From" information to the format required by the UI
// spec and then decode it.
HBufC* details = iWapPushUtils->ConvertDetailsL( srvAddress );
CleanupStack::PushL( details );
- HBufC* convertedFrom =
+ HBufC* convertedFrom =
CPushMtmUtil::ConvertUriToDisplayFormL( *details );
CleanupStack::PushL( convertedFrom );
//
@@ -989,7 +989,7 @@
else
{
// Display URL.
- __ASSERT_DEBUG( HrefFlag(),
+ __ASSERT_DEBUG( HrefFlag(),
ContHandPanic( EPushContHandPanUnspecSiHref ) );
const TPtrC url = aSIPushMsgEntry.Url();
HBufC* convertedUrl = CPushMtmUtil::ConvertUriToDisplayFormL( url );
@@ -1003,11 +1003,11 @@
// ******** Push MTM specific processing *********
/*
- * Unfortunately in CPushMsgEntryBase there is no such functionality
- * with which we can reach TMsvEntry as non-const, but we have to
- * modify the entry's iMtmData2 member somehow. We can do it
- * with either casting or with modifying and saving the entry
- * manually after it has been saved by CSIPushMsgEntry. The latter
+ * Unfortunately in CPushMsgEntryBase there is no such functionality
+ * with which we can reach TMsvEntry as non-const, but we have to
+ * modify the entry's iMtmData2 member somehow. We can do it
+ * with either casting or with modifying and saving the entry
+ * manually after it has been saved by CSIPushMsgEntry. The latter
* solution is more expensive so we choose the first.
*/
TMsvEntry& tEntry = CONST_CAST( TMsvEntry&, aSIPushMsgEntry.Entry() );
@@ -1038,10 +1038,10 @@
TBool deletePushMsg( EFalse );
- __ASSERT_DEBUG( ActionFlag(),
+ __ASSERT_DEBUG( ActionFlag(),
ContHandPanic( EPushContHandPanUnspecSiAction ) );
- // S60 requirement: if both the href and the message is empty then
+ // S60 requirement: if both the href and the message is empty then
// delete the msg.
if ( HrefFlag() == EFalse && DataFlag() == EFalse )
{
@@ -1075,7 +1075,7 @@
}
}
- // An SI with the action attribute set to “delete” MUST have an
+ // An SI with the action attribute set to “delete” MUST have an
// explicitly assigned value for si-id.
if ( !deletePushMsg && ActionFlag() )
{
@@ -1099,7 +1099,7 @@
if ( !deletePushMsg && ActionFlag() )
{
// SI with action=signal-none must not be presented to the end-user.
- // Note. In S60 signal-none behaves the same as delete: the
+ // Note. In S60 signal-none behaves the same as delete: the
// message is discarded after processing it!
if ( iPushMsgAction == CSIPushMsgEntry::ESIPushMsgSignalNone )
{
@@ -1119,7 +1119,7 @@
}
else
{
- // The new entry must be discarded.
+ // The new entry must be discarded.
// Delete the corresponding matching entry, too.
if ( matchingEntryId != KMsvNullIndexEntryId )
{
@@ -1150,7 +1150,7 @@
//Delete this old entry
iWapPushUtils->DeleteEntryL( aMatchingEntryId );
}
-
+
SetSIPushMsgEntryFieldsL( *siEntry );
iSavedMsgId = siEntry->SaveL( *iMsvSession, KMsvGlobalInBoxIndexEntryId );
@@ -1179,9 +1179,9 @@
{
PUSHLOG_ENTERFN("CSIContentHandler::HandleMsgOrderReceptionL")
- __ASSERT_DEBUG( ( SiIdFlag() || HrefFlag() ),
+ __ASSERT_DEBUG( ( SiIdFlag() || HrefFlag() ),
ContHandPanic( EPushContHandPanNoSiIdOrHrefAttr ) );
- __ASSERT_DEBUG( CreatedFlag(),
+ __ASSERT_DEBUG( CreatedFlag(),
ContHandPanic( EPushContHandPanNoCreatedAttr ) );
CMsvEntrySelection* matchingIdList = NULL;
@@ -1207,7 +1207,7 @@
CSIPushMsgEntry* siEntry = CSIPushMsgEntry::NewL();
CleanupStack::PushL( siEntry );
- // Delete older stored messages and/or mark current message for
+ // Delete older stored messages and/or mark current message for
// deletion if same date or older than stored messages
TBool foundOneToBeReplaced = EFalse;
for ( TInt count = 0; count < matchingListCount; ++count )
@@ -1216,7 +1216,7 @@
siEntry->RetrieveL( *iMsvSession, matchingSiMsgEntryId );
- // Skip date comparisons if creation date not valid -
+ // Skip date comparisons if creation date not valid -
// SI without created attribute never gets replaced.
TTime existingSiCreatedTime( siEntry->Created() );
@@ -1226,25 +1226,25 @@
}
else
{
- __ASSERT_DEBUG( !foundOneToBeReplaced,
+ __ASSERT_DEBUG( !foundOneToBeReplaced,
ContHandPanic( EPushContHandPanTooManySi ) );
if ( foundOneToBeReplaced )
{
PUSHLOG_WRITE(" Already found one")
// Only one SI has to be found.
- // If the program runs into it, then make a
- // garbage collection to ensure consistency and
+ // If the program runs into it, then make a
+ // garbage collection to ensure consistency and
// remove other messages found.
iWapPushUtils->DeleteEntryL( matchingSiMsgEntryId );
- // After the 'for' only one SI is allowed that has created
+ // After the 'for' only one SI is allowed that has created
// attribute.
}
else
{
foundOneToBeReplaced = ETrue; // A match was found.
- // Check if received SI is newer than existing stored Si
+ // Check if received SI is newer than existing stored Si
// (out of order).
- if ( iCreatedTime > existingSiCreatedTime )
+ if ( iCreatedTime > existingSiCreatedTime )
{
PUSHLOG_WRITE(" Replacing...")
// The new SI replaces the existing.
@@ -1263,7 +1263,7 @@
CleanupStack::PopAndDestroy( siEntry ); // siEntry
}
-
+
CleanupStack::PopAndDestroy( matchingIdList ); // matchingIdList
PUSHLOG_LEAVEFN("CSIContentHandler::HandleMsgOrderReceptionL")
@@ -1274,7 +1274,7 @@
// CSIContentHandler::ConvertDateTimeL
// ---------------------------------------------------------
//
-TBool CSIContentHandler::ConvertDateTimeL( const TDesC& aDateTime,
+TBool CSIContentHandler::ConvertDateTimeL( const TDesC& aDateTime,
TTime& aConvertedDate ) const
{
PUSHLOG_ENTERFN("CSIContentHandler::ConvertDateTimeL")
@@ -1301,7 +1301,7 @@
else
{
// Now 'str' is in format YYYYMMDD:HHMMSS
- // Adjust UTC time to zero offset TTime. Only month and day
+ // Adjust UTC time to zero offset TTime. Only month and day
// is effected.
const TInt KFirstMonthChar = KValidTTimeMonthStart;
const TInt KSecondMonthChar = KFirstMonthChar + 1;
@@ -1336,7 +1336,7 @@
str[KSecondDayChar]--;
}
- // string is now syntaxically correct, but Set() will return an
+ // string is now syntaxically correct, but Set() will return an
// error if it's semantically incorrect.
User::LeaveIfError( convertedTime.Set( str ) );
convertedOK = ETrue;
@@ -1387,7 +1387,7 @@
convertedPtr.Append( TChar(KAsciiZeroCharCode + low) );
}
- // A valid UTC %Datetime contains 14 numerical characters and 6
+ // A valid UTC %Datetime contains 14 numerical characters and 6
// non-numerical: “1999-04-30T06:40:00Z”.
// So fill the remaining bytes with zeros.
for ( i = convertedPtr.Length(); i < KValidUTCNumericals; ++i )
@@ -1443,8 +1443,8 @@
{
// strip out formatting characters
TInt formatCharPos = 4;
- aDateTime.Delete( formatCharPos, 1 );
- // now move through two characters at a time and remove other chars
+ aDateTime.Delete( formatCharPos, 1 );
+ // now move through two characters at a time and remove other chars
// to just leave digits
const TInt KRemainingFormatChars = 5;
TInt i( 0 );
@@ -1456,10 +1456,10 @@
// Now aDateTime has to be in format YYYYMMDDHHMMSS
- __ASSERT_DEBUG( aDateTime.Length() == KValidTTimeLength,
+ __ASSERT_DEBUG( aDateTime.Length() == KValidTTimeLength,
ContHandPanic( EPushContHandPanBadTTimeLength ) );
- // now have UTC string stripped of format characters - check remaining
+ // now have UTC string stripped of format characters - check remaining
// characters are all digits - YYYYMMDDHHMMSS
TChar ch;
for ( i = 0; i < KValidTTimeLength; ++i )
@@ -1474,7 +1474,7 @@
if ( isValid )
{
- /*
+ /*
In YYYYMMDDHHMMSS
YYYY = 4 digit year ("0000" ... "9999")
MM = 2 digit month ("01"=January, "02"=February ... "12"=December)
@@ -1487,7 +1487,7 @@
TUint val;
// Do not check year. There are no restrictions.
// Check month.
- TLex parser( aDateTime.Mid( KValidTTimeMonthStart,
+ TLex parser( aDateTime.Mid( KValidTTimeMonthStart,
KValidTTimeBlockLength ) );
err = parser.Val( val, EDecimal );
if ( err )
@@ -1506,7 +1506,7 @@
// Check day.
if ( isValid )
{
- parser = aDateTime.Mid( KValidTTimeDayStart,
+ parser = aDateTime.Mid( KValidTTimeDayStart,
KValidTTimeBlockLength );
err = parser.Val( val, EDecimal );
if ( err )
@@ -1526,7 +1526,7 @@
// Check hour.
if ( isValid )
{
- parser = aDateTime.Mid( KValidTTimeHourStart,
+ parser = aDateTime.Mid( KValidTTimeHourStart,
KValidTTimeBlockLength );
err = parser.Val( val, EDecimal );
if ( err )
@@ -1546,7 +1546,7 @@
// Check minute.
if ( isValid )
{
- parser = aDateTime.Mid( KValidTTimeMinuteStart,
+ parser = aDateTime.Mid( KValidTTimeMinuteStart,
KValidTTimeBlockLength );
err = parser.Val( val, EDecimal );
if ( err )
@@ -1566,7 +1566,7 @@
// Check second.
if ( isValid )
{
- parser = aDateTime.Mid( KValidTTimeSecondStart,
+ parser = aDateTime.Mid( KValidTTimeSecondStart,
KValidTTimeBlockLength );
err = parser.Val( val, EDecimal );
if ( err )
@@ -1601,7 +1601,7 @@
// ---------------------------------------------------------
//
TBool CSIContentHandler::AttributeToTTimeL
- ( NW_DOM_AttributeHandle_t& aAttrHandle,
+ ( NW_DOM_AttributeHandle_t& aAttrHandle,
TTime& aConvertedDate ) const
{
PUSHLOG_ENTERFN("CSIContentHandler::AttributeToTTimeL")
@@ -1640,7 +1640,7 @@
dataBuf->Des().Copy( dataPtr );
gotDate = ConvertDateTimeL( *dataBuf, aConvertedDate );
- CleanupStack::PopAndDestroy( 2, stringOwner ); // dataBuf,
+ CleanupStack::PopAndDestroy( 2, stringOwner ); // dataBuf,
// stringOwner
}
else if ( valType == NW_DOM_ATTR_VAL_OPAQUE )
@@ -1669,12 +1669,12 @@
// CSIContentHandler::HandleMessageL
// ---------------------------------------------------------
//
-void CSIContentHandler::HandleMessageL( CPushMessage* aPushMsg,
+void CSIContentHandler::HandleMessageL( CPushMessage* aPushMsg,
TRequestStatus& aStatus )
{
PUSHLOG_ENTERFN("CSIContentHandler::HandleMessageL")
- __ASSERT_DEBUG( aPushMsg != NULL,
+ __ASSERT_DEBUG( aPushMsg != NULL,
ContHandPanic( EPushContHandPanMsgNull ) );
#ifdef __TEST_LOG__
@@ -1701,7 +1701,7 @@
{
PUSHLOG_ENTERFN("CSIContentHandler::HandleMessageL")
- __ASSERT_DEBUG( aPushMsg != NULL,
+ __ASSERT_DEBUG( aPushMsg != NULL,
ContHandPanic( EPushContHandPanMsgNull ) );
#ifdef __TEST_LOG__
--- a/pushmtm/Plugins/PushContentHandler/CSLContentHandler.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CSLContentHandler.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -30,7 +30,7 @@
#include "StringResourceReader.h"
#include "sl_dict.h"
#include "PushContentHandlerUtils.h"
-#include <CSLPushMsgEntry.h>
+#include <push/cslpushmsgentry.h>
#include <msvids.h>
#include <apgtask.h>
#include <apgcli.h>
--- a/pushmtm/Plugins/PushContentHandler/PushContentHandlerGroupProxy.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/PushContentHandlerGroupProxy.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -27,7 +27,7 @@
#include "CMultiPartMixedContentHandler.h"
#include "CMultiPartRelAndAltContentHandler.h"
#include <e32std.h>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
const TImplementationProxy ImplementationTable[] =
--- a/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -22,7 +22,7 @@
#include "PushMtmFetchOperation.h"
#include "PushContentHandlerPanic.h"
#include "PushMtmLog.h"
-#include <CSLPushMsgEntry.h>
+#include <push/cslpushmsgentry.h>
#include <Uri8.h>
#include <SysUtil.h>
#include <cookiefilterinterface.h>
--- a/pushmtm/Plugins/PushContentHandler/sl_dict.h Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/sl_dict.h Thu Jan 07 12:48:02 2010 +0200
@@ -15,7 +15,6 @@
*
*/
-
/*
** WARNING
**
@@ -31,10 +30,8 @@
#ifndef HEADER_GUARD_sl_dict_h
#define HEADER_GUARD_sl_dict_h
-
#include <nw_wbxml_dictionary.h>
-
#ifdef __cplusplus
extern "C"
{
--- a/pushmtm/Plugins/WhiteListAdapterSrc/WhiteListAdapterGroupProxy.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/WhiteListAdapterSrc/WhiteListAdapterGroupProxy.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -20,7 +20,7 @@
// INCLUDE FILES
// System includes
#include <e32std.h>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
// User includes
#include "WhiteListAdapter.h"
--- a/pushmtm/ViewerSrc/PushViewerMsgEdAppUi.cpp Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/ViewerSrc/PushViewerMsgEdAppUi.cpp Thu Jan 07 12:48:02 2010 +0200
@@ -26,8 +26,8 @@
#include "PushMtmUtil.h"
#include "PushViewer.hrh"
#include "PushMtmLog.h"
-#include <CSIPushMsgEntry.h>
-#include <CSLPushMsgEntry.h>
+#include <push/CSIPushMsgEntry.h>
+#include <push/CSLPushMsgEntry.h>
#include <PushViewer.rsg>
#include <aknmessagequerydialog.h>
#include <AknQueryDialog.h>
@@ -49,7 +49,6 @@
#include "eikon.hrh"
-
// ================= MEMBER FUNCTIONS =======================
// ---------------------------------------------------------