diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:20:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:33 +0100 |
commit | 87686af6b85f3bb06c0d75dd870455236506cb7b (patch) | |
tree | b29e54ce4b62042a0d559be9186b9f802b077384 /pyuno/source/module/pyuno_runtime.cxx | |
parent | 1fc2fe74f2db49b17abc3c4df7feec4f215052ca (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I7a5fda2606f42e2736ad0618f2d8bcc5ba4028fb
Diffstat (limited to 'pyuno/source/module/pyuno_runtime.cxx')
-rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 476691592728..283ffc53edd8 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -80,30 +80,30 @@ static PyTypeObject RuntimeImpl_Type = nullptr, nullptr, nullptr, - 0, nullptr, - 0, - 0, - 0, nullptr, nullptr, nullptr, nullptr, nullptr, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, 0, - NULL, + nullptr, nullptr, nullptr, nullptr, 0, nullptr, nullptr, - NULL, - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, nullptr, nullptr, 0, @@ -112,17 +112,17 @@ static PyTypeObject RuntimeImpl_Type = nullptr, nullptr, nullptr, - NULL, - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, nullptr #if PY_VERSION_HEX >= 0x02060000 , 0 #endif #if PY_VERSION_HEX >= 0x03040000 - , 0 + , nullptr #endif }; @@ -182,7 +182,7 @@ static PyRef importUnoModule( ) throw ( RuntimeException ) static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) { *pLevel = LogLevel::NONE; - *ppFile = 0; + *ppFile = nullptr; OUString fileName; osl_getModuleURLFromFunctionAddress( reinterpret_cast< oslGenericFunction >(readLoggingConfig), @@ -223,7 +223,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) oslProcessInfo data; data.Size = sizeof( data ); osl_getProcessInfo( - 0 , osl_Process_IDENTIFIER , &data ); + nullptr , osl_Process_IDENTIFIER , &data ); osl_getSystemPathFromFileURL( str.pData, &str.pData); OString o = OUStringToOString( str, osl_getThreadTextEncoding() ); o += "."; @@ -233,7 +233,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) if ( *ppFile ) { // do not buffer (useful if e.g. analyzing a crash) - setvbuf( *ppFile, 0, _IONBF, 0 ); + setvbuf( *ppFile, nullptr, _IONBF, 0 ); } else { @@ -255,7 +255,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx ) RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type); if( ! me ) throw RuntimeException( "cannot instantiate pyuno::RuntimeImpl" ); - me->cargo = 0; + me->cargo = nullptr; // must use a different struct here, as the PyObject_New // makes C++ unusable RuntimeCargo *c = new RuntimeCargo(); @@ -327,7 +327,7 @@ bool Runtime::isInitialized() throw ( RuntimeException ) } Runtime::Runtime() throw( RuntimeException ) - : impl( 0 ) + : impl( nullptr ) { PyRef globalDict, runtime; getRuntimeImpl( globalDict , runtime ); @@ -576,7 +576,7 @@ static Sequence< Type > invokeGetTypes( const Runtime & r , PyObject * o ) raiseInvocationTargetExceptionWhenNeeded( r ); if( method.is() && PyCallable_Check( method.get() ) ) { - PyRef types( PyObject_CallObject( method.get(), 0 ) , SAL_NO_ACQUIRE ); + PyRef types( PyObject_CallObject( method.get(), nullptr ) , SAL_NO_ACQUIRE ); raiseInvocationTargetExceptionWhenNeeded( r ); if( types.is() && PyTuple_Check( types.get() ) ) { @@ -899,7 +899,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con } else { - OUString const msg(lcl_ExceptionMessage(o, 0)); + OUString const msg(lcl_ExceptionMessage(o, nullptr)); throw RuntimeException(msg); } } |