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
---
 unotools/inc/unotools/accessiblerelationsethelper.hxx |  4 ++--
 unotools/inc/unotools/accessiblestatesethelper.hxx    |  4 ++--
 unotools/inc/unotools/ucblockbytes.hxx                | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'unotools/inc')

diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx
index edc05d1a54a7..7c20ed7a8281 100644
--- a/unotools/inc/unotools/accessiblerelationsethelper.hxx
+++ b/unotools/inc/unotools/accessiblerelationsethelper.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/servicehelper.hxx>
 
@@ -147,7 +147,7 @@ public:
 
 protected:
     /// Mutex guarding this object.
-    ::vos::OMutex maMutex;
+    ::osl::Mutex maMutex;
 
 private:
     /// The implementation of this helper interface.
diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx
index b7b830a4a247..5ef72a89f7eb 100644
--- a/unotools/inc/unotools/accessiblestatesethelper.hxx
+++ b/unotools/inc/unotools/accessiblestatesethelper.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/servicehelper.hxx>
 
@@ -169,7 +169,7 @@ public:
 
 protected:
     /// Mutex guarding this object.
-    ::vos::OMutex maMutex;
+    ::osl::Mutex maMutex;
 
 private:
     /// The implementation of this helper interface.
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index f06f9d9522e5..a7090d5efebc 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -36,7 +36,7 @@
 
 #include <osl/thread.hxx>
 #include <osl/conditn.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <tools/stream.hxx>
 #include <tools/link.hxx>
 #include <tools/errcode.hxx>
@@ -107,7 +107,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
 {
     osl::Condition          m_aInitialized;
     osl::Condition          m_aTerminated;
-    vos::OMutex             m_aMutex;
+    osl::Mutex              m_aMutex;
 
     String                  m_aContentType;
     String                  m_aRealURL;
@@ -184,25 +184,25 @@ public:
 
     NS_UNO::Reference < NS_IO::XInputStream > getInputStream_Impl() const
                             {
-                                vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
+                                osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
                                 return m_xInputStream;
                             }
 
     NS_UNO::Reference < NS_IO::XOutputStream > getOutputStream_Impl() const
                             {
-                                vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
+                                osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
                                 return m_xOutputStream;
                             }
 
     NS_UNO::Reference < NS_IO::XSeekable > getSeekable_Impl() const
                             {
-                                vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
+                                osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
                                 return m_xSeekable;
                             }
 
     sal_Bool                hasInputStream_Impl() const
                             {
-                                vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
+                                osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
                                 return m_xInputStream.is();
                             }
 
-- 
cgit v1.2.3