diff -r 137ebc85284b -r 1b758917cafc menufw/hierarchynavigator/hnmetadatamodel/inc/hnxmlmodelprovider.h
--- a/menufw/hierarchynavigator/hnmetadatamodel/inc/hnxmlmodelprovider.h	Tue May 25 12:29:32 2010 +0300
+++ b/menufw/hierarchynavigator/hnmetadatamodel/inc/hnxmlmodelprovider.h	Wed Jun 09 09:29:04 2010 +0300
@@ -36,7 +36,7 @@
  * @since S60 5.0
  * @ingroup group_hnmetadatamodel
  */
-NONSHARABLE_CLASS(CHnXmlModelProvider) : public CActive
+NONSHARABLE_CLASS(CHnXmlModelProvider) : public CBase
     {
 public:
     /**
@@ -60,18 +60,6 @@
      */
     IMPORT_C virtual ~CHnXmlModelProvider();
     
-    /**
-     * @see CAsctive::DoCancel
-     */
-    void DoCancel();
-
-    /**
-     * Services the suite synchronization steps according to class iterator.
-     *
-     * @see CAsctive::RunL
-     */
-    void RunL();
-
 private:
     
     /**
@@ -97,37 +85,26 @@
      * Builds root of xml model from suite definition.
      *
      * @since S60 v5.0
-     * @param aSuiteName Suite name.
      * @param aXmlDoc XLM model of the suite.
      * @return Error code.
      */
-     TInt CollectSuiteL( const TDesC& aSuiteName, RXmlEngDocument& aXmlDoc );
+     TInt CollectSuiteL( RXmlEngDocument& aXmlDoc );
      
      /**
      * appends items to suite in model,
      *
      * @since S60 v5.0
-     * @param aSuiteName Name of suite to append items to.
      * @param aXmlDoc XLM model of the suite.
      */
-     void CollectItemsL(const TDesC& aSuiteName, RXmlEngDocument& aXmlDoc );
-     
-     /**
-     * Copies suites and items definitions to working dir.
-     *
-     * @since S60 v5.0
-     * @return Error code.
-     */
-     TBool SynchronizeSuitesL();
-     
+     void CollectItemsL( RXmlEngDocument& aXmlDoc );
+
     /**
      * Creates model from suite definition.
      *
      * @since S60 v5.0
-     * @param aStr Name of suite.
      * @param aXmlDoc XML model of the suite.
      */
-    void CreateModelL( const TDesC& aStr, RXmlEngDocument& aXmlDoc  );   
+    void CreateModelL( RXmlEngDocument& aXmlDoc  );
     
     /**
      * Changes event names to ids.
@@ -166,17 +143,7 @@
      * @return RXmlEngDocument.
      */
      RXmlEngDocument ParseFileL( const TDesC& aPath );
-     
-     /**
-      * Resets cached models.
-      */
-     void ResetCache();
-     
-    /**
-     * Reparses a document.
-     */
-     IMPORT_C void ReloadModelL();
-   
+
     /**
      * Parses a document - searching proper suite.
      *
@@ -193,41 +160,10 @@
       * @return Event id.
       */     
      TInt GetNewEventId( HBufC* aEventName );
-     
-     /**
-      * Check if suite exists.
-      *
-      * @since S60 5.0
-      * @param aSuite Suite name.
-      * @return ETrue if suite exists, otherwise EFalse.
-      */
-     TBool SuiteExistsL( const TDesC& aSuite );
-    
+
 private:
      
     /**
-     * Invoked after asynchronous synchronization is finished.
-     */
-     void SynchronizationFinishedL();
-
-    /**
-     * Sets up normal path to suites.
-     *
-     * @param aPath Path to be searched for suites.
-     */	
-     void SearchPathForSuitesL( const TDesC& aPath );
-	
-    /**
-     * Sets up normal path to suites.
-     */   
-     void SetupSuitePathL();
-	
-    /**
-     * Sets up fail sage path to suites.
-     */   
-    void SetupFailSafeSuitePathL();
-	
-    /**
      * Standard C++ constructor.
      */     
     CHnXmlModelProvider();
@@ -236,15 +172,6 @@
      * Standard symbian 2nd phase constructor.
      */     
     void ConstructL();
-
-    /**
-    * Finds drive letter where suite definition is.
-    *
-    * @since S60 v5.0
-    * @return Error code
-    */
-    void CheckDrivesL(); 
-               
     
 #ifdef _DEBUG
 private:
@@ -265,49 +192,14 @@
     RXmlEngDOMParser iDomParser;
                 
     /**
-     * File server session
-     */
-    RFs iFs;
-        
-    /**
-     * File manager
-     */
-    CFileMan* iFileMan;                
-    
-    /**
-     * List containing names of suites (suite name is same as dir name)
-     * that should be installed from all drives
-     */    
-    RHashSet< HBufC* > iInstSuites;
-    
-    /**
      * Event map.
      */
     RHashMap< HBufC*, TInt > iEventMap;
-    
-    /**
-     * Main path.
-     */
-    RBuf iPath;
-    
+
     /**
      * Cached suites.
      */
     CHnXmlModelCache* iCache;
     
-    /**
-     * Own. Iterator used in synchronisation. 
-     * Indicates next suite name to be synchronised.
-     */
-    THashSetIter<HBufC*>* iSuiteSetIterator;
-
-    /**
-     * ETrue if suite files on the c: drive were updated during the
-     * last synchronization. New suite files also count as updated.
-     * EFalse if the last synchronization did not alter any files
-     * on the c: drive.
-     */
-    TBool iSuiteFilesUpdated;
-
     };
 #endif // C_HNMULMODELPROVIDER_H