From 5782f69c0cc2df713c83620e9fc77cb4e12ff474 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 8 Jun 2015 16:27:02 +0200
Subject: loplugin:cstylecast: deal with remaining pointer casts

Change-Id: Iffa346c16a6775b206c8f8613eee9e7201e3badb
---
 pyuno/source/module/pyuno.cxx          | 46 ++++++++++++++++----------------
 pyuno/source/module/pyuno_callable.cxx | 46 ++++++++++++++++----------------
 pyuno/source/module/pyuno_runtime.cxx  | 48 +++++++++++++++++-----------------
 3 files changed, 70 insertions(+), 70 deletions(-)

(limited to 'pyuno')

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 7020004afb88..86220376e0cb 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -662,48 +662,48 @@ static PyTypeObject PyUNOType =
     "pyuno",
     sizeof (PyUNO),
     0,
-    (destructor) PyUNO_del,
-    (printfunc) 0,
-    (getattrfunc) PyUNO_getattr,
-    (setattrfunc) PyUNO_setattr,
+    PyUNO_del,
+    nullptr,
+    PyUNO_getattr,
+    PyUNO_setattr,
     /* this type does not exist in Python 3: (cmpfunc) */ 0,
-    (reprfunc) PyUNO_repr,
+    PyUNO_repr,
     0,
     0,
     0,
-    (hashfunc) 0,
-    (ternaryfunc) 0,
-    (reprfunc) PyUNO_str,
-    (getattrofunc)0,
-    (setattrofunc)0,
+    nullptr,
+    nullptr,
+    PyUNO_str,
+    nullptr,
+    nullptr,
     NULL,
     TP_FLAGS,
     NULL,
-    (traverseproc)0,
-    (inquiry)0,
-    (richcmpfunc) PyUNO_cmp,
+    nullptr,
+    nullptr,
+    PyUNO_cmp,
     0,
-    (getiterfunc)0,
-    (iternextfunc)0,
+    nullptr,
+    nullptr,
     PyUNOMethods,
     NULL,
     NULL,
     NULL,
     NULL,
-    (descrgetfunc)0,
-    (descrsetfunc)0,
+    nullptr,
+    nullptr,
     0,
-    (initproc)0,
-    (allocfunc)0,
-    (newfunc)0,
-    (freefunc)0,
-    (inquiry)0,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    (destructor)0
+    nullptr
 #if PY_VERSION_HEX >= 0x02060000
     , 0
 #endif
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 075e0615876b..6a96369d1382 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -187,48 +187,48 @@ static PyTypeObject PyUNO_callable_Type =
     "PyUNO_callable",
     sizeof (PyUNO_callable),
     0,
-    (destructor) ::pyuno::PyUNO_callable_del,
-    (printfunc) 0,
-    (getattrfunc) 0,
-    (setattrfunc) 0,
+    ::pyuno::PyUNO_callable_del,
+    nullptr,
+    nullptr,
+    nullptr,
     0,
-    (reprfunc) 0,
+    nullptr,
     0,
     0,
     0,
-    (hashfunc) 0,
-    (ternaryfunc) ::pyuno::PyUNO_callable_call,
-    (reprfunc) 0,
-    (getattrofunc)0,
-    (setattrofunc)0,
+    nullptr,
+    ::pyuno::PyUNO_callable_call,
+    nullptr,
+    nullptr,
+    nullptr,
     NULL,
     0,
     NULL,
-    (traverseproc)0,
-    (inquiry)0,
-    (richcmpfunc)0,
+    nullptr,
+    nullptr,
+    nullptr,
     0,
-    (getiterfunc)0,
-    (iternextfunc)0,
+    nullptr,
+    nullptr,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    (descrgetfunc)0,
-    (descrsetfunc)0,
+    nullptr,
+    nullptr,
     0,
-    (initproc)0,
-    (allocfunc)0,
-    (newfunc)0,
-    (freefunc)0,
-    (inquiry)0,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    (destructor)0
+    nullptr
 #if PY_VERSION_HEX >= 0x02060000
     , 0
 #endif
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 4d31de19fa64..309f148a2a6c 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -76,48 +76,48 @@ static PyTypeObject RuntimeImpl_Type =
     "pyuno_runtime",
     sizeof (RuntimeImpl),
     0,
-    (destructor) RuntimeImpl::del,
-    (printfunc) 0,
-    (getattrfunc) 0,
-    (setattrfunc) 0,
+    RuntimeImpl::del,
+    nullptr,
+    nullptr,
+    nullptr,
     0,
-    (reprfunc) 0,
+    nullptr,
     0,
     0,
     0,
-    (hashfunc) 0,
-    (ternaryfunc) 0,
-    (reprfunc) 0,
-    (getattrofunc)0,
-    (setattrofunc)0,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     NULL,
     0,
     NULL,
-    (traverseproc)0,
-    (inquiry)0,
-    (richcmpfunc)0,
+    nullptr,
+    nullptr,
+    nullptr,
     0,
-    (getiterfunc)0,
-    (iternextfunc)0,
+    nullptr,
+    nullptr,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    (descrgetfunc)0,
-    (descrsetfunc)0,
+    nullptr,
+    nullptr,
     0,
-    (initproc)0,
-    (allocfunc)0,
-    (newfunc)0,
-    (freefunc)0,
-    (inquiry)0,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    (destructor)0
+    nullptr
 #if PY_VERSION_HEX >= 0x02060000
     , 0
 #endif
@@ -1014,7 +1014,7 @@ PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
         ensureUnlimitedLifetime( setlocale( LC_NUMERIC, 0 )  );
     setlocale( LC_NUMERIC, "C" );
     PyRef locale( // python requires C locale
-        PyLong_FromVoidPtr( (void*)oldLocale ), SAL_NO_ACQUIRE);
+        PyLong_FromVoidPtr( const_cast<char *>(oldLocale) ), SAL_NO_ACQUIRE);
     PyDict_SetItemString(
         PyThreadState_GetDict(), g_NUMERICID, locale.get() );
 }
-- 
cgit