General housekeeping and cleanup. Move static declarations and

data definitions from .h files into corresponding .c files.
Blame zr for this since he's the one who pointed out that our
bpy headers were a mish-mash of stuff that belonged in the .c files!

In a nutshell, the headers should contain the declarations necessary
to use a module or class.  The implementation files ( .c in this case )
should contain statements that allocate storage ( definitions in
the C sense ) and executable code.

When used at file scope, the keyword 'static' means "don't tell
anyone else about this".  Since headers describe a public
interface, static declarations and definitions belong in the
implementation files.

The net result of all this is that after stuff has moved out
into the .c files, the .h files are empty or mostly empty.
I didn't delete them since there seem to be some public
declarations and because I did not want to cause too much
disruption at one time. Time enough for that later!

1 files changed, 2 insertions, 193 deletions

diff --git a/source/blender/python/api2_2x/Curve.h b/source/blender/python/api2_2x/Curve.h
index a89d0b7c94f..a42aa13a611 100644
--- a/source/blender/python/api2_2x/Curve.h
+++ b/source/blender/python/api2_2x/Curve.h
@@ -24,7 +24,7 @@
  *
  * This is a new part of Blender.
  *
- * Contributor(s): Jacques Guignot
+ * Contributor(s): Jacques Guignot, Stephen Swaney
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
@@ -32,197 +32,6 @@
 #ifndef EXPP_CURVE_H
 #define EXPP_CURVE_H
 
