...

diff --git a/cmake/QtTools.cmake b/cmake/QtTools.cmake
index 4f1e5744694ec947213353239bea2c5da46372f2..f4dd0cd8d20e1e7fef2bdbda5dd3f61e936f3170 100644 (file)
--- a/cmake/QtTools.cmake
+++ b/cmake/QtTools.cmake
@@ -20,9 +20,7 @@ IF(BUILD_QT4_COMPONENTS)
     QVTKWidget
     CACHE STRING "Base Qt4-based vtkRenderWindow"
     )
-  # ADD_DEFINITIONS(-DcpPlugins_QT4 -DcpExtensions_QT4)
-ELSE(BUILD_QT4_COMPONENTS)
-  # ADD_DEFINITIONS(-UcpPlugins_QT4 -UcpExtensions_QT4)
+  MARK_AS_ADVANCED(CLEAR cpPlugins_Qt4_VTKWidget)
 ENDIF(BUILD_QT4_COMPONENTS)
 
 ## eof - $RCSfile$

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index 2f2fdd2b623107d61b7b51a3c754a73a9ed766fe..2a2315e5cdb2ebce064f15bfdaad02f48a9cc84c 100644 (file)
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -5,7 +5,7 @@
 SET(ITK_DIR "@ITK_DIR@")
 SET(VTK_DIR "@VTK_DIR@")
 IF("@Qt4_FOUND@" STREQUAL "TRUE")
-  SET(USE_QT4 ON)
+  SET(BUILD_QT4_COMPONENTS ON)
   SET(QT_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@")
 ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 

diff --git a/lib/cpInstances/DataObjects/Skeleton.cxx b/lib/cpInstances/DataObjects/Skeleton.cxx
index fc4492bcc677cf2fe7f0b20ce329309ed9af15ed..1c3018634e84e6cea38f1e0fdc4cf0a522c29b61 100644 (file)
--- a/lib/cpInstances/DataObjects/Skeleton.cxx
+++ b/lib/cpInstances/DataObjects/Skeleton.cxx
@@ -1,7 +1,7 @@
 #include <cpInstances/DataObjects/Skeleton.h>
 
 // -------------------------------------------------------------------------
-void cpInstances::Skeleton::
+void cpInstances::DataObjects::Skeleton::
 SetITK( itk::LightObject* o )
 {
   this->Superclass::SetITK( o );
@@ -18,20 +18,20 @@ SetITK( itk::LightObject* o )
 }
 
 // -------------------------------------------------------------------------
-void cpInstances::Skeleton::
+void cpInstances::DataObjects::Skeleton::
 SetVTK( vtkObjectBase* o )
 {
 }
 
 // -------------------------------------------------------------------------
-cpInstances::Skeleton::
+cpInstances::DataObjects::Skeleton::
 Skeleton( )
   : Superclass( )
 {
 }
 
 // -------------------------------------------------------------------------
-cpInstances::Skeleton::
+cpInstances::DataObjects::Skeleton::
 ~Skeleton( )
 {
 }

diff --git a/lib/cpInstances/DataObjects/Skeleton.h b/lib/cpInstances/DataObjects/Skeleton.h
index 060a8e5832e78bc59b01f316e2f12fc88c455fc3..16592a685348aa9fcb731613de72e469e9b4519e 100644 (file)
--- a/lib/cpInstances/DataObjects/Skeleton.h
+++ b/lib/cpInstances/DataObjects/Skeleton.h
@@ -1,5 +1,5 @@
-#ifndef __cpInstances__Skeleton__h__
-#define __cpInstances__Skeleton__h__
+#ifndef __cpInstances__DataObjects__Skeleton__h__
+#define __cpInstances__DataObjects__Skeleton__h__
 
 #include <cpInstances/cpPluginsDataObjects_Export.h>
 #include <cpPlugins/Pipeline/DataObject.h>
@@ -8,36 +8,40 @@
 
 namespace cpInstances
 {
-  /**
-   */
-  class cpPluginsDataObjects_EXPORT Skeleton
-    : public cpPlugins::Pipeline::DataObject
+  namespace DataObjects
   {
-  public:
-    typedef Skeleton                      Self;
-    typedef cpPlugins::Pipeline::DataObject Superclass;
-    typedef itk::SmartPointer< Self >          Pointer;
-    typedef itk::SmartPointer< const Self >    ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( Skeleton, cpPlugins::Pipeline::DataObject );
-    cpPlugins_Id_Macro( Skeleton, Object );
-    cpPlugins_Compatibility_Macro;
-
-  public:
-    virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE;
-    virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE;
-
-  protected:
-    Skeleton( );
-    virtual ~Skeleton( );
-
-  private:
-    // Purposely not implemented
-    Skeleton( const Self& );
-    Self& operator=( const Self& );
-  };
+    /**
+     */
+    class cpPluginsDataObjects_EXPORT Skeleton
+      : public cpPlugins::Pipeline::DataObject
+    {
+    public:
+      typedef Skeleton                      Self;
+      typedef cpPlugins::Pipeline::DataObject Superclass;
+      typedef itk::SmartPointer< Self >          Pointer;
+      typedef itk::SmartPointer< const Self >    ConstPointer;
+
+    public:
+      itkNewMacro( Self );
+      itkTypeMacro( Skeleton, cpPlugins::Pipeline::DataObject );
+      cpPlugins_Id_Macro( Skeleton, Object );
+      cpPlugins_Compatibility_Macro;
+
+    public:
+      virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE;
+      virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE;
+
+    protected:
+      Skeleton( );
+      virtual ~Skeleton( );
+
+    private:
+      // Purposely not implemented
+      Skeleton( const Self& );
+      Self& operator=( const Self& );
+    };
+
+  } // ecapseman
 
 } // ecapseman
 

