fix -Wextra in FreeCADBase

FreeCAD · Sep 21, 2016 · f408f31 · f408f31
1 parent 3f9fd3d
commit f408f31
Show file tree

Hide file tree

Showing 16 changed files with 177 additions and 126 deletions.
diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp
@@ -400,7 +400,7 @@ SignalException::~SignalException()
 
 void SignalException::throw_signal(int signum)
 {
-    std::cerr << "SIGSEGV signal raised" << std::endl;
+    std::cerr << "SIGSEGV signal raised: " << signum << std::endl;
     throw std::runtime_error ("throw_signal");
 }
 #endif

diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h
@@ -89,10 +89,10 @@ class BaseExport SystemExitException : public Exception
     SystemExitException(void);
     SystemExitException(const SystemExitException &inst);
     virtual ~SystemExitException() throw() {}
-    const long getExitCode(void) const { return _exitCode;}
+    long getExitCode(void) const { return _exitCode;}
 
 protected:
-    long int _exitCode;
+    long _exitCode;
 };
 
 /** If the application starts we release immediately the global interpreter lock

diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp
@@ -142,21 +142,21 @@ PyObject* MatrixPy::richCompare(PyObject *v, PyObject *w, int op)
         Matrix4D m2 = static_cast<MatrixPy*>(w)->value();
 
         PyObject *res=0;
-        if (op != Py_EQ && op != Py_NE) {
-            PyErr_SetString(PyExc_TypeError,
-            "no ordering relation is defined for Matrix");
-            return 0;
-        }
-        else if (op == Py_EQ) {
-            res = (m1 == m2) ? Py_True : Py_False;
+        if (op != Py_EQ && op != Py_NE) {
+            PyErr_SetString(PyExc_TypeError,
+            "no ordering relation is defined for Matrix");
+            return 0;
+        }
+        else if (op == Py_EQ) {
+            res = (m1 == m2) ? Py_True : Py_False;
             Py_INCREF(res);
             return res;
-        }
-        else {
-            res = (m1 != m2) ? Py_True : Py_False;
+        }
+        else {
+            res = (m1 != m2) ? Py_True : Py_False;
             Py_INCREF(res);
             return res;
-        }
+        }
     }
     else {
         // This always returns False
@@ -696,119 +696,119 @@ int MatrixPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * MatrixPy::number_divide_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_divide_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_remainder_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_remainder_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_power_handler (PyObject *self, PyObject *other, PyObject *arg)
+PyObject * MatrixPy::number_power_handler (PyObject* /*self*/, PyObject* /*other*/, PyObject* /*arg*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_negative_handler (PyObject *self)
+PyObject * MatrixPy::number_negative_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_positive_handler (PyObject *self)
+PyObject * MatrixPy::number_positive_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_absolute_handler (PyObject *self)
+PyObject * MatrixPy::number_absolute_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int MatrixPy::number_nonzero_handler (PyObject *self)
+int MatrixPy::number_nonzero_handler (PyObject* /*self*/)
 {
     return 1;
 }
 
-PyObject * MatrixPy::number_invert_handler (PyObject *self)
+PyObject * MatrixPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * MatrixPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-int MatrixPy::number_coerce_handler (PyObject **self, PyObject **other)
+int MatrixPy::number_coerce_handler (PyObject ** /*self*/, PyObject ** /*other*/)
 {
     return 1;
 }
 
