--- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Fri Sep 17 08:32:10 2010 +0300
@@ -36,6 +36,7 @@
 //       match the cases of the corresponding directories in Symbian 4.
 #include <VG/openvg.h>
 #include <vg/vgcontext_symbian.h>
+#include "hbnvgrasterizer_p.h"
 #endif //HB_NVG_CS_ICON
 
 QT_BEGIN_NAMESPACE
@@ -46,14 +47,6 @@
 
 class HbThemeServerSymbian;
 
-#if defined (HB_NVG_CS_ICON)
-struct HbNvgAspectRatioSettings
-{
-    TNvgAlignStatusType nvgAlignStatusAndAspectRatio;
-    TNvgMeetOrSliceType type;
-};
-#endif //HB_NVG_CS_ICON
-
 class HbPixmapIconProcessor : public HbIconProcessor
 {
 public :
@@ -72,18 +65,15 @@
                                   HbMultiIconParams &multiPieceIconParams);
 
 private :
+#if defined (HB_NVG_CS_ICON)
+    bool renderNvgToPixmap(const QString& iconPath);
+#endif
     bool renderSvgToPixmap(const QString& iconPath);
     bool renderPicToPixmap(const QString& iconPath);
     bool renderOtherFormatsToPixmap(const QString& iconPath);
 
-#if defined (HB_NVG_CS_ICON)
-    VGIColorBufferFormat mapToVgiDisplayFormat(QImage::Format imageFormat) const;
-    bool renderNvgToPixmap(const QString& iconPath);
-    bool pixmapFromByteArray(const QByteArray &byteArray, const QSize iconSize, Qt::AspectRatioMode aspectRatioMode);
-    HbNvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio(
-                                                    Qt::AspectRatioMode aspectRatio) const;
-#endif //HB_NVG_CS_ICON
 private:
+    mutable HbSharedIconInfo data;
     QPixmap pixmap;
 };