diff --git a/plugins/cpExtensions/SkeletonReader.cxx b/plugins/cpExtensions/SkeletonReader.cxx
index f62ff69dffcf0dde581cad1b59f4f490a961318a..20ac274ceb71b8ed09ff2186e57553adec527a53 100644 (file)
--- a/plugins/cpExtensions/SkeletonReader.cxx
+++ b/plugins/cpExtensions/SkeletonReader.cxx
@@ -32,7 +32,7 @@ cpPluginscpExtensions::SkeletonReader::
 SkeletonReader( )
   : Superclass( )
 {
-  this->_ConfigureOutput< cpInstances::Skeleton >( "Output" );
+  this->_ConfigureOutput< cpInstances::DataObjects::Skeleton >( "Output" );
   this->m_Parameters.ConfigureAsOpenFileName( "FileName", "" );
   this->m_Parameters.SetAcceptedFileExtensions(
     "FileName",

diff --git a/plugins/cpExtensions/SkeletonToImageFilter.cxx b/plugins/cpExtensions/SkeletonToImageFilter.cxx
index 30bdddcdbde304feeac791ec82b09ef93315d915..f3e83bf53dc32118e40f45ae92c8f984a8397ae5 100644 (file)
--- a/plugins/cpExtensions/SkeletonToImageFilter.cxx
+++ b/plugins/cpExtensions/SkeletonToImageFilter.cxx
@@ -10,7 +10,7 @@ cpPluginscpExtensions::SkeletonToImageFilter::
 SkeletonToImageFilter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpInstances::Skeleton >( "Skeleton", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Skeleton >( "Skeleton", true, false );
   this->_ConfigureInput< cpInstances::DataObjects::Image >( "TemplateImage", true, false );
   this->_ConfigureOutput< cpInstances::DataObjects::Image >( "Output" );
   this->m_Parameters.ConfigureAsUint( "InsideValue", 1 );

diff --git a/plugins/cpExtensions/SkeletonWriter.cxx b/plugins/cpExtensions/SkeletonWriter.cxx
index f23f6007ef4e44a8234b58e15f3509d627e98fcc..ab514040496deb5208d6b8f3b00114c53cc5eeb7 100644 (file)
--- a/plugins/cpExtensions/SkeletonWriter.cxx
+++ b/plugins/cpExtensions/SkeletonWriter.cxx
@@ -32,7 +32,7 @@ cpPluginscpExtensions::SkeletonWriter::
 SkeletonWriter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpInstances::Skeleton >( "Input", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Skeleton >( "Input", true, false );
   this->m_Parameters.ConfigureAsSaveFileName( "FileName", "" );
   this->m_Parameters.SetAcceptedFileExtensions(
     "FileName",