-#include <Python.h>
-#include <stdio.h>
-
-#include <BLI_arithb.h>
-#include <BLI_blenlib.h>
-#include <BKE_main.h>
-#include <BKE_global.h>
-#include <BKE_object.h>
-#include <BKE_library.h>
-#include <BKE_curve.h>
-
-#include "gen_utils.h"
-#include "bpy_types.h"
-
-/*****************************************************************************/
-/*  Python API function prototypes for the Curve module.                     */
-/*****************************************************************************/
-static PyObject *M_Curve_New (PyObject *self, PyObject *args);
-static PyObject *M_Curve_Get (PyObject *self, PyObject *args);
-
-/*****************************************************************************/
-/* The following string definitions are used for documentation strings.      */
-/* In Python these will be written to the console when doing a               */
-/*  Blender.Curve.__doc__                                                    */
-/*****************************************************************************/
-char M_Curve_doc[] = "The Blender Curve module\n\n\
-This module provides access to **Curve Data** in Blender.\n\
-Functions :\n\
-	New(opt name) : creates a new curve object with the given name (optional)\n\
-	Get(name) : retreives a curve  with the given name (mandatory)\n\
-	get(name) : same as Get. Kept for compatibility reasons";
-char M_Curve_New_doc[] ="";
-char M_Curve_Get_doc[] ="xxx";
-/*****************************************************************************/
-/*  Python method structure definition for Blender.Curve module:             */
-/*****************************************************************************/
-struct PyMethodDef M_Curve_methods[] = {
-  {"New",(PyCFunction)M_Curve_New, METH_VARARGS,M_Curve_New_doc},
-  {"Get",         M_Curve_Get,         METH_VARARGS, M_Curve_Get_doc},
-  {"get",         M_Curve_Get,         METH_VARARGS, M_Curve_Get_doc},
-  {NULL, NULL, 0, NULL}
-};
-
-
-/*****************************************************************************/
-/*  Python BPy_Curve methods declarations:                                     */
-/*****************************************************************************/
-static PyObject *Curve_getName(BPy_Curve *self);
-static PyObject *Curve_setName(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getPathLen(BPy_Curve *self);
-static PyObject *Curve_setPathLen(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getTotcol(BPy_Curve *self);
-static PyObject *Curve_setTotcol(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getMode(BPy_Curve *self);
-static PyObject *Curve_setMode(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getBevresol(BPy_Curve *self);
-static PyObject *Curve_setBevresol(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getResolu(BPy_Curve *self);
-static PyObject *Curve_setResolu(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getResolv(BPy_Curve *self);
-static PyObject *Curve_setResolv(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getWidth(BPy_Curve *self);
-static PyObject *Curve_setWidth(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getExt1(BPy_Curve *self);
-static PyObject *Curve_setExt1(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getExt2(BPy_Curve *self);
-static PyObject *Curve_setExt2(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getControlPoint(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_setControlPoint(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getLoc(BPy_Curve *self);
-static PyObject *Curve_setLoc(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getRot(BPy_Curve *self);
-static PyObject *Curve_setRot(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getSize(BPy_Curve *self);
-static PyObject *Curve_setSize(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getNumCurves(BPy_Curve *self);
-static PyObject *Curve_isNurb( BPy_Curve *self, PyObject *args );
-static PyObject *Curve_getNumPoints(BPy_Curve *self, PyObject *args);
-static PyObject *Curve_getNumPoints(BPy_Curve *self, PyObject *args);
-
-/*****************************************************************************/
-/*  Python BPy_Curve methods table:                                            */
-/*****************************************************************************/
-static PyMethodDef BPy_Curve_methods[] = {
-  {"getName", (PyCFunction)Curve_getName,
-	METH_NOARGS,"() - Return Curve Data name"},
-  {"setName", (PyCFunction)Curve_setName,
-	METH_VARARGS,"() - Sets Curve Data name"},
-  {"getPathLen", (PyCFunction)Curve_getPathLen,
-	METH_NOARGS,"() - Return Curve path length"},
-  {"setPathLen", (PyCFunction)Curve_setPathLen,
-	METH_VARARGS,"(int) - Sets Curve path length"},
-  {"getTotcol", (PyCFunction)Curve_getTotcol,
-	METH_NOARGS,"() - Return the number of materials of the curve"},
-  {"setTotcol", (PyCFunction)Curve_setTotcol, 
-	METH_VARARGS,"(int) - Sets the number of materials of the curve"},
-  {"getFlag", (PyCFunction)Curve_getMode, 
-   	METH_NOARGS,"() - Return flag (see the doc for semantic)"},
-  {"setFlag", (PyCFunction)Curve_setMode, 
-	METH_VARARGS,"(int) - Sets flag (see the doc for semantic)"},
-  {"getBevresol", (PyCFunction)Curve_getBevresol, 
-	METH_NOARGS,"() - Return bevel resolution"},
-  {"setBevresol", (PyCFunction)Curve_setBevresol, 
-	METH_VARARGS,"(int) - Sets bevel resolution"},
-  {"getResolu", (PyCFunction)Curve_getResolu, 
-	METH_NOARGS,"() - Return U resolution"},
-  {"setResolu", (PyCFunction)Curve_setResolu, 
-	METH_VARARGS,"(int) - Sets U resolution"},
-  {"getResolv", (PyCFunction)Curve_getResolv, 
-	METH_NOARGS,"() - Return V resolution"},
-  {"setResolv", (PyCFunction)Curve_setResolv, 
-	METH_VARARGS,"(int) - Sets V resolution"},
-  {"getWidth", (PyCFunction)Curve_getWidth, 
-	METH_NOARGS,"() - Return curve width"},
-  {"setWidth", (PyCFunction)Curve_setWidth, 
-	METH_VARARGS,"(int) - Sets curve width"},
-  {"getExt1", (PyCFunction)Curve_getExt1, 
-	METH_NOARGS,"() - Returns extent 1 of the bevel"},
-  {"setExt1", (PyCFunction)Curve_setExt1, 
-	METH_VARARGS,"(int) - Sets  extent 1 of the bevel"},
-  {"getExt2", (PyCFunction)Curve_getExt2, 
-	METH_NOARGS,"() - Return extent 2 of the bevel "},
-  {"setExt2", (PyCFunction)Curve_setExt2, 
-	METH_VARARGS,"(int) - Sets extent 2 of the bevel "},
-  {"getControlPoint", (PyCFunction)Curve_getControlPoint, 
-	METH_VARARGS,"(int numcurve,int numpoint) -\
-Gets a control point.Depending upon the curve type, returne a list of 4 or 9 floats"},
-  {"setControlPoint", (PyCFunction)Curve_setControlPoint, 
-	METH_VARARGS,"(int numcurve,int numpoint,float x,float y,float z,\
-loat w)(nurbs) or  (int numcurve,int numpoint,float x1,...,x9(bezier)\
-Sets a control point "},
-  {"getLoc", (PyCFunction)Curve_getLoc, 
-	METH_NOARGS,"() - Gets Location of the curve (a 3-tuple) "},
-  {"setLoc", (PyCFunction)Curve_setLoc, 
-	METH_VARARGS,"(3-tuple) - Sets Location "},
-  {"getRot", (PyCFunction)Curve_getRot, 
-	METH_NOARGS,"() - Gets curve rotation"},
-  {"setRot", (PyCFunction)Curve_setRot, 
-	METH_VARARGS,"(3-tuple) - Sets curve rotation"},
-  {"getSize", (PyCFunction)Curve_getSize, 
-	METH_NOARGS,"() - Gets curve size"},
-  {"setSize", (PyCFunction)Curve_setSize, 
-	METH_VARARGS,"(3-tuple) - Sets curve size"},
-  {"getNumCurves", (PyCFunction)Curve_getNumCurves, 
-	METH_NOARGS,"() - Gets # of curves"},
-  {"isNurb", (PyCFunction)Curve_isNurb, 
-	METH_VARARGS,"(nothing or integer) - returns 1 or 0, depending upon the curve being a Nurb"},
-  {"getNumPoints", (PyCFunction)Curve_getNumPoints, 
-	METH_VARARGS,"(nothing or integer) - returns the number of points of the specified curve"},
-  {0}
-};
-
-/*****************************************************************************/
-/*  Python Curve_Type callback function prototypes:                           */
-/*****************************************************************************/
-static void CurveDeAlloc (BPy_Curve *msh);
-//static int CurvePrint (BPy_Curve *msh, FILE *fp, int flags);
-static int CurveSetAttr (BPy_Curve *msh, char *name, PyObject *v);
-static PyObject *CurveGetAttr (BPy_Curve *msh, char *name);
-static PyObject *CurveRepr (BPy_Curve *msh);
-// PyObject* Curve_CreatePyObject (struct Curve *curve);
-//int Curve_CheckPyObject (PyObject *py_obj);
-//struct Curve* Curve_FromPyObject (PyObject *py_obj);
-
-
-/*****************************************************************************/
-/* Python Curve_Type structure definition:                                   */
-/*****************************************************************************/
-PyTypeObject Curve_Type =
-{
-  PyObject_HEAD_INIT(NULL)
-  0,                                      /* ob_size */
-  "Curve",                               /* tp_name */
-  sizeof (BPy_Curve),                      /* tp_basicsize */
-  0,                                      /* tp_itemsize */
-  /* methods */
-  (destructor)CurveDeAlloc,              /* tp_dealloc */
-  0,                 /* tp_print */
-  (getattrfunc)CurveGetAttr,             /* tp_getattr */
-  (setattrfunc)CurveSetAttr,             /* tp_setattr */
-  0,                                      /* tp_compare */
-  (reprfunc)CurveRepr,                   /* tp_repr */
-  0,                                      /* tp_as_number */
-  0,                                      /* tp_as_sequence */
-  0,                                      /* tp_as_mapping */
-  0,                                      /* tp_as_hash */
-  0,0,0,0,0,0,
-  0,                                      /* tp_doc */ 
-  0,0,0,0,0,0,
-  BPy_Curve_methods,                       /* tp_methods */
-  0,                                      /* tp_members */
-};
+#include <bpy_types.h>
 
 #endif /* EXPP_CURVE_H */