Changeset 58856 in vbox for trunk/src/VBox

Timestamp:

Nov 25, 2015 1:46:02 PM (9 years ago)

Author:

vboxsync

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

104337

Message:

FE/Qt: Qt5 migration (part 9): QHeaderView API changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (1 diff)
• runtime/UIAddDiskEncryptionPasswordDialog.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsNetwork.cpp (modified) (1 diff)
• widgets/UIApplianceEditorWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp ¶

@@ -1231 +1231 @@
         pTreeWidget->sortItems(0, Qt::AscendingOrder);
         if (iColumns > 0)
+#if QT_VERSION >= 0x050000
+            pTreeWidget->header()->setSectionResizeMode(0, QHeaderView::Fixed);
+#else /* QT_VERSION < 0x050000 */
             pTreeWidget->header()->setResizeMode(0, QHeaderView::Fixed);
+#endif /* QT_VERSION < 0x050000 */
         if (iColumns > 1)
+#if QT_VERSION >= 0x050000
+            pTreeWidget->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+#else /* QT_VERSION < 0x050000 */
             pTreeWidget->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+#endif /* QT_VERSION < 0x050000 */
         if (iColumns > 2)
+#if QT_VERSION >= 0x050000
+            pTreeWidget->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+#else /* QT_VERSION < 0x050000 */
             pTreeWidget->header()->setResizeMode(2, QHeaderView::ResizeToContents);
+#endif /* QT_VERSION < 0x050000 */
         pTreeWidget->header()->setStretchLastSection(false);
         pTreeWidget->setSortingEnabled(true);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp ¶

@@ -424 +424 @@
     verticalHeader()->setDefaultSectionSize((int)(verticalHeader()->minimumSectionSize() * 1.33));
     horizontalHeader()->setStretchLastSection(false);
+#if QT_VERSION >= 0x050000
+    horizontalHeader()->setSectionResizeMode(UIEncryptionDataTableSection_Id, QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(UIEncryptionDataTableSection_Password, QHeaderView::Stretch);
+#else /* QT_VERSION < 0x050000 */
     horizontalHeader()->setResizeMode(UIEncryptionDataTableSection_Id, QHeaderView::Interactive);
     horizontalHeader()->setResizeMode(UIEncryptionDataTableSection_Password, QHeaderView::Stretch);
+#endif /* QT_VERSION < 0x050000 */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp ¶

@@ -97 +97 @@
     //m_pPackagesTree->header()->hide();
     m_pPackagesTree->header()->setStretchLastSection(false);
+#if QT_VERSION >= 0x050000
+    m_pPackagesTree->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    m_pPackagesTree->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    m_pPackagesTree->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+#else /* QT_VERSION < 0x050000 */
     m_pPackagesTree->header()->setResizeMode(0, QHeaderView::ResizeToContents);
     m_pPackagesTree->header()->setResizeMode(1, QHeaderView::Stretch);
     m_pPackagesTree->header()->setResizeMode(2, QHeaderView::ResizeToContents);
+#endif /* QT_VERSION < 0x050000 */
     m_pPackagesTree->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(m_pPackagesTree, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp ¶

@@ -571 +571 @@
     verticalHeader()->setDefaultSectionSize((int)(verticalHeader()->minimumSectionSize() * 1.33));
     horizontalHeader()->setStretchLastSection(false);
+#if QT_VERSION >= 0x050000
+    horizontalHeader()->setSectionResizeMode(UIHotKeyTableSection_Name, QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(UIHotKeyTableSection_Value, QHeaderView::Stretch);
+#else /* QT_VERSION < 0x050000 */
     horizontalHeader()->setResizeMode(UIHotKeyTableSection_Name, QHeaderView::Interactive);
     horizontalHeader()->setResizeMode(UIHotKeyTableSection_Value, QHeaderView::Stretch);
+#endif /* QT_VERSION < 0x050000 */
 
     /* Reinstall delegate: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp ¶

@@ -389 +389 @@
         m_pTreeNetworkNAT->setColumnCount(2);
         m_pTreeNetworkNAT->header()->setStretchLastSection(false);
+#if QT_VERSION >= 0x050000
+        m_pTreeNetworkNAT->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+        m_pTreeNetworkNAT->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+#else /* QT_VERSION < 0x050000 */
         m_pTreeNetworkNAT->header()->setResizeMode(0, QHeaderView::ResizeToContents);
         m_pTreeNetworkNAT->header()->setResizeMode(1, QHeaderView::Stretch);
+#endif /* QT_VERSION < 0x050000 */
         m_pTreeNetworkNAT->setContextMenuPolicy(Qt::CustomContextMenu);
         connect(m_pTreeNetworkNAT, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp ¶

@@ -1127 +1127 @@
     m_pTvSettings->setAllColumnsShowFocus(true);
     m_pTvSettings->header()->setStretchLastSection(true);
+#if QT_VERSION >= 0x050000
+    m_pTvSettings->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else /* QT_VERSION < 0x050000 */
     m_pTvSettings->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif /* QT_VERSION < 0x050000 */
 
     /* Hidden by default */