--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Fri Jun 11 13:58:22 2010 +0300
@@ -96,12 +96,9 @@
     void CleanupSessionCssItem(QString key);
     void clearCssCache();
     void MemoryGood();
-    void FreeGpuRam(int bytes);
+    void FreeGpuRam(int bytes, bool useSwRendering);
     void freeUnusedGpuResources();
     
-    void insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item);
-    QSizeF iconDefaultSizeCacheItem(const QString &key);
-
     void doCleanup();
     static bool gpuMemoryState();
 
@@ -142,23 +139,19 @@
 
 #endif
 
-private:
-    void createThemeIndex(const QString &themePath, const HbThemeType &themetype);
-
 public:
     RProperty iThemeProperty;
     QString iCurrentThemeName;
     QString iCurrentThemePath;
+    QStringList romThemeNames;
 
 private:
     void ConstructL();
     HbIconDataCache * cache;
     HbCache* cssCache;
-    QHash<QString, QSizeF> iconDefaultSizes;
 
     static bool gpuGoodMemoryState;
     HbRenderingMode renderMode;
-    QStringList romThemeNames;
     CHbThemeChangeNotificationListener * iListener;
     CHbThemeWatcher *iWatcher;
 };
@@ -178,8 +171,6 @@
     void ServiceL(const RMessage2 & aMessage);
     void DispatchMessageL(const RMessage2 & aMessage);
     void GetSharedIconInfoL(const RMessage2 & aMessage);
-    void GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage);
-    QSizeF RetrieveIconDefaultSize(const QString &filename);
     void HandleStyleSheetLookupL(const RMessage2 & aMessage);
     void HandleWidgetMLLookupL(const RMessage2& aMessage);
     void HandleDeviceProfilesReqL(const RMessage2& aMessage);