--- a/contentstorage/caclient/s60/inc/caobjectadapter.h Fri Apr 16 15:16:09 2010 +0300
+++ b/contentstorage/caclient/s60/inc/caobjectadapter.h Mon May 03 12:48:45 2010 +0300
@@ -22,6 +22,7 @@
// CLASS DECLARATION
#include <QList>
+#include <QSharedPointer>
#include <cadefs.h>
@@ -83,7 +84,7 @@
*/
static void convertL(
const RPointerArray<CCaInnerEntry>& fromEntriesArray,
- QList<CaEntry *>& toEntriesArray);
+ QList< QSharedPointer<CaEntry> > & toEntriesArray);
/**
* Converts QList of ids to RArray of TInts.
@@ -108,13 +109,6 @@
TInt internalErrorCode);
/**
- * Creates icon.
- * @param entry entry.
- * @return HbIcon.
- */
- static HbIcon makeIcon(const CaEntry &entry, const QSize &size);
-
- /**
* Converts notifier type to inner notifier type.
* @param from notifier type.
* @param to resulting inner notifier type.
@@ -149,19 +143,6 @@
int id);
private:
- /**
- * Creates icon. Leaving version.
- * @param entry entry.
- * @return HbIcon.
- */
- static HbIcon makeIconL(const CaEntry &entry, const QSize &size);
-
- /**
- * Make bitmap copy, used to get rid of compression for extended bitmap
- * @param input input bitmap.
- * @return copied bitmap.
- */
- static CFbsBitmap *copyBitmapLC(CFbsBitmap *input);
/**
* Maps a given sort subject and the order to be applied