diff -r bc5a64e5bc3c -r 5bcb308bd24d phoneplugins/infowidgetplugin/infowidget/inc/infowidgetlayoutmanager.h --- 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 currentWidgetRoles(); - QGraphicsLayout* layoutInfoDisplay(); - QGraphicsLayout* layoutSettingsDialog(); + QGraphicsWidget* layoutInfoDisplay(); + QGraphicsWidget* layoutSettingsDialog(); const QList widgetRoles( DisplayRole displayRole) const; - bool loadWidgets(const DisplayRole displayRole, - const QList &displayWidgets, - QMap &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 &displayWidgets, + QMap &widgetMap); + + private: QMap m_widgets; QMap m_infoDisplayWidgets; QMap m_settingsDialogWidgets; QMap m_objects; - InfoWidgetDocumentLoader *m_documentLoader; + QScopedPointer m_documentLoader; + DisplayRole m_displayRole; - int m_layoutRows; qreal m_cachedLayoutRowHeight; };