--- a/contentstorage/castorage/inc/casqlitestorage.h	Wed Oct 13 12:59:22 2010 +0300
+++ b/contentstorage/castorage/inc/casqlitestorage.h	Mon Oct 18 10:44:15 2010 +0300
@@ -66,19 +66,13 @@
      * Loads data base from rom.
      */
     void LoadDataBaseFromRomL();
-    
+
     //from CCpStorage
     /**
      * Saves a copy of database to private.
      */
     void SaveDatabaseL();
 
-    //from CCpStorage
-    /**
-     * Restores a copy of database from backup to private.
-     */
-    void RestoreDatabaseL();
-
     /**
      * Localizes one entry attribute.
      *
@@ -92,7 +86,7 @@
      * @param aLocalization localization information about entry.
      */
     void AddLocalizationL( const CCaLocalizationEntry& aLocalization );
-    
+
     /**
      * Checks if entry already exists in localization table
      *
@@ -106,9 +100,9 @@
      * @param aLocalization localization information about entry.
      * @param aStatement SQL statement
      */
-    void ExecuteLocalizationStatementL(const CCaLocalizationEntry& aLocalization, 
+    void ExecuteLocalizationStatementL(const CCaLocalizationEntry& aLocalization,
             const TDesC& aStatement);
-   
+
     /**
      * Fetches data from database.
      *
@@ -141,11 +135,11 @@
      * @param aEntryIdArray List of enties ids.
      * @param aParentIdArray The result list of parents
      * ids for a specific select.
-     * @param aCheckParentsParent falg if set to true then 
-     * search also for parent of the parent 
+     * @param aCheckParentsParent falg if set to true then
+     * search also for parent of the parent
      */
     void GetParentsIdsL( const RArray<TInt>& aEntryIdArray,
-            RArray<TInt>& aParentIdArray, 
+            RArray<TInt>& aParentIdArray,
             TBool aCheckParentsParent = ETrue );
 
     /**
@@ -171,7 +165,7 @@
             TCaOperationParams aParams );
 
     /**
-     * Add ifno launch to db.
+     * Change flag used for removable entries
      * @param aEntryId.
      * @param aRemovable.
      */
@@ -222,6 +216,23 @@
      */
     CCaSqLiteStorage();
 
+    void GetDownloadedApplicationsArrayL(
+            RArray<TInt>& aResultArray );
+
+    void GetDownloadedApplicationsArrayL(
+            RPointerArray<CCaInnerEntry>& aResultArray );
+
+    void SetDownloadedApplicationsArrayL(
+            RPointerArray<CCaInnerEntry>& aResultArray );
+
+    /**
+     * Restores a copy of database from backup to private.
+     */
+    void RestoreDatabaseL();
+
+
+    TInt GetCollectionDownloadIdL();
+
     TInt CreatePrivateDirPath( TFileName& aPrivatePath,
             const TDesC& aDrive, const TDesC& aDbName );
 
@@ -237,6 +248,9 @@
     void ExecuteOrganizeL( const RArray<TInt>& aEntryIds,
             TCaOperationParams aParams );
 
+    void ExecuteOrganizeL( const RPointerArray<CCaInnerEntry> & aResultArray,
+            TCaOperationParams aParams );
+
     void ExecuteTouchL( const TInt aEntryId, TBool aRemovable );
 
     void ExecuteDbPropertyL( const TDesC& aProperty, TDes& aPropertyValue );
@@ -248,8 +262,6 @@
             const TInt aGroupId,
             RPointerArray<CCaSqlQuery>& aSqlQuery );
 
-    void RemoveOldEntriesFromLaunchTableL( TInt aDays );
-
     void VerifyOrganizeParamsL( const RArray<TInt>& aEntryIds,
             TCaOperationParams aParams );
 
@@ -283,7 +295,7 @@
      * Private path on C-drive.
      */
     TFileName iPrivatePathCDrive;
-    
+
     /**
      * Private path on C-drive for backup db.
      */
@@ -294,6 +306,11 @@
      */
     RFs iRfs;
 
+    /**
+     * Id of downloaded collection.
+     */
+    TInt iCollectionDownloadId;
+
     };
 
 #endif //C_CASTORAGE_ENGINE_H