--- a/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsbkmlist.h	Mon Mar 15 12:41:53 2010 +0200
+++ b/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsbkmlist.h	Wed Mar 31 22:04:35 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 - 2010 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"
@@ -21,15 +21,10 @@
 
 #include <e32base.h>
 #include <bamdesca.h>               // For MDesCArray
-#include <favouritesdbobserver.h>   // For MFavouritesDbObserver
 #include <favouritesdb.h>           // For RFavouritesDb
-#include <favouritesitemlist.h>     // For CFavouritesItemList
 #include <mcsmenu.h>                // For MenuContentService
+#include <propertymap.h>
 
-class CActiveFavouritesDbNotifier;
-class CAiScutSettingsItem;
-class CMCSPluginSettingsModel;
-class CMCSPluginWatcher;
 struct TSettingItem;
 /**
  *  @ingroup group_mcsplugin
@@ -110,18 +105,10 @@
      * @param aParams On return, the bookmark parameters
      * @param aCaption On return, the bookmark caption
      * @return KErrNotFound if the bookmark cannot be found, KErrNone otherwise
-     */
-    //TInt GetDataByIndex(TInt aIndex, TPtrC& aParams, TPtrC& aCaption) const;
-    
+     */    
     TSettingItem FindItemL( 
         RPointerArray<HSPluginSettingsIf::CPropertyMap>& aProperties );
-    
-    /**
-     * Remove menu item
-     * 
-     * @param aIndex 
-     */
-    void RemoveMenuItemL( TInt aIndex );
+
 
 protected:
 
@@ -147,13 +134,6 @@
         const TDesC& aUrl, TBookmarkType aType );
 
     /**
-     * Updates the bookmark list
-     *
-     * @since S60 v3.2
-     */
-    void UpdateBkmListL();
-
-    /**
      * Get bookmarks from favourites
      */
     void GetBookmarksFromFavouritesL();
@@ -185,23 +165,6 @@
     CMenuItem* MCSMenuItemL( const TDesC& aUid,const TDesC& aName,
         const TDesC& aUrl );
 
-    /**
-     * GetMCSPluginFolderIdL
-     * 
-     * @return TInt
-     */
-    TInt GetMCSPluginFolderIdL();
-
-    /**
-     * UpdateMenuItemsRefCountL
-     * 
-     * @param aItem
-     * @param aValueToAdd
-     * @return TInt
-     */
-    TInt UpdateMenuItemsRefCountL( CMenuItem* aItem, TInt aValueToAdd );
-
-
 private:
 
     /**
@@ -289,9 +252,6 @@
          */
         void ConstructL( const TDesC&  aUid, const TDesC& aCaption);
 
-    private:  // data
-
-
     };
 
 private:  // data
@@ -302,15 +262,13 @@
      */
     RPointerArray<CBkmListItem> iListItems;
 
-    // Runtime created CMenuItems must be stored, because those are refered 
+    /**
+     * Runtime created CMenuItems must be stored,
+     * because those are refered later, own.  
+     */
     RPointerArray<CMenuItem> iMenuItems;
 
     /**
-     * A flag indicating if the bookmark list should observe changes
-     */
-    TBool iObserving;
-
-    /**
      * Bookmark database session.
      * Own.
      */
@@ -324,30 +282,9 @@
 
     /**
      * iMenu
+     * Own.
      */
     RMenu iMenu;
-
-    /**
-     * Save watcher
-     */
-
-    CMCSPluginWatcher* iSaveWatcher;
-
-    /**
-     * Update watcher
-     */
-    CMCSPluginWatcher* iUpdateWatcher;
-
-    /**
-     * Remove watcher
-     */
-    CMCSPluginWatcher* iRemoveWatcher;
-
-    /**
-     * MCS plugin folder ID
-     */
-    TInt iMCSPluginFolderId;
-
 };
 
 #endif // CMCSPLUGINSETTINGSBKMLIST_H