Commit 4e11e0eb authored by Andi Vajda's avatar Andi Vajda
Browse files

Merge branch 'inconsistent' into 'main'

Make parameter names in declarations consistent with definitions.

See merge request !143
parents 5769e495 f5899c96
......@@ -97,7 +97,7 @@ PyTypeObject UMemoryType_ = {
/* UObject */
static PyObject *t_uobject_richcmp(t_uobject *, PyObject *o2, int op);
static PyObject *t_uobject_richcmp(t_uobject *, PyObject *arg, int op);
static PyObject *t_uobject_str(t_uobject *self);
static PyObject *t_uobject_getDynamicClassID(t_uobject *self);
......
......@@ -26,7 +26,7 @@
extern PyTypeObject RuleBasedCollatorType_;
PyObject *wrap_RuleBasedCollator(RuleBasedCollator *collator, int flag);
PyObject *wrap_RuleBasedCollator(RuleBasedCollator *object, int flag);
void _init_collator(PyObject *m);
......
......@@ -345,7 +345,7 @@ public:
};
EXPORT PyObject *PyUnicode_FromUnicodeString(const UnicodeString *string);
EXPORT PyObject *PyUnicode_FromUnicodeString(const UChar *chars, int size);
EXPORT PyObject *PyUnicode_FromUnicodeString(const UChar *utf16, int len16);
EXPORT UnicodeString &PyBytes_AsUnicodeString(PyObject *object,
const char *encoding,
......
......@@ -26,9 +26,9 @@
PyObject *wrap_SimpleDateFormat(SimpleDateFormat *, int);
#if U_ICU_VERSION_HEX >= VERSION_HEX(64, 0, 0)
PyObject *wrap_FormattedDateInterval(FormattedDateInterval *value, int flag);
PyObject *wrap_FormattedDateInterval(FormattedDateInterval *object, int flag);
PyObject *wrap_FormattedRelativeDateTime(
FormattedRelativeDateTime *value, int flag);
FormattedRelativeDateTime *object, int flag);
#endif
void _init_dateformat(PyObject *m);
......
......@@ -50,12 +50,13 @@ extern PyTypeObject FormattedValueType_;
PyObject *t_format_format(t_format *self, PyObject *args);
PyObject *wrap_Format(Format *format);
#if U_ICU_VERSION_HEX >= 0x04000000
PyObject *wrap_PluralRules(PluralRules *rules, int flag);
PyObject *wrap_PluralRules(PluralRules *object, int flag);
#endif
#if U_ICU_VERSION_HEX >= VERSION_HEX(64, 0, 0)
PyObject *wrap_FormattedValue(FormattedValue *formatted_value, int flag);
PyObject *wrap_FormattedList(FormattedList *formatted_list, int flag);
PyObject *wrap_ConstrainedFieldPosition(ConstrainedFieldPosition *fp, int flag);
PyObject *wrap_FormattedValue(FormattedValue *object, int flag);
PyObject *wrap_FormattedList(FormattedList *object, int flag);
PyObject *wrap_ConstrainedFieldPosition(
ConstrainedFieldPosition *object, int flag);
#endif
void _init_format(PyObject *m);
......
......@@ -99,30 +99,30 @@ static PyObject *t_locale_addLikelySubtags(t_locale *self);
static PyObject *t_locale_minimizeSubtags(t_locale *self);
#endif
#if U_ICU_VERSION_HEX >= 0x04040000
static PyObject *t_locale_getRoot(PyTypeObject *type);
static PyObject *t_locale_getRoot(PyTypeObject *self);
#endif
static PyObject *t_locale_getEnglish(PyTypeObject *type);
static PyObject *t_locale_getFrench(PyTypeObject *type);
static PyObject *t_locale_getGerman(PyTypeObject *type);
static PyObject *t_locale_getItalian(PyTypeObject *type);
static PyObject *t_locale_getJapanese(PyTypeObject *type);
static PyObject *t_locale_getKorean(PyTypeObject *type);
static PyObject *t_locale_getChinese(PyTypeObject *type);
static PyObject *t_locale_getSimplifiedChinese(PyTypeObject *type);
static PyObject *t_locale_getTraditionalChinese(PyTypeObject *type);
static PyObject *t_locale_getFrance(PyTypeObject *type);
static PyObject *t_locale_getGermany(PyTypeObject *type);
static PyObject *t_locale_getItaly(PyTypeObject *type);
static PyObject *t_locale_getJapan(PyTypeObject *type);
static PyObject *t_locale_getKorea(PyTypeObject *type);
static PyObject *t_locale_getChina(PyTypeObject *type);
static PyObject *t_locale_getPRC(PyTypeObject *type);
static PyObject *t_locale_getTaiwan(PyTypeObject *type);
static PyObject *t_locale_getUK(PyTypeObject *type);
static PyObject *t_locale_getUS(PyTypeObject *type);
static PyObject *t_locale_getCanada(PyTypeObject *type);
static PyObject *t_locale_getCanadaFrench(PyTypeObject *type);
static PyObject *t_locale_getDefault(PyTypeObject *type);
static PyObject *t_locale_getEnglish(PyTypeObject *self);
static PyObject *t_locale_getFrench(PyTypeObject *self);
static PyObject *t_locale_getGerman(PyTypeObject *self);
static PyObject *t_locale_getItalian(PyTypeObject *self);
static PyObject *t_locale_getJapanese(PyTypeObject *self);
static PyObject *t_locale_getKorean(PyTypeObject *self);
static PyObject *t_locale_getChinese(PyTypeObject *self);
static PyObject *t_locale_getSimplifiedChinese(PyTypeObject *self);
static PyObject *t_locale_getTraditionalChinese(PyTypeObject *self);
static PyObject *t_locale_getFrance(PyTypeObject *self);
static PyObject *t_locale_getGermany(PyTypeObject *self);
static PyObject *t_locale_getItaly(PyTypeObject *self);
static PyObject *t_locale_getJapan(PyTypeObject *self);
static PyObject *t_locale_getKorea(PyTypeObject *self);
static PyObject *t_locale_getChina(PyTypeObject *self);
static PyObject *t_locale_getPRC(PyTypeObject *self);
static PyObject *t_locale_getTaiwan(PyTypeObject *self);
static PyObject *t_locale_getUK(PyTypeObject *self);
static PyObject *t_locale_getUS(PyTypeObject *self);
static PyObject *t_locale_getCanada(PyTypeObject *self);
static PyObject *t_locale_getCanadaFrench(PyTypeObject *self);
static PyObject *t_locale_getDefault(PyTypeObject *self);
static PyObject *t_locale_setDefault(PyTypeObject *type, PyObject *args);
static PyObject *t_locale_createFromName(PyTypeObject *type, PyObject *args);
#if U_ICU_VERSION_HEX >= VERSION_HEX(63, 0, 0)
......
......@@ -26,7 +26,7 @@
extern PyTypeObject LocaleType_;
PyObject *wrap_Locale(Locale *locale, int flags);
PyObject *wrap_Locale(Locale *object, int flags);
PyObject *wrap_Locale(const Locale &locale);
void _init_locale(PyObject *m);
......
......@@ -28,7 +28,7 @@ extern PyTypeObject MeasureUnitType_;
extern PyTypeObject CurrencyUnitType_;
extern PyTypeObject MeasureType_;
PyObject *wrap_MeasureUnit(MeasureUnit *mu, int flags);
PyObject *wrap_MeasureUnit(MeasureUnit *object, int flags);
void _init_measureunit(PyObject *m);
#endif /* _measureunit_h */
......@@ -48,9 +48,9 @@ public:
extern PyTypeObject FormattedNumberType_;
extern PyTypeObject FormattedNumberRangeType_;
PyObject *wrap_FormattedNumber(icu::number::FormattedNumber *value, int flag);
PyObject *wrap_FormattedNumber(icu::number::FormattedNumber *object, int flag);
PyObject *wrap_FormattedNumberRange(
icu::number::FormattedNumberRange *value, int flag);
icu::number::FormattedNumberRange *object, int flag);
#endif
......
......@@ -79,7 +79,7 @@ U_NAMESPACE_END
extern PyTypeObject TransliteratorType;
PyObject *wrap_Transliterator(Transliterator *transliterator, int flags);
PyObject *wrap_Transliterator(Transliterator *object, int flags);
PyObject *wrap_Transliterator(const Transliterator &transliterator);
void _init_transliterator(PyObject *m);
......
......@@ -66,10 +66,10 @@ static PyObject *t_tzinfo_richcmp(t_tzinfo *self, PyObject *other, int op);
static PyObject *t_tzinfo__resetDefault(PyTypeObject *cls);
static PyObject *t_tzinfo_getDefault(PyTypeObject *cls);
static PyObject *t_tzinfo_setDefault(PyTypeObject *cls, PyObject *tz);
static PyObject *t_tzinfo_setDefault(PyTypeObject *cls, PyObject *arg);
static PyObject *t_tzinfo_getFloating(PyTypeObject *cls);
static PyObject *t_tzinfo_getInstances(PyTypeObject *cls);
static PyObject *t_tzinfo_getInstance(PyTypeObject *cls, PyObject *arg);
static PyObject *t_tzinfo_getInstance(PyTypeObject *cls, PyObject *id);
static PyObject *t_tzinfo_utcoffset(t_tzinfo *self, PyObject *dt);
static PyObject *t_tzinfo_dst(t_tzinfo *self, PyObject *dt);
......
Supports Markdown
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