kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ remove unneeded semicolons

Browse Source
This commit is contained in:
wmayer
2014-05-08 17:32:23 +02:00
parent 6d17bbb7f6
commit 0467777d1b
19 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/Axis.h
View File

@@ -40,7 +40,7 @@ public:
Axis(const Axis&);
Axis(const Vector3d& Orig, const Vector3d& Dir);
/// Destruction
~Axis () {};
~Axis () {}
const Vector3d& getBase(void) const {return _base;}
const Vector3d& getDirection(void) const {return _dir;}

8
src/Base/Console.h
View File

@@ -52,7 +52,7 @@
namespace Base {
class ConsoleSingleton;
}; // namespace Base
} // namespace Base
typedef Base::ConsoleSingleton ConsoleMsgType;
typedef unsigned int ConsoleMsgFlags;
@@ -72,13 +72,13 @@ public:
:bErr(true),bMsg(true),bLog(true),bWrn(true) {}
virtual ~ConsoleObserver() {}
/// get calles when a Warning is issued
virtual void Warning(const char *){};
virtual void Warning(const char *){}
/// get calles when a Message is issued
virtual void Message(const char *){};
virtual void Message(const char *){}
/// get calles when a Error is issued
virtual void Error (const char *)=0;
/// get calles when a Log Message is issued
virtual void Log (const char *){};
virtual void Log (const char *){}
virtual const char *Name(void){return 0L;}
bool bErr,bMsg,bLog,bWrn;

2
src/Base/Matrix.h
View File

@@ -59,7 +59,7 @@ public:
Matrix4D (const Vector3f& rclBase, const Vector3f& rclDir, float fAngle);
Matrix4D (const Vector3d& rclBase, const Vector3d& rclDir, double fAngle);
/// Destruction
~Matrix4D () {};
~Matrix4D () {}
/** @name Operators */
//@{

6
src/Base/Observer.h
View File

