Merge branch 'V7_dev'

[samples/pylight.git] / src / PYLIGHTGUI / PYLIGHT_DataModel.py

diff --git a/src/PYLIGHTGUI/PYLIGHT_DataModel.py b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
index 857ec33f307a219b6858fd5c490c8ff456720a9b..c1b52797e5c8c6c56513ff1445767b0cd7859027 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHT_DataModel.py
+++ b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
@@ -21,7 +21,7 @@
 #  Date   : 13/04/2009
 #
 import SalomePyQt
-from PyQt4.QtCore import *
+from qtsalome import *
 
 # Get SALOME PyQt interface
 sgPyQt=SalomePyQt.SalomePyQt()
@@ -30,9 +30,7 @@ def processText(text):
     '''
     Remove "\n" sumbol from end of line
     '''
-    processed = text
-    if isinstance(text,QString):
-        processed = text.toLatin1().data()
+    processed = str(text)
     if processed[len(processed)-1:] == "\n":
         processed = processed[:len(processed)-1]