Merge relevant changes from V8_0_0_BR branch

[modules/jobmanager.git] / src / genericgui / BL_QModelManager.cxx

diff --git a/src/genericgui/BL_QModelManager.cxx b/src/genericgui/BL_QModelManager.cxx
index 77bd60eb47ae9371ab060ac275a710382a98955c..c7b3884933134253dcc19ecbf1ba7135f8f5859f 100644 (file)
--- a/src/genericgui/BL_QModelManager.cxx
+++ b/src/genericgui/BL_QModelManager.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2009-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
@@ -20,6 +20,8 @@
 #include "BL_QModelManager.hxx"
 #include "BL_JobsManager_QT.hxx"
 
+#include <QStandardItemModel>
+
 #ifdef WNT
 #undef ERROR
 #endif
@@ -54,7 +56,7 @@ void
 BL::QModelManager::new_job_added(const QString & name)
 {
   DEBTRACE("Adding new job in the model manager");
-  BL::Job * job = _jobs_manager->getJob(name.toStdString());
+  BL::Job * job = _jobs_manager->getJob(name.toUtf8().constData());
   QStandardItem * new_job_name = new QStandardItem(name);
   
   QStandardItem * new_job_type;
@@ -101,7 +103,7 @@ BL::QModelManager::job_state_changed(const QString & name)
 {
   DEBTRACE("BL::QModelManager::job_state_changed received");
 
-  BL::Job * job = _jobs_manager->getJob(name.toStdString());
+  BL::Job * job = _jobs_manager->getJob(name.toUtf8().constData());
   QList<QStandardItem *> item_list = _model->findItems(name);
   QStandardItem * job_state_item = _model->item(item_list.at(0)->row(), 2);
 
@@ -130,7 +132,7 @@ BL::QModelManager::delete_job(const QString & name)
   if (list.size() != 1)
   {
     DEBMSG("LIST SIZE IS :" << list.size());
-    DEBMSG("FOR NAME :" << name.toStdString());
+    DEBMSG("FOR NAME :" << name.toUtf8().constData());
   }
   if (list.size() > 0)
     _model->removeRow(list[0]->row());