diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrgui/mrlocationplugin/inc/cesmrlocationpluginimpl.h --- a/meetingrequest/mrgui/mrlocationplugin/inc/cesmrlocationpluginimpl.h Mon Mar 15 12:39:10 2010 +0200 +++ b/meetingrequest/mrgui/mrlocationplugin/inc/cesmrlocationpluginimpl.h Wed Mar 31 21:08:33 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies). +* 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" @@ -22,7 +22,7 @@ #include // -#include "AknServerApp.h" +#include "aknserverapp.h" // #include "cesmrlocationplugin.h" @@ -45,57 +45,68 @@ * * @param aObserver extension for the API */ - static CESMRLocationPluginImpl* NewL(); - - /** + static CESMRLocationPluginImpl* NewL(); + + /** * C++ Destructor. */ virtual ~CESMRLocationPluginImpl(); public:// from base CESMRLocationPlugin ecom interface void SetObserver ( MESMRLocationPluginObserver* aObserver ); - + public:// from base class MESMRLocationPlugin - void SelectFromMapL( const TDesC& aSearchQuery, const TDesC& aLocationUrl ); + void SelectFromMapL( + const TDesC& aSearchQuery, + const TDesC& aLocationUrl ); + void SelectFromMapL( + const TDesC& aSearchQuery, + const CCalGeoValue* aGeoValue ); void SearchFromMapL( const TDesC& aSearchQuery ); - void ShowOnMapL( const TDesC& aLocation, const TDesC& aLocationUrl ); + void ShowOnMapL( const TDesC& aLocationUrl ); + void ShowOnMapL( const CCalGeoValue& aGeoValue ); protected: // from base class CActive - void DoCancel(); - void RunL(); - TInt RunError( TInt aError ); - + void DoCancel(); + void RunL(); + TInt RunError( TInt aError ); + protected:// from base class MAknServerAppExitObserver void HandleServerAppExit( TInt aReason ); - + private: - CESMRLocationPluginImpl(); + CESMRLocationPluginImpl(); void ConstructL(); void CreateMapViewL(); void HandleSelectFromMapCompletedL(); + void SelectFromMapL( + const TDesC& aSearchQuery, + CPosLandmark* aLandmark ); + void ShowLandmarkL( CPosLandmark* aLandmark ); + CESMRUrlParserPlugin& UrlParserL(); private: // data - MESMRLocationPluginObserver* iObserver; - + MESMRLocationPluginObserver* iObserver; + /** * Map provider. * Own. */ - CMnProvider* iProvider; + CMnProvider* iProvider; /** * Map view. * Own. */ CMnMapView* iMapView; - + /** * UrlparserPlugin * Own. */ CESMRUrlParserPlugin* iUrlParser; - + /** * RPointerArray for landmarks to perform for example search from maps * with search string functionality