end of cleanup ; naming conventions, balance between c and h files

1 files changed, 30 insertions, 38 deletions

diff --git a/source/blender/python/api2_2x/Wave.h b/source/blender/python/api2_2x/Wave.h
index 8fab6b0d5da..1544088535d 100644
--- a/source/blender/python/api2_2x/Wave.h
+++ b/source/blender/python/api2_2x/Wave.h
@@ -52,51 +52,43 @@ PyObject *M_Wave_New (PyObject *self, PyObject *args);
 PyObject *M_Wave_Get (PyObject *self, PyObject *args);
 
 
-/*****************************************************************************/
-/* Python C_Wave structure definition:                                       */
-/*****************************************************************************/
-typedef struct {
-  PyObject_HEAD
-  Effect   *wave;
-} C_Wave;
-
 #include"Effect.h"
 /*****************************************************************************/
-/* Python C_Wave methods declarations:                                       */
+/* Python BPy_Wave methods declarations:                                       */
 /*****************************************************************************/
-PyObject *Effect_getType(C_Effect *self);
-PyObject *Effect_setType(C_Effect *self, PyObject *args);
-PyObject *Effect_getFlag(C_Effect *self);
-PyObject *Effect_setFlag(C_Effect *self, PyObject *args);
-PyObject *Wave_getStartx(C_Wave *self);
-PyObject *Wave_setStartx(C_Wave *self,PyObject*a);
-PyObject *Wave_getStarty(C_Wave *self);
-PyObject *Wave_setStarty(C_Wave *self,PyObject*a);
-PyObject *Wave_getHeight(C_Wave *self);
-PyObject *Wave_setHeight(C_Wave *self,PyObject*a);
-PyObject *Wave_getWidth(C_Wave *self);
-PyObject *Wave_setWidth(C_Wave *self,PyObject*a);
-PyObject *Wave_getNarrow(C_Wave *self);
-PyObject *Wave_setNarrow(C_Wave *self,PyObject*a);
-PyObject *Wave_getSpeed(C_Wave *self);
-PyObject *Wave_setSpeed(C_Wave *self,PyObject*a);
-PyObject *Wave_getMinfac(C_Wave *self);
-PyObject *Wave_setMinfac(C_Wave *self,PyObject*a);
-PyObject *Wave_getDamp(C_Wave *self);
-PyObject *Wave_setDamp(C_Wave *self,PyObject*a);
-PyObject *Wave_getTimeoffs(C_Wave *self);
-PyObject *Wave_setTimeoffs(C_Wave *self,PyObject*a);
-PyObject *Wave_getLifetime(C_Wave *self);
-PyObject *Wave_setLifetime(C_Wave *self,PyObject*a);
+PyObject *Effect_getType(BPy_Effect *self);
+PyObject *Effect_setType(BPy_Effect *self, PyObject *args);
+PyObject *Effect_getFlag(BPy_Effect *self);
+PyObject *Effect_setFlag(BPy_Effect *self, PyObject *args);
+PyObject *Wave_getStartx(BPy_Wave *self);
+PyObject *Wave_setStartx(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getStarty(BPy_Wave *self);
+PyObject *Wave_setStarty(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getHeight(BPy_Wave *self);
+PyObject *Wave_setHeight(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getWidth(BPy_Wave *self);
+PyObject *Wave_setWidth(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getNarrow(BPy_Wave *self);
+PyObject *Wave_setNarrow(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getSpeed(BPy_Wave *self);
+PyObject *Wave_setSpeed(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getMinfac(BPy_Wave *self);
+PyObject *Wave_setMinfac(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getDamp(BPy_Wave *self);
+PyObject *Wave_setDamp(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getTimeoffs(BPy_Wave *self);
+PyObject *Wave_setTimeoffs(BPy_Wave *self,PyObject*a);
+PyObject *Wave_getLifetime(BPy_Wave *self);
+PyObject *Wave_setLifetime(BPy_Wave *self,PyObject*a);
 
 /*****************************************************************************/
 /* Python Wave_Type callback function prototypes:                            */
 /*****************************************************************************/
-void WaveDeAlloc (C_Wave *msh);
-int WavePrint (C_Wave *msh, FILE *fp, int flags);
-int WaveSetAttr (C_Wave *msh, char *name, PyObject *v);
-PyObject *WaveGetAttr (C_Wave *msh, char *name);
-PyObject *WaveRepr (C_Wave *msh);
+void WaveDeAlloc (BPy_Wave *msh);
+int WavePrint (BPy_Wave *msh, FILE *fp, int flags);
+int WaveSetAttr (BPy_Wave *msh, char *name, PyObject *v);
+PyObject *WaveGetAttr (BPy_Wave *msh, char *name);
+PyObject *WaveRepr (BPy_Wave *msh);
 PyObject* WaveCreatePyObject (struct Effect *wave);
 int WaveCheckPyObject (PyObject *py_obj);
 struct Wave* WaveFromPyObject (PyObject *py_obj);