-PyObject * MatrixPy::number_int_handler (PyObject *self)
+PyObject * MatrixPy::number_int_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_long_handler (PyObject *self)
+PyObject * MatrixPy::number_long_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_float_handler (PyObject *self)
+PyObject * MatrixPy::number_float_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_oct_handler (PyObject *self)
+PyObject * MatrixPy::number_oct_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * MatrixPy::number_hex_handler (PyObject *self)
+PyObject * MatrixPy::number_hex_handler (PyObject * /*self*/)
 {
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;

diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
@@ -122,7 +122,8 @@ PyTypeObject PyObjectBase::Type = {
     0,                                                      /*tp_cache */
     0,                                                      /*tp_subclasses */
     0,                                                      /*tp_weaklist */
-    0                                                       /*tp_del */
+    0,                                                      /*tp_del */
+    0                                                       /*tp_version_tag */
 };
 
 /*------------------------------

diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
@@ -49,7 +49,7 @@ PyObject *QuantityPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // P
 }
 
 // constructor method
-int QuantityPy::PyInit(PyObject* args, PyObject* kwd)
+int QuantityPy::PyInit(PyObject* args, PyObject* /*kwd*/)
 {
     Quantity *self = getQuantityPtr();
 
@@ -110,7 +110,7 @@ int QuantityPy::PyInit(PyObject* args, PyObject* kwd)
     return -1;
 }
 
-PyObject* QuantityPy::getUserPreferred(PyObject *args)
+PyObject* QuantityPy::getUserPreferred(PyObject* /*args*/)
 {
     QString uus;
     double factor;
@@ -418,14 +418,14 @@ PyObject * QuantityPy::number_remainder_handler (PyObject *self, PyObject *other
     return new QuantityPy(new Quantity(q,a->getUnit()));
 }
 
-PyObject * QuantityPy::number_divmod_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_divmod_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     //PyNumber_Divmod();
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
 
-PyObject * QuantityPy::number_power_handler (PyObject *self, PyObject *other, PyObject *modulo)
+PyObject * QuantityPy::number_power_handler (PyObject *self, PyObject *other, PyObject * /*modulo*/)
 {
     if (!PyObject_TypeCheck(self, &(QuantityPy::Type))) {
         PyErr_SetString(PyExc_TypeError, "First arg must be Quantity");
@@ -585,54 +585,54 @@ int QuantityPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
     return 0; 
 }
 
-PyObject * QuantityPy::number_invert_handler (PyObject *self)
+PyObject * QuantityPy::number_invert_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "bad operand type for unary ~");
     return 0;
 }
 
-PyObject * QuantityPy::number_lshift_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_lshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for <<");
     return 0;
 }
 
-PyObject * QuantityPy::number_rshift_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_rshift_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for >>");
     return 0;
 }
 
-PyObject * QuantityPy::number_and_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_and_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for &");
     return 0;
 }
 
-PyObject * QuantityPy::number_xor_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_xor_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for ^");
     return 0;
 }
 
-PyObject * QuantityPy::number_or_handler (PyObject *self, PyObject *other)
+PyObject * QuantityPy::number_or_handler (PyObject* /*self*/, PyObject* /*other*/)
 {
     PyErr_SetString(PyExc_TypeError, "unsupported operand type(s) for |");
     return 0;
 }
 
-int QuantityPy::number_coerce_handler (PyObject **self, PyObject **other)
+int QuantityPy::number_coerce_handler (PyObject** /*self*/, PyObject** /*other*/)
 {
     return 1;
 }
 
-PyObject * QuantityPy::number_oct_handler (PyObject *self)
+PyObject * QuantityPy::number_oct_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "oct() argument can't be converted to oct");
     return 0;
 }
 
-PyObject * QuantityPy::number_hex_handler (PyObject *self)
+PyObject * QuantityPy::number_hex_handler (PyObject* /*self*/)
 {
     PyErr_SetString(PyExc_TypeError, "hex() argument can't be converted to hex");
     return 0;

diff --git a/src/Base/Stream.cpp b/src/Base/Stream.cpp
@@ -781,7 +781,7 @@ Streambuf::seekoff(std::streambuf::off_type off,
 
 std::streambuf::pos_type
 Streambuf::seekpos(std::streambuf::pos_type pos,
-                   std::ios_base::openmode which/*mode*/)
+                   std::ios_base::openmode /*mode*/)
 {
     return seekoff(pos, std::ios_base::beg);
 }