diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf index 9e87acc69..f1d03386d 100644 --- a/scripts/mkqtdecl4/mkqtdecl.conf +++ b/scripts/mkqtdecl4/mkqtdecl.conf @@ -1359,6 +1359,7 @@ drop_method "QXmlAttributes", /QXmlAttributes::index\(\s*const\s+QLatin1String/ drop_method "QXmlInputSource", /QXmlInputSource::setData\(.*QByteArray/ # clashes with QString version drop_method "QXmlEntityResolver", /QXmlEntityResolver::resolveEntity/ # requires pointer return value drop_method "QXmlDefaultHandler", /QXmlDefaultHandler::resolveEntity/ # requires pointer return value +drop_method "QXmlSimpleReader", /QXmlSimpleReader::parse\(.*QXmlInputSource\s*&/ # clashes with QXmlInputSource * version rename "QDomElement", /QDomElement::setAttribute\(.*qulonglong/, "setAttribute_ull|attribute_ull=" rename "QDomElement", /QDomElement::setAttribute\(.*qlonglong/, "setAttribute_ll|attribute_ll=" rename "QDomElement", /QDomElement::setAttribute\(.*unsigned int/, "setAttribute_ui|attribute_ui=" diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf index 13d3ab9fe..10d3e457c 100644 --- a/scripts/mkqtdecl5/mkqtdecl.conf +++ b/scripts/mkqtdecl5/mkqtdecl.conf @@ -1495,6 +1495,7 @@ no_imports "QXmlStreamAttributes" # base class is a template. drop_method "QXmlStreamAttributes", /QXmlStreamAttributes::append\(const\s+QVector/ # QVector is a template drop_method "QXmlStreamAttributes", /QXmlStreamAttributes::hasAttribute\(\s*QLatin1String/ # QLatin1String is not available drop_method "QXmlStreamAttributes", /QXmlStreamAttributes::value\(.*QLatin1String/ # QLatin1String is not available +drop_method "QXmlSimpleReader", /QXmlSimpleReader::parse\(.*QXmlInputSource\s*&/ # clashes with QXmlInputSource * version drop_method "QAbstractXmlNodeModel", /QAbstractXmlNodeModel::sequencedTypedValue/ # QExplicitlySharedDataPointer template not available drop_method "QAbstractXmlNodeModel", /QAbstractXmlNodeModel::type/ # QExplicitlySharedDataPointer template not available drop_method "QAbstractXmlNodeModel", /QAbstractXmlNodeModel::iterate/ # QExplicitlySharedDataPointer template not available diff --git a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc b/src/gsiqt4/gsiDeclQXmlSimpleReader.cc index 9945c535d..cf9b472cf 100644 --- a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc +++ b/src/gsiqt4/gsiDeclQXmlSimpleReader.cc @@ -193,25 +193,6 @@ static void _call_f_lexicalHandler_c0 (const qt_gsi::GenericMethod * /*decl*/, v } -// (const QXmlInputSource &) - - -static void _init_f_parse_2852 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("input"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_parse_2852 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QXmlInputSource &arg1 = args.read (heap); - ret.write ((bool)((QXmlSimpleReader *)cls)->parse (arg1)); -} - - // (const QXmlInputSource *) @@ -470,7 +451,6 @@ static gsi::Methods methods_QXmlSimpleReader () { methods += new qt_gsi::GenericMethod ("hasFeature", "@brief Method (const QString &) const\nThis is a reimplementation of QXmlReader::hasFeature", true, &_init_f_hasFeature_c2025, &_call_f_hasFeature_c2025); methods += new qt_gsi::GenericMethod ("hasProperty", "@brief Method (const QString &) const\nThis is a reimplementation of QXmlReader::hasProperty", true, &_init_f_hasProperty_c2025, &_call_f_hasProperty_c2025); methods += new qt_gsi::GenericMethod (":lexicalHandler", "@brief Method () const\nThis is a reimplementation of QXmlReader::lexicalHandler", true, &_init_f_lexicalHandler_c0, &_call_f_lexicalHandler_c0); - methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource &)\nThis is a reimplementation of QXmlReader::parse", false, &_init_f_parse_2852, &_call_f_parse_2852); methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource *)\nThis is a reimplementation of QXmlReader::parse", false, &_init_f_parse_2856, &_call_f_parse_2856); methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource *, bool)\n", false, &_init_f_parse_3612, &_call_f_parse_3612); methods += new qt_gsi::GenericMethod ("parseContinue", "@brief Method bool QXmlSimpleReader::parseContinue()\n", false, &_init_f_parseContinue_0, &_call_f_parseContinue_0); @@ -644,21 +624,6 @@ public: } } - // [adaptor impl] bool QXmlSimpleReader::parse(const QXmlInputSource &input) - bool cbs_parse_2852_0(const QXmlInputSource &input) - { - return QXmlSimpleReader::parse(input); - } - - virtual bool parse(const QXmlInputSource &input) - { - if (cb_parse_2852_0.can_issue()) { - return cb_parse_2852_0.issue(&QXmlSimpleReader_Adaptor::cbs_parse_2852_0, input); - } else { - return QXmlSimpleReader::parse(input); - } - } - // [adaptor impl] bool QXmlSimpleReader::parse(const QXmlInputSource *input) bool cbs_parse_2856_0(const QXmlInputSource *input) { @@ -848,7 +813,6 @@ public: gsi::Callback cb_hasFeature_c2025_0; gsi::Callback cb_hasProperty_c2025_0; gsi::Callback cb_lexicalHandler_c0_0; - gsi::Callback cb_parse_2852_0; gsi::Callback cb_parse_2856_0; gsi::Callback cb_parse_3612_0; gsi::Callback cb_parseContinue_0_0; @@ -1065,29 +1029,6 @@ static void _set_callback_cbs_lexicalHandler_c0_0 (void *cls, const gsi::Callbac } -// bool QXmlSimpleReader::parse(const QXmlInputSource &input) - -static void _init_cbs_parse_2852_0 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("input"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_cbs_parse_2852_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QXmlInputSource &arg1 = args.read (heap); - ret.write ((bool)((QXmlSimpleReader_Adaptor *)cls)->cbs_parse_2852_0 (arg1)); -} - -static void _set_callback_cbs_parse_2852_0 (void *cls, const gsi::Callback &cb) -{ - ((QXmlSimpleReader_Adaptor *)cls)->cb_parse_2852_0 = cb; -} - - // bool QXmlSimpleReader::parse(const QXmlInputSource *input) static void _init_cbs_parse_2856_0 (qt_gsi::GenericMethod *decl) @@ -1406,8 +1347,6 @@ static gsi::Methods methods_QXmlSimpleReader_Adaptor () { methods += new qt_gsi::GenericMethod ("hasProperty", "@brief Virtual method bool QXmlSimpleReader::hasProperty(const QString &name)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hasProperty_c2025_0, &_call_cbs_hasProperty_c2025_0, &_set_callback_cbs_hasProperty_c2025_0); methods += new qt_gsi::GenericMethod ("lexicalHandler", "@hide", true, &_init_cbs_lexicalHandler_c0_0, &_call_cbs_lexicalHandler_c0_0); methods += new qt_gsi::GenericMethod ("lexicalHandler", "@brief Virtual method QXmlLexicalHandler *QXmlSimpleReader::lexicalHandler()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_lexicalHandler_c0_0, &_call_cbs_lexicalHandler_c0_0, &_set_callback_cbs_lexicalHandler_c0_0); - methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_2852_0, &_call_cbs_parse_2852_0); - methods += new qt_gsi::GenericMethod ("parse", "@brief Virtual method bool QXmlSimpleReader::parse(const QXmlInputSource &input)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_parse_2852_0, &_call_cbs_parse_2852_0, &_set_callback_cbs_parse_2852_0); methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_2856_0, &_call_cbs_parse_2856_0); methods += new qt_gsi::GenericMethod ("parse", "@brief Virtual method bool QXmlSimpleReader::parse(const QXmlInputSource *input)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_parse_2856_0, &_call_cbs_parse_2856_0, &_set_callback_cbs_parse_2856_0); methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_3612_0, &_call_cbs_parse_3612_0); diff --git a/src/gsiqt5/gsiDeclQXmlSimpleReader.cc b/src/gsiqt5/gsiDeclQXmlSimpleReader.cc index 9945c535d..cf9b472cf 100644 --- a/src/gsiqt5/gsiDeclQXmlSimpleReader.cc +++ b/src/gsiqt5/gsiDeclQXmlSimpleReader.cc @@ -193,25 +193,6 @@ static void _call_f_lexicalHandler_c0 (const qt_gsi::GenericMethod * /*decl*/, v } -// (const QXmlInputSource &) - - -static void _init_f_parse_2852 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("input"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_parse_2852 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QXmlInputSource &arg1 = args.read (heap); - ret.write ((bool)((QXmlSimpleReader *)cls)->parse (arg1)); -} - - // (const QXmlInputSource *) @@ -470,7 +451,6 @@ static gsi::Methods methods_QXmlSimpleReader () { methods += new qt_gsi::GenericMethod ("hasFeature", "@brief Method (const QString &) const\nThis is a reimplementation of QXmlReader::hasFeature", true, &_init_f_hasFeature_c2025, &_call_f_hasFeature_c2025); methods += new qt_gsi::GenericMethod ("hasProperty", "@brief Method (const QString &) const\nThis is a reimplementation of QXmlReader::hasProperty", true, &_init_f_hasProperty_c2025, &_call_f_hasProperty_c2025); methods += new qt_gsi::GenericMethod (":lexicalHandler", "@brief Method () const\nThis is a reimplementation of QXmlReader::lexicalHandler", true, &_init_f_lexicalHandler_c0, &_call_f_lexicalHandler_c0); - methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource &)\nThis is a reimplementation of QXmlReader::parse", false, &_init_f_parse_2852, &_call_f_parse_2852); methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource *)\nThis is a reimplementation of QXmlReader::parse", false, &_init_f_parse_2856, &_call_f_parse_2856); methods += new qt_gsi::GenericMethod ("parse", "@brief Method (const QXmlInputSource *, bool)\n", false, &_init_f_parse_3612, &_call_f_parse_3612); methods += new qt_gsi::GenericMethod ("parseContinue", "@brief Method bool QXmlSimpleReader::parseContinue()\n", false, &_init_f_parseContinue_0, &_call_f_parseContinue_0); @@ -644,21 +624,6 @@ public: } } - // [adaptor impl] bool QXmlSimpleReader::parse(const QXmlInputSource &input) - bool cbs_parse_2852_0(const QXmlInputSource &input) - { - return QXmlSimpleReader::parse(input); - } - - virtual bool parse(const QXmlInputSource &input) - { - if (cb_parse_2852_0.can_issue()) { - return cb_parse_2852_0.issue(&QXmlSimpleReader_Adaptor::cbs_parse_2852_0, input); - } else { - return QXmlSimpleReader::parse(input); - } - } - // [adaptor impl] bool QXmlSimpleReader::parse(const QXmlInputSource *input) bool cbs_parse_2856_0(const QXmlInputSource *input) { @@ -848,7 +813,6 @@ public: gsi::Callback cb_hasFeature_c2025_0; gsi::Callback cb_hasProperty_c2025_0; gsi::Callback cb_lexicalHandler_c0_0; - gsi::Callback cb_parse_2852_0; gsi::Callback cb_parse_2856_0; gsi::Callback cb_parse_3612_0; gsi::Callback cb_parseContinue_0_0; @@ -1065,29 +1029,6 @@ static void _set_callback_cbs_lexicalHandler_c0_0 (void *cls, const gsi::Callbac } -// bool QXmlSimpleReader::parse(const QXmlInputSource &input) - -static void _init_cbs_parse_2852_0 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("input"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_cbs_parse_2852_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QXmlInputSource &arg1 = args.read (heap); - ret.write ((bool)((QXmlSimpleReader_Adaptor *)cls)->cbs_parse_2852_0 (arg1)); -} - -static void _set_callback_cbs_parse_2852_0 (void *cls, const gsi::Callback &cb) -{ - ((QXmlSimpleReader_Adaptor *)cls)->cb_parse_2852_0 = cb; -} - - // bool QXmlSimpleReader::parse(const QXmlInputSource *input) static void _init_cbs_parse_2856_0 (qt_gsi::GenericMethod *decl) @@ -1406,8 +1347,6 @@ static gsi::Methods methods_QXmlSimpleReader_Adaptor () { methods += new qt_gsi::GenericMethod ("hasProperty", "@brief Virtual method bool QXmlSimpleReader::hasProperty(const QString &name)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hasProperty_c2025_0, &_call_cbs_hasProperty_c2025_0, &_set_callback_cbs_hasProperty_c2025_0); methods += new qt_gsi::GenericMethod ("lexicalHandler", "@hide", true, &_init_cbs_lexicalHandler_c0_0, &_call_cbs_lexicalHandler_c0_0); methods += new qt_gsi::GenericMethod ("lexicalHandler", "@brief Virtual method QXmlLexicalHandler *QXmlSimpleReader::lexicalHandler()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_lexicalHandler_c0_0, &_call_cbs_lexicalHandler_c0_0, &_set_callback_cbs_lexicalHandler_c0_0); - methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_2852_0, &_call_cbs_parse_2852_0); - methods += new qt_gsi::GenericMethod ("parse", "@brief Virtual method bool QXmlSimpleReader::parse(const QXmlInputSource &input)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_parse_2852_0, &_call_cbs_parse_2852_0, &_set_callback_cbs_parse_2852_0); methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_2856_0, &_call_cbs_parse_2856_0); methods += new qt_gsi::GenericMethod ("parse", "@brief Virtual method bool QXmlSimpleReader::parse(const QXmlInputSource *input)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_parse_2856_0, &_call_cbs_parse_2856_0, &_set_callback_cbs_parse_2856_0); methods += new qt_gsi::GenericMethod ("parse", "@hide", false, &_init_cbs_parse_3612_0, &_call_cbs_parse_3612_0);