merge vosremoval-mutex.diff

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

4 files changed, 23 insertions, 23 deletions

diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 44ce0d295f42..e4137649c8ed 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -41,7 +41,7 @@
 class BitmapTransporter : public OWeakObject, AWT::XBitmap
 {
     SvMemoryStream                      m_aStream;
-    vos::OMutex                         m_aProtector;
+    osl::Mutex                          m_aProtector;
 
 public:
 
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 34d0f3e1a82d..a232365f4c49 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -29,7 +29,7 @@
 #define _EXT_SCANNER_HXX
 
 #include <tools/stream.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weak.hxx>
@@ -64,7 +64,7 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap
 {
 protected:
 
-    vos::OMutex                             maProtector;
+    osl::Mutex                              maProtector;
     void*                                   mpData;
 
     void                                    AcquireData();
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index fa671b99eede..7043c3d9a971 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -65,7 +65,7 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
 
 AWT::Size BitmapTransporter::getSize() throw()
 {
-    vos::OGuard aGuard( m_aProtector );
+    osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
     AWT::Size   aRet;
 
@@ -89,7 +89,7 @@ AWT::Size BitmapTransporter::getSize() throw()
 
 SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
 {
-    vos::OGuard aGuard( m_aProtector );
+    osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
 
     // create return value
@@ -112,7 +112,7 @@ struct SaneHolder
 {
     Sane                m_aSane;
     REF( AWT::XBitmap ) m_xBitmap;
-    vos::OMutex         m_aProtector;
+    osl::Mutex          m_aProtector;
     ScanError           m_nError;
     bool                m_bBusy;
 
@@ -147,7 +147,7 @@ namespace
             m_aSanes.clear();
     }
 
-    struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {};
+    struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
     struct theSanes : public rtl::Static<allSanes, theSanes> {};
 }
 
@@ -193,7 +193,7 @@ ScannerThread::~ScannerThread()
 
 void ScannerThread::run()
 {
-    vos::OGuard         aGuard( m_pHolder->m_aProtector );
+    osl::MutexGuard         aGuard( m_pHolder->m_aProtector );
     BitmapTransporter*  pTransporter = new BitmapTransporter;
     REF( XInterface )   aIf( static_cast< OWeakObject* >( pTransporter ) );
 
@@ -225,13 +225,13 @@ void ScannerThread::run()
 
 void ScannerManager::AcquireData()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     theSanes::get().acquire();
 }
 
 void ScannerManager::ReleaseData()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     theSanes::get().release();
 }
 
@@ -255,7 +255,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
 
 SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( rSanes.empty() )
@@ -280,7 +280,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
 
 BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -315,7 +315,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
 void ScannerManager::startScan( const ScannerContext& scanner_context,
                                 const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -345,7 +345,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
 
 ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -364,7 +364,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
 
 REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
 {
-    vos::OGuard aGuard( theSaneProtector::get() );
+    osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -375,7 +375,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
             );
     boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
 
-    vos::OGuard aProtGuard( pHolder->m_aProtector );
+    osl::MutexGuard aProtGuard( pHolder->m_aProtector );
 
     REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap );
     pHolder->m_xBitmap = REF( AWT::XBitmap )();
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 81870e763972..8e449d906654 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -42,7 +42,7 @@
 #include <math.h>
 #include <tools/svwin.h>
 #include <tools/stream.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vos/module.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -110,7 +110,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
     TW_IDENTITY                                 aSrcIdent;
     Link                                        aNotifyLink;
     DSMENTRYPROC                                pDSM;
-    NAMESPACE_VOS( OModule )*                   pMod;
+    NAMESPACE_VOS(OModule )*                    pMod;
     ULONG                                       nCurState;
     HWND                                        hTwainWnd;
     HHOOK                                       hTwainHook;
@@ -994,7 +994,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
 
 SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
 {
-    vos::OGuard             aGuard( maProtector );
+    osl::MutexGuard aGuard( maProtector );
     SEQ( ScannerContext )   aRet( 1 );
 
     aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) );
@@ -1008,7 +1008,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
 BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
     throw( ScannerException )
 {
-    vos::OGuard                         aGuard( maProtector );
+    osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1024,7 +1024,7 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
 void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
     throw( ScannerException )
 {
-    vos::OGuard                         aGuard( maProtector );
+    osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1039,7 +1039,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
 ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
     throw( ScannerException )
 {
-    vos::OGuard                         aGuard( maProtector );
+    osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1053,7 +1053,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
 uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
     throw( ScannerException )
 {
-    vos::OGuard aGuard( maProtector );
+    osl::MutexGuard aGuard( maProtector );
     return uno::Reference< awt::XBitmap >( this );
 }