--- a/src/hbcore/image/hbiconloader_p.h	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/image/hbiconloader_p.h	Fri Sep 17 08:32:10 2010 +0300
@@ -153,6 +153,7 @@
     void removeFrameDrawerInfo(HbFrameDrawerPrivate *frameDrawer);
 
     void freeGpuIconData();
+    void freeIconData();
     void removeItemInCache(HbIconImpl *iconImpl);
 
     void handleForegroundLost();
@@ -164,6 +165,7 @@
 
 private slots:
     void themeChange(const QStringList &updatedFiles);
+    void themeChangeFinished();
     void destroy();
     void updateLayoutDirection();
     void localLoadReady(const HbIconLoadingParams &loadParams, void *reqParams);
@@ -184,23 +186,20 @@
     void getIconFromServerAsync(HbIconLoadingParams &params,
                                 HbAsyncIconLoaderCallback callback,
                                 void *callbackParam);
-    void getMultiIconImplFromServer(QStringList &multiPartIconList,
-                                    QVector<QSizeF>  &sizeList,
-                                    Qt::AspectRatioMode aspectRatioMode,
-                                    QIcon::Mode mode,
-                                    bool mirrored,
-                                    bool mirroredIconFound,
-                                    HbIconLoader::IconLoaderOptions options,
-                                    const QColor &color,
-                                    HbIconLoader::IconDataType type,
-                                    HbIconLoader::Purpose,
-                                    QVector<HbIconImpl *> & iconImplList,
-                                    HbRenderingMode renderMode);
-
+    
+    HbIconImpl * createLocalConsolidatedIcon(const HbMultiPartSizeData &multiPartIconData,
+                               const QStringList & iconPathList,
+                               const QSizeF &consolidatedSize,
+                               Qt::AspectRatioMode aspectRatioMode,
+                               QIcon::Mode mode,
+                               const IconLoaderOptions & options,
+                               const QColor &color);
+    
     void loadSvgIcon(HbIconLoadingParams &params);
     void loadPictureIcon(HbIconLoadingParams &params);
     void loadAnimatedIcon(HbIconLoadingParams &params, const QString &format);
     void loadPixmapIcon(HbIconLoadingParams &params, const QString &format);
+    void loadNvgIcon(HbIconLoadingParams &params);
 
     QList< HbFrameDrawerPrivate *> frameDrawerInstanceList;
     QList< HbIconEngine *> iconEngineList;