Another step in the Big Bpy Cleanup.

- move static declarations and data definitions out of headers.
  the BGL module still need cleaning.

- move declarations out of modules.h and into appropriate .h files.
  modules.h still exists as a container for the few modules that
  need to #include almost everything.

- all files now have a $Id tag and have been formatted by indent

there are no changes to executable code.

pre-commit versions are tagged with bpy-cleanup-pre-20041007
for the sake of paranoia.

1 files changed, 22 insertions, 169 deletions

diff --git a/source/blender/python/api2_2x/Metaball.h b/source/blender/python/api2_2x/Metaball.h
index 2d91cdc2dd7..b190b53dce3 100644
--- a/source/blender/python/api2_2x/Metaball.h
+++ b/source/blender/python/api2_2x/Metaball.h
@@ -34,185 +34,38 @@
 #define EXPP_METABALL_H
 
 #include <Python.h>
+#include <DNA_meta_types.h>
 
-#include <BKE_main.h>
-#include <BKE_global.h>
-#include <BKE_mball.h>
-#include <BKE_object.h>
-#include <BKE_library.h>
-#include <BLI_blenlib.h>
 
-#include "constant.h"
-#include "gen_utils.h"
-#include "modules.h"
-#include "bpy_types.h"
+extern PyTypeObject Metaball_Type;
 
+#define BPy_Metaball_Check(v) ((v)->ob_type==&Metaball_Type)
 
-/*****************************************************************************/
-/* Python API function prototypes for the Metaball module.                   */
-/*****************************************************************************/
-static PyObject *M_Metaball_New( PyObject * self, PyObject * args );
-static PyObject *M_Metaball_Get( PyObject * self, PyObject * args );
+/* Python BPy_Metaball structure definition */
+typedef struct {
+	PyObject_HEAD		/* required py macro */
+	MetaBall * metaball;
+} BPy_Metaball;
 
-/*****************************************************************************/
-/* The following string definitions are used for documentation strings.      */
-/* In Python these will be written to the console when doing a               */
-/* Blender.Metaball.__doc__                                                  */
-/*****************************************************************************/
-static char M_Metaball_doc[] =
-	"The Blender Metaball module\n\n\nMetaballs are spheres\
- that can join each other to create smooth,\
- organic volumes\n. The spheres themseves are called\
- 'Metaelements' and can be accessed from the Metaball module.";
 
-static char M_Metaball_New_doc[] = "Creates a new metaball";
+extern PyTypeObject Metaelem_Type;
 
-static char M_Metaball_Get_doc[] = "Retreives an existing metaball";
+#define BPy_Metaelem_Check(v) ((v)->ob_type==&Metaelem_Type)
 