@@ -56,13 +56,13 @@ public:
* A constructor.
* No special function so far.
*/
Observer(){};
Observer(){}
/**
* A destructor.
* No special function so far.
*/
virtual ~Observer(){};
virtual ~Observer(){}
/**
* This method need to be reimplemented from the concrete Observer
@@ -108,7 +108,7 @@ public:
* A constructor.
* No special function so far.
*/
Subject(){};
Subject(){}
/**
* A destructor.

2
src/Base/Placement.h
View File

@@ -46,7 +46,7 @@ public:
Placement(const Vector3d& Pos, const Rotation &Rot);
Placement(const Vector3d& Pos, const Rotation &Rot, const Vector3d& Cnt);
/// Destruction
~Placement () {};
~Placement () {}
Matrix4D toMatrix(void) const;
void fromMatrix(const Matrix4D& m);

52
src/Base/PyObjectBase.h
View File

@@ -37,13 +37,13 @@
#undef slots
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
#define slots
#include <iostream>
@@ -66,12 +66,12 @@
* @see PYFUNCIMP_S
* @see FCPythonExport
*/
#define PYFUNCDEF_S(SFUNC) static PyObject* SFUNC (PyObject *self,PyObject *args,PyObject *kwd);
#define PYFUNCDEF_S(SFUNC) static PyObject* SFUNC (PyObject *self,PyObject *args,PyObject *kwd)
/** Python static class macro for implementation
* used to set up a implementation for PYFUNCDEF_S definition.
* Its a pure convenience macro. You can also do
* Its a pure convenience macro. You can also do
* it by hand if you want. It looks like that:
* \code
* PyObject* CLASS::SFUNC (PyObject *self,PyObject *args,PyObject *kwd)
@@ -104,7 +104,7 @@ namespace Base
{
inline int streq(const char *A, const char *B) // define "streq"
{ return strcmp(A,B) == 0;};
{ return strcmp(A,B) == 0;}
inline void Assert(int expr, char *msg) // C++ assert
@@ -124,7 +124,7 @@ inline void Assert(int expr, char *msg) // C++ assert
/// some basic python macros
#define Py_NEWARGS 1
/// return with no return value if nothing happens
/// return with no return value if nothing happens
#define Py_Return Py_INCREF(Py_None); return Py_None;
/// returns an error
#define Py_Error(E, M) {PyErr_SetString(E, M); return NULL;}
@@ -144,7 +144,7 @@ public: \
static PyTypeObject Type; \
static PyMethodDef Methods[]; \
static PyParentObject Parents[]; \
virtual PyTypeObject *GetType(void) {return &Type;}; \
virtual PyTypeObject *GetType(void) {return &Type;} \
virtual PyParentObject *GetParents(void) {return Parents;}
/** This defines the _getattr_up macro
@@ -177,12 +177,12 @@ namespace Base
* very important because nearly all important classes in FreeCAD
* are visible in python for macro recording and automation purpose.
* The class App::Document is a good expample for an exported class.
* There are some convenience macros to make it easier to inherit
* There are some convenience macros to make it easier to inherit
* from this class and defining new methods exported to python.
* PYFUNCDEF_D defines a new exported method.
* PYFUNCIMP_D defines the implementation of the new exported method.
* In the implementation you can use Py_Return, Py_Error, Py_Try and Py_Assert.
* PYMETHODEDEF makes the entry in the python method table.
* PYMETHODEDEF makes the entry in the python method table.
* @see Document
* @see PYFUNCDEF_D
* @see PYFUNCIMP_D
@@ -198,7 +198,7 @@ class BaseExport PyObjectBase : public PyObject
* Every PyObjectBase object is also a python object. So you can use
* every Python C-Library function also on a PyObjectBase object
*/
Py_Header;
Py_Header
protected:
/// destructor
@@ -206,7 +206,7 @@ protected:
public:
/** Constructor
* Sets the Type of the object (for inheritance) and decrease the
* Sets the Type of the object (for inheritance) and decrease the
* the reference count of the PyObject.
*/
PyObjectBase(void*, PyTypeObject *T);
@@ -219,20 +219,20 @@ public:
PyObjectBase* DecRef(void) {Py_DECREF(this);return this;}
/** GetAttribute implementation
* This method implements the retrieval of object attributes.
* This method implements the retrieval of object attributes.
* If you want to implement attributes in your class, reimplement
* this method.
* You have to call the method of the base class.
* Note: if you reimplement _gettattr() in a inheriting class you
* need to call the method of the base class! Otherwise even the
* methods of the object will disappear!
* methods of the object will disappear!
*/
virtual PyObject *_getattr(char *attr);
/// static wrapper for pythons _getattr()
static PyObject *__getattr(PyObject * PyObj, char *attr);
/** SetAttribute implementation
* This method implements the setting of object attributes.
* This method implements the setting of object attributes.
* If you want to implement attributes in your class, reimplement
* this method.
* You have to call the method of the base class.
@@ -242,14 +242,14 @@ public:
static int __setattr(PyObject *PyObj, char *attr, PyObject *value);
/** _repr method
* Override this method to return a string object with some
* information about the object.
* Override this method to return a string object with some
* information about the object.
* \code
* PyObject *MeshFeaturePy::_repr(void)
* {
* std::stringstream a;
* a << "MeshFeature: [ ";
* a << "some really important info about the object!";
* a << "some really important info about the object!";
* a << "]" << std::endl;
* return Py_BuildValue("s", a.str().c_str());
* }
@@ -266,7 +266,7 @@ public:
}
/** PyInit method
* Override this method to initialize a newly created
* Override this method to initialize a newly created
* instance of the class (Constuctor)
*/
virtual int PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
@@ -336,8 +336,8 @@ protected:
static PyObject * s##DFUNC (PyObject *self, PyObject *args, PyObject * /*kwd*/){return (( CLASS *)self)-> DFUNC (args);};
/** Python dynamic class macro for implementation
* used to set up an implementation for PYFUNCDEF_D definition.
* Its a pure convenience macro. You can also do
* used to set up an implementation for PYFUNCDEF_D definition.
* Its a pure convenience macro. You can also do
* it by hand if you want. It looks like that:
* \code
* PyObject *FCPyParametrGrp::PyGetGrp(PyObject *args)
@@ -353,7 +353,7 @@ static PyObject * s##DFUNC (PyObject *self, PyObject *args, PyObject * /*kwd*/){
/** Python dynamic class macro for the method list
* used to fill the method list of a class derived from PyObjectBase.
* Its a pure convenience macro. You can also do
* Its a pure convenience macro. You can also do
* it by hand if you want. It looks like that:
* \code
* PyMethodDef DocTypeStdPy::Methods[] = {

2
src/Base/Quantity.h
View File

@@ -47,7 +47,7 @@ public:
Quantity(const Quantity&);
Quantity(double Value, const Unit& unit=Unit());
/// Destruction
~Quantity () {};
~Quantity () {}
/** Operators. */
//@{

2
src/Base/Unit.h
View File

@@ -57,7 +57,7 @@ public:
Unit(const Unit&);
Unit(const std::string& Pars);
/// Destruction
~Unit () {};
~Unit () {}
/** Operators. */

4
src/Base/Vector3D.h
View File

@@ -218,7 +218,7 @@ template <class _Pr1, class _Pr2>
inline Vector3<_Pr1> toVector(const Vector3<_Pr2>& v)
{
return Vector3<_Pr1>((_Pr1)v.x,(_Pr1)v.y,(_Pr1)v.z);
};
}
typedef Vector3<float> Vector3f;
typedef Vector3<double> Vector3d;
@@ -260,7 +260,7 @@ inline _Vec1 convertTo(const _Vec2& v)
typedef typename traits_out::float_type float_type;
traits_type t(v);
return _Vec1((float_type)t.x(),(float_type)t.y(),(float_type)t.z());
};
}
} // namespace Base

10
src/Base/ViewProj.h
View File

@@ -36,8 +36,8 @@ namespace Base {
class BaseExport ViewProjMethod
{
public:
virtual ~ViewProjMethod(){};
virtual bool isValid() const { return true; };
virtual ~ViewProjMethod(){}
virtual bool isValid() const { return true; }
/** Convert 3D point to 2D projection plane */
virtual Vector3f operator()(const Vector3f &rclPt) const = 0;
/** Convert 3D point to 2D projection plane */
@@ -50,7 +50,7 @@ public:
virtual Matrix4D getProjectionMatrix (void) const = 0;
protected:
ViewProjMethod(){};
ViewProjMethod(){}
};
/**
@@ -60,8 +60,8 @@ protected:
class BaseExport ViewProjMatrix : public ViewProjMethod
{
public:
ViewProjMatrix (const Matrix4D &rclMtx) : _clMtx(rclMtx) { _clMtxInv = _clMtx; _clMtxInv.inverse(); };
virtual ~ViewProjMatrix(){};
ViewProjMatrix (const Matrix4D &rclMtx) : _clMtx(rclMtx) { _clMtxInv = _clMtx; _clMtxInv.inverse(); }
virtual ~ViewProjMatrix(){}
inline Vector3f operator()(const Vector3f &rclPt) const;
inline Vector3d operator()(const Vector3d &rclPt) const;