Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 64162)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 64163)
@@ -539,5 +539,4 @@
 	src/extensions/QISplitter.cpp \
 	src/extensions/QIAdvancedToolBar.cpp \
-	src/extensions/QITableView.cpp \
 	src/extradata/UIExtraDataManager.cpp \
 	src/globals/UIActionPool.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.h	(revision 64162)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.h	(revision 64163)
@@ -29,4 +29,7 @@
 
 signals:
+
+    /** Notifies listeners about @a pEditor created for particular model @a index. */
+    void sigEditorCreated(QWidget *pEditor, const QModelIndex &index) const;
 
     /** Notifies listeners about editor's Enter key triggering. */
@@ -64,4 +67,7 @@
             connect(pEditor, SIGNAL(sigEnterKeyTriggered()), this, SIGNAL(sigEditorEnterKeyTriggered()));
 
+        /* Notify listeners about editor created: */
+        emit sigEditorCreated(pEditor, index);
+
         /* Return actual editor: */
         return pEditor;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp	(revision 64162)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp	(revision 64163)
@@ -20,9 +20,7 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Qt includes: */
-# include <QStyledItemDelegate>
-
 /* GUI includes: */
 # include "QITableView.h"
+# include "QIStyledItemDelegate.h"
 
 /* Other VBox includes: */
@@ -31,52 +29,4 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
-/** QStyledItemDelegate extension used with QITableView. */
-class QITableViewStyledItemDelegate : public QStyledItemDelegate
-{
-    Q_OBJECT;
-
-signals:
-
-    /** Notifies listeners about @a pEditor created for particular model @a index. */
-    void sigEditorCreated(QWidget *pEditor, const QModelIndex &index) const;
-
-public:
-
-    /** Constructs table-view styled-item-delegate on the basis of passed @a pParent. */
-    QITableViewStyledItemDelegate(QObject *pParent);
-
-private:
-
-    /** Returns the widget used to edit the item specified by @a index for editing.
-      * The @a pParent widget and style @a option are used to control how the editor widget appears.
-      * Besides that, we are notifying listener about editor was created for particular model @a index. */
-    virtual QWidget* createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-};
-
-
-/*********************************************************************************************************************************
-*   Class QITableViewStyledItemDelegate implementation.                                                                          *
-*********************************************************************************************************************************/
-
-QITableViewStyledItemDelegate::QITableViewStyledItemDelegate(QObject *pParent)
-    : QStyledItemDelegate(pParent)
-{
-}
-
-QWidget* QITableViewStyledItemDelegate::createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-    /* Call to base-class: */
-    QWidget *pEditor = QStyledItemDelegate::createEditor(pParent, option, index);
-    /* Notify listeners about editor created: */
-    emit sigEditorCreated(pEditor, index);
-    /* Return editor: */
-    return pEditor;
-}
-
-
-/*********************************************************************************************************************************
-*   Class QITableView implementation.                                                                                            *
-*********************************************************************************************************************************/
 
 QITableView::QITableView(QWidget *pParent)
@@ -109,5 +59,5 @@
     delete itemDelegate();
     /* Create new delegate: */
-    QITableViewStyledItemDelegate *pStyledItemDelegate = new QITableViewStyledItemDelegate(this);
+    QIStyledItemDelegate *pStyledItemDelegate = new QIStyledItemDelegate(this);
     AssertPtrReturnVoid(pStyledItemDelegate);
     {
@@ -143,4 +93,2 @@
 }
 
-#include "QITableView.moc"
-