diff -r e6ad4ef83b23 -r b7da29130b0e src/hbcore/gui/hbcssinspector_p.h
--- a/src/hbcore/gui/hbcssinspector_p.h	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.h	Fri Sep 17 08:32:10 2010 +0300
@@ -41,6 +41,7 @@
 QT_FORWARD_DECLARE_CLASS(QTextEdit)
 QT_FORWARD_DECLARE_CLASS(HbAnchorArrowDrawer)
 QT_FORWARD_DECLARE_CLASS(HbMainWindow)
+QT_FORWARD_DECLARE_CLASS(HbPopupManager)
 
 
 class HbCssInfoDrawer : public HbWidgetBase
@@ -54,15 +55,15 @@
 public slots:
     void updateFocusItem(const QGraphicsItem* item);
 
-    void setBoxVisible(bool visible) { mShowBox = visible; };
-    void setItemTextVisible(bool visible) { mShowItemText = visible; };
-    void setGuideLinesVisible(bool visible) { mDrawGuideLines = visible; };
+    void setBoxVisible(bool visible) { mShowBox = visible; }
+    void setItemTextVisible(bool visible) { mShowItemText = visible; }
+    void setGuideLinesVisible(bool visible) { mDrawGuideLines = visible; }
 
-    void setHintTextVisible(bool visible) { mShowHintText = visible; };
-    void setMinHintBoxVisible(bool visible) { mShowMinHintBox = visible; };
-    void setPrefHintBoxVisible(bool visible) { mShowPrefHintBox = visible; };
-    void setMaxHintBoxVisible(bool visible) { mShowMaxHintBox = visible; };
-    void setSizePrefsVisible(bool visible) { mShowSizePrefs = visible; };
+    void setHintTextVisible(bool visible) { mShowHintText = visible; }
+    void setMinHintBoxVisible(bool visible) { mShowMinHintBox = visible; }
+    void setPrefHintBoxVisible(bool visible) { mShowPrefHintBox = visible; }
+    void setMaxHintBoxVisible(bool visible) { mShowMaxHintBox = visible; }
+    void setSizePrefsVisible(bool visible) { mShowSizePrefs = visible; }
 
 protected:
     void changeEvent(QEvent *event);
@@ -105,8 +106,8 @@
     void newItemHovered(const QGraphicsItem* item);
 
 public slots:
-    void setHoverMode(bool enabled) { mHoverMode = enabled; };
-    void setBlockingMode(bool enabled) { mBlockingMode = enabled; };
+    void setHoverMode(bool enabled) { mHoverMode = enabled; }
+    void setBlockingMode(bool enabled) { mBlockingMode = enabled; }
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
@@ -140,18 +141,36 @@
 };
 
 
+class ModelItemWrapper {
+public:
+    ModelItemWrapper(QGraphicsItem *item);
+    ModelItemWrapper(HbMainWindow *window);
+    ModelItemWrapper(HbPopupManager *mPopupMgr);
+    ModelItemWrapper();
+
+    QGraphicsItem *graphicsItem() const;
+    HbMainWindow *window() const;
+    HbPopupManager *popupManager() const;
+
+private:
+    QGraphicsItem *mGraphicsItem;
+    HbMainWindow *mWindow;
+    HbPopupManager *mPopupMgr;
+};
+
+
 class CssInspectorModelItem
 {
 public:
-    CssInspectorModelItem(QGraphicsItem *item, int row,
+    CssInspectorModelItem(ModelItemWrapper *item, int row,
         CssInspectorModelItem *parent=0);
     ~CssInspectorModelItem();
     CssInspectorModelItem *child(int i);
     CssInspectorModelItem *parent();
-    QGraphicsItem *data();
+    ModelItemWrapper *data();
     int row();
 private:
-    QGraphicsItem *mItem;
+    ModelItemWrapper *mItem;
     QHash<int, CssInspectorModelItem*> mChildren;
     CssInspectorModelItem *mParent;
     int mRow;
@@ -162,7 +181,7 @@
 {
     Q_OBJECT
 public:
-    CssInspectorModel(HbMainWindow *win=0, QObject *parent=0);
+    CssInspectorModel(QObject *parent=0);
     ~CssInspectorModel();
 
     QVariant data(const QModelIndex &index, int role) const;
@@ -175,7 +194,6 @@
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
 private:
-    HbMainWindow *mWin;
     CssInspectorModelItem *mRootItem;
 };
 
@@ -197,6 +215,7 @@
 
 public:
     static HbCssInspectorWindow *instance();
+    static bool exists();
     virtual ~HbCssInspectorWindow();
 
 public slots: