--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetlayoutmanager.h	Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetlayoutmanager.h	Wed Aug 18 09:48:26 2010 +0300
@@ -91,17 +91,13 @@
     DisplayRole currentDisplayRole(); 
     QList<LayoutItemRole> currentWidgetRoles(); 
     
-    QGraphicsLayout* layoutInfoDisplay();
-    QGraphicsLayout* layoutSettingsDialog();
+    QGraphicsWidget* layoutInfoDisplay();
+    QGraphicsWidget* layoutSettingsDialog();
     
     const QList<InfoWidgetLayoutManager::LayoutItemRole> widgetRoles(
             DisplayRole displayRole) const; 
 
-    bool loadWidgets(const DisplayRole displayRole, 
-            const QList<LayoutItemRole> &displayWidgets,
-            QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
-    bool reloadWidgets(const DisplayRole displayRole);
-    
+    bool loadWidgets(const DisplayRole displayRole);
     QGraphicsWidget* loadWidget(InfoWidgetDocumentLoader &loader, 
             DisplayRole displayRole, 
             LayoutItemRole widgetRole);
@@ -119,21 +115,24 @@
             bool deleteLater = false);
     void destroyWidgets();
     
-    int layoutRows() const; 
-    void setLayoutRows(int rows);
-    
     qreal layoutRowHeight();
     bool textFitsToRect(QString text, QFont font, QRectF rect) const;  
     
+protected: 
+    bool loadWidgets(const DisplayRole displayRole, 
+            const QList<LayoutItemRole> &displayWidgets,
+            QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
+
+    
 private:
     QMap<LayoutItemRole, QGraphicsWidget *> m_widgets;
     QMap<LayoutItemRole, QGraphicsWidget *> m_infoDisplayWidgets; 
     QMap<LayoutItemRole, QGraphicsWidget *> m_settingsDialogWidgets;
     QMap<LayoutItemRole, QObject *> m_objects;
 
-    InfoWidgetDocumentLoader *m_documentLoader;
+    QScopedPointer<InfoWidgetDocumentLoader> m_documentLoader;
+    
     DisplayRole m_displayRole; 
-    int m_layoutRows;
     qreal m_cachedLayoutRowHeight; 
     
 };