Some syntax simplifations

[cpPlugins.git] / lib / cpPlugins / Plugins / MeshReader.cxx

diff --git a/lib/cpPlugins/Plugins/MeshReader.cxx b/lib/cpPlugins/Plugins/MeshReader.cxx
index 17d668c5594fe6b9eae73f7012675315196a760c..b219899fa930cb525f21dd8a2486bf78e3ecee56 100644 (file)
--- a/lib/cpPlugins/Plugins/MeshReader.cxx
+++ b/lib/cpPlugins/Plugins/MeshReader.cxx
@@ -1,8 +1,15 @@
 #include <cpPlugins/Plugins/MeshReader.h>
 #include <cpPlugins/Interface/Mesh.h>
 
-#include <cpPlugins/Extensions/QuadEdgeMesh.h>
-#include <cpPlugins/Extensions/MeshReader.h>
+#include <cpPlugins/Extensions/DataStructures/QuadEdgeMesh.h>
+#include <cpPlugins/Extensions/IO/MeshReader.h>
+
+// -------------------------------------------------------------------------
+std::string cpPlugins::Plugins::MeshReader::
+GetClassName( ) const
+{
+  return( "cpPlugins::Plugins::MeshReader" );
+}
 
 // -------------------------------------------------------------------------
 cpPlugins::Plugins::MeshReader::
@@ -24,13 +31,6 @@ cpPlugins::Plugins::MeshReader::
 {
 }
 
-// -------------------------------------------------------------------------
-std::string cpPlugins::Plugins::MeshReader::
-GetClassName( ) const
-{
-  return( "cpPlugins::Plugins::MeshReader" );
-}
-
 // -------------------------------------------------------------------------
 std::string cpPlugins::Plugins::MeshReader::
 _GenerateData( )
@@ -80,15 +80,17 @@ _GD1( )
   if( fIt == this->m_Parameters.end( ) )
     fIt = this->m_DefaultParameters.find( "FileName" );
 
-  typedef cpPlugins::Extensions::QuadEdgeMesh< P, D > _TMesh;
-  typedef cpPlugins::Extensions::MeshReader< _TMesh > _TReader;
+  using namespace cpPlugins::Extensions;
+  typedef DataStructures::QuadEdgeMesh< P, D > _TMesh;
+  typedef IO::MeshReader< _TMesh > _TReader;
 
   _TReader* reader =
-    dynamic_cast< _TReader* >( this->m_Reader.GetPointer( ) );
+    dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
   if( reader == NULL )
   {
-    this->m_Reader = _TReader::New( );
-    reader = dynamic_cast< _TReader* >( this->m_Reader.GetPointer( ) );
+    this->m_RealProcessObject = _TReader::New( );
+    reader =
+      dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
   reader->SetFileName( fIt->second.second );