diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-22 12:52:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-23 11:11:49 +0200 |
commit | 1f2a47a6d39be654847c2bdde7605e08ad2fb78a (patch) | |
tree | 92ea9da2d9147091594302fe86128b36221a9ce4 /io/source/acceptor | |
parent | e4f690b0389263c35f83fa8b58382c6518d00f62 (diff) |
io: sal_Bool->bool
Change-Id: I136c98cbe15d1c6629028392a9573066320b3a04
Diffstat (limited to 'io/source/acceptor')
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 4 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 24 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 12 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.hxx | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 6fa424c60f42..6ba5606f86b0 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -149,7 +149,7 @@ namespace io_acceptor PipeAcceptor::PipeAcceptor( const OUString &sPipeName , const OUString & sConnectionDescription) : m_sPipeName( sPipeName ), m_sConnectionDescription( sConnectionDescription ), - m_bClosed( sal_False ) + m_bClosed( false ) { } @@ -199,7 +199,7 @@ namespace io_acceptor void PipeAcceptor::stopAccepting() { - m_bClosed = sal_True; + m_bClosed = true; Pipe pipe; { MutexGuard guard( m_mutex ); diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index 82ec366d40c4..9146757a4ef8 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -49,7 +49,7 @@ namespace io_acceptor { template<class T> struct ReferenceEqual { - sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, + bool operator () (const ::com::sun::star::uno::Reference<T> & op1, const ::com::sun::star::uno::Reference<T> & op2) const { return op1.get() == op2.get(); @@ -103,14 +103,14 @@ namespace io_acceptor { OUString m_sDescription; ::osl::Mutex _mutex; - sal_Bool _started; - sal_Bool _closed; - sal_Bool _error; + bool _started; + bool _closed; + bool _error; XStreamListener_hash_set _listeners; }; template<class T> - void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t) + void notifyListeners(SocketConnection * pCon, bool * notified, T t) { XStreamListener_hash_set listeners; @@ -118,7 +118,7 @@ namespace io_acceptor { ::osl::MutexGuard guard(pCon->_mutex); if(!*notified) { - *notified = sal_True; + *notified = true; listeners = pCon->_listeners; } } @@ -158,9 +158,9 @@ namespace io_acceptor { SocketConnection::SocketConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ), - _started(sal_False), - _closed(sal_False), - _error(sal_False) + _started(false), + _closed(false), + _error(false) { // make it unique m_sDescription += ",uniqueValue=" ; @@ -317,13 +317,13 @@ namespace io_acceptor { SocketAcceptor::SocketAcceptor( const OUString &sSocketName, sal_uInt16 nPort, - sal_Bool bTcpNoDelay, + bool bTcpNoDelay, const OUString &sConnectionDescription) : m_sSocketName( sSocketName ), m_sConnectionDescription( sConnectionDescription ), m_nPort( nPort ), m_bTcpNoDelay( bTcpNoDelay ), - m_bClosed( sal_False ) + m_bClosed( false ) { } @@ -396,7 +396,7 @@ namespace io_acceptor { void SocketAcceptor::stopAccepting() { - m_bClosed = sal_True; + m_bClosed = true; m_socket.close(); } } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 207ba21ff611..49d3feef50aa 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -71,7 +71,7 @@ namespace io_acceptor SocketAcceptor *m_pSocket; Mutex m_mutex; OUString m_sLastDescription; - sal_Bool m_bInAccept; + bool m_bInAccept; Reference< XMultiComponentFactory > _xSMgr; Reference< XComponentContext > _xCtx; @@ -82,7 +82,7 @@ namespace io_acceptor OAcceptor::OAcceptor( const Reference< XComponentContext > & xCtx ) : m_pPipe( 0 ) , m_pSocket( 0 ) - , m_bInAccept( sal_False ) + , m_bInAccept( false ) , _xSMgr( xCtx->getServiceManager() ) , _xCtx( xCtx ) {} @@ -101,7 +101,7 @@ namespace io_acceptor struct BeingInAccept { - BeingInAccept( sal_Bool *pFlag,const OUString & sConnectionDescription ) throw( AlreadyAcceptingException) + BeingInAccept( bool *pFlag,const OUString & sConnectionDescription ) throw( AlreadyAcceptingException) : m_pFlag( pFlag ) { if( *m_pFlag ) @@ -110,13 +110,13 @@ namespace io_acceptor sMessage += sConnectionDescription; throw AlreadyAcceptingException( sMessage , Reference< XInterface > () ); } - *m_pFlag = sal_True; + *m_pFlag = true; } ~BeingInAccept() { - *m_pFlag = sal_False; + *m_pFlag = false; } - sal_Bool *m_pFlag; + bool *m_pFlag; }; Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescription ) diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx index 89002f0256b0..3e56b86e75e9 100644 --- a/io/source/acceptor/acceptor.hxx +++ b/io/source/acceptor/acceptor.hxx @@ -38,7 +38,7 @@ namespace io_acceptor { ::osl::Pipe m_pipe; OUString m_sPipeName; OUString m_sConnectionDescription; - sal_Bool m_bClosed; + bool m_bClosed; }; class SocketAcceptor @@ -46,7 +46,7 @@ namespace io_acceptor { public: SocketAcceptor( const OUString & sSocketName , sal_uInt16 nPort, - sal_Bool bTcpNoDelay, + bool bTcpNoDelay, const OUString &sConnectionDescription ); void init(); @@ -59,8 +59,8 @@ namespace io_acceptor { OUString m_sSocketName; OUString m_sConnectionDescription; sal_uInt16 m_nPort; - sal_Bool m_bTcpNoDelay; - sal_Bool m_bClosed; + bool m_bTcpNoDelay; + bool m_bClosed; }; } |