From d88b292704957818eff9a348a524b5c90b40031b Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 16 Oct 2010 03:20:00 -0500
Subject: merge vosremoval-mutex.diff

In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
---
 canvas/inc/canvas/vclwrapper.hxx       | 2 +-
 canvas/source/vcl/bitmapbackbuffer.cxx | 2 +-
 canvas/source/vcl/impltools.hxx        | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'canvas')

diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index cbd880709b3d..cf42e15e2ef3 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.hxx
@@ -30,7 +30,7 @@
 #define INCLUDED_CANVAS_VCLWRAPPER_HXX
 
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index faeeaa793475..6865a70f1e31 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -32,7 +32,7 @@
 #include "bitmapbackbuffer.hxx"
 
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 082de4eeff74..963162b22587 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -30,10 +30,11 @@
 #define _VCLCANVAS_TOOLS_HXX
 
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/solarmutex.hxx>
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
@@ -123,18 +124,18 @@ namespace vclcanvas
         {
         public:
             LocalGuard() :
-                aGuard( Application::GetSolarMutex() )
+                aSolarGuard()
             {
             }
 
             /// To be compatible with CanvasBase mutex concept
             LocalGuard( const ::osl::Mutex& ) :
-                aGuard( Application::GetSolarMutex() )
+                aSolarGuard()
             {
             }
 
         private:
-            ::vos::OGuard aGuard;
+            SolarMutexGuard aSolarGuard;
         };
 
         class OutDevStateKeeper
-- 
cgit