...

[cpPlugins.git] / plugins / VTKWidgets / SeedWidget.cxx

diff --git a/plugins/VTKWidgets/SeedWidget.cxx b/plugins/VTKWidgets/SeedWidget.cxx
index 31578af384b6955b84161d116c5db4591b7df0f4..d0db73eaa6f8b14837cb91494fe4a22271cf6ca6 100644 (file)
--- a/plugins/VTKWidgets/SeedWidget.cxx
+++ b/plugins/VTKWidgets/SeedWidget.cxx
@@ -1,7 +1,8 @@
 #include <VTKWidgets/SeedWidget.h>
 
-#include <cpInstances/Image.h>
-#include <cpInstances/Mesh.h>
+#include <cpPlugins/OS/String.h>
+#include <cpInstances/DataObjects/Image.h>
+#include <cpInstances/DataObjects/Mesh.h>
 
 #include <cpExtensions/Interaction/SeedWidget.h>
 #include <cpExtensions/Interaction/ImageSlicePointPlacer.h>
@@ -55,8 +56,8 @@ cpPluginsVTKWidgets::SeedWidget::
 SeedWidget( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpInstances::Mesh       _TMesh;
+  typedef cpPlugins::Pipeline::DataObject _TData;
+  typedef cpInstances::DataObjects::Mesh       _TMesh;
 
   // Create ports
   this->_ConfigureInput< _TData >( "Input", false, false );
@@ -163,14 +164,14 @@ _GD0_Image( vtkImageData* image )
     // Associate input text
     std::string text = this->m_Parameters.GetString( "Text" );
     std::vector< std::string > tok1, tok2;
-    cpExtensions::Tokenize( tok1, text, "#" );
+    tok1 = cpPlugins::OS::String::Tokenize( text, "#" );
     if( tok1.size( ) > seeds->GetPoints( )->GetNumberOfPoints( ) )
     {
       for( auto t1 = tok1.begin( ); t1 != tok1.end( ); ++t1 )
       {
         if( *t1 != "" )
         {
-          cpExtensions::Tokenize( tok2, *t1, " " );
+          tok2 = cpPlugins::OS::String::Tokenize( *t1, " " );
           double x[ 3 ];
           for( unsigned int d = 0; d < 3; ++d )
           {