Changeset 97755 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 6, 2022 10:31:12 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9898: Migrating UIFileManagerTable stuff to Qt6.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -301 +301 @@
     if (m_pHistoryComboBox)
     {
-#ifdef VBOX_IS_QT6_OR_LATER
-        disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
-                   this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+        m_pHistoryComboBox->blockSignals(true);
         m_pHistoryComboBox->clear();
-        connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
-                this, &UIFileManagerNavigationWidget::sltHandlePathChange);
-#else
-        disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                   this, &UIFileManagerNavigationWidget::sltHandlePathChange);
-        m_pHistoryComboBox->clear();
-        connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                this, &UIFileManagerNavigationWidget::sltHandlePathChange);
-#endif
+        m_pHistoryComboBox->blockSignals(false);
     }
 
@@ -348 +338 @@
             connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::sigHidePopup,
                     this, &UIFileManagerNavigationWidget::sltHandleHidePopup);
-#ifdef VBOX_IS_QT6_OR_LATER
-            connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
+            connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::currentTextChanged,
                     this, &UIFileManagerNavigationWidget::sltHandlePathChange);
-#else
-            connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                    this, &UIFileManagerNavigationWidget::sltHandlePathChange);
-#endif
 
             m_pContainer->addWidget(m_pBreadCrumbs);