fix(Compiling): Missing headers

Added missing headers causing compile errors when PCHs were disabled. Removed unused members in ::visuVTKAdaptor::Reconstruction.
fw4spl-org · Mar 9, 2017 · 5acc183 · 5acc183
1 parent 48b1636
commit 5acc183
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/Bundles/LeafVisu/visuVTKAdaptor/include/visuVTKAdaptor/Reconstruction.hpp b/Bundles/LeafVisu/visuVTKAdaptor/include/visuVTKAdaptor/Reconstruction.hpp
@@ -10,11 +10,6 @@
 #include "visuVTKAdaptor/config.hpp"
 #include "visuVTKAdaptor/MeshFactory.hpp"
 
-#include <fwCom/Slot.hpp>
-#include <fwCom/Slot.hxx>
-#include <fwCom/Slots.hpp>
-#include <fwCom/Slots.hxx>
-
 #include <fwRenderVTK/IVtkAdaptorService.hpp>
 
 namespace fwData
@@ -65,17 +60,14 @@ class VISUVTKADAPTOR_CLASS_API Reconstruction : public ::fwRenderVTK::IVtkAdapto
      * @name Slots API
      * @{
      */
-    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_MESH_SLOT;
     /// slot used to update mesh
-    typedef ::fwCom::Slot<void (SPTR(::fwData::Mesh))> UpdateMeshSlotType;
+    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_MESH_SLOT;
 
-    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_VISIBILITY_SLOT;
     /// slot used to update visibility
-    typedef ::fwCom::Slot<void (bool)> UpdateVisibilitySlotType;
+    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_VISIBILITY_SLOT;
 
-    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_NORMAL_MODE_SLOT;
     /// slot used to update normal mode (0: none, 1: point, 2: cell)
-    typedef ::fwCom::Slot<void (std::uint8_t)> UpdateNormalModeSlotType;
+    VISUVTKADAPTOR_API static const ::fwCom::Slots::SlotKeyType s_UPDATE_NORMAL_MODE_SLOT;
 
     /// Slot: used to update normal display(0: none, 1: point, 2: cell)
     void updateNormalMode(std::uint8_t mode);
@@ -127,22 +119,6 @@ class VISUVTKADAPTOR_CLASS_API Reconstruction : public ::fwRenderVTK::IVtkAdapto
 private:
     bool m_autoResetCamera;
 
-    /**
-     * @name Slots attributes
-     * @{
-     */
-
-    /// Slot used to update mesh
-    UpdateMeshSlotType::sptr m_slotUpdateMesh;
-
-    /// Slot used to update visibility
-    UpdateVisibilitySlotType::sptr m_slotUpdateVisibility;
-
-    /// slot used to update normal mode (0: none, 1: point, 2: cell)
-    UpdateNormalModeSlotType::sptr m_slotUpdateNormalMode;
-    /**
-     * @}
-     */
 };
 
 } //namespace visuVTKAdaptor

diff --git a/Bundles/LeafVisu/visuVTKAdaptor/src/visuVTKAdaptor/Reconstruction.cpp b/Bundles/LeafVisu/visuVTKAdaptor/src/visuVTKAdaptor/Reconstruction.cpp
@@ -8,6 +8,11 @@
 
 #include "visuVTKAdaptor/Mesh.hpp"
 
+#include <fwCom/Slot.hpp>
+#include <fwCom/Slot.hxx>
+#include <fwCom/Slots.hpp>
+#include <fwCom/Slots.hxx>
+
 #include <fwData/Material.hpp>
 #include <fwData/Mesh.hpp>
 #include <fwData/Reconstruction.hpp>
@@ -45,9 +50,9 @@ Reconstruction::Reconstruction() throw() :
     m_sharpEdgeAngle(180.),
     m_autoResetCamera(true)
 {
-    m_slotUpdateMesh       = newSlot(s_UPDATE_MESH_SLOT, &Reconstruction::updateMesh, this);
-    m_slotUpdateVisibility = newSlot(s_UPDATE_VISIBILITY_SLOT, &Reconstruction::updateVisibility, this);
-    m_slotUpdateNormalMode = newSlot(s_UPDATE_NORMAL_MODE_SLOT, &Reconstruction::updateNormalMode, this);
+    newSlot(s_UPDATE_MESH_SLOT, &Reconstruction::updateMesh, this);
+    newSlot(s_UPDATE_VISIBILITY_SLOT, &Reconstruction::updateVisibility, this);
+    newSlot(s_UPDATE_NORMAL_MODE_SLOT, &Reconstruction::updateNormalMode, this);
 }
 
 //------------------------------------------------------------------------------

diff --git a/SrcLib/core/fwMemory/include/fwMemory/stream/in/Buffer.hpp b/SrcLib/core/fwMemory/include/fwMemory/stream/in/Buffer.hpp
@@ -12,6 +12,8 @@
 
 #include <fwCore/macros.hpp>
 
+#include <functional>
+
 namespace fwMemory
 {
 namespace stream