-/*****************************************************************************/
-/* Python method structure definition for Blender.Metaball module:           */
-/*****************************************************************************/
-struct PyMethodDef M_Metaball_methods[] = {
-	{"New", M_Metaball_New, METH_VARARGS, M_Metaball_New_doc},
-	{"Get", M_Metaball_Get, METH_VARARGS, M_Metaball_Get_doc},
-	{"get", M_Metaball_Get, METH_VARARGS, M_Metaball_Get_doc},
-	{NULL, NULL, 0, NULL}
-};
+/* Python BPy_Metaelem structure definition */
+typedef struct {
+	PyObject_HEAD		/* required py macro */
+	MetaElem * metaelem;
+} BPy_Metaelem;
 
 
-/*****************************************************************************/
-/* Python BPy_Metaball methods declarations:                                */
-/*****************************************************************************/
-static PyObject *Metaball_getMetaElemList( BPy_Metaball * self );
-static PyObject *Metaball_addMetaelem( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getBbox( BPy_Metaball * self );
-static PyObject *Metaball_getName( BPy_Metaball * self );
-static PyObject *Metaball_setName( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getWiresize( BPy_Metaball * self );
-static PyObject *Metaball_setWiresize( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getRendersize( BPy_Metaball * self );
-static PyObject *Metaball_setRendersize( BPy_Metaball * self,
-					 PyObject * args );
-static PyObject *Metaball_getThresh( BPy_Metaball * self );
-static PyObject *Metaball_setThresh( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getNMetaElems( BPy_Metaball * self );
-static PyObject *Metaball_getMetatype( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetatype( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetadata( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetadata( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetax( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetax( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetay( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetay( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetaz( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetaz( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetas( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetas( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getMetalen( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_setMetalen( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getloc( BPy_Metaball * self );
-static PyObject *Metaball_setloc( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getrot( BPy_Metaball * self );
-static PyObject *Metaball_setrot( BPy_Metaball * self, PyObject * args );
-static PyObject *Metaball_getsize( BPy_Metaball * self );
-static PyObject *Metaball_setsize( BPy_Metaball * self, PyObject * args );
-
-/*****************************************************************************/
-/* Python BPy_Metaball methods table:                                       */
-/*****************************************************************************/
-static PyMethodDef BPy_Metaball_methods[] = {
-	/* name, method, flags, doc */
-	{"getName", ( PyCFunction ) Metaball_getName,
-	 METH_NOARGS, "() - Return Metaball  name"},
-
-	{"getMetaElemList", ( PyCFunction ) Metaball_getMetaElemList,
-	 METH_NOARGS, "() - Return Metaelems list"},
-
-	{"addMetaelem", ( PyCFunction ) Metaball_addMetaelem,
-	 METH_VARARGS, "() -Adds a metaelem to the metaball"},
-	{"setName", ( PyCFunction ) Metaball_setName,
-	 METH_VARARGS, "() - Sets Metaball  name"},
-	{"getWiresize", ( PyCFunction ) Metaball_getWiresize,
-	 METH_NOARGS, "() - Return Metaball  wire size"},
-	{"setWiresize", ( PyCFunction ) Metaball_setWiresize,
-	 METH_VARARGS, "() - Sets Metaball  wire size"},
-	{"getRendersize", ( PyCFunction ) Metaball_getRendersize,
-	 METH_NOARGS, "() - Return Metaball  render size"},
-	{"setRendersize", ( PyCFunction ) Metaball_setRendersize,
-	 METH_VARARGS, "() - Sets Metaball  render size"},
-	{"getThresh", ( PyCFunction ) Metaball_getThresh,
-	 METH_NOARGS, "() - Return Metaball  threshold"},
-	{"setThresh", ( PyCFunction ) Metaball_setThresh,
-	 METH_VARARGS, "() - Sets Metaball  threshold"},
-	{"getBbox", ( PyCFunction ) Metaball_getBbox,
-	 METH_NOARGS, "() - Return Metaball bounding box"},
-	{"getNMetaElems", ( PyCFunction ) Metaball_getNMetaElems,
-	 METH_NOARGS, "() Returns the number of Spheres "},
-	{"getMetatype", ( PyCFunction ) Metaball_getMetatype,
-	 METH_VARARGS, "() - "},
-	{"setMetatype", ( PyCFunction ) Metaball_setMetatype,
-	 METH_VARARGS, "() - "},
-	{"getMetadata", ( PyCFunction ) Metaball_getMetadata,
-	 METH_VARARGS, "() - Gets Metaball MetaData "},
-	{"setMetadata", ( PyCFunction ) Metaball_setMetadata,
-	 METH_VARARGS, "() - "},
-	{"getMetax", ( PyCFunction ) Metaball_getMetax,
-	 METH_VARARGS, "() - gets the x coordinate of the metaelement "},
-	{"setMetax", ( PyCFunction ) Metaball_setMetax,
-	 METH_VARARGS, "() -sets the x coordinate of the metaelement "},
-	{"getMetay", ( PyCFunction ) Metaball_getMetay,
-	 METH_VARARGS, "() - gets the y coordinate of the metaelement"},
-	{"setMetay", ( PyCFunction ) Metaball_setMetay,
-	 METH_VARARGS, "() - sets the y coordinate of the metaelement"},
-	{"getMetaz", ( PyCFunction ) Metaball_getMetaz,
-	 METH_VARARGS, "() - gets the z coordinate of the metaelement"},
-	{"setMetaz", ( PyCFunction ) Metaball_setMetaz,
-	 METH_VARARGS, "() - sets the z coordinate of the metaelement"},
-	{"getMetas", ( PyCFunction ) Metaball_getMetas,
-	 METH_VARARGS, "() - gets the s coordinate of the metaelement"},
-	{"setMetas", ( PyCFunction ) Metaball_setMetas,
-	 METH_VARARGS, "() - sets the s coordinate of the metaelement"},
-	{"getMetalen", ( PyCFunction ) Metaball_getMetalen,
-	 METH_VARARGS, "() -  gets the length of the metaelement."},
-	{"setMetalen", ( PyCFunction ) Metaball_setMetalen,
-	 METH_VARARGS, "() -  sets the length of the metaelement."},
-	{"getloc", ( PyCFunction ) Metaball_getloc,
-	 METH_NOARGS, "() - Gets Metaball loc values"},
-	{"setloc", ( PyCFunction ) Metaball_setloc,
-	 METH_VARARGS, "(f f f) - Sets Metaball loc values"},
-	{"getrot", ( PyCFunction ) Metaball_getrot,
-	 METH_NOARGS, "() - Gets Metaball rot values"},
-	{"setrot", ( PyCFunction ) Metaball_setrot,
-	 METH_VARARGS, "(f f f) - Sets Metaball rot values"},
-	{"getsize", ( PyCFunction ) Metaball_getsize,
-	 METH_NOARGS, "() - Gets Metaball size values"},
-	{"setsize", ( PyCFunction ) Metaball_setsize,
-	 METH_VARARGS, "(f f f) - Sets Metaball size values"},
-	{NULL, NULL, 0, NULL}
-};
-
-/*****************************************************************************/
-/* Python BPy_Metaelem methods table:                                        */
-/*****************************************************************************/
-static PyMethodDef BPy_Metaelem_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
-/*****************************************************************************/
-/* Python Metaball_Type callback function prototypes:                       */
-/*****************************************************************************/
-static void MetaballDeAlloc( BPy_Metaball * self );
-static int MetaballSetAttr( BPy_Metaball * self, char *name, PyObject * v );
-static PyObject *MetaballGetAttr( BPy_Metaball * self, char *name );
-static PyObject *MetaballRepr( BPy_Metaball * self );
-
-/*****************************************************************************/
-/* Python Metaelem_Type callback function prototypes:                        */
-/*****************************************************************************/
-static void MetaelemDeAlloc( BPy_Metaelem * self );
-static int MetaelemSetAttr( BPy_Metaelem * self, char *name, PyObject * v );
-static PyObject *MetaelemGetAttr( BPy_Metaelem * self, char *name );
-static PyObject *MetaelemRepr( BPy_Metaelem * self );
+/*
+ * prototypes
+ */
 
+PyObject *Metaball_Init( void );
+PyObject *Metaball_CreatePyObject( MetaBall * metaball );
+MetaBall *Metaball_FromPyObject( PyObject * py_obj );
+int Metaball_CheckPyObject( PyObject * py_obj );
 
 #endif				/* EXPP_METABALL_H */