Qt binding: Removing ambiguitiy between QLatin1String and const char *

This commit is contained in:
Matthias Koefferlein 2023-03-26 00:56:01 +01:00
parent 40d3fd41b1
commit 79ad6b3fae
14 changed files with 18 additions and 408 deletions

View File

@ -37,6 +37,7 @@ drop_method :all_classes, /.*\s+&&$/ # no move semantics
drop_method :all_classes, /\(.*std::initializer_list.*\)/ # no brace initialization
drop_method :all_classes, /\(.*QStringView\W/ # no QStringView
drop_method :all_classes, /^QStringView\W/ # no QStringView
drop_method :all_classes, /\(.*QLatin1String\W/ # clashes usually with const char *
def_alias :all_classes, /::create\(/, "qt_create" # clashes with GSI/Ruby
def_alias :all_classes, /::destroy\(/, "qt_destroy" # clashes with GSI/Ruby

View File

@ -45,6 +45,7 @@ drop_method :all_classes, /::bindable/ # no QBindable available
drop_method :all_classes, /.*QtPrivate::.*/ # no private stuff
drop_method :all_classes, /\(.*QStringView\W/ # no QStringView
drop_method :all_classes, /^QStringView\W/ # no QStringView
drop_method :all_classes, /\(.*QLatin1String\W/ # clashes usually with const char *
def_alias :all_classes, /::create\(/, "qt_create" # clashes with GSI/Ruby
def_alias :all_classes, /::destroy\(/, "qt_destroy" # clashes with GSI/Ruby

View File

@ -277,25 +277,6 @@ static void _call_f_operator_index__c2025 (const qt_gsi::GenericMethod * /*decl*
}
// const QJsonValue QJsonDocument::operator[](QLatin1String key)
static void _init_f_operator_index__c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<const QJsonValue > ();
}
static void _call_f_operator_index__c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<const QJsonValue > ((const QJsonValue)((QJsonDocument *)cls)->operator[] (arg1));
}
// const QJsonValue QJsonDocument::operator[](int i)
@ -566,7 +547,6 @@ static gsi::Methods methods_QJsonDocument () {
methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QJsonDocument::operator!=(const QJsonDocument &other)\n", true, &_init_f_operator_excl__eq__c2635, &_call_f_operator_excl__eq__c2635);
methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QJsonDocument::operator==(const QJsonDocument &other)\n", true, &_init_f_operator_eq__eq__c2635, &_call_f_operator_eq__eq__c2635);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonDocument::operator[](const QString &key)\n", true, &_init_f_operator_index__c2025, &_call_f_operator_index__c2025);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonDocument::operator[](QLatin1String key)\n", true, &_init_f_operator_index__c1701, &_call_f_operator_index__c1701);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonDocument::operator[](int i)\n", true, &_init_f_operator_index__c767, &_call_f_operator_index__c767);
methods += new qt_gsi::GenericMethod ("rawData", "@brief Method const char *QJsonDocument::rawData(int *size)\n", true, &_init_f_rawData_c953, &_call_f_rawData_c953);
methods += new qt_gsi::GenericMethod ("setArray|array=", "@brief Method void QJsonDocument::setArray(const QJsonArray &array)\n", false, &_init_f_setArray_2315, &_call_f_setArray_2315);

View File

@ -150,25 +150,6 @@ static void _call_f_constFind_c2025 (const qt_gsi::GenericMethod * /*decl*/, voi
}
// QJsonObject::const_iterator QJsonObject::constFind(QLatin1String key)
static void _init_f_constFind_c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonObject::const_iterator > ();
}
static void _call_f_constFind_c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonObject::const_iterator > ((QJsonObject::const_iterator)((QJsonObject *)cls)->constFind (arg1));
}
// bool QJsonObject::contains(const QString &key)
@ -188,25 +169,6 @@ static void _call_f_contains_c2025 (const qt_gsi::GenericMethod * /*decl*/, void
}
// bool QJsonObject::contains(QLatin1String key)
static void _init_f_contains_c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<bool > ();
}
static void _call_f_contains_c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<bool > ((bool)((QJsonObject *)cls)->contains (arg1));
}
// int QJsonObject::count()
@ -305,25 +267,6 @@ static void _call_f_find_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls
}
// QJsonObject::iterator QJsonObject::find(QLatin1String key)
static void _init_f_find_1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonObject::iterator > ();
}
static void _call_f_find_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonObject::iterator > ((QJsonObject::iterator)((QJsonObject *)cls)->find (arg1));
}
// QJsonObject::const_iterator QJsonObject::find(const QString &key)
@ -343,25 +286,6 @@ static void _call_f_find_c2025 (const qt_gsi::GenericMethod * /*decl*/, void *cl
}
// QJsonObject::const_iterator QJsonObject::find(QLatin1String key)
static void _init_f_find_c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonObject::const_iterator > ();
}
static void _call_f_find_c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonObject::const_iterator > ((QJsonObject::const_iterator)((QJsonObject *)cls)->find (arg1));
}
// QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &value)
@ -505,25 +429,6 @@ static void _call_f_operator_index__c2025 (const qt_gsi::GenericMethod * /*decl*
}
// QJsonValue QJsonObject::operator[](QLatin1String key)
static void _init_f_operator_index__c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonValue > ();
}
static void _call_f_operator_index__c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonValue > ((QJsonValue)((QJsonObject *)cls)->operator[] (arg1));
}
// QJsonValueRef QJsonObject::operator[](const QString &key)
@ -543,25 +448,6 @@ static void _call_f_operator_index__2025 (const qt_gsi::GenericMethod * /*decl*/
}
// QJsonValueRef QJsonObject::operator[](QLatin1String key)
static void _init_f_operator_index__1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonValueRef > ();
}
static void _call_f_operator_index__1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonValueRef > ((QJsonValueRef)((QJsonObject *)cls)->operator[] (arg1));
}
// void QJsonObject::remove(const QString &key)
@ -685,25 +571,6 @@ static void _call_f_value_c2025 (const qt_gsi::GenericMethod * /*decl*/, void *c
}
// QJsonValue QJsonObject::value(QLatin1String key)
static void _init_f_value_c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<QJsonValue > ();
}
static void _call_f_value_c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QJsonValue > ((QJsonValue)((QJsonObject *)cls)->value (arg1));
}
// static QJsonObject QJsonObject::fromVariantHash(const QHash<QString, QVariant> &map)
@ -755,18 +622,14 @@ static gsi::Methods methods_QJsonObject () {
methods += new qt_gsi::GenericMethod ("constBegin", "@brief Method QJsonObject::const_iterator QJsonObject::constBegin()\n", true, &_init_f_constBegin_c0, &_call_f_constBegin_c0);
methods += new qt_gsi::GenericMethod ("constEnd", "@brief Method QJsonObject::const_iterator QJsonObject::constEnd()\n", true, &_init_f_constEnd_c0, &_call_f_constEnd_c0);
methods += new qt_gsi::GenericMethod ("constFind", "@brief Method QJsonObject::const_iterator QJsonObject::constFind(const QString &key)\n", true, &_init_f_constFind_c2025, &_call_f_constFind_c2025);
methods += new qt_gsi::GenericMethod ("constFind", "@brief Method QJsonObject::const_iterator QJsonObject::constFind(QLatin1String key)\n", true, &_init_f_constFind_c1701, &_call_f_constFind_c1701);
methods += new qt_gsi::GenericMethod ("contains", "@brief Method bool QJsonObject::contains(const QString &key)\n", true, &_init_f_contains_c2025, &_call_f_contains_c2025);
methods += new qt_gsi::GenericMethod ("contains", "@brief Method bool QJsonObject::contains(QLatin1String key)\n", true, &_init_f_contains_c1701, &_call_f_contains_c1701);
methods += new qt_gsi::GenericMethod ("count", "@brief Method int QJsonObject::count()\n", true, &_init_f_count_c0, &_call_f_count_c0);
methods += new qt_gsi::GenericMethod ("empty", "@brief Method bool QJsonObject::empty()\n", true, &_init_f_empty_c0, &_call_f_empty_c0);
methods += new qt_gsi::GenericMethod ("end", "@brief Method QJsonObject::iterator QJsonObject::end()\n", false, &_init_f_end_0, &_call_f_end_0);
methods += new qt_gsi::GenericMethod ("end", "@brief Method QJsonObject::const_iterator QJsonObject::end()\n", true, &_init_f_end_c0, &_call_f_end_c0);
methods += new qt_gsi::GenericMethod ("erase", "@brief Method QJsonObject::iterator QJsonObject::erase(QJsonObject::iterator it)\n", false, &_init_f_erase_2516, &_call_f_erase_2516);
methods += new qt_gsi::GenericMethod ("find", "@brief Method QJsonObject::iterator QJsonObject::find(const QString &key)\n", false, &_init_f_find_2025, &_call_f_find_2025);
methods += new qt_gsi::GenericMethod ("find", "@brief Method QJsonObject::iterator QJsonObject::find(QLatin1String key)\n", false, &_init_f_find_1701, &_call_f_find_1701);
methods += new qt_gsi::GenericMethod ("find", "@brief Method QJsonObject::const_iterator QJsonObject::find(const QString &key)\n", true, &_init_f_find_c2025, &_call_f_find_c2025);
methods += new qt_gsi::GenericMethod ("find", "@brief Method QJsonObject::const_iterator QJsonObject::find(QLatin1String key)\n", true, &_init_f_find_c1701, &_call_f_find_c1701);
methods += new qt_gsi::GenericMethod ("insert", "@brief Method QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &value)\n", false, &_init_f_insert_4230, &_call_f_insert_4230);
methods += new qt_gsi::GenericMethod ("isEmpty?", "@brief Method bool QJsonObject::isEmpty()\n", true, &_init_f_isEmpty_c0, &_call_f_isEmpty_c0);
methods += new qt_gsi::GenericMethod ("keys", "@brief Method QStringList QJsonObject::keys()\n", true, &_init_f_keys_c0, &_call_f_keys_c0);
@ -775,9 +638,7 @@ static gsi::Methods methods_QJsonObject () {
methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QJsonObject::operator!=(const QJsonObject &other)\n", true, &_init_f_operator_excl__eq__c2403, &_call_f_operator_excl__eq__c2403);
methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QJsonObject::operator==(const QJsonObject &other)\n", true, &_init_f_operator_eq__eq__c2403, &_call_f_operator_eq__eq__c2403);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method QJsonValue QJsonObject::operator[](const QString &key)\n", true, &_init_f_operator_index__c2025, &_call_f_operator_index__c2025);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method QJsonValue QJsonObject::operator[](QLatin1String key)\n", true, &_init_f_operator_index__c1701, &_call_f_operator_index__c1701);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method QJsonValueRef QJsonObject::operator[](const QString &key)\n", false, &_init_f_operator_index__2025, &_call_f_operator_index__2025);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method QJsonValueRef QJsonObject::operator[](QLatin1String key)\n", false, &_init_f_operator_index__1701, &_call_f_operator_index__1701);
methods += new qt_gsi::GenericMethod ("remove", "@brief Method void QJsonObject::remove(const QString &key)\n", false, &_init_f_remove_2025, &_call_f_remove_2025);
methods += new qt_gsi::GenericMethod ("size", "@brief Method int QJsonObject::size()\n", true, &_init_f_size_c0, &_call_f_size_c0);
methods += new qt_gsi::GenericMethod ("swap", "@brief Method void QJsonObject::swap(QJsonObject &other)\n", false, &_init_f_swap_1708, &_call_f_swap_1708);
@ -785,7 +646,6 @@ static gsi::Methods methods_QJsonObject () {
methods += new qt_gsi::GenericMethod ("toVariantHash", "@brief Method QHash<QString, QVariant> QJsonObject::toVariantHash()\n", true, &_init_f_toVariantHash_c0, &_call_f_toVariantHash_c0);
methods += new qt_gsi::GenericMethod ("toVariantMap", "@brief Method QMap<QString, QVariant> QJsonObject::toVariantMap()\n", true, &_init_f_toVariantMap_c0, &_call_f_toVariantMap_c0);
methods += new qt_gsi::GenericMethod ("value", "@brief Method QJsonValue QJsonObject::value(const QString &key)\n", true, &_init_f_value_c2025, &_call_f_value_c2025);
methods += new qt_gsi::GenericMethod ("value", "@brief Method QJsonValue QJsonObject::value(QLatin1String key)\n", true, &_init_f_value_c1701, &_call_f_value_c1701);
methods += new qt_gsi::GenericStaticMethod ("fromVariantHash", "@brief Static method QJsonObject QJsonObject::fromVariantHash(const QHash<QString, QVariant> &map)\nThis method is static and can be called without an instance.", &_init_f_fromVariantHash_3610, &_call_f_fromVariantHash_3610);
methods += new qt_gsi::GenericStaticMethod ("fromVariantMap", "@brief Static method QJsonObject QJsonObject::fromVariantMap(const QMap<QString, QVariant> &map)\nThis method is static and can be called without an instance.", &_init_f_fromVariantMap_3508, &_call_f_fromVariantMap_3508);
return methods;

View File

@ -370,25 +370,6 @@ static void _call_f_operator_index__c2025 (const qt_gsi::GenericMethod * /*decl*
}
// const QJsonValue QJsonValue::operator[](QLatin1String key)
static void _init_f_operator_index__c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<const QJsonValue > ();
}
static void _call_f_operator_index__c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<const QJsonValue > ((const QJsonValue)((QJsonValue *)cls)->operator[] (arg1));
}
// const QJsonValue QJsonValue::operator[](int i)
@ -661,7 +642,6 @@ static gsi::Methods methods_QJsonValue () {
methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QJsonValue::operator!=(const QJsonValue &other)\n", true, &_init_f_operator_excl__eq__c2313, &_call_f_operator_excl__eq__c2313);
methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QJsonValue::operator==(const QJsonValue &other)\n", true, &_init_f_operator_eq__eq__c2313, &_call_f_operator_eq__eq__c2313);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonValue::operator[](const QString &key)\n", true, &_init_f_operator_index__c2025, &_call_f_operator_index__c2025);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonValue::operator[](QLatin1String key)\n", true, &_init_f_operator_index__c1701, &_call_f_operator_index__c1701);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonValue::operator[](int i)\n", true, &_init_f_operator_index__c767, &_call_f_operator_index__c767);
methods += new qt_gsi::GenericMethod ("swap", "@brief Method void QJsonValue::swap(QJsonValue &other)\n", false, &_init_f_swap_1618, &_call_f_swap_1618);
methods += new qt_gsi::GenericMethod ("toArray", "@brief Method QJsonArray QJsonValue::toArray()\n", true, &_init_f_toArray_c0, &_call_f_toArray_c0);

View File

@ -374,28 +374,6 @@ static void _call_f_fromString_2870 (const qt_gsi::GenericStaticMethod * /*decl*
}
// static QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)
static void _init_f_fromString_2546 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("string");
decl->add_arg<QLatin1String > (argspec_0);
static gsi::ArgSpecBase argspec_1 ("suffixIndex", true, "nullptr");
decl->add_arg<int * > (argspec_1);
decl->set_return<QVersionNumber > ();
}
static void _call_f_fromString_2546 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
int *arg2 = args ? gsi::arg_reader<int * >() (args, heap) : gsi::arg_maker<int * >() (nullptr, heap);
ret.write<QVersionNumber > ((QVersionNumber)QVersionNumber::fromString (arg1, arg2));
}
// bool ::operator>(const QVersionNumber &lhs, const QVersionNumber &rhs)
static bool op_QVersionNumber_operator_gt__5398(const QVersionNumber *_self, const QVersionNumber &rhs) {
return ::operator>(*_self, rhs);
@ -451,7 +429,6 @@ static gsi::Methods methods_QVersionNumber () {
methods += new qt_gsi::GenericStaticMethod ("commonPrefix", "@brief Static method QVersionNumber QVersionNumber::commonPrefix(const QVersionNumber &v1, const QVersionNumber &v2)\nThis method is static and can be called without an instance.", &_init_f_commonPrefix_5398, &_call_f_commonPrefix_5398);
methods += new qt_gsi::GenericStaticMethod ("compare", "@brief Static method int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2)\nThis method is static and can be called without an instance.", &_init_f_compare_5398, &_call_f_compare_5398);
methods += new qt_gsi::GenericStaticMethod ("fromString", "@brief Static method QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixIndex)\nThis method is static and can be called without an instance.", &_init_f_fromString_2870, &_call_f_fromString_2870);
methods += new qt_gsi::GenericStaticMethod ("fromString", "@brief Static method QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)\nThis method is static and can be called without an instance.", &_init_f_fromString_2546, &_call_f_fromString_2546);
methods += gsi::method_ext(">", &::op_QVersionNumber_operator_gt__5398, gsi::arg ("rhs"), "@brief Operator bool ::operator>(const QVersionNumber &lhs, const QVersionNumber &rhs)\nThis is the mapping of the global operator to the instance method.");
methods += gsi::method_ext(">=", &::op_QVersionNumber_operator_gt__eq__5398, gsi::arg ("rhs"), "@brief Operator bool ::operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs)\nThis is the mapping of the global operator to the instance method.");
methods += gsi::method_ext("<", &::op_QVersionNumber_operator_lt__5398, gsi::arg ("rhs"), "@brief Operator bool ::operator<(const QVersionNumber &lhs, const QVersionNumber &rhs)\nThis is the mapping of the global operator to the instance method.");

View File

@ -155,25 +155,6 @@ static void _call_ctor_QColor_1731 (const qt_gsi::GenericStaticMethod * /*decl*/
}
// Constructor QColor::QColor(QLatin1String name)
static void _init_ctor_QColor_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("name");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return_new<QColor> ();
}
static void _call_ctor_QColor_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QColor *> (new QColor (arg1));
}
// Constructor QColor::QColor(QColor::Spec spec)
@ -1455,26 +1436,6 @@ static void _call_f_setNamedColor_2025 (const qt_gsi::GenericMethod * /*decl*/,
}
// void QColor::setNamedColor(QLatin1String name)
static void _init_f_setNamedColor_1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("name");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<void > ();
}
static void _call_f_setNamedColor_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
__SUPPRESS_UNUSED_WARNING(ret);
((QColor *)cls)->setNamedColor (arg1);
}
// void QColor::setRed(int red)
@ -2117,25 +2078,6 @@ static void _call_f_isValidColor_2025 (const qt_gsi::GenericStaticMethod * /*dec
}
// static bool QColor::isValidColor(QLatin1String)
static void _init_f_isValidColor_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("arg1");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<bool > ();
}
static void _call_f_isValidColor_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<bool > ((bool)QColor::isValidColor (arg1));
}
namespace gsi
{
@ -2148,7 +2090,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(unsigned int rgb)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1772, &_call_ctor_QColor_1772);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QRgba64 rgba64)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1003, &_call_ctor_QColor_1003);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(const char *aname)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1731, &_call_ctor_QColor_1731);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QLatin1String name)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1701, &_call_ctor_QColor_1701);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QColor::Spec spec)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1539, &_call_ctor_QColor_1539);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(const QColor &color)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1905, &_call_ctor_QColor_1905);
methods += new qt_gsi::GenericMethod (":alpha", "@brief Method int QColor::alpha()\n", true, &_init_f_alpha_c0, &_call_f_alpha_c0);
@ -2215,7 +2156,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericMethod ("setHsv", "@brief Method void QColor::setHsv(int h, int s, int v, int a)\n", false, &_init_f_setHsv_2744, &_call_f_setHsv_2744);
methods += new qt_gsi::GenericMethod ("setHsvF", "@brief Method void QColor::setHsvF(double h, double s, double v, double a)\n", false, &_init_f_setHsvF_3960, &_call_f_setHsvF_3960);
methods += new qt_gsi::GenericMethod ("setNamedColor", "@brief Method void QColor::setNamedColor(const QString &name)\n", false, &_init_f_setNamedColor_2025, &_call_f_setNamedColor_2025);
methods += new qt_gsi::GenericMethod ("setNamedColor", "@brief Method void QColor::setNamedColor(QLatin1String name)\n", false, &_init_f_setNamedColor_1701, &_call_f_setNamedColor_1701);
methods += new qt_gsi::GenericMethod ("setRed|red=", "@brief Method void QColor::setRed(int red)\n", false, &_init_f_setRed_767, &_call_f_setRed_767);
methods += new qt_gsi::GenericMethod ("setRedF|redF=", "@brief Method void QColor::setRedF(double red)\n", false, &_init_f_setRedF_1071, &_call_f_setRedF_1071);
methods += new qt_gsi::GenericMethod ("setRgb", "@brief Method void QColor::setRgb(int r, int g, int b, int a)\n", false, &_init_f_setRgb_2744, &_call_f_setRgb_2744);
@ -2246,7 +2186,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericStaticMethod ("fromRgba64", "@brief Static method QColor QColor::fromRgba64(unsigned short int r, unsigned short int g, unsigned short int b, unsigned short int a)\nThis method is static and can be called without an instance.", &_init_f_fromRgba64_9580, &_call_f_fromRgba64_9580);
methods += new qt_gsi::GenericStaticMethod ("fromRgba64", "@brief Static method QColor QColor::fromRgba64(QRgba64 rgba)\nThis method is static and can be called without an instance.", &_init_f_fromRgba64_1003, &_call_f_fromRgba64_1003);
methods += new qt_gsi::GenericStaticMethod ("isValidColor?", "@brief Static method bool QColor::isValidColor(const QString &name)\nThis method is static and can be called without an instance.", &_init_f_isValidColor_2025, &_call_f_isValidColor_2025);
methods += new qt_gsi::GenericStaticMethod ("isValidColor?", "@brief Static method bool QColor::isValidColor(QLatin1String)\nThis method is static and can be called without an instance.", &_init_f_isValidColor_1701, &_call_f_isValidColor_1701);
return methods;
}

View File

@ -88,25 +88,6 @@ static void _call_ctor_QAnyStringView_2025 (const qt_gsi::GenericStaticMethod *
}
// Constructor QAnyStringView::QAnyStringView(QLatin1String str)
static void _init_ctor_QAnyStringView_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("str");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return_new<QAnyStringView> ();
}
static void _call_ctor_QAnyStringView_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QAnyStringView *> (new QAnyStringView (arg1));
}
// Constructor QAnyStringView::QAnyStringView(const QChar &c)
@ -332,7 +313,6 @@ static gsi::Methods methods_QAnyStringView () {
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAnyStringView::QAnyStringView()\nThis method creates an object of class QAnyStringView.", &_init_ctor_QAnyStringView_0, &_call_ctor_QAnyStringView_0);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAnyStringView::QAnyStringView(const QByteArray &str)\nThis method creates an object of class QAnyStringView.", &_init_ctor_QAnyStringView_2309, &_call_ctor_QAnyStringView_2309);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAnyStringView::QAnyStringView(const QString &str)\nThis method creates an object of class QAnyStringView.", &_init_ctor_QAnyStringView_2025, &_call_ctor_QAnyStringView_2025);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAnyStringView::QAnyStringView(QLatin1String str)\nThis method creates an object of class QAnyStringView.", &_init_ctor_QAnyStringView_1701, &_call_ctor_QAnyStringView_1701);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAnyStringView::QAnyStringView(const QChar &c)\nThis method creates an object of class QAnyStringView.", &_init_ctor_QAnyStringView_1776, &_call_ctor_QAnyStringView_1776);
methods += new qt_gsi::GenericMethod ("back", "@brief Method QChar QAnyStringView::back()\n", true, &_init_f_back_c0, &_call_f_back_c0);
methods += new qt_gsi::GenericMethod ("data", "@brief Method const void *QAnyStringView::data()\n", true, &_init_f_data_c0, &_call_f_data_c0);

View File

@ -71,25 +71,6 @@ static void _call_ctor_QCalendar_2072 (const qt_gsi::GenericStaticMethod * /*dec
}
// Constructor QCalendar::QCalendar(QLatin1String name)
static void _init_ctor_QCalendar_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("name");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return_new<QCalendar> ();
}
static void _call_ctor_QCalendar_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QCalendar *> (new QCalendar (arg1));
}
// Constructor QCalendar::QCalendar(QCalendar::SystemId id)
@ -589,7 +570,6 @@ static gsi::Methods methods_QCalendar () {
gsi::Methods methods;
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCalendar::QCalendar()\nThis method creates an object of class QCalendar.", &_init_ctor_QCalendar_0, &_call_ctor_QCalendar_0);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCalendar::QCalendar(QCalendar::System system)\nThis method creates an object of class QCalendar.", &_init_ctor_QCalendar_2072, &_call_ctor_QCalendar_2072);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCalendar::QCalendar(QLatin1String name)\nThis method creates an object of class QCalendar.", &_init_ctor_QCalendar_1701, &_call_ctor_QCalendar_1701);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCalendar::QCalendar(QCalendar::SystemId id)\nThis method creates an object of class QCalendar.", &_init_ctor_QCalendar_2245, &_call_ctor_QCalendar_2245);
methods += new qt_gsi::GenericMethod ("dateFromParts", "@brief Method QDate QCalendar::dateFromParts(int year, int month, int day)\n", true, &_init_f_dateFromParts_c2085, &_call_f_dateFromParts_c2085);
methods += new qt_gsi::GenericMethod ("dateFromParts", "@brief Method QDate QCalendar::dateFromParts(const QCalendar::YearMonthDay &parts)\n", true, &_init_f_dateFromParts_c3509, &_call_f_dateFromParts_c3509);

View File

@ -282,25 +282,6 @@ static void _call_f_operator_eq__eq__c2313 (const qt_gsi::GenericMethod * /*decl
}
// const QJsonValue QJsonValueRef::operator[](QLatin1String key)
static void _init_f_operator_index__c1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("key");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<const QJsonValue > ();
}
static void _call_f_operator_index__c1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<const QJsonValue > ((const QJsonValue)((QJsonValueRef *)cls)->operator[] (arg1));
}
// const QJsonValue QJsonValueRef::operator[](qsizetype i)
@ -495,7 +476,6 @@ static gsi::Methods methods_QJsonValueRef () {
methods += new qt_gsi::GenericMethod ("assign", "@brief Method QJsonValueRef &QJsonValueRef::operator =(const QJsonValueRef &val)\n", false, &_init_f_operator_eq__2598, &_call_f_operator_eq__2598);
methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QJsonValueRef::operator!=(const QJsonValue &other)\n", true, &_init_f_operator_excl__eq__c2313, &_call_f_operator_excl__eq__c2313);
methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QJsonValueRef::operator==(const QJsonValue &other)\n", true, &_init_f_operator_eq__eq__c2313, &_call_f_operator_eq__eq__c2313);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonValueRef::operator[](QLatin1String key)\n", true, &_init_f_operator_index__c1701, &_call_f_operator_index__c1701);
methods += new qt_gsi::GenericMethod ("[]", "@brief Method const QJsonValue QJsonValueRef::operator[](qsizetype i)\n", true, &_init_f_operator_index__c1442, &_call_f_operator_index__c1442);
methods += new qt_gsi::GenericMethod ("toArray", "@brief Method QJsonArray QJsonValueRef::toArray()\n", true, &_init_f_toArray_c0, &_call_f_toArray_c0);
methods += new qt_gsi::GenericMethod ("toBool", "@brief Method bool QJsonValueRef::toBool(bool defaultValue)\n", true, &_init_f_toBool_c864, &_call_f_toBool_c864);

View File

@ -374,28 +374,6 @@ static void _call_f_fromString_2870 (const qt_gsi::GenericStaticMethod * /*decl*
}
// static QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)
static void _init_f_fromString_2546 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("string");
decl->add_arg<QLatin1String > (argspec_0);
static gsi::ArgSpecBase argspec_1 ("suffixIndex", true, "nullptr");
decl->add_arg<int * > (argspec_1);
decl->set_return<QVersionNumber > ();
}
static void _call_f_fromString_2546 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
int *arg2 = args ? gsi::arg_reader<int * >() (args, heap) : gsi::arg_maker<int * >() (nullptr, heap);
ret.write<QVersionNumber > ((QVersionNumber)QVersionNumber::fromString (arg1, arg2));
}
namespace gsi
{
@ -421,7 +399,6 @@ static gsi::Methods methods_QVersionNumber () {
methods += new qt_gsi::GenericStaticMethod ("commonPrefix", "@brief Static method QVersionNumber QVersionNumber::commonPrefix(const QVersionNumber &v1, const QVersionNumber &v2)\nThis method is static and can be called without an instance.", &_init_f_commonPrefix_5398, &_call_f_commonPrefix_5398);
methods += new qt_gsi::GenericStaticMethod ("compare", "@brief Static method int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2)\nThis method is static and can be called without an instance.", &_init_f_compare_5398, &_call_f_compare_5398);
methods += new qt_gsi::GenericStaticMethod ("fromString", "@brief Static method QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixIndex)\nThis method is static and can be called without an instance.", &_init_f_fromString_2870, &_call_f_fromString_2870);
methods += new qt_gsi::GenericStaticMethod ("fromString", "@brief Static method QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)\nThis method is static and can be called without an instance.", &_init_f_fromString_2546, &_call_f_fromString_2546);
return methods;
}

View File

@ -155,25 +155,6 @@ static void _call_ctor_QColor_1731 (const qt_gsi::GenericStaticMethod * /*decl*/
}
// Constructor QColor::QColor(QLatin1String name)
static void _init_ctor_QColor_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("name");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return_new<QColor> ();
}
static void _call_ctor_QColor_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<QColor *> (new QColor (arg1));
}
// Constructor QColor::QColor(QColor::Spec spec)
@ -1398,26 +1379,6 @@ static void _call_f_setNamedColor_2025 (const qt_gsi::GenericMethod * /*decl*/,
}
// void QColor::setNamedColor(QLatin1String name)
static void _init_f_setNamedColor_1701 (qt_gsi::GenericMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("name");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<void > ();
}
static void _call_f_setNamedColor_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
__SUPPRESS_UNUSED_WARNING(ret);
((QColor *)cls)->setNamedColor (arg1);
}
// void QColor::setRed(int red)
@ -2075,25 +2036,6 @@ static void _call_f_isValidColor_2025 (const qt_gsi::GenericStaticMethod * /*dec
}
// static bool QColor::isValidColor(QLatin1String)
static void _init_f_isValidColor_1701 (qt_gsi::GenericStaticMethod *decl)
{
static gsi::ArgSpecBase argspec_0 ("arg1");
decl->add_arg<QLatin1String > (argspec_0);
decl->set_return<bool > ();
}
static void _call_f_isValidColor_1701 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
tl::Heap heap;
QLatin1String arg1 = gsi::arg_reader<QLatin1String >() (args, heap);
ret.write<bool > ((bool)QColor::isValidColor (arg1));
}
namespace gsi
{
@ -2106,7 +2048,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(unsigned int rgb)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1772, &_call_ctor_QColor_1772);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QRgba64 rgba64)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1003, &_call_ctor_QColor_1003);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(const char *aname)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1731, &_call_ctor_QColor_1731);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QLatin1String name)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1701, &_call_ctor_QColor_1701);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QColor::Spec spec)\nThis method creates an object of class QColor.", &_init_ctor_QColor_1539, &_call_ctor_QColor_1539);
methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QColor::QColor(QColor::Spec spec, unsigned short int a1, unsigned short int a2, unsigned short int a3, unsigned short int a4, unsigned short int a5)\nThis method creates an object of class QColor.", &_init_ctor_QColor_13379, &_call_ctor_QColor_13379);
methods += new qt_gsi::GenericMethod (":alpha", "@brief Method int QColor::alpha()\n", true, &_init_f_alpha_c0, &_call_f_alpha_c0);
@ -2169,7 +2110,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericMethod ("setHsv", "@brief Method void QColor::setHsv(int h, int s, int v, int a)\n", false, &_init_f_setHsv_2744, &_call_f_setHsv_2744);
methods += new qt_gsi::GenericMethod ("setHsvF", "@brief Method void QColor::setHsvF(float h, float s, float v, float a)\n", false, &_init_f_setHsvF_3556, &_call_f_setHsvF_3556);
methods += new qt_gsi::GenericMethod ("setNamedColor", "@brief Method void QColor::setNamedColor(const QString &name)\n", false, &_init_f_setNamedColor_2025, &_call_f_setNamedColor_2025);
methods += new qt_gsi::GenericMethod ("setNamedColor", "@brief Method void QColor::setNamedColor(QLatin1String name)\n", false, &_init_f_setNamedColor_1701, &_call_f_setNamedColor_1701);
methods += new qt_gsi::GenericMethod ("setRed|red=", "@brief Method void QColor::setRed(int red)\n", false, &_init_f_setRed_767, &_call_f_setRed_767);
methods += new qt_gsi::GenericMethod ("setRedF|redF=", "@brief Method void QColor::setRedF(float red)\n", false, &_init_f_setRedF_970, &_call_f_setRedF_970);
methods += new qt_gsi::GenericMethod ("setRgb", "@brief Method void QColor::setRgb(int r, int g, int b, int a)\n", false, &_init_f_setRgb_2744, &_call_f_setRgb_2744);
@ -2201,7 +2141,6 @@ static gsi::Methods methods_QColor () {
methods += new qt_gsi::GenericStaticMethod ("fromRgba64", "@brief Static method QColor QColor::fromRgba64(unsigned short int r, unsigned short int g, unsigned short int b, unsigned short int a)\nThis method is static and can be called without an instance.", &_init_f_fromRgba64_9580, &_call_f_fromRgba64_9580);
methods += new qt_gsi::GenericStaticMethod ("fromRgba64", "@brief Static method QColor QColor::fromRgba64(QRgba64 rgba)\nThis method is static and can be called without an instance.", &_init_f_fromRgba64_1003, &_call_f_fromRgba64_1003);
methods += new qt_gsi::GenericStaticMethod ("isValidColor?", "@brief Static method bool QColor::isValidColor(const QString &name)\nThis method is static and can be called without an instance.", &_init_f_isValidColor_2025, &_call_f_isValidColor_2025);
methods += new qt_gsi::GenericStaticMethod ("isValidColor?", "@brief Static method bool QColor::isValidColor(QLatin1String)\nThis method is static and can be called without an instance.", &_init_f_isValidColor_1701, &_call_f_isValidColor_1701);
return methods;
}

View File

@ -685,6 +685,13 @@ class QtBindingTest(unittest.TestCase):
self.assertEqual("%08x" % image.pixel(1, 0), "14131211")
self.assertEqual("%08x" % image.pixel(0, 2), "64636261")
def test_57(self):
# QColor with string parameter (suppressing QLatin1String)
color = pya.QColor("blue")
self.assertEqual(color.name(), "#0000ff")
# run unit tests
if __name__ == '__main__':

View File

@ -812,6 +812,15 @@ class QtBinding_TestClass < TestBase
end
def test_57
# QColor with string parameter (suppressing QLatin1String)
color = RBA::QColor::new("blue")
assert_equal(color.name(), "#0000ff")
end
end
load("test_epilogue.rb")