Commit 721a0969 authored by Christoph Reiter's avatar Christoph Reiter 🐍
Browse files

Rename PYGLIB_DEFINE_TYPE to PYGI_DEFINE_TYPE

This is a leftover from when things were split up
parent 9787959f
Pipeline #170648 passed with stages
in 9 minutes and 42 seconds
......@@ -30,7 +30,7 @@
GQuark pygboxed_type_key;
PYGLIB_DEFINE_TYPE("gobject.GBoxed", PyGBoxed_Type, PyGBoxed);
PYGI_DEFINE_TYPE("gobject.GBoxed", PyGBoxed_Type, PyGBoxed);
static void
gboxed_dealloc(PyGBoxed *self)
......
......@@ -30,7 +30,7 @@
GQuark pygenum_class_key;
PYGLIB_DEFINE_TYPE("gobject.GEnum", PyGEnum_Type, PyGEnum);
PYGI_DEFINE_TYPE("gobject.GEnum", PyGEnum_Type, PyGEnum);
static PyObject *
pyg_enum_val_new(PyObject* subclass, GType gtype, PyObject *intval)
......
......@@ -29,7 +29,7 @@
GQuark pygflags_class_key;
PYGLIB_DEFINE_TYPE("gobject.GFlags", PyGFlags_Type, PyGFlags);
PYGI_DEFINE_TYPE("gobject.GFlags", PyGFlags_Type, PyGFlags);
static PyObject *
pyg_flags_val_new(PyObject* subclass, GType gtype, PyObject *intval)
......
......@@ -165,7 +165,7 @@ boxed_init (PyObject *self,
return 0;
}
PYGLIB_DEFINE_TYPE("gi.Boxed", PyGIBoxed_Type, PyGIBoxed);
PYGI_DEFINE_TYPE("gi.Boxed", PyGIBoxed_Type, PyGIBoxed);
PyObject *
pygi_boxed_new (PyTypeObject *type,
......
......@@ -44,7 +44,7 @@ _ccallback_call(PyGICCallback *self, PyObject *args, PyObject *kwargs)
return result;
}
PYGLIB_DEFINE_TYPE("gi.CCallback", PyGICCallback_Type, PyGICCallback);
PYGI_DEFINE_TYPE("gi.CCallback", PyGICCallback_Type, PyGICCallback);
PyObject *
_pygi_ccallback_new (GCallback callback,
......
......@@ -233,7 +233,7 @@ _base_info_richcompare (PyGIBaseInfo *self, PyObject *other, int op)
return res;
}
PYGLIB_DEFINE_TYPE("gi.BaseInfo", PyGIBaseInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE("gi.BaseInfo", PyGIBaseInfo_Type, PyGIBaseInfo);
gboolean
_pygi_is_python_keyword (const gchar *name)
......@@ -514,7 +514,7 @@ out:
/* CallableInfo */
PYGLIB_DEFINE_TYPE ("gi.CallableInfo", PyGICallableInfo_Type, PyGICallableInfo);
PYGI_DEFINE_TYPE ("gi.CallableInfo", PyGICallableInfo_Type, PyGICallableInfo);
/* _callable_info_call:
*
......@@ -761,21 +761,21 @@ static PyMethodDef _PyGICallableInfo_methods[] = {
};
/* CallbackInfo */
PYGLIB_DEFINE_TYPE ("gi.CallbackInfo", PyGICallbackInfo_Type, PyGICallableInfo);
PYGI_DEFINE_TYPE ("gi.CallbackInfo", PyGICallbackInfo_Type, PyGICallableInfo);
static PyMethodDef _PyGICallbackInfo_methods[] = {
{ NULL, NULL, 0 }
};
/* ErrorDomainInfo */
PYGLIB_DEFINE_TYPE ("gi.ErrorDomainInfo", PyGIErrorDomainInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.ErrorDomainInfo", PyGIErrorDomainInfo_Type, PyGIBaseInfo);
static PyMethodDef _PyGIErrorDomainInfo_methods[] = {
{ NULL, NULL, 0 }
};
/* SignalInfo */
PYGLIB_DEFINE_TYPE ("gi.SignalInfo", PyGISignalInfo_Type, PyGICallableInfo);
PYGI_DEFINE_TYPE ("gi.SignalInfo", PyGISignalInfo_Type, PyGICallableInfo);
static PyObject *
_wrap_g_signal_info_get_flags (PyGIBaseInfo *self)
......@@ -805,7 +805,7 @@ static PyMethodDef _PyGISignalInfo_methods[] = {
};
/* PropertyInfo */
PYGLIB_DEFINE_TYPE ("gi.PropertyInfo", PyGIPropertyInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.PropertyInfo", PyGIPropertyInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_property_info_get_flags (PyGIBaseInfo *self)
......@@ -836,7 +836,7 @@ static PyMethodDef _PyGIPropertyInfo_methods[] = {
/* ArgInfo */
PYGLIB_DEFINE_TYPE ("gi.ArgInfo", PyGIArgInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.ArgInfo", PyGIArgInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_arg_info_get_direction (PyGIBaseInfo *self)
......@@ -923,7 +923,7 @@ static PyMethodDef _PyGIArgInfo_methods[] = {
/* TypeInfo */
PYGLIB_DEFINE_TYPE ("gi.TypeInfo", PyGITypeInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.TypeInfo", PyGITypeInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_type_info_is_pointer (PyGIBaseInfo *self)
......@@ -1009,7 +1009,7 @@ static PyMethodDef _PyGITypeInfo_methods[] = {
/* FunctionInfo */
PYGLIB_DEFINE_TYPE ("gi.FunctionInfo", PyGIFunctionInfo_Type, PyGICallableInfo);
PYGI_DEFINE_TYPE ("gi.FunctionInfo", PyGIFunctionInfo_Type, PyGICallableInfo);
static PyObject *
_wrap_g_function_info_is_constructor (PyGIBaseInfo *self)
......@@ -1228,7 +1228,7 @@ static PyMethodDef _PyGIFunctionInfo_methods[] = {
};
/* RegisteredTypeInfo */
PYGLIB_DEFINE_TYPE ("gi.RegisteredTypeInfo", PyGIRegisteredTypeInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.RegisteredTypeInfo", PyGIRegisteredTypeInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_registered_type_info_get_type_name (PyGIBaseInfo *self)
......@@ -1261,7 +1261,7 @@ static PyMethodDef _PyGIRegisteredTypeInfo_methods[] = {
/* GIStructInfo */
PYGLIB_DEFINE_TYPE ("StructInfo", PyGIStructInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("StructInfo", PyGIStructInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_struct_info_get_fields (PyGIBaseInfo *self)
......@@ -1438,7 +1438,7 @@ pygi_g_struct_info_is_simple (GIStructInfo *struct_info)
/* EnumInfo */
PYGLIB_DEFINE_TYPE ("gi.EnumInfo", PyGIEnumInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.EnumInfo", PyGIEnumInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_enum_info_get_values (PyGIBaseInfo *self)
......@@ -1482,7 +1482,7 @@ static PyMethodDef _PyGIEnumInfo_methods[] = {
/* ObjectInfo */
PYGLIB_DEFINE_TYPE ("ObjectInfo", PyGIObjectInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("ObjectInfo", PyGIObjectInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_object_info_get_parent (PyGIBaseInfo *self)
......@@ -1624,7 +1624,7 @@ static PyMethodDef _PyGIObjectInfo_methods[] = {
/* GIInterfaceInfo */
PYGLIB_DEFINE_TYPE ("InterfaceInfo", PyGIInterfaceInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("InterfaceInfo", PyGIInterfaceInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_interface_info_get_methods (PyGIBaseInfo *self)
......@@ -1701,7 +1701,7 @@ static PyMethodDef _PyGIInterfaceInfo_methods[] = {
};
/* GIConstantInfo */
PYGLIB_DEFINE_TYPE ("gi.ConstantInfo", PyGIConstantInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.ConstantInfo", PyGIConstantInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_constant_info_get_value (PyGIBaseInfo *self)
......@@ -1741,7 +1741,7 @@ static PyMethodDef _PyGIConstantInfo_methods[] = {
};
/* GIValueInfo */
PYGLIB_DEFINE_TYPE ("gi.ValueInfo", PyGIValueInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.ValueInfo", PyGIValueInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_value_info_get_value (PyGIBaseInfo *self)
......@@ -1761,7 +1761,7 @@ static PyMethodDef _PyGIValueInfo_methods[] = {
/* GIFieldInfo */
PYGLIB_DEFINE_TYPE ("gi.FieldInfo", PyGIFieldInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.FieldInfo", PyGIFieldInfo_Type, PyGIBaseInfo);
static gssize
_struct_field_array_length_marshal (gsize length_index,
......@@ -2157,14 +2157,14 @@ static PyMethodDef _PyGIFieldInfo_methods[] = {
/* GIUnresolvedInfo */
PYGLIB_DEFINE_TYPE ("gi.UnresolvedInfo", PyGIUnresolvedInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.UnresolvedInfo", PyGIUnresolvedInfo_Type, PyGIBaseInfo);
static PyMethodDef _PyGIUnresolvedInfo_methods[] = {
{ NULL, NULL, 0 }
};
/* GIVFuncInfo */
PYGLIB_DEFINE_TYPE ("gi.VFuncInfo", PyGIVFuncInfo_Type, PyGICallableInfo);
PYGI_DEFINE_TYPE ("gi.VFuncInfo", PyGIVFuncInfo_Type, PyGICallableInfo);
static PyObject *
_wrap_g_vfunc_info_get_flags (PyGIBaseInfo *self)
......@@ -2200,7 +2200,7 @@ static PyMethodDef _PyGIVFuncInfo_methods[] = {
/* GIUnionInfo */
PYGLIB_DEFINE_TYPE ("gi.UnionInfo", PyGIUnionInfo_Type, PyGIBaseInfo);
PYGI_DEFINE_TYPE ("gi.UnionInfo", PyGIUnionInfo_Type, PyGIBaseInfo);
static PyObject *
_wrap_g_union_info_get_fields (PyGIBaseInfo *self)
......
......@@ -26,7 +26,7 @@
PyObject *PyGIRepositoryError;
PYGLIB_DEFINE_TYPE("gi.Repository", PyGIRepository_Type, PyGIRepository);
PYGI_DEFINE_TYPE("gi.Repository", PyGIRepository_Type, PyGIRepository);
static PyObject *
_wrap_g_irepository_enumerate_versions (PyGIRepository *self,
......
......@@ -43,7 +43,7 @@ static PyObject *free_list[PyGIResultTuple_MAXSAVESIZE];
static int numfree[PyGIResultTuple_MAXSAVESIZE];
#endif
PYGLIB_DEFINE_TYPE ("gi._gi.ResultTuple", PyGIResultTuple_Type, PyTupleObject)
PYGI_DEFINE_TYPE ("gi._gi.ResultTuple", PyGIResultTuple_Type, PyTupleObject)
/**
* ResultTuple.__repr__() implementation.
......
......@@ -144,7 +144,7 @@ struct_init (PyObject *self,
return 0;
}
PYGLIB_DEFINE_TYPE("gi.Struct", PyGIStruct_Type, PyGIStruct);
PYGI_DEFINE_TYPE("gi.Struct", PyGIStruct_Type, PyGIStruct);
PyObject *
......
......@@ -111,7 +111,7 @@ typedef struct {
GType type;
} PyGTypeWrapper;
PYGLIB_DEFINE_TYPE("gobject.GType", PyGTypeWrapper_Type, PyGTypeWrapper);
PYGI_DEFINE_TYPE("gobject.GType", PyGTypeWrapper_Type, PyGTypeWrapper);
static PyObject*
generic_gsize_richcompare(gsize a, gsize b, int op)
......@@ -1253,7 +1253,7 @@ object_doc_descr_get(PyObject *self, PyObject *obj, PyObject *type)
return pystring;
}
PYGLIB_DEFINE_TYPE("gobject.GObject.__doc__", PyGObjectDoc_Type, PyObject);
PYGI_DEFINE_TYPE("gobject.GObject.__doc__", PyGObjectDoc_Type, PyObject);
/**
* pyg_object_descr_doc_get:
......
......@@ -12,7 +12,7 @@ const gchar * pyg_constant_strip_prefix(const gchar *name, const gchar *strip_pr
gboolean pygi_guint_from_pyssize (Py_ssize_t pyval, guint *result);
#define PYGLIB_DEFINE_TYPE(typename, symbol, csymbol) \
#define PYGI_DEFINE_TYPE(typename, symbol, csymbol) \
PyTypeObject symbol = { \
PyVarObject_HEAD_INIT(NULL, 0) \
typename, \
......
......@@ -30,7 +30,7 @@
GQuark pyginterface_type_key;
GQuark pyginterface_info_key;
PYGLIB_DEFINE_TYPE("gobject.GInterface", PyGInterface_Type, PyObject)
PYGI_DEFINE_TYPE("gobject.GInterface", PyGInterface_Type, PyObject)
static int
pyg_interface_init(PyObject *self, PyObject *args, PyObject *kwargs)
......
......@@ -207,7 +207,7 @@ typedef struct {
guint index;
} PyGPropsIter;
PYGLIB_DEFINE_TYPE("gi._gi.GPropsIter", PyGPropsIter_Type, PyGPropsIter);
PYGI_DEFINE_TYPE("gi._gi.GPropsIter", PyGPropsIter_Type, PyGPropsIter);
static void
pyg_props_iter_dealloc(PyGPropsIter *self)
......@@ -352,7 +352,7 @@ set_property_from_pspec(GObject *obj,
return TRUE;
}
PYGLIB_DEFINE_TYPE("gi._gi.GProps", PyGProps_Type, PyGProps);
PYGI_DEFINE_TYPE("gi._gi.GProps", PyGProps_Type, PyGProps);
static int
PyGProps_setattro(PyGProps *self, PyObject *attr, PyObject *pvalue)
......@@ -478,7 +478,7 @@ static PySequenceMethods _PyGProps_as_sequence = {
0
};
PYGLIB_DEFINE_TYPE("gi._gi.GPropsDescr", PyGPropsDescr_Type, PyObject);
PYGI_DEFINE_TYPE("gi._gi.GPropsDescr", PyGPropsDescr_Type, PyObject);
static PyObject *
pyg_props_descr_descr_get(PyObject *self, PyObject *obj, PyObject *type)
......@@ -1107,7 +1107,7 @@ pygobject_watch_closure(PyObject *self, GClosure *closure)
/* -------------- PyGObject behaviour ----------------- */
PYGLIB_DEFINE_TYPE("gi._gi.GObject", PyGObject_Type, PyGObject);
PYGI_DEFINE_TYPE("gi._gi.GObject", PyGObject_Type, PyGObject);
static void
pygobject_dealloc(PyGObject *self)
......@@ -2258,7 +2258,7 @@ typedef struct {
gboolean have_floating_ref;
} PyGObjectWeakRef;
PYGLIB_DEFINE_TYPE("gi._gi.GObjectWeakRef", PyGObjectWeakRef_Type, PyGObjectWeakRef);
PYGI_DEFINE_TYPE("gi._gi.GObjectWeakRef", PyGObjectWeakRef_Type, PyGObjectWeakRef);
static int
pygobject_weak_ref_traverse(PyGObjectWeakRef *self, visitproc visit, void *arg)
......
......@@ -25,7 +25,7 @@
#include "pygi-util.h"
#include "pygi-basictype.h"
PYGLIB_DEFINE_TYPE("gi._gi.OptionContext", PyGOptionContext_Type, PyGOptionContext)
PYGI_DEFINE_TYPE("gi._gi.OptionContext", PyGOptionContext_Type, PyGOptionContext)
/**
* pyg_option_group_transfer_group:
......
......@@ -24,7 +24,7 @@
#include "pygi-error.h"
#include "pygi-util.h"
PYGLIB_DEFINE_TYPE("gi._gi.OptionGroup", PyGOptionGroup_Type, PyGOptionGroup)
PYGI_DEFINE_TYPE("gi._gi.OptionGroup", PyGOptionGroup_Type, PyGOptionGroup)
/**
* pyg_option_group_new:
......
......@@ -31,7 +31,7 @@
#include "pygi-util.h"
#include "pygi-basictype.h"
PYGLIB_DEFINE_TYPE("gobject.GParamSpec", PyGParamSpec_Type, PyGParamSpec);
PYGI_DEFINE_TYPE("gobject.GParamSpec", PyGParamSpec_Type, PyGParamSpec);
static PyObject*
pyg_param_spec_richcompare(PyObject *self, PyObject *other, int op)
......
......@@ -30,7 +30,7 @@
GQuark pygpointer_class_key;
PYGLIB_DEFINE_TYPE("gobject.GPointer", PyGPointer_Type, PyGPointer);
PYGI_DEFINE_TYPE("gobject.GPointer", PyGPointer_Type, PyGPointer);
static void
pyg_pointer_dealloc(PyGPointer *self)
......
......@@ -32,7 +32,7 @@ struct _PyGChildSetupData {
PyObject *data;
};
PYGLIB_DEFINE_TYPE("gi._gi.Pid", PyGPid_Type, PyLongObject)
PYGI_DEFINE_TYPE("gi._gi.Pid", PyGPid_Type, PyLongObject)
static GPid
pyg_pid_get_pid (PyObject *self)
......
......@@ -5,7 +5,7 @@
#include "test-unknown.h"
#include "test-floating.h"
#define PYGLIB_DEFINE_TYPE(typename, symbol, csymbol) \
#define PYGI_DEFINE_TYPE(typename, symbol, csymbol) \
PyTypeObject symbol = { \
PyVarObject_HEAD_INIT(NULL, 0) \
typename, \
......@@ -116,7 +116,7 @@ static const PyMethodDef _PyTestInterface_methods[] = {
};
/* TestInterface */
PYGLIB_DEFINE_TYPE("test.Interface", PyTestInterface_Type, PyObject);
PYGI_DEFINE_TYPE("test.Interface", PyTestInterface_Type, PyObject);
static PyObject *
_wrap_TestInterface__do_iface_method(PyObject *cls, PyObject *args, PyObject *kwargs)
......@@ -141,7 +141,7 @@ _wrap_TestInterface__do_iface_method(PyObject *cls, PyObject *args, PyObject *kw
return Py_None;
}
PYGLIB_DEFINE_TYPE("testhelper.Unknown", PyTestUnknown_Type, PyGObject);
PYGI_DEFINE_TYPE("testhelper.Unknown", PyTestUnknown_Type, PyGObject);
static void
_wrap_TestInterface__proxy_do_iface_method(TestInterface *self)
......@@ -227,10 +227,10 @@ static const GInterfaceInfo __TestInterface__iinfo = {
};
/* TestFloating */
PYGLIB_DEFINE_TYPE("testhelper.Floating", PyTestFloating_Type, PyGObject);
PYGI_DEFINE_TYPE("testhelper.Floating", PyTestFloating_Type, PyGObject);
/* TestOwnedByLibrary */
PYGLIB_DEFINE_TYPE("testhelper.OwnedByLibrary", PyTestOwnedByLibrary_Type, PyGObject);
PYGI_DEFINE_TYPE("testhelper.OwnedByLibrary", PyTestOwnedByLibrary_Type, PyGObject);
static PyObject *
_wrap_test_owned_by_library_release (PyGObject *self)
......@@ -245,7 +245,7 @@ static const PyMethodDef _PyTestOwnedByLibrary_methods[] = {
};
/* TestFloatingAndSunk */
PYGLIB_DEFINE_TYPE("testhelper.FloatingAndSunk", PyTestFloatingAndSunk_Type, PyGObject);
PYGI_DEFINE_TYPE("testhelper.FloatingAndSunk", PyTestFloatingAndSunk_Type, PyGObject);
static PyObject *
_wrap_test_floating_and_sunk_release (PyGObject *self)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment