--- a/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Oct 06 18:32:31 2026 +0200
+++ b/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Oct 06 18:34:56 2026 +0200
@@ -374,7 +374,6 @@
   ${ORTHANC_STONE_ROOT}/Toolbox/Windowing.cpp
   
   ${ORTHANC_STONE_ROOT}/Viewport/DefaultViewportInteractor.cpp
-  ${ORTHANC_STONE_ROOT}/Viewport/ViewportLocker.cpp
   
   ${ORTHANC_STONE_ROOT}/Volumes/IVolumeSlicer.cpp
   ${ORTHANC_STONE_ROOT}/Volumes/OrientedVolumeBoundingBox.cpp

--- a/OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp	Tue Oct 06 18:32:31 2026 +0200
+++ b/OrthancStone/Sources/Scene2D/PinchZoomTracker.cpp	Tue Oct 06 18:34:56 2026 +0200
@@ -24,7 +24,7 @@
 #include "PinchZoomTracker.h"
 
 #include "../Scene2DViewport/ViewportController.h"
-#include "../Viewport/ViewportLocker.h"
+
 
 namespace OrthancStone
 {

--- a/OrthancStone/Sources/Viewport/ViewportLocker.cpp	Tue Oct 06 18:32:31 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-
-#include "ViewportLocker.h"
-
-#include <OrthancException.h>
-
-namespace OrthancStone
-{
-  IViewport::ILock& ViewportLocker::GetLock() const
-  {
-    if (lock2_.get() == NULL)
-    {
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-    }
-    else
-    {
-      return *lock2_;
-    }
-  }
-  
-
-  ViewportLocker::ViewportLocker(boost::weak_ptr<IViewport> viewport) :
-    lock1_(viewport.lock())
-  {
-    if (lock1_)
-    {
-      lock2_.reset(lock1_->Lock());
-    }
-  }
-}

--- a/OrthancStone/Sources/Viewport/ViewportLocker.h	Tue Oct 06 18:32:31 2026 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2023 Osimis S.A., Belgium
- * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- **/
-
-
-#pragma once
-
-#include "IViewport.h"
-
-namespace OrthancStone
-{
-  // TODO Refactoring - Remove this class
-  class ViewportLocker : public boost::noncopyable
-  {
-  private:
-    boost::shared_ptr<IViewport>       lock1_;
-    std::unique_ptr<IViewport::ILock>  lock2_;
-
-    IViewport::ILock& GetLock() const;
-
-  public:
-    explicit ViewportLocker(IViewport& viewport) :
-      lock2_(viewport.Lock())
-    {
-    }
-
-    explicit ViewportLocker(boost::weak_ptr<IViewport> viewport);
-
-    bool IsValid() const
-    {
-      return (lock2_.get() != NULL);
-    }
-
-    ViewportController& GetController() const
-    {
-      return GetLock().GetController();
-    }
-
-    void Invalidate() const
-    {
-      return GetLock().Invalidate();
-    }
-  };
-}