Upgrade to paraview 5.4

[modules/gui.git] / src / VTKViewer / VTKViewer_FramedTextActor.cxx

diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.cxx b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
index 9dfe19d9b808c7f45323cd37eb4eb1fae7ec463b..efd2ae0c14acc423c25bc751e63673083e662116 100644 (file)
--- a/src/VTKViewer/VTKViewer_FramedTextActor.cxx
+++ b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -52,7 +52,7 @@ namespace
     return QString( txt );
 #endif
   }
-  const char* toUtf8( const QString& txt )
+  std::string toUtf8( const QString& txt )
   {
 #ifdef PAL22528_UNICODE
     return txt.toUtf8().constData();
@@ -300,7 +300,7 @@ void VTKViewer_FramedTextActor::SetText(const char* theText)
   while(anIter.hasNext())
     aTrimmedStringList.append(anIter.next().trimmed());
 
-  myTextActor->SetInput(toUtf8(aTrimmedStringList.join("\n")));
+  myTextActor->SetInput(toUtf8(aTrimmedStringList.join("\n")).c_str());
   Modified();
 }