Merge Qt5 porting.

[modules/geom.git] / src / RepairGUI / RepairGUI_InspectObjectDlg.cxx

diff --git a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
index a66f9c18edb8ff46ca807b4aa2f72d589f16bc49..897348edc33d63b984973e78d32839210ef94d19 100644 (file)
--- a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
+++ b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
@@ -145,7 +145,7 @@ RepairGUI_InspectObjectDlg::TreeWidgetItem::TreeWidgetItem
   myShape( shape ),
   myTolerance (theTolerance)
 {
-  myIO = new SALOME_InteractiveObject( entry.toAscii(), "GEOM", "TEMP_IO" );
+  myIO = new SALOME_InteractiveObject( entry.toLatin1(), "GEOM", "TEMP_IO" );
   setFlags( flags() | Qt::ItemIsEditable );
 }
 
@@ -417,9 +417,15 @@ void RepairGUI_InspectObjectDlg::createTreeWidget(QTreeWidget *&theTreeObjects)
   headerItem->setIcon(1, myInvisible);
   theTreeObjects->setHeaderItem(headerItem);
   theTreeObjects->header()->moveSection(1, 0);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   theTreeObjects->header()->setClickable(true);
   theTreeObjects->header()->setMovable(false);
   theTreeObjects->header()->setResizeMode( 1, QHeaderView::ResizeToContents);
+#else
+  theTreeObjects->header()->setSectionsClickable(true);
+  theTreeObjects->header()->setSectionsMovable(false);
+  theTreeObjects->header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents);
+#endif
   theTreeObjects->setSelectionMode(QAbstractItemView::ExtendedSelection);
   theTreeObjects->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
   // set custom item delegate