diff --git a/Changelog b/Changelog index 628861999..2dac5d89a 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,8 @@ * Bugfix: https://github.com/klayoutmatthias/klayout/issues/139 Libraries have not been reassigned when loading a GDS file from command line (does not happen on File/Open) +* Bugfix: https://github.com/klayoutmatthias/klayout/issues/141 + Issue with RBA::QHostAddress (ambiguous overload) on Qt5 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/142 Issue with RBA::RecursiveShapeIterator#region= * Bugfix: 8 bit indexed GIF images can be used for package icons now diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf index cbc0b77ea..a7652aeb5 100644 --- a/scripts/mkqtdecl5/mkqtdecl.conf +++ b/scripts/mkqtdecl5/mkqtdecl.conf @@ -1565,10 +1565,10 @@ no_imports "QAbstractXmlNodeModel" # base class is QSharedData which is not ava # QtNetwork drop_method "QUrlInfo", /QUrlInfo::QUrlInfo\(.*permissions/ # too many arguments (13) -drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*quint8\s*\*/ # requires char *, a string version is available for IPv6 +drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*const\s+QIPv6Address/ # requires QIPv6Address struct, a string version is available for IPv6 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*const\s+sockaddr/ # requires sockaddr struct, a string version is available for IPv6 -drop_method "QHostAddress", /QHostAddress::setAddress\(\s*quint8\s*\*/ # requires char *, a string version is available for IPv6 +drop_method "QHostAddress", /QHostAddress::setAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6 drop_method "QHostAddress", /QHostAddress::setAddress\(\s*const\s+QIPv6Address/ # requires QIPv6Address struct, a string version is available for IPv6 drop_method "QHostAddress", /QHostAddress::setAddress\(\s*const\s+sockaddr/ # requires sockaddr struct, a string version is available for IPv6 drop_method "QHostAddress", /QHostAddress::toIPv6Address\(/ # requires QIPv6Address struct diff --git a/src/gsiqt5/gsiDeclQHostAddress.cc b/src/gsiqt5/gsiDeclQHostAddress.cc index ddf325724..34df91167 100644 --- a/src/gsiqt5/gsiDeclQHostAddress.cc +++ b/src/gsiqt5/gsiDeclQHostAddress.cc @@ -70,25 +70,6 @@ static void _call_ctor_QHostAddress_1098 (const qt_gsi::GenericStaticMethod * /* } -// Constructor QHostAddress::QHostAddress(const quint8 *ip6Addr) - - -static void _init_ctor_QHostAddress_1934 (qt_gsi::GenericStaticMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("ip6Addr"); - decl->add_arg (argspec_0); - decl->set_return_new (); -} - -static void _call_ctor_QHostAddress_1934 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const quint8 *arg1 = args.read (heap); - ret.write (new QHostAddress (arg1)); -} - - // Constructor QHostAddress::QHostAddress(const QString &address) @@ -397,26 +378,6 @@ static void _call_f_setAddress_1098 (const qt_gsi::GenericMethod * /*decl*/, voi } -// void QHostAddress::setAddress(const quint8 *ip6Addr) - - -static void _init_f_setAddress_1934 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("ip6Addr"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_setAddress_1934 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const quint8 *arg1 = args.read (heap); - __SUPPRESS_UNUSED_WARNING(ret); - ((QHostAddress *)cls)->setAddress (arg1); -} - - // bool QHostAddress::setAddress(const QString &address) @@ -532,7 +493,6 @@ static gsi::Methods methods_QHostAddress () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QHostAddress::QHostAddress()\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_0, &_call_ctor_QHostAddress_0); methods += new qt_gsi::GenericStaticMethod ("new_ip4", "@brief Constructor QHostAddress::QHostAddress(quint32 ip4Addr)\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_1098, &_call_ctor_QHostAddress_1098); - methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QHostAddress::QHostAddress(const quint8 *ip6Addr)\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_1934, &_call_ctor_QHostAddress_1934); methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QHostAddress::QHostAddress(const QString &address)\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_2025, &_call_ctor_QHostAddress_2025); methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QHostAddress::QHostAddress(const QHostAddress ©)\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_2518, &_call_ctor_QHostAddress_2518); methods += new qt_gsi::GenericStaticMethod ("new_special", "@brief Constructor QHostAddress::QHostAddress(QHostAddress::SpecialAddress address)\nThis method creates an object of class QHostAddress.", &_init_ctor_QHostAddress_3172, &_call_ctor_QHostAddress_3172); @@ -550,7 +510,6 @@ static gsi::Methods methods_QHostAddress () { methods += new qt_gsi::GenericMethod ("protocol", "@brief Method QAbstractSocket::NetworkLayerProtocol QHostAddress::protocol()\n", true, &_init_f_protocol_c0, &_call_f_protocol_c0); methods += new qt_gsi::GenericMethod (":scopeId", "@brief Method QString QHostAddress::scopeId()\n", true, &_init_f_scopeId_c0, &_call_f_scopeId_c0); methods += new qt_gsi::GenericMethod ("setAddress", "@brief Method void QHostAddress::setAddress(quint32 ip4Addr)\n", false, &_init_f_setAddress_1098, &_call_f_setAddress_1098); - methods += new qt_gsi::GenericMethod ("setAddress", "@brief Method void QHostAddress::setAddress(const quint8 *ip6Addr)\n", false, &_init_f_setAddress_1934, &_call_f_setAddress_1934); methods += new qt_gsi::GenericMethod ("setAddress", "@brief Method bool QHostAddress::setAddress(const QString &address)\n", false, &_init_f_setAddress_2025, &_call_f_setAddress_2025); methods += new qt_gsi::GenericMethod ("setScopeId|scopeId=", "@brief Method void QHostAddress::setScopeId(const QString &id)\n", false, &_init_f_setScopeId_2025, &_call_f_setScopeId_2025); methods += new qt_gsi::GenericMethod ("toIPv4Address", "@brief Method quint32 QHostAddress::toIPv4Address()\n", true, &_init_f_toIPv4Address_c0, &_call_f_toIPv4Address_c0);