summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:17:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:29 +0100
commit22980bea48da60918354463d78dd53938f764725 (patch)
tree4e386627fc2037027e0df16a32de2f3deac738b5 /io
parenta96b564aeeea6cd27d68084327d11be615ebc0a8 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I04ceb5b1514a1d0bf123a1cded5e1aac3e8dde2f
Diffstat (limited to 'io')
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx6
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx4
-rw-r--r--io/source/acceptor/acceptor.cxx8
-rw-r--r--io/source/services.cxx26
-rw-r--r--io/source/stm/omark.cxx2
-rw-r--r--io/source/stm/opipe.cxx2
-rw-r--r--io/source/stm/opump.cxx2
-rw-r--r--io/source/stm/streamhelper.cxx4
8 files changed, 27 insertions, 27 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 98db657aa55f..de67189f844a 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -115,10 +115,10 @@ public:
OTextInputStream::OTextInputStream()
: mbEncodingInitialized(false)
- , mConvText2Unicode(NULL)
- , mContextText2Unicode(NULL)
+ , mConvText2Unicode(nullptr)
+ , mContextText2Unicode(nullptr)
, mSeqSource(READ_BYTE_COUNT)
- , mpBuffer(NULL)
+ , mpBuffer(nullptr)
, mnBufferSize(0)
, mnCharsInBuffer(0)
, mbReachedEOF(false)
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 8f8a44afe634..802e0a75bc58 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -95,8 +95,8 @@ public:
OTextOutputStream::OTextOutputStream()
: mbEncodingInitialized(false)
- , mConvUnicode2Text(NULL)
- , mContextUnicode2Text(NULL)
+ , mConvUnicode2Text(nullptr)
+ , mContextUnicode2Text(nullptr)
{
}
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index a9298a75fc2d..12f0a10aca3e 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -79,8 +79,8 @@ namespace io_acceptor
OAcceptor::OAcceptor( const Reference< XComponentContext > & xCtx )
- : m_pPipe( 0 )
- , m_pSocket( 0 )
+ : m_pPipe( nullptr )
+ , m_pSocket( nullptr )
, m_bInAccept( false )
, _xSMgr( xCtx->getServiceManager() )
, _xCtx( xCtx )
@@ -163,7 +163,7 @@ namespace io_acceptor
{
MutexGuard g( m_mutex );
delete m_pPipe;
- m_pPipe = 0;
+ m_pPipe = nullptr;
}
throw;
}
@@ -197,7 +197,7 @@ namespace io_acceptor
{
MutexGuard g( m_mutex );
delete m_pSocket;
- m_pSocket = 0;
+ m_pSocket = nullptr;
}
throw;
}
diff --git a/io/source/services.cxx b/io/source/services.cxx
index 4caaf9b9d438..31487b61920e 100644
--- a/io/source/services.cxx
+++ b/io/source/services.cxx
@@ -35,64 +35,64 @@ static const struct ImplementationEntry g_entries[] =
{
io_acceptor::acceptor_CreateInstance, io_acceptor::acceptor_getImplementationName ,
io_acceptor::acceptor_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
{
stoc_connector::connector_CreateInstance, stoc_connector::connector_getImplementationName ,
stoc_connector::connector_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
{
io_stm::OPipeImpl_CreateInstance, io_stm::OPipeImpl_getImplementationName ,
io_stm::OPipeImpl_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
{
io_stm::OPumpImpl_CreateInstance, io_stm::OPumpImpl_getImplementationName ,
io_stm::OPumpImpl_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
{
io_stm::ODataInputStream_CreateInstance, io_stm::ODataInputStream_getImplementationName,
io_stm::ODataInputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_stm::ODataOutputStream_CreateInstance, io_stm::ODataOutputStream_getImplementationName,
io_stm::ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_stm::OObjectInputStream_CreateInstance, io_stm::OObjectInputStream_getImplementationName,
io_stm::OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_stm::OObjectOutputStream_CreateInstance, io_stm::OObjectOutputStream_getImplementationName,
io_stm::OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_stm::OMarkableInputStream_CreateInstance, io_stm::OMarkableInputStream_getImplementationName,
io_stm::OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_stm::OMarkableOutputStream_CreateInstance, io_stm::OMarkableOutputStream_getImplementationName,
io_stm::OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory,
- 0, 0
+ nullptr, 0
},
{
io_TextInputStream::TextInputStream_CreateInstance, io_TextInputStream::TextInputStream_getImplementationName ,
io_TextInputStream::TextInputStream_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
{
io_TextOutputStream::TextOutputStream_CreateInstance, io_TextOutputStream::TextOutputStream_getImplementationName ,
io_TextOutputStream::TextOutputStream_getSupportedServiceNames, createSingleComponentFactory ,
- 0, 0
+ nullptr, 0
},
- {0, 0, 0, 0, 0, 0}
+ {nullptr, nullptr, nullptr, nullptr, nullptr, 0}
};
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL io_component_getFactory(
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 646f06c2b98b..c2e524b0c965 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -717,7 +717,7 @@ void OMarkableInputStream::closeInput() throw (NotConnectedException, RuntimeExc
setSuccessor( Reference< XConnectable >() );
delete m_pBuffer;
- m_pBuffer = 0;
+ m_pBuffer = nullptr;
m_nCurrentPos = 0;
m_nCurrentMark = 0;
}
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 494619cf882c..b32c869f093a 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -263,7 +263,7 @@ void OPipeImpl::closeInput()
m_bInputStreamClosed = true;
delete m_pFIFO;
- m_pFIFO = 0;
+ m_pFIFO = nullptr;
// readBytes may throw an exception
m_conditionBytesAvail.set();
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index c68d174fab08..3386ba48966f 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -105,7 +105,7 @@ namespace io_stm {
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override;
};
-Pump::Pump() : m_aThread( 0 ),
+Pump::Pump() : m_aThread( nullptr ),
m_cnt( m_aMutex ),
m_closeFired( false )
{
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 3e789ac0dada..2e358a549d39 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -52,7 +52,7 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( css::io::BufferSizeExceeded
MemRingBuffer::MemRingBuffer()
{
m_nBufferLen = 0;
- m_p = 0;
+ m_p = nullptr;
m_nStart = 0;
m_nOccupiedBuffer = 0;
}
@@ -187,7 +187,7 @@ void MemRingBuffer::shrink() throw ()
if( m_p ) {
free( m_p );
}
- m_p = 0;
+ m_p = nullptr;
m_nBufferLen = 0;
m_nStart = 0;
}