Merge Qt5 porting.

[modules/yacs.git] / src / genericgui / CatalogWidget.cxx

diff --git a/src/genericgui/CatalogWidget.cxx b/src/genericgui/CatalogWidget.cxx
old mode 100755 (executable)
new mode 100644 (file)
index a206af2..793916e
--- a/src/genericgui/CatalogWidget.cxx
+++ b/src/genericgui/CatalogWidget.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -59,6 +59,7 @@ CatalogWidget::CatalogWidget(QWidget *parent,
   _dragModifier=false;
 
   setColumnCount(1);
+  setHeaderHidden( true );
 
   addCatalog(_builtinCatalog, "Built In");
   addCatalog(_sessionCatalog, "Current Session");
@@ -240,7 +241,7 @@ void CatalogWidget::startDrag(Qt::DropActions supportedActions)
           drag = new QDrag(this);
           mime = new ItemMimeData;
           drag->setMimeData(mime);
-          mime->setData(mimeType, mimeInfo.toAscii());
+          mime->setData(mimeType, mimeInfo.toLatin1());
           drag->setPixmap(pixmap);
 
           theMimeInfo = mimeInfo;