merge vosremoval-mutex.diff

In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually

4 files changed, 8 insertions, 8 deletions

diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 3f7bdf78f809..e45fd11b0495 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -32,7 +32,7 @@
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include "bootstrp/listmacr.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #define OS_NONE             0x0000
 #define OS_WIN16            0x0001
@@ -265,7 +265,7 @@ private:
 
     static Link aDBNotFoundHdl;
 protected:
-    NAMESPACE_VOS( OMutex ) aMutex;
+    osl::Mutex      aMutex;
 
     USHORT          nStarMode;
     SolarFileList   aFileList;
diff --git a/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx
index b0028b0b2de1..210cfb1ac2a7 100644
--- a/tools/inc/pch/precompiled_tools.hxx
+++ b/tools/inc/pch/precompiled_tools.hxx
@@ -88,7 +88,7 @@
 #include "sys/types.h"
 
 #include "vos/macros.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "vos/process.hxx"
 //---MARKER---
 #endif
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index 16b8b028a715..00767880c915 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -36,7 +36,7 @@
 #ifndef _TOOLS_SIMPLERESMGR_HXX_
 #define _TOOLS_SIMPLERESMGR_HXX_
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <tools/resid.hxx>
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
@@ -47,7 +47,7 @@ class InternalResMgr;
 class TOOLS_DLLPUBLIC SimpleResMgr
 {
 protected:
-    NAMESPACE_VOS(OMutex)   m_aAccessSafety;
+    osl::Mutex              m_aAccessSafety;
     InternalResMgr*         m_pResImpl;
 
 public:
diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx
index a5faf89bbe40..eef67455a6bb 100644
--- a/tools/inc/tools/solarmutex.hxx
+++ b/tools/inc/tools/solarmutex.hxx
@@ -29,15 +29,15 @@
 #define _TOOLS_SOLARMUTEX_HXX
 
 #include "tools/toolsdllapi.h"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 namespace tools
 {
     class TOOLS_DLLPUBLIC SolarMutex
     {
     public:
-        static ::vos::IMutex* GetSolarMutex();
-        static void SetSolarMutex( ::vos::IMutex* pMutex );
+        static ::osl::SolarMutex* GetSolarMutex();
+        static void SetSolarMutex( ::osl::SolarMutex* pMutex );
         static bool Acquire();
         static void Release();
     };