Changeset 92207 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2021 8:19:14 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148038

Message:

FE/Qt: Deallocating QItemEditorFactory instance to fix some small leakage.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPortForwardingTable.cpp (modified) (5 diffs)
• UIPortForwardingTable.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp

@@ -792 +792 @@
     , m_pTableView(0)
     , m_pToolBar(0)
+    , m_pNewItemEditorFactory(0)
     , m_pTableModel(0)
     , m_pActionAdd(0)
@@ -799 +800 @@
     /* Prepare: */
     prepare();
+}
+
+UIPortForwardingTable::~UIPortForwardingTable()
+{
+    delete m_pNewItemEditorFactory;
 }
 
@@ -1118 +1124 @@
         {
             /* Create new item editor factory: */
-            QItemEditorFactory *pNewItemEditorFactory = new QItemEditorFactory;
-            if (pNewItemEditorFactory)
+            m_pNewItemEditorFactory = new QItemEditorFactory;
+            if (m_pNewItemEditorFactory)
             {
                 /* Register NameEditor as the NameData editor: */
                 int iNameId = qRegisterMetaType<NameData>();
                 QStandardItemEditorCreator<NameEditor> *pNameEditorItemCreator = new QStandardItemEditorCreator<NameEditor>();
-                pNewItemEditorFactory->registerEditor((QVariant::Type)iNameId, pNameEditorItemCreator);
+                m_pNewItemEditorFactory->registerEditor((QVariant::Type)iNameId, pNameEditorItemCreator);
 
                 /* Register ProtocolEditor as the KNATProtocol editor: */
                 int iProtocolId = qRegisterMetaType<KNATProtocol>();
                 QStandardItemEditorCreator<ProtocolEditor> *pProtocolEditorItemCreator = new QStandardItemEditorCreator<ProtocolEditor>();
-                pNewItemEditorFactory->registerEditor((QVariant::Type)iProtocolId, pProtocolEditorItemCreator);
+                m_pNewItemEditorFactory->registerEditor((QVariant::Type)iProtocolId, pProtocolEditorItemCreator);
 
                 /* Register IPv4Editor/IPv6Editor as the IpData editor: */
@@ -1136 +1142 @@
                 {
                     QStandardItemEditorCreator<IPv4Editor> *pIPv4EditorItemCreator = new QStandardItemEditorCreator<IPv4Editor>();
-                    pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv4EditorItemCreator);
+                    m_pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv4EditorItemCreator);
                 }
                 else
                 {
                     QStandardItemEditorCreator<IPv6Editor> *pIPv6EditorItemCreator = new QStandardItemEditorCreator<IPv6Editor>();
-                    pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv6EditorItemCreator);
+                    m_pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv6EditorItemCreator);
                 }
 
@@ -1147 +1153 @@
                 int iPortId = qRegisterMetaType<PortData>();
                 QStandardItemEditorCreator<PortEditor> *pPortEditorItemCreator = new QStandardItemEditorCreator<PortEditor>();
-                pNewItemEditorFactory->registerEditor((QVariant::Type)iPortId, pPortEditorItemCreator);
+                m_pNewItemEditorFactory->registerEditor((QVariant::Type)iPortId, pPortEditorItemCreator);
 
                 /* Set newly created item editor factory for table delegate: */
-                pStyledItemDelegate->setItemEditorFactory(pNewItemEditorFactory);
+                pStyledItemDelegate->setItemEditorFactory(m_pNewItemEditorFactory);
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.h

@@ -36 +36 @@
 class QAction;
 class QHBoxLayout;
+class QItemEditorFactory;
 class QIDialogButtonBox;
 class QITableView;
 class UIPortForwardingModel;
 class QIToolBar;
-
 
 /** QString subclass used to distinguish name data from simple QString. */
@@ -211 +211 @@
       * @param  fAllowEmptyGuestIPs  Brings whether this table allows empty guest IPs. */
     UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6, bool fAllowEmptyGuestIPs);
-
+    ~UIPortForwardingTable();
     /** Returns the list of port forwarding rules. */
     UIPortForwardingDataList rules() const;
@@ -293 +293 @@
     /** Holds the tool-bar instance. */
     QIToolBar   *m_pToolBar;
+    /** Holds the item editor factory instance. */
+    QItemEditorFactory *m_pNewItemEditorFactory;
 
     /** Holds the table-model